Fix BerkDB detection code with 5.0 wrt #319677 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 31 insertions, 7 deletions

diff --git a/app-crypt/onak/ChangeLog b/app-crypt/onak/ChangeLog
index 691b5d2dab77..cd56a3603896 100644
--- a/app-crypt/onak/ChangeLog
+++ b/app-crypt/onak/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/onak
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/ChangeLog,v 1.8 2010/06/17 21:22:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/ChangeLog,v 1.9 2010/07/14 11:56:37 ssuominen Exp $
+
+  14 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> onak-0.3.7.ebuild,
+  +files/onak-0.3.7-berkdb-5.0.patch:
+  Fix BerkDB detection code with 5.0 wrt #319677 by Diego E. Pettenò.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> onak-0.3.3-r1.ebuild,
   onak-0.3.7.ebuild:
diff --git a/app-crypt/onak/Manifest b/app-crypt/onak/Manifest
index 153ca43f6ce2..8c0f18c2dc96 100644
--- a/app-crypt/onak/Manifest
+++ b/app-crypt/onak/Manifest
@@ -1,6 +1,7 @@
+AUX onak-0.3.7-berkdb-5.0.patch 556 RMD160 3bd5bb9e807827d8adff93f4a652e16c9a59d111 SHA1 b44c28b17b5c622d1ac16d8241dc5e44259b49dd SHA256 aa0bc3bac61eb41019de638b984db8f171edef6f60865b743638bcfebce80ebb
 DIST onak-0.3.3.tar.gz 235853 RMD160 691b9c0ab7bc8dedede4d3b97a49ce8ed3704131 SHA1 61c248a28c129f3b9a15e505332ccd055d0d1ec0 SHA256 eaa6710530b66ab57b7bc46e8e8d884b1091506e5ec97e7e202985c9bbcfdaa8
 DIST onak-0.3.7.tar.gz 239512 RMD160 fcecdb45e02afb91ab3a4de88d540eeb61affd6f SHA1 c8f67a05f4c2d2dab2b210487e845eae57c2cd6e SHA256 e05f7e574ca7e5664ac38f278b1df96e3c76d029970c41edd99440f11cc84b82
 EBUILD onak-0.3.3-r1.ebuild 1426 RMD160 5f156f02d1ab02fdf9e16bd0093d6cdf0fa32a44 SHA1 73ac28f34a9080b4312d44dba4744f69828cd93c SHA256 014d82dc32314d86497fa950ae849dcd74ec74f1eaf31cc5a86cc441faea12bb
-EBUILD onak-0.3.7.ebuild 1376 RMD160 baf717c98945f90e07a8dbd82aa05aefe8d101d8 SHA1 743513cd66e5340d43ba12aa22cbffc8a8861087 SHA256 e1e3701105d21be17830a16f16b68910a002dee817702878b1599330b9dbe959
-MISC ChangeLog 1396 RMD160 8e89e95e54f342d196bba2fbbb45435f0ffbc886 SHA1 662e329a1d2fcf13579185a6ecf469b4fb04b931 SHA256 f80f58d68fb7b9c3f9d3bbcae85a2aeefa66b51e0943030e28b5900c90aa14f1
+EBUILD onak-0.3.7.ebuild 1458 RMD160 6d8cb83035bc5a425fffce2b8a6ed98d91c640a9 SHA1 8031572cc83fd222f508df72391791232b4c2a14 SHA256 046f92d1b0337055576edfa9d9821250128b90456cc080d1ad69e7aa9ed192b0
+MISC ChangeLog 1581 RMD160 387282c9fad9e7f97ed0e9af1a7f0552b1467f18 SHA1 4ca8cbc5a8c42b9bb744423006e10397dca69a22 SHA256 eed9ac984361003f76a9eabba00f256aad811bfffda0f61170cc89096d69f3b3
 MISC metadata.xml 222 RMD160 66c75209b7ea0b1e4c86c9e47fbc7463d7359b42 SHA1 016eae3e47d404d2c1f411fc47329004f5b231bc SHA256 4a9f1c32a9a2bf909479ede7bee0f78698d6e9d86a13ceb5e81433c14b70bdcf
diff --git a/app-crypt/onak/files/onak-0.3.7-berkdb-5.0.patch b/app-crypt/onak/files/onak-0.3.7-berkdb-5.0.patch
new file mode 100644
index 000000000000..ae3bd1afd747
--- /dev/null
+++ b/app-crypt/onak/files/onak-0.3.7-berkdb-5.0.patch
@@ -0,0 +1,12 @@
+diff -ur onak-0.3.7.orig/configure.ac onak-0.3.7/configure.ac
+--- onak-0.3.7.orig/configure.ac	2009-06-02 18:15:08.000000000 +0300
++++ onak-0.3.7/configure.ac	2010-07-14 14:53:51.000000000 +0300
+@@ -17,7 +17,7 @@
+ printf "#include <db.h>\nDB_VERSION_MAJOR DB_VERSION_MINOR\n" >conftest.c
+ set `eval $ac_cpp conftest.c | egrep '^ *[[0-9]] *'`; v="$1"; vv="$2"
+ AC_MSG_RESULT($v.$vv)
+-if test "$v" -eq 4; then
++if test "$v" -ge 4; then
+ 	for db in "db-$v.$vv" "db$v.$vv" "db-$v" "db$v" "db"; do
+ 		AC_MSG_CHECKING(for db_create in lib$db)
+ 		oldLIBS="$LIBS"
diff --git a/app-crypt/onak/onak-0.3.7.ebuild b/app-crypt/onak/onak-0.3.7.ebuild
index 75a09cd901d6..3c0fda21b80d 100644
--- a/app-crypt/onak/onak-0.3.7.ebuild
+++ b/app-crypt/onak/onak-0.3.7.ebuild
@@ -1,19 +1,26 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.7.ebuild,v 1.2 2010/06/17 21:22:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.7.ebuild,v 1.3 2010/07/14 11:56:37 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="onak is an OpenPGP keyserver"
 HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
 SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="berkdb postgres"
-RDEPEND="berkdb? ( =sys-libs/db-4* )
+
+DEPEND="berkdb? ( >=sys-libs/db-4 )
 	postgres? ( dev-db/postgresql-server )"
-DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-berkdb-5.0.patch
+	eautoreconf
+}
 
 src_configure() {
 	local backend="fs"