9 files changed, 16 insertions, 148 deletions
diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index c144ffe84812..107e3433ef13 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/qdbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.23 2005/02/18 11:15:21 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.24 2005/05/05 14:36:00 hattya Exp $
+
+*qdbm-1.8.24 (05 May 2005)
+
+  05 May 2005; Akinori Hattori <hattya@gentoo.org> -qdbm-1.8.13.ebuild,
+  -qdbm-1.8.14.ebuild, -qdbm-1.8.15.ebuild, +qdbm-1.8.24.ebuild:
+  new upstream release.
 
 *qdbm-1.8.21 (18 Feb 2005)
 
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 88874f7b05cc..43604fd417ed 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,14 +1,10 @@
-MD5 735bdddb9bd2aa7521cdb318b46e5d34 ChangeLog 2483
+MD5 b4cb3fcac82e3c4b869d4f2bdfd0d25e ChangeLog 2673
 MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230
-MD5 5e5bab9218684cb5effeb74d1efb71fe qdbm-1.8.13.ebuild 1154
-MD5 87777c0bb7a066bde4ee0d3370f9c557 qdbm-1.8.14.ebuild 1159
-MD5 9935a04373368ab825552933261e0448 qdbm-1.8.15.ebuild 1159
 MD5 baa34b4deb9f8a225a9751b44b1f2d71 qdbm-1.8.16.ebuild 1165
 MD5 da3f7a934564aae0528dbeec95c99fe1 qdbm-1.8.17.ebuild 1200
 MD5 6ce7b0d753cc5d7cca2400430a3693c9 qdbm-1.8.21.ebuild 1206
-MD5 3162efb60c6bd5483bf56f2b5dd9396b files/digest-qdbm-1.8.13 63
-MD5 16ebc6231d28ac424989fd6fd1e9fb29 files/digest-qdbm-1.8.14 63
-MD5 77d48911377c01d79d9dd6d5db819573 files/digest-qdbm-1.8.15 63
+MD5 040a5b53949d8731f5ba519634b00dc2 qdbm-1.8.24.ebuild 1206
 MD5 5e73e3df7c9ba5df4312934edf80cd9a files/digest-qdbm-1.8.16 63
 MD5 340399145118f869822d6127294a3ebb files/digest-qdbm-1.8.17 63
 MD5 3bdad6c38cab98c137eaf649d708042d files/digest-qdbm-1.8.21 63
