new upstream release. fixes bug #331553.

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

4 files changed, 145 insertions, 11 deletions

diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index ea9ef022bee8..0df33cff2503 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/qdbm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.130 2010/07/31 10:28:55 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.131 2010/11/25 09:51:32 hattya Exp $
+
+*qdbm-1.8.78 (25 Nov 2010)
+
+  25 Nov 2010; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.78.ebuild,
+  files/qdbm-perl-runpath-vendor.diff:
+  new upstream release. fixes bug #331553.
 
   31 Jul 2010; Akinori Hattori <hattya@gentoo.org>
   -files/qdbm-1.8.75-runpath.diff, qdbm-1.8.77.ebuild,
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 63621d4dc931..5d89e15556c4 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,6 +1,8 @@
-AUX qdbm-perl-runpath-vendor.diff 1184 RMD160 adf9924a55e20586377d264041ff662743ba9892 SHA1 f5e0039177eaa1bc2a6af288d0a7c74607439bad SHA256 c1bd36aff7c4b8f3939d8064cd14921f055362e0008e683420a6e383ea02d9bd
+AUX qdbm-perl-runpath-vendor.diff 1054 RMD160 369d3d03d4259e7e6f31cc7fe3dba88a6c2a33bb SHA1 a2fa5f660790627148a75bb2c7fd80598d1d3d51 SHA256 e1e0b6bbe6089b8d1c7c80a5040a5102e8b09a1db05a3c9e7d4749dfdd88ffc0
 AUX qdbm-runpath.diff 1585 RMD160 95ea0b97a86342f3b54b586b542699e970fd9333 SHA1 e2dbd37b6f57604b3a1b7544f394e370577cafcf SHA256 d3e70c6b172fc5c379ede598b793bd1262a6209e99653af929e8c633ffebccf4
 DIST qdbm-1.8.77.tar.gz 948271 RMD160 3c684a4127204faf32472d29d7fd64a07e394332 SHA1 e277e77bc0209cc4c8eb205a9082ef880048445c SHA256 e413a57b28061f65c6e26fbec584f0d1c9c06f3142ee513fec4061f65533c772
+DIST qdbm-1.8.78.tar.gz 1015429 RMD160 84c812eaa0ddde822dd37515de67287098bd3a4b SHA1 8c2ab938c2dad8067c29b0aa93efc6389f0e7076 SHA256 b466fe730d751e4bfc5900d1f37b0fb955f2826ac456e70012785e012cdcb73e
 EBUILD qdbm-1.8.77.ebuild 2162 RMD160 132a724307b86ae5570e03e8bac5a963934bef28 SHA1 40118b5796e5342b119c43ab9bdf33a470ccf359 SHA256 7794079d94a38b7a90adae4095388b9082359db4b1430500309a9422184beb71
-MISC ChangeLog 14721 RMD160 f076c7b6b57bf1bbd5104bd1c25a8fd379cd95b0 SHA1 0ae563c626a270483868263d14d47e444a86d7a1 SHA256 c6362425121947c1397e12ead7e3b9d0ca58487164ee37cc5cde9de0dafda004
+EBUILD qdbm-1.8.78.ebuild 2358 RMD160 1904f77dbe98992e93c994cf63e76561a779a33f SHA1 95e84cf7c77730de28fcbe9cc3bac530ab4ae079 SHA256 275ccfafed1926b433ce27745217709656f99a7656e0f9aeca7dbcea8aebd6e4
+MISC ChangeLog 14904 RMD160 a69bd33859c33e8c0c6e323357294ddf8d5a1e42 SHA1 1e479ad56648bc5a0b2c2386999217e38baf7a2e SHA256 7dd44a59baaa245d81de957a61df6fc3f79121776e304560d9bea2a654be7c52
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
diff --git a/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff b/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff
index e5395ec4719a..d46f9b3f236e 100644
--- a/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff
+++ b/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff
@@ -1,26 +1,22 @@
 diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in
 --- qdbm-1.8.62.orig/perl/Makefile.in
 +++ qdbm-1.8.62/perl/Makefile.in
