fixes bug #240170.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 10 insertions, 119 deletions

diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index 66eaec223e7c..659541c81961 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/qdbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.127 2009/03/30 18:48:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.128 2009/08/16 07:52:02 hattya Exp $
+
+  16 Aug 2009; Akinori Hattori <hattya@gentoo.org> -qdbm-1.8.75-r1.ebuild,
+  qdbm-1.8.77.ebuild:
+  fixes bug #240170.
 
   30 Mar 2009; Raúl Porcel <armin76@gentoo.org> qdbm-1.8.77.ebuild:
   arm/s390/sh stable wrt #212590
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index df54892a3269..67d958697438 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,9 +1,7 @@
 AUX qdbm-1.8.75-runpath.diff 1689 RMD160 e5f358b2c37ce69a4a5f814f62d87e2cb23288db SHA1 5a65a4aa0ad6f4260aff71e1dca82da988d04fb1 SHA256 216f308394592ff8f8c4ee3da36e29b5d99e9b38d27d015c63a26efadb223af2
 AUX qdbm-1.8.77-runpath.diff 1658 RMD160 bf7f1a6bfee257b4f196d4867e29a710bd2fedeb SHA1 dbc56a83cb9ee15be9df094447e9c26223d8b81c SHA256 385fd412f79856cdba16c77ec6dc380d40e96e6e944c7a2f6647a2520d45b6ef
 AUX qdbm-perl-runpath-vendor.diff 1257 RMD160 1e120cfd5fa3e51d2b353323229ab573684dea7f SHA1 ced72afc98e5288edc0a330d6cff632c83bb3d0b SHA256 b64ec547408bd8b0524c673ef01041653ae5ba7a5f1f5ab96986ed1b34ca864c
-DIST qdbm-1.8.75.tar.gz 947612 RMD160 a7886b98ef4006486b87ac51a8edb62a927a6238 SHA1 de93a794b13bb73909356c1ed2c0a97785171609 SHA256 539b5f7d024a9f5d64dd757da7c636c934f5c74e2ad3a9fa60af7dd94bf6fde5
 DIST qdbm-1.8.77.tar.gz 948271 RMD160 3c684a4127204faf32472d29d7fd64a07e394332 SHA1 e277e77bc0209cc4c8eb205a9082ef880048445c SHA256 e413a57b28061f65c6e26fbec584f0d1c9c06f3142ee513fec4061f65533c772
-EBUILD qdbm-1.8.75-r1.ebuild 1905 RMD160 b912984b42af479ee43f9605df896f41577c3bb8 SHA1 42f12a46a149af1ffd4937ba4298876e7b4b04ff SHA256 1d41a7ad92cad7e3cba6319e9b9bd024cb79e1d3556f1f6d856a7b06e23af0d7
-EBUILD qdbm-1.8.77.ebuild 1904 RMD160 46c398df48f2e1f0d4e0e6f16543e69da8c914a4 SHA1 cdbd1e3cfef86435e7a2b1554464c7540fb5ba89 SHA256 e8250c1e2c960548ce5e3046d8fca8079e243cbf037eeafcef78e323f8681fde
-MISC ChangeLog 14266 RMD160 b7b256180098df27484e7930315068f68e77f431 SHA1 1b845bf4db519bac85ed365321d353508c739ab9 SHA256 26d54fbb30f1077d82d84216a00f1431f434e65f5164c1b2890223fe6825643a
+EBUILD qdbm-1.8.77.ebuild 1964 RMD160 767a642169b992999d1730966b33ec80eb645838 SHA1 77b350eda0a9a89572ed839147f07f21b18199b4 SHA256 d450ea7588418e51328c6f07fa1b1244ebf169ea4021aa8e316dbdd8fd5db642
+MISC ChangeLog 14384 RMD160 532574fe85c419ddb90db2727d0e4d061153f668 SHA1 746f62e079c42c63fe4f165841d69dd0d9ed41f0 SHA256 de06c2b1fbc58e92784ce8c84b8f0d147263e1d8efc2239810da03e5de11d1c5
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
diff --git a/dev-db/qdbm/qdbm-1.8.75-r1.ebuild b/dev-db/qdbm/qdbm-1.8.75-r1.ebuild
deleted file mode 100644
index 5db88b927404..000000000000
--- a/dev-db/qdbm/qdbm-1.8.75-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.75-r1.ebuild,v 1.13 2007/12/29 10:53:29 welp Exp $
-
-inherit eutils java-pkg-opt-2 multilib
-
-IUSE="debug java perl ruby zlib"
-
-DESCRIPTION="Quick Database Manager"
-HOMEPAGE="http://qdbm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-SLOT="0"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	perl? ( dev-lang/perl )
-	ruby? ( virtual/ruby )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	sed -i "/^JAVACFLAGS/s:$: ${JAVACFLAGS}:" java/Makefile.in
-
-	epatch "${FILESDIR}"/${P}-runpath.diff
-	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
-
-}
-
-src_compile() {
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable zlib) \
-		--enable-pthread \
-		--enable-iconv \
-		|| die
-	emake || die
-
-	local u
-
-	for u in java perl ruby; do
-		if ! use ${u}; then
-			continue
-		fi
-
-		cd ${u}
-		econf || die
-		emake || die
-		cd -
-	done
-
-}
-
-src_test() {
-
-	emake -j1 check || die
-
-	local u
-
-	for u in java perl ruby; do
-		if ! use ${u}; then
-			continue
-		fi
-
-		cd ${u}
-		emake -j1 check || die
-		cd -
-	done
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc ChangeLog NEWS README THANKS
-	dohtml *.html
-
-	rm -rf "${D}"/usr/share/${PN}
-
-	local u mydatadir=/usr/share/doc/${P}/html
-
-	for u in java perl ruby; do
-		if ! use ${u}; then
-			continue
-		fi
-
-		cd ${u}
-		emake DESTDIR="${D}" MYDATADIR=${mydatadir}/${u} install || die
-
-		case ${u} in
-			java)
-				java-pkg_dojar "${D}"/usr/$(get_libdir)/*.jar
-				rm -f "${D}"/usr/$(get_libdir)/*.jar
-				;;
-			perl)
-				rm "${D}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
-				;;
-		esac
-		cd -
-	done
-
-	rm -f "${D}"/usr/bin/*test
-
-}
diff --git a/dev-db/qdbm/qdbm-1.8.77.ebuild b/dev-db/qdbm/qdbm-1.8.77.ebuild
index 2b0ae0a571c2..52bd22fbd995 100644
--- a/dev-db/qdbm/qdbm-1.8.77.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.77.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.8 2009/03/30 18:48:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.9 2009/08/16 07:52:02 hattya Exp $
 
 inherit eutils java-pkg-opt-2 multilib
 
@@ -26,7 +26,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	sed -i "/^JAVACFLAGS/s:$: ${JAVACFLAGS}:" java/Makefile.in
+	sed -i "/^CFLAGS/s/$/ ${CFLAGS}/" Makefile.in || die
+	sed -i "/^JAVACFLAGS/s/$/ ${JAVACFLAGS}/" java/Makefile.in || die
 
 	epatch "${FILESDIR}"/${P}-runpath.diff
 	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff