fixes bug #240170.

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 8 insertions, 115 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/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