Fix lib-dir handling, bug #164790.

Package-Manager: portage-2.1.2-r5

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index cb3933d214c4865eac7d337acb49810b99db6073..7a8d8d4ad5390c8954cc838a5dce48905f950d92 100644 (file)
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/qtjava
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.42 2007/02/01 12:26:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.43 2007/02/01 13:31:53 caster Exp $
+
+  01 Feb 2007; Vlastimil Babka <caster@gentoo.org> qtjava-3.5.2-r1.ebuild,
+  qtjava-3.5.6-r1.ebuild:
+  Fix lib-dir handling, bug #164790.
 
   01 Feb 2007; Markus Rothe <corsair@gentoo.org> qtjava-3.5.2-r1.ebuild:
   Stable on ppc64; bug #155341

diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index d70ea1fb75af380e8268c995911f408e11bd1708..6917faf6e0e08f53dfb3aa7db596caab16638c0a 100644 (file)
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -8,26 +8,26 @@ RMD160 46183053d044bb5cf74275185c9c242cab319341 files/qtjava-3.5-javacflags.patc
 SHA256 e9ddce9f0f3cd0a8524b2595cc2956f13100c636112d4d9e189a9d3dc7961e31 files/qtjava-3.5-javacflags.patch 483
 DIST kdebindings-3.5.2.tar.bz2 5416964 RMD160 670891a4848bd18d9ce629f675d1d2550b45307c SHA1 f1b0180d8005b9497cd8549f260b30f43e08ed4b SHA256 71ca8bf60cc9eb232ddfe5d6522e0051931b2f498ee0066edcb6c4900784f1c9
 DIST kdebindings-3.5.6.tar.bz2 5421905 RMD160 3c6547c5eb4baa9efe0e94473d4daf4e14514f80 SHA1 e844ef929ecb9d6ccf2225c78f4b9f5867e6a384 SHA256 9fad26d5827d996cbd88d9267883b5bc444f228d9fc8e0312db56e5f6d7363d8
-EBUILD qtjava-3.5.2-r1.ebuild 1235 RMD160 04416bcbd08cbfd66d035c21447c7c871b44aa92 SHA1 b096f2e5669954314e92e434d25280404c1dd66b SHA256 40377a7f0cab7405baf18c3a19f1e0692968ca2a0326876246980f9ab686068c
-MD5 fe1c48a677b3c1c2a2e8b6c30dc74ce3 qtjava-3.5.2-r1.ebuild 1235
-RMD160 04416bcbd08cbfd66d035c21447c7c871b44aa92 qtjava-3.5.2-r1.ebuild 1235
-SHA256 40377a7f0cab7405baf18c3a19f1e0692968ca2a0326876246980f9ab686068c qtjava-3.5.2-r1.ebuild 1235
+EBUILD qtjava-3.5.2-r1.ebuild 1276 RMD160 e1eee1136e58a8496a58fba524274fe14ecd674b SHA1 7520e41da739f1cfa03ff5236d70a2ab1ebdbfeb SHA256 96042d3d1c7dae3c291393dbbd88ad5fa6ec3290311931a375d5c8fadaeb62ea
+MD5 274334a7ae559deb7193652c9b763e53 qtjava-3.5.2-r1.ebuild 1276
+RMD160 e1eee1136e58a8496a58fba524274fe14ecd674b qtjava-3.5.2-r1.ebuild 1276
+SHA256 96042d3d1c7dae3c291393dbbd88ad5fa6ec3290311931a375d5c8fadaeb62ea qtjava-3.5.2-r1.ebuild 1276
 EBUILD qtjava-3.5.2.ebuild 961 RMD160 22abdba12d388b9dd4bf74166c0cd39c49c5ee51 SHA1 e1bf36b431666578d794be3318a63f0f1f523e02 SHA256 a9100b8fc8ae9be3dc221fd6057bbec5ab845052e41c5b799605fae12acf870e
 MD5 add12d3bddd3f1c63b1951df63ee3af9 qtjava-3.5.2.ebuild 961
 RMD160 22abdba12d388b9dd4bf74166c0cd39c49c5ee51 qtjava-3.5.2.ebuild 961
 SHA256 a9100b8fc8ae9be3dc221fd6057bbec5ab845052e41c5b799605fae12acf870e qtjava-3.5.2.ebuild 961
