Fix lib-dir handling, bug #164790.

(Portage version: 2.1.2-r5)

4 files changed, 17 insertions, 10 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/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
 }