emul-libs are no longer installed to /emul/linux/x86/

Package-Manager: portage-2.1.2-r9

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 8558b3fb4e44fd2e514a8180c6b7da4e854058c5..487d3bd67326242d73743708dbd9260e41bd4edc 100644 (file)
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.250 2007/02/05 11:44:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.251 2007/02/21 10:40:28 blubb Exp $
+
+  21 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  files/arts-1.5.4-multilib.patch, arts-3.5.5.ebuild:
+  emul-libs are no longer installed to /emul/linux/x86/
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/1.3.0-jack-configure.in.in.patch, -files/arts-1.2.x.diff,

diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 3e9ea6e57b0e2ecb6aee169add399581f3fca223..37f77061f6a15a1d710ac2f7879406965d7246d5 100644 (file)
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX arts-1.5.0-bindnow.patch 795 RMD160 412bcf44fb499dd1f162768a604e603e819be508 SHA1 eb9a509c57afa0f5a80330082a24cbcafb864fa6 SHA256 05073dec5c390a6a474dc4e92141b4fd5b1132770b410f71050685994cf04dbb
 MD5 075bf36b46babf9e79102028402d85a4 files/arts-1.5.0-bindnow.patch 795
 RMD160 412bcf44fb499dd1f162768a604e603e819be508 files/arts-1.5.0-bindnow.patch 795
@@ -9,19 +6,19 @@ AUX arts-1.5.0-check_tmp_dir.patch 537 RMD160 b4e85c9710f55017bcf50d82f6bb323e17
 MD5 c360f7144a248f6a74a69de51173ffc1 files/arts-1.5.0-check_tmp_dir.patch 537
 RMD160 b4e85c9710f55017bcf50d82f6bb323e17295b7c files/arts-1.5.0-check_tmp_dir.patch 537
 SHA256 3c75415ccbbb79f91faea127316bccc060241a95b98df25485e9bbe1651cd10b files/arts-1.5.0-check_tmp_dir.patch 537
-AUX arts-1.5.4-multilib.patch 1113 RMD160 bb87f837bb5b381b1757f18a5ad6cfad3454c8df SHA1 47287d5df918f7d405774c526ee35ed75db48d04 SHA256 9e21a53c1f715bc7c0268fcec5decb046c0b0582fac4bee9c83466f7febada1c
-MD5 bd3529539c158f9ac62b15b5f884b0ca files/arts-1.5.4-multilib.patch 1113
-RMD160 bb87f837bb5b381b1757f18a5ad6cfad3454c8df files/arts-1.5.4-multilib.patch 1113
-SHA256 9e21a53c1f715bc7c0268fcec5decb046c0b0582fac4bee9c83466f7febada1c files/arts-1.5.4-multilib.patch 1113
+AUX arts-1.5.4-multilib.patch 347 RMD160 537c12af56d0f1bdef618b1a0baa13757d6b18b1 SHA1 7e5baf74ef86655ac89ef26e0fe2bf4765c0f1a3 SHA256 65f6b51fad6b830a51fd4dd1583082fbd5a1ec21ed5b15040e465fbf59860792
+MD5 ab6ec117000d277a1239a4114f32e854 files/arts-1.5.4-multilib.patch 347
+RMD160 537c12af56d0f1bdef618b1a0baa13757d6b18b1 files/arts-1.5.4-multilib.patch 347
+SHA256 65f6b51fad6b830a51fd4dd1583082fbd5a1ec21ed5b15040e465fbf59860792 files/arts-1.5.4-multilib.patch 347
 DIST arts-1.5.5.tar.bz2 967552 RMD160 9884d410a7b22a4221b57d9c170b5260739c68a1 SHA1 570fd77fbc47103f7bb9fb22d10cb80b3642ecc9 SHA256 2e5d5f07078ac79911815c25c6768b7fbf3c54989a4fc5b52a07e4a73b50aec1
