diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-02-01 13:31:53 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-02-01 13:31:53 +0000 |
| commit | 6b5c2c5bb8a8cf2fb4d1a2a1f3ae9e5434aa042d (patch) | |
| tree | 952ed71356e9e648c42f35b2f431663a9a1553c3 /kde-base/qtjava | |
| parent | Fix manpage symlinks. (diff) | |
| download | gentoo-2-6b5c2c5bb8a8cf2fb4d1a2a1f3ae9e5434aa042d.tar.gz gentoo-2-6b5c2c5bb8a8cf2fb4d1a2a1f3ae9e5434aa042d.tar.bz2 gentoo-2-6b5c2c5bb8a8cf2fb4d1a2a1f3ae9e5434aa042d.zip | |
Fix lib-dir handling, bug #164790.
(Portage version: 2.1.2-r5)
Diffstat (limited to 'kde-base/qtjava')
| -rw-r--r-- | kde-base/qtjava/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/qtjava/qtjava-3.5.2-r1.ebuild | 7 | ||||
| -rw-r--r-- | kde-base/qtjava/qtjava-3.5.6-r1.ebuild | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog index cb3933d214c4..7a8d8d4ad539 100644 --- 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/qtjava-3.5.2-r1.ebuild b/kde-base/qtjava/qtjava-3.5.2-r1.ebuild index 475368320c35..e0e14b70126c 100644 --- 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 6aa05a8c259a..cea2d646adc3 100644 --- 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 } |