Fix lib-dir handling, bug #164790.

Package-Manager: portage-2.1.2-r5

5 files changed, 33 insertions, 26 deletions

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index cde8659ad0a7..0fc2fec37843 100644
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.50 2007/02/01 12:25:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.51 2007/02/01 13:47:59 caster Exp $
+
+  01 Feb 2007; Vlastimil Babka <caster@gentoo.org> kdejava-3.5.2-r1.ebuild,
+  kdejava-3.5.5-r1.ebuild, kdejava-3.5.6-r1.ebuild:
+  Fix lib-dir handling, bug #164790.
 
   01 Feb 2007; Markus Rothe <corsair@gentoo.org> kdejava-3.5.5-r1.ebuild:
   Stable on ppc64; bug #155341
diff --git a/kde-base/kdejava/Manifest b/kde-base/kdejava/Manifest
index 1fbbf5439bed..df87cf25de8e 100644
--- a/kde-base/kdejava/Manifest
+++ b/kde-base/kdejava/Manifest
@@ -13,34 +13,34 @@ SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df files/no
 DIST kdebindings-3.5.2.tar.bz2 5416964 RMD160 670891a4848bd18d9ce629f675d1d2550b45307c SHA1 f1b0180d8005b9497cd8549f260b30f43e08ed4b SHA256 71ca8bf60cc9eb232ddfe5d6522e0051931b2f498ee0066edcb6c4900784f1c9
 DIST kdebindings-3.5.5.tar.bz2 5419613 RMD160 8515555111e2745f63b403d3255ff5521bf77875 SHA1 42b6a70280f2f7b0c0d90c236b983a68ea6a70c4 SHA256 54751d3fe6635abf7bb8ef08ff240354e56dfaaa02cd16b1dd2a837706c4b274
 DIST kdebindings-3.5.6.tar.bz2 5421905 RMD160 3c6547c5eb4baa9efe0e94473d4daf4e14514f80 SHA1 e844ef929ecb9d6ccf2225c78f4b9f5867e6a384 SHA256 9fad26d5827d996cbd88d9267883b5bc444f228d9fc8e0312db56e5f6d7363d8
-EBUILD kdejava-3.5.2-r1.ebuild 1647 RMD160 ce2ed0c598912379f955c736f07d8f4eaca79877 SHA1 5227da1d19be3f1cfa5b26cd53a602aac1449199 SHA256 78e50efc8ddf86f4acb30046f9970e2d2723ba7a941e637b5c381aa50ab7af31
-MD5 a6a294297cb647ad5d65fcb8a99500e5 kdejava-3.5.2-r1.ebuild 1647
-RMD160 ce2ed0c598912379f955c736f07d8f4eaca79877 kdejava-3.5.2-r1.ebuild 1647
-SHA256 78e50efc8ddf86f4acb30046f9970e2d2723ba7a941e637b5c381aa50ab7af31 kdejava-3.5.2-r1.ebuild 1647
+EBUILD kdejava-3.5.2-r1.ebuild 1689 RMD160 deffa190b09eb094db50d1e55f645828c9fbf6a0 SHA1 8a616ab86b385a36613cf7033c3d6f068a2c34bf SHA256 6f22b4d6b1f2c058d5bc6d1d014921a70587f42ed96d0d5274aca74fc507bc21
+MD5 bb2e8b708d68e800aca5f6f6dac73050 kdejava-3.5.2-r1.ebuild 1689
+RMD160 deffa190b09eb094db50d1e55f645828c9fbf6a0 kdejava-3.5.2-r1.ebuild 1689
+SHA256 6f22b4d6b1f2c058d5bc6d1d014921a70587f42ed96d0d5274aca74fc507bc21 kdejava-3.5.2-r1.ebuild 1689
 EBUILD kdejava-3.5.2.ebuild 1457 RMD160 99343f10d3c7190c82d4e519f3c6c87c5d1d7593 SHA1 189c32f4e52d01382e281b679e3920052200ddde SHA256 1773526b7a85b95743fa1ff7244e0dec13161e82d58dc7533e6f4a0da996b960
 MD5 d6936e9ad5ee765c81bbc193a23d7239 kdejava-3.5.2.ebuild 1457
 RMD160 99343f10d3c7190c82d4e519f3c6c87c5d1d7593 kdejava-3.5.2.ebuild 1457
 SHA256 1773526b7a85b95743fa1ff7244e0dec13161e82d58dc7533e6f4a0da996b960 kdejava-3.5.2.ebuild 1457