-EBUILD arts-3.5.5.ebuild 2732 RMD160 19583c1ba89202b8ee30823980715c2e06d23995 SHA1 f821dd25a0c925a780dead53c2eb380c17c30bc2 SHA256 0890f808efc91921e394440cd1fcc0a5c754b86f088822f704b4bcd52f11a752
-MD5 48babef8394f22718e9012aa3040260e arts-3.5.5.ebuild 2732
-RMD160 19583c1ba89202b8ee30823980715c2e06d23995 arts-3.5.5.ebuild 2732
-SHA256 0890f808efc91921e394440cd1fcc0a5c754b86f088822f704b4bcd52f11a752 arts-3.5.5.ebuild 2732
-MISC ChangeLog 32139 RMD160 8b89bd517707ec2ac17c934e060ce9084f5f37b0 SHA1 f53caea920d3098ee7140241a33c6e464e46b851 SHA256 ffe311088d2bd6a939a92a1b56be770c614f3b3b294416926a45fb7b08ef6681
-MD5 97e184d2e080a481762f7193c11a55ff ChangeLog 32139
-RMD160 8b89bd517707ec2ac17c934e060ce9084f5f37b0 ChangeLog 32139
-SHA256 ffe311088d2bd6a939a92a1b56be770c614f3b3b294416926a45fb7b08ef6681 ChangeLog 32139
+EBUILD arts-3.5.5.ebuild 2879 RMD160 f24a6b99103482c446bc4e57c01a63a4e753b7e9 SHA1 0f54ab4d74f9f5a8f53ec90e8c9054ac9d4cb1e3 SHA256 f23385e12e81646b843cce97f8e82f9744eb25c5fbdd77e01c5a7809275ae56d
+MD5 a91da16158113fe0a475192508790527 arts-3.5.5.ebuild 2879
+RMD160 f24a6b99103482c446bc4e57c01a63a4e753b7e9 arts-3.5.5.ebuild 2879
+SHA256 f23385e12e81646b843cce97f8e82f9744eb25c5fbdd77e01c5a7809275ae56d arts-3.5.5.ebuild 2879
+MISC ChangeLog 32295 RMD160 3dab0d257936195ec167bcd74002316f4eb510e8 SHA1 745d11e23dbdfc93a6d32343414d79987c96cb28 SHA256 180ebf9bf76b92d5bd8cf15231625ec6750d9f35b5718166fdcc8ffcbcff2eba
+MD5 790afe57c9c481e370d502bb9d668d83 ChangeLog 32295
+RMD160 3dab0d257936195ec167bcd74002316f4eb510e8 ChangeLog 32295
+SHA256 180ebf9bf76b92d5bd8cf15231625ec6750d9f35b5718166fdcc8ffcbcff2eba ChangeLog 32295
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -29,10 +26,3 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 0bcd4c097838a110cb6d84b292bbd05d files/digest-arts-3.5.5 235
 RMD160 599264630165e526bfc89b7f7ae0794ba9ef0190 files/digest-arts-3.5.5 235
 SHA256 70de89a39e83b439bad014f832d9782bb3a30d4855512271601ae0f655761a6c files/digest-arts-3.5.5 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxxisAiZjviIA2XgRAiR+AKDjoy+UcGm70GMzJp+DEYECgpc3kwCgtNBv
-DceEmdWaN3waGQLodQcYLWw=
-=Y2Ur
------END PGP SIGNATURE-----

diff --git a/kde-base/arts/arts-3.5.5.ebuild b/kde-base/arts/arts-3.5.5.ebuild
index 16a16088018145d7bce02ff08bfdeb40bd67438a..452aecf4ceb1e4fce6c7c292ab30ea97597b9469 100644 (file)
--- a/kde-base/arts/arts-3.5.5.ebuild
+++ b/kde-base/arts/arts-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.5.ebuild,v 1.10 2007/01/05 16:54:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.5.ebuild,v 1.11 2007/02/21 10:40:28 blubb Exp $
 
 inherit kde flag-o-matic eutils versionator
 set-kdedir 3.5
@@ -40,6 +40,10 @@ PATCHES="${FILESDIR}/arts-1.5.0-bindnow.patch
 src_unpack() {
        kde_src_unpack
 
+       sed -i -e "s:GENTOO_LIB64:$(get_abi_LIBDIR amd64):" \
+               -e "s:GENTOO_LIB32:$(get_abi_LIBDIR x86):" artsc/artsdsp.in \
+               || die "multilib-sed failed"
+
        # Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
        # before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
        local nosspflags

diff --git a/kde-base/arts/files/arts-1.5.4-multilib.patch b/kde-base/arts/files/arts-1.5.4-multilib.patch
index fca790ff973e6682bdcd01b2e9461ba258ccfe27..8fca0e9d2d97ac0b63bc8858f7261e591fcbc1d6 100644 (file)
--- a/kde-base/arts/files/arts-1.5.4-multilib.patch
+++ b/kde-base/arts/files/arts-1.5.4-multilib.patch
@@ -1,52 +1,15 @@
---- artsc/artsdsp.in.orig      2006-08-23 16:30:16.000000000 +0200
-+++ artsc/artsdsp.in   2006-08-23 16:50:07.000000000 +0200
-@@ -94,6 +94,9 @@
- binary=`which $1`
- machine=`uname -m`
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- set `file -L $binary`
- 
- case $2 in
-@@ -106,10 +109,16 @@
+--- artsc/artsdsp.in.orig     2007-02-21 10:23:40.000000000 +0000
++++ artsc/artsdsp.in  2007-02-21 10:24:00.000000000 +0000
+@@ -106,10 +106,10 @@
  
  case $3 in
      32-bit)
 -       arch_libdir=lib
-+       artsd=`which artsd`
-+       set `file -L $artsd`
-+       if test "$3" == "32-bit"; then
-+         libdir=${prefix}/lib
-+       else
-+         libdir=/emul/linux/x86/usr/lib
-+       fi
++       arch_libdir=GENTOO_LIB32
         ;;
      64-bit)
 -       arch_libdir=lib64
-+        libdir=${prefix}/lib64
++       arch_libdir=GENTOO_LIB64
         ;;
      *)
         exit 1
-@@ -117,10 +126,6 @@
- 
- set $origargs
- 
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=${prefix}/${arch_libdir}
--
- if test "$single_thread" = 1; then
-   LD_PRELOAD=${libdir}/libartsdsp_st.so.0
- else
-@@ -129,6 +134,9 @@
- if test -f ${libdir}/libdl.so.2; then
-   LD_PRELOAD=$LD_PRELOAD:${libdir}/libdl.so.2
- fi
-+if test -f ${libdir}/libaoss.so.0; then
-+  LD_PRELOAD=$LD_PRELOAD:${libdir}/libaoss.so.0
-+fi
- export LD_PRELOAD
- 
- # invoke the program with the args given