+MD5 51e813f892cba7feaa2eb90583334ce9 files/digest-qdbm-1.8.24 63
diff --git a/dev-db/qdbm/files/digest-qdbm-1.8.13 b/dev-db/qdbm/files/digest-qdbm-1.8.13
deleted file mode 100644
index aeabd8858be8..000000000000
--- a/dev-db/qdbm/files/digest-qdbm-1.8.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af5f9648bf95169a2fcf541d76d6649f qdbm-1.8.13.tar.gz 806205
diff --git a/dev-db/qdbm/files/digest-qdbm-1.8.14 b/dev-db/qdbm/files/digest-qdbm-1.8.14
deleted file mode 100644
index 6dd535965c72..000000000000
--- a/dev-db/qdbm/files/digest-qdbm-1.8.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c0fc1666e049de020132012899c5bc2 qdbm-1.8.14.tar.gz 808779
diff --git a/dev-db/qdbm/files/digest-qdbm-1.8.15 b/dev-db/qdbm/files/digest-qdbm-1.8.15
deleted file mode 100644
index 5c53ffdc670e..000000000000
--- a/dev-db/qdbm/files/digest-qdbm-1.8.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b87525f248bfc77f61a177a9442adcbd qdbm-1.8.15.tar.gz 812733
diff --git a/dev-db/qdbm/files/digest-qdbm-1.8.24 b/dev-db/qdbm/files/digest-qdbm-1.8.24
new file mode 100644
index 000000000000..c253174fbb6f
--- /dev/null
+++ b/dev-db/qdbm/files/digest-qdbm-1.8.24
@@ -0,0 +1 @@
+MD5 d5f411b58664879ea63dd0c549554d9f qdbm-1.8.24.tar.gz 840581
diff --git a/dev-db/qdbm/qdbm-1.8.13.ebuild b/dev-db/qdbm/qdbm-1.8.13.ebuild
deleted file mode 100644
index 7e829cb476cd..000000000000
--- a/dev-db/qdbm/qdbm-1.8.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.13.ebuild,v 1.5 2005/01/01 17:42:35 eradicator Exp $
-
-inherit java-pkg
-
-IUSE="debug java perl ruby zlib"
-
-DESCRIPTION="Quick Database Manager"
-HOMEPAGE="http://qdbm.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-
-DEPEND="java? ( virtual/jdk )
-	perl? ( dev-lang/perl )
-	ruby? ( virtual/ruby )
-	zlib? ( sys-libs/zlib )"
-
-src_compile() {
-
-	econf \
-		`use_enable debug` \
-		`use_enable zlib` \
-		--enable-pthread \
-		--enable-iconv \
-		|| die
-	emake || die
-
-	for u in java perl ruby; do
-		if use $u; then
-			cd $u
-			econf || die
-			make || die
-			cd -
-		fi
-	done
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc COPYING ChangeLog NEWS README THANKS
-
-	for u in perl ruby; do
-		if use $u; then
-			cd $u
-			make DESTDIR=${D} install || die
-			cd -
-		fi
-	done
-
-	if use java; then
-		cd java
-		make DESTDIR=${D} install || die
-		java-pkg_dojar ${D}/usr/lib/*.jar
-		rm ${D}/usr/lib/*.jar
-		cd -
-	fi
-
-	rm ${D}/usr/bin/*test
-
-}
diff --git a/dev-db/qdbm/qdbm-1.8.15.ebuild b/dev-db/qdbm/qdbm-1.8.15.ebuild
deleted file mode 100644
index 7efcc92bf19d..000000000000
--- a/dev-db/qdbm/qdbm-1.8.15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.15.ebuild,v 1.4 2005/01/01 17:42:35 eradicator Exp $
-
-inherit java-pkg
-
-IUSE="debug java perl ruby zlib"
-
-DESCRIPTION="Quick Database Manager"
-HOMEPAGE="http://qdbm.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~amd64 ~ppc"
-SLOT="0"
-
-DEPEND="java? ( virtual/jdk )
-	perl? ( dev-lang/perl )
-	ruby? ( virtual/ruby )
-	zlib? ( sys-libs/zlib )"
-
-src_compile() {
-
-	econf \
-		`use_enable debug` \
-		`use_enable zlib` \
-		--enable-pthread \
-		--enable-iconv \
-		|| die
-	emake || die
-
-	for u in java perl ruby; do
-		if use $u; then
-			cd $u
-			econf || die
-			make || die
-			cd -
-		fi
-	done
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc COPYING ChangeLog NEWS README THANKS
-
-	for u in perl ruby; do
-		if use $u; then
-			cd $u
-			make DESTDIR=${D} install || die
-			cd -
-		fi
-	done
-
-	if use java; then
-		cd java
-		make DESTDIR=${D} install || die
-		java-pkg_dojar ${D}/usr/lib/*.jar
-		rm ${D}/usr/lib/*.jar
-		cd -
-	fi
-
-	rm ${D}/usr/bin/*test
-
-}
diff --git a/dev-db/qdbm/qdbm-1.8.14.ebuild b/dev-db/qdbm/qdbm-1.8.24.ebuild
index 9726a18f9597..7a088b27cb10 100644
--- a/dev-db/qdbm/qdbm-1.8.14.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.24.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.14.ebuild,v 1.5 2005/01/01 17:42:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.24.ebuild,v 1.1 2005/05/05 14:36:00 hattya Exp $
 
-inherit java-pkg
+inherit java-pkg multilib
 
 IUSE="debug java perl ruby zlib"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qdbm.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 DEPEND="java? ( virtual/jdk )
@@ -56,8 +56,8 @@ src_install() {
 	if use java; then
 		cd java
 		make DESTDIR=${D} install || die
-		java-pkg_dojar ${D}/usr/lib/*.jar
-		rm ${D}/usr/lib/*.jar
+		java-pkg_dojar ${D}/usr/$(get_libdir)/*.jar
+		rm ${D}/usr/$(get_libdir)/*.jar
 		cd -
 	fi