-@@ -42,16 +42,16 @@
+@@ -42,15 +42,15 @@
  all :
  	cd depot && [ -f Makefile ] || \
  	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
 -	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
--	  $(RUNENV) make
 +	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
-+	  $(RUNENV) make LD_RUN_PATH=
+ 	  $(RUNENV) make
  	cd curia && [ -f Makefile ] || \
  	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
 -	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
--	  $(RUNENV) make
 +	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
-+	  $(RUNENV) make LD_RUN_PATH=
+ 	  $(RUNENV) make
  	cd villa && [ -f Makefile ] || \
  	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
 -	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
--	  $(RUNENV) make
 +	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
-+	  $(RUNENV) make LD_RUN_PATH=
+ 	  $(RUNENV) make
  	@printf '\n'
  	@printf '#================================================================\n'
- 	@printf '# Ready to install.\n'
diff --git a/dev-db/qdbm/qdbm-1.8.78.ebuild b/dev-db/qdbm/qdbm-1.8.78.ebuild
new file mode 100644
index 000000000000..1a519c3d9f3a
--- /dev/null
+++ b/dev-db/qdbm/qdbm-1.8.78.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78.ebuild,v 1.1 2010/11/25 09:51:32 hattya Exp $
+
+EAPI="3"
+
+inherit eutils java-pkg-opt-2 multilib
+
+IUSE="cxx debug java perl ruby zlib"
+
+DESCRIPTION="Quick Database Manager"
+HOMEPAGE="http://fallabs.com/qdbm/"
+SRC_URI="http://fallabs.com/${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? ( dev-lang/ruby:1.8 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${PN}-runpath.diff
+	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
+
+	# apply flags
+	sed -i "/^CFLAGS/s/$/ ${CFLAGS}/" Makefile.in || die
+	sed -i "/^CXXFLAGS/s/$/ ${CXXFLAGS}/" plus/Makefile.in || die
+	sed -i "/^JAVACFLAGS/s/$/ ${JAVACFLAGS}/" java/Makefile.in || die
+
+	# replace make -> $(MAKE)
+	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" \
+		Makefile.in \
+		{cgi,java,perl,plus,ruby}/Makefile.in \
+		|| die
+
+}
+
+qdbm_api_for() {
+
+	local u
+
+	for u in cxx java perl ruby; do
+		if ! use "${u}"; then
+			continue
+		fi
+
+		if [ "${u}" = "cxx" ]; then
+			u="plus"
+		fi
+
+		cd "${u}"
+		case "${EBUILD_PHASE}" in
+		configure)
+			econf || die
+			;;
+		compile)
+			emake || die
+			;;
+		test)
+			emake -j1 check || die
+			;;
+		install)
+			emake \
+				DESTDIR="${ED}" \
+				MYDATADIR=/usr/share/doc/${P}/html \
+				install \
+				|| die
+		esac
+		cd -
+	done
+
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable zlib) \
+		--enable-pthread \
+		--enable-iconv \
+		|| die
+	qdbm_api_for # configure
+
+}
+
+src_compile() {
+
+	emake || die
+	qdbm_api_for # compile
+
+}
+
+src_test() {
+
+	emake -j1 check || die
+	qdbm_api_for # test
+
+}
+
+src_install() {
+
+	emake DESTDIR="${ED}" install || die
+
+	dodoc ChangeLog NEWS README THANKS
+	dohtml -r doc/
+
+	rm -rf "${ED}"/usr/share/${PN}
+
+	qdbm_api_for # install
+
+	if use java; then
+		java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
+		rm -f "${ED}"/usr/$(get_libdir)/*.jar
+
+	elif use perl; then
+		rm -f "${ED}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
+		find "${ED}" -name .packlist -print0 | xargs -0 rm -f
+
+	fi
+
+	rm -f "${D}"/usr/bin/*test
+	rm -f "${D}"/usr/share/man/man1/*test.1*
+
+}