-EBUILD kdejava-3.5.5-r1.ebuild 1662 RMD160 abc103e7a02ffebf562c6aeb82a5990ca53f0876 SHA1 f5ca3e1a609966706171c8515776078cae30b876 SHA256 f79c56334a9913d3da90cd9d5f4b0cd86f2c02ad4668a140d9b6ffc64c135018
-MD5 7dd83432301878332e5762906fb72e69 kdejava-3.5.5-r1.ebuild 1662
-RMD160 abc103e7a02ffebf562c6aeb82a5990ca53f0876 kdejava-3.5.5-r1.ebuild 1662
-SHA256 f79c56334a9913d3da90cd9d5f4b0cd86f2c02ad4668a140d9b6ffc64c135018 kdejava-3.5.5-r1.ebuild 1662
+EBUILD kdejava-3.5.5-r1.ebuild 1703 RMD160 1db9c70c224ca48348ab45e215605d88b2b8603d SHA1 e4d7f1fa2e952a2c847ba72b2f64291c1753af62 SHA256 7f62504fe80dcf23e31f551a316e1117e62fdf9a7ef7e7074a70e9488b38c536
+MD5 00896c76f2897e08d8d79f2fac8f7496 kdejava-3.5.5-r1.ebuild 1703
+RMD160 1db9c70c224ca48348ab45e215605d88b2b8603d kdejava-3.5.5-r1.ebuild 1703
+SHA256 7f62504fe80dcf23e31f551a316e1117e62fdf9a7ef7e7074a70e9488b38c536 kdejava-3.5.5-r1.ebuild 1703
 EBUILD kdejava-3.5.5.ebuild 1470 RMD160 87089b9f2ffd0128ae991e73ac265538e6138d0d SHA1 2415d425f300764462124b76aae457b3631df71f SHA256 255967257bb68c366ef6d92dbeb727a62ef721f48ee0c9ca40f0ef4111018a97
 MD5 33e0ea80ddd46c3d6ae798dd933df154 kdejava-3.5.5.ebuild 1470
 RMD160 87089b9f2ffd0128ae991e73ac265538e6138d0d kdejava-3.5.5.ebuild 1470
 SHA256 255967257bb68c366ef6d92dbeb727a62ef721f48ee0c9ca40f0ef4111018a97 kdejava-3.5.5.ebuild 1470
-EBUILD kdejava-3.5.6-r1.ebuild 1660 RMD160 b924036330b34869222668df26c8104bb3c7d2a9 SHA1 d33e516e2b60f926381b1a4cd930b1a3f9d5bde9 SHA256 bd35d5ecc666607a1bdf2717618105d305fb60a50da9fbbebaaabc811264a38d
-MD5 ea6b2f61bd25496aeb372f08d1ada716 kdejava-3.5.6-r1.ebuild 1660
-RMD160 b924036330b34869222668df26c8104bb3c7d2a9 kdejava-3.5.6-r1.ebuild 1660
-SHA256 bd35d5ecc666607a1bdf2717618105d305fb60a50da9fbbebaaabc811264a38d kdejava-3.5.6-r1.ebuild 1660
+EBUILD kdejava-3.5.6-r1.ebuild 1702 RMD160 af6657f339b3fda69b42e5cc00804e725415ecc0 SHA1 5e37665770bda0ad8b8be8d02247eb81659fbee9 SHA256 678306efd61f390c05229bb0aa8e02954902fcd477faecf16a0df8a573ac1604
+MD5 5d37905f943468891f248aedeeabd2ba kdejava-3.5.6-r1.ebuild 1702
+RMD160 af6657f339b3fda69b42e5cc00804e725415ecc0 kdejava-3.5.6-r1.ebuild 1702
+SHA256 678306efd61f390c05229bb0aa8e02954902fcd477faecf16a0df8a573ac1604 kdejava-3.5.6-r1.ebuild 1702
 EBUILD kdejava-3.5.6.ebuild 1470 RMD160 481bc697bfcf87a89fd5d788780a43796fb1262a SHA1 204fcf0589bac58520670b3351a36c72590127ab SHA256 e5d3009993100d2d02a5a704140a38f210964c000d758f6f79fe29fb96c50156
 MD5 85548ecaaba7278442d8e0d9a864f543 kdejava-3.5.6.ebuild 1470
 RMD160 481bc697bfcf87a89fd5d788780a43796fb1262a kdejava-3.5.6.ebuild 1470
 SHA256 e5d3009993100d2d02a5a704140a38f210964c000d758f6f79fe29fb96c50156 kdejava-3.5.6.ebuild 1470