-EBUILD qtjava-3.5.6-r1.ebuild 1233 RMD160 a9b632df458e2f3c6a9086715e4105de2ecc2bcf SHA1 940ed6277072a335ea530b32fa5976a28d56c20d SHA256 f2d0f5bcdb2afc761bd95bbdd0f85d97ec55e7a1c9f24e7f79ad99f9a65adfc3
-MD5 22cc8204e6ab896a9ce70b092944b322 qtjava-3.5.6-r1.ebuild 1233
-RMD160 a9b632df458e2f3c6a9086715e4105de2ecc2bcf qtjava-3.5.6-r1.ebuild 1233
-SHA256 f2d0f5bcdb2afc761bd95bbdd0f85d97ec55e7a1c9f24e7f79ad99f9a65adfc3 qtjava-3.5.6-r1.ebuild 1233
+EBUILD qtjava-3.5.6-r1.ebuild 1275 RMD160 d1914a8d8732e1186ab75b56b2dfc58775a9e7ce SHA1 5d0bbdbae0081ae6f140751e83215dbe17a2c8ac SHA256 cd0547e960f76132d7882725b0779b800fbac11771c14667cce417112dc00c32
+MD5 dd15d11769d118010a8723fbb1867626 qtjava-3.5.6-r1.ebuild 1275
+RMD160 d1914a8d8732e1186ab75b56b2dfc58775a9e7ce qtjava-3.5.6-r1.ebuild 1275
+SHA256 cd0547e960f76132d7882725b0779b800fbac11771c14667cce417112dc00c32 qtjava-3.5.6-r1.ebuild 1275
 EBUILD qtjava-3.5.6.ebuild 959 RMD160 3376687a524fdbfacc1b1eba5361aef8b7bf9761 SHA1 fc421bbb2bd17c398bf1598a96b7c6a64ec941f8 SHA256 cfc3e715450e5f4d1a603cf75f0cde08b774a9aa4462162fd122404c9c4fc970
 MD5 0ee2b7c1fadef948822fb2fb7ebdaf57 qtjava-3.5.6.ebuild 959
 RMD160 3376687a524fdbfacc1b1eba5361aef8b7bf9761 qtjava-3.5.6.ebuild 959
 SHA256 cfc3e715450e5f4d1a603cf75f0cde08b774a9aa4462162fd122404c9c4fc970 qtjava-3.5.6.ebuild 959
-MISC ChangeLog 5854 RMD160 b83c9801f5ab460ae0e800c77887c3639eea95cb SHA1 aaca531fd0e4cbf155bf9c22e2343e2fa5bdc675 SHA256 0c0b84dbdcc845d03ee7cd5593a139d14aac4eb2a915f46f54269b4961970460
-MD5 5583fa13527c7cf994175a3cf2928b9c ChangeLog 5854
-RMD160 b83c9801f5ab460ae0e800c77887c3639eea95cb ChangeLog 5854
-SHA256 0c0b84dbdcc845d03ee7cd5593a139d14aac4eb2a915f46f54269b4961970460 ChangeLog 5854
+MISC ChangeLog 5992 RMD160 858d666b61d8994c68779d255938fc792dc38df1 SHA1 4ac8717dafbf96c4af3ac4160b16ce4b9caba858 SHA256 dfe90ffdd070471b644b2b7a3cc09ba03e6fc30e8a21698c922ba385f9a83407
+MD5 4e79e89e19014aaedae55bc3343cff95 ChangeLog 5992
+RMD160 858d666b61d8994c68779d255938fc792dc38df1 ChangeLog 5992
+SHA256 dfe90ffdd070471b644b2b7a3cc09ba03e6fc30e8a21698c922ba385f9a83407 ChangeLog 5992
 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/qtjava/qtjava-3.5.2-r1.ebuild b/kde-base/qtjava/qtjava-3.5.2-r1.ebuild
index 475368320c353cd9c73affba8619ca63400e72d4..e0e14b70126cf07175d1ec1fd41da0ac0f280659 100644 (file)
--- a/kde-base/qtjava/qtjava-3.5.2-r1.ebuild
+++ b/kde-base/qtjava/qtjava-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/qtjava/qtjava-3.5.2-r1.ebuild,v 1.2 2007/02/01 12:26:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.2-r1.ebuild,v 1.3 2007/02/01 13:31:53 caster Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -40,9 +40,10 @@ src_compile() {
 src_install() {
        kde-meta_src_install
 
+       local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
        # Is there a cleaner way?
-       rm -rf ${D}/usr/kde/${SLOT}/lib/java
+       rm -rf "${libdir}/java" || die "rm failed"
 
        java-pkg_dojar ${S}/${PN}/javalib/${PN}.jar
-       java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
+       java-pkg_regso "${libdir}"/*.so
 }

diff --git a/kde-base/qtjava/qtjava-3.5.6-r1.ebuild b/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
index 6aa05a8c259aba78859adcd721367eb5fa78435e..cea2d646adc344046813d2a4cdce37dc6e568889 100644 (file)
--- a/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
+++ b/kde-base/qtjava/qtjava-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/qtjava/qtjava-3.5.6-r1.ebuild,v 1.1 2007/02/01 00:44:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.6-r1.ebuild,v 1.2 2007/02/01 13:31:53 caster Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -40,9 +40,10 @@ src_compile() {
 src_install() {
        kde-meta_src_install
 
+       local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)"
        # Is there a cleaner way?
-       rm -rf ${D}/usr/kde/${SLOT}/lib/java
+       rm -rf "${libdir}/java" || die "rm failed"
 
        java-pkg_dojar ${S}/${PN}/javalib/${PN}.jar
-       java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
+       java-pkg_regso "${libdir}"/*.so
 }