diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-14 11:56:37 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-14 11:56:37 +0000 |
commit | 764e4432109d164bf22b5ca5d68cb25b72872157 (patch) | |
tree | 275a4394b5f1ab089bdf6167e3695125e116ec9d /app-crypt | |
parent | Add perl-5.12 as provider (diff) | |
download | gentoo-2-764e4432109d164bf22b5ca5d68cb25b72872157.tar.gz gentoo-2-764e4432109d164bf22b5ca5d68cb25b72872157.tar.bz2 gentoo-2-764e4432109d164bf22b5ca5d68cb25b72872157.zip |
Fix BerkDB detection code with 5.0 wrt #319677 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
-rw-r--r-- | app-crypt/onak/ChangeLog | 6 | ||||
-rw-r--r-- | app-crypt/onak/files/onak-0.3.7-berkdb-5.0.patch | 12 | ||||
-rw-r--r-- | app-crypt/onak/onak-0.3.7.ebuild | 15 |
3 files changed, 28 insertions, 5 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/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" |