-MISC ChangeLog 6900 RMD160 a8ad3599c047e7d3c27764590d5754a8d915227d SHA1 f3ef0d28cd30a67c9123095dc0bf9d0e01447a61 SHA256 f3e7bd98eab73023731c5b0a1f5988f5ef1fc729290aa8b092075572bfab04b9
-MD5 f227ba629755b163bd0f249cd38ed824 ChangeLog 6900
-RMD160 a8ad3599c047e7d3c27764590d5754a8d915227d ChangeLog 6900
-SHA256 f3e7bd98eab73023731c5b0a1f5988f5ef1fc729290aa8b092075572bfab04b9 ChangeLog 6900
+MISC ChangeLog 7065 RMD160 32c5acf06ccadd3b5f98b8fcb1523870a025de7e SHA1 b07573dda9e89a7a88e138c72c85e41cbe22b012 SHA256 8e93c673afa3dcdcd04c830f528457ba3507ae3d36620f2a579151aa3ec1d316
+MD5 30b05113ab2a89e87459e415b4b7307b ChangeLog 7065
+RMD160 32c5acf06ccadd3b5f98b8fcb1523870a025de7e ChangeLog 7065
+SHA256 8e93c673afa3dcdcd04c830f528457ba3507ae3d36620f2a579151aa3ec1d316 ChangeLog 7065
 MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8
 MD5 76e6979e60db4af541cd6af21de010f7 metadata.xml 174
 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e metadata.xml 174
diff --git a/kde-base/kdejava/kdejava-3.5.2-r1.ebuild b/kde-base/kdejava/kdejava-3.5.2-r1.ebuild
index 6ffdc5bfd8df..3fa2c58f84d9 100644
--- a/kde-base/kdejava/kdejava-3.5.2-r1.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.2-r1.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/kdejava/kdejava-3.5.2-r1.ebuild,v 1.1 2007/02/01 00:45:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.2-r1.ebuild,v 1.2 2007/02/01 13:47:59 caster Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -51,8 +51,9 @@ src_compile() {
 src_install() {
 	kde-meta_src_install
 
-	rm -rf ${D}/usr/kde/${SLOT}/lib/java
+	local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
+	rm -rf "${libdir}/java" || die "rm failed"
 
 	java-pkg_dojar ${S}/${PN}/koala/koala.jar
-	java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
+	java-pkg_regso "${libdir}"/*.so
 }
diff --git a/kde-base/kdejava/kdejava-3.5.5-r1.ebuild b/kde-base/kdejava/kdejava-3.5.5-r1.ebuild
index 92a644dd7389..c35f17836065 100644
--- a/kde-base/kdejava/kdejava-3.5.5-r1.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.5-r1.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/kdejava/kdejava-3.5.5-r1.ebuild,v 1.2 2007/02/01 12:25:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.5-r1.ebuild,v 1.3 2007/02/01 13:47:59 caster Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -51,8 +51,9 @@ src_compile() {
 src_install() {
 	kde-meta_src_install
 
-	rm -rf ${D}/usr/kde/${SLOT}/lib/java
+	local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
+	rm -rf "${libdir}/java" || die "rm failed"
 
 	java-pkg_dojar ${S}/${PN}/koala/koala.jar
-	java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
+	java-pkg_regso "${libdir}"/*.so
 }
diff --git a/kde-base/kdejava/kdejava-3.5.6-r1.ebuild b/kde-base/kdejava/kdejava-3.5.6-r1.ebuild
index 8c3425dc220d..d5e371935115 100644
--- a/kde-base/kdejava/kdejava-3.5.6-r1.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.6-r1.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/kdejava/kdejava-3.5.6-r1.ebuild,v 1.1 2007/02/01 00:45:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.6-r1.ebuild,v 1.2 2007/02/01 13:47:59 caster Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -51,8 +51,9 @@ src_compile() {
 src_install() {
 	kde-meta_src_install
 
-	rm -rf ${D}/usr/kde/${SLOT}/lib/java
+	local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
+	rm -rf "${libdir}/java" || die "rm failed"
 
 	java-pkg_dojar ${S}/${PN}/koala/koala.jar
-	java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
+	java-pkg_regso "${libdir}"/*.so
 }