Skip BerkDB sanity check resulting in AC_MSG_ERROR with 5.0 wrt #319951 by Diego...

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

diff --git a/net-p2p/dctc/ChangeLog b/net-p2p/dctc/ChangeLog
index fd8b4b5012878ea7f2518b9c2eec448fc9658933..bfc8e4ac1b1e1385e6a82be152b42dff6d640cec 100644 (file)
--- a/net-p2p/dctc/ChangeLog
+++ b/net-p2p/dctc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/dctc
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.35 2007/03/02 09:24:57 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.36 2010/07/14 11:16:34 ssuominen Exp $
+
+  14 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> dctc-0.85.9.ebuild,
+  +files/dctc-0.85.9-skip_db_ver_check.patch:
+  Skip BerkDB sanity check resulting in AC_MSG_ERROR with 5.0 wrt #319951 by
+  Diego E. Pettenò.
 
   02 Mar 2007; Raúl Porcel <armin76@gentoo.org> dctc-0.85.9.ebuild:
   Fix has_version syntax, bug 168892

diff --git a/net-p2p/dctc/Manifest b/net-p2p/dctc/Manifest
index 362021d667cf8f1b9f78326ba3d4617f244c12ab..aa4896733cfbe9e6790a2045b8bbd7a718fdcbc5 100644 (file)
--- a/net-p2p/dctc/Manifest
+++ b/net-p2p/dctc/Manifest
@@ -1,6 +1,7 @@
 AUX dctc-0.85.6-passive.patch 1090 RMD160 a08f6ed7570ed6e0cfe554b03d20dd92ff2eee5c SHA1 3c6f8cb0eddcd0cfe639eebbf091116170af4df9 SHA256 b8ac42672e3286bb6e3ffdbd300884acc64f93ed2ff80c2359a26ebf0e0ccc9e
 AUX dctc-0.85.9-gcc41.patch 1395 RMD160 03c9557e16dcb268e3c47f267c84e96000518fad SHA1 ca507f28e8e17c44ccf69e2e13b9fcdb10551c70 SHA256 b0ccf2e044c1679d7bbbc24d1e48141c6fe814bf055cb5a77f0b20ed19ab1951
+AUX dctc-0.85.9-skip_db_ver_check.patch 369 RMD160 7021775cb6c04cff0488e13641ffa02dc7ab4008 SHA1 f85077ea216efbb6269941e1affdd7a812fd77d5 SHA256 0f46fc852a2984f2c5e9408c38cba415fddfca8193061333dea21c9fd0f17b51
 DIST dctc-0.85.9.tar.gz 506477 RMD160 dde07b6802e5a421a86fcb83480cdc720b2985b6 SHA1 4d68d394ea2429f645073f22805eca31e87e345c SHA256 68ba3757419499277255d4febf375aba4b45362b3b35be1d07a5489f12d15fcc
-EBUILD dctc-0.85.9.ebuild 1303 RMD160 06fc7f1789fffa25c2686bb51082a50a7607aceb SHA1 faa982d07c379cadf8689783ce36be1c10d0fc63 SHA256 fcacb56e3e650c085cd7d192a43829c1ef58f1d16e173fcf44222e58a8f5823d
-MISC ChangeLog 4987 RMD160 6c699afaacf38f0dce869fc78eb44ee7ae20a982 SHA1 3378a9b88bd0da19236aa5a822fcb05db17ee7d5 SHA256 126533c142600c9bf476f8db5e480170a3456cf35f2966ce957d1e4d5f4dda65
+EBUILD dctc-0.85.9.ebuild 1292 RMD160 99c7fd6a2f77b5912e21a5076024434eca06c344 SHA1 23aaf3aa62acfba53c29f7d07efb5e73a2947b26 SHA256 4171e6239bb22d3d0f10f07dcfe2e477914a4ec03c2e647711c3b1cfdfb5974b
+MISC ChangeLog 5208 RMD160 017c37425838ae8ae0a8717dbb0bd03fb6b445f2 SHA1 49e4fc638395731ac2b7d0a1eabe04552a0ca708 SHA256 67512e9220e790621075a8db72f11de281d4f9fa749d7dd546ae82c5d56650b3
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f

diff --git a/net-p2p/dctc/dctc-0.85.9.ebuild b/net-p2p/dctc/dctc-0.85.9.ebuild
index f4e102cbfe97d6b7f629b490266f617593b9f717..bd1eb918ba18a9afb5dcf2fd29f64d5f6aafe926 100644 (file)
--- a/net-p2p/dctc/dctc-0.85.9.ebuild
+++ b/net-p2p/dctc/dctc-0.85.9.ebuild
@@ -1,13 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.18 2007/03/02 09:24:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.19 2010/07/14 11:16:34 ssuominen Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils autotools
-
-IUSE=""
+inherit autotools eutils
 
 DESCRIPTION="Direct Connect Text Client, almost famous file share program"
 HOMEPAGE="http://brainz.servebeer.com/dctc/"
@@ -16,6 +11,7 @@ SRC_URI="http://brainz.servebeer.com/dctc/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~amd64 ~sparc"
+IUSE=""
 
 RDEPEND="=dev-libs/glib-2*
        >=sys-libs/db-3
@@ -29,6 +25,7 @@ src_unpack() {
 
        epatch "${FILESDIR}"/dctc-0.85.6-passive.patch
        epatch "${FILESDIR}"/dctc-0.85.9-gcc41.patch
+       epatch "${FILESDIR}"/dctc-0.85.9-skip_db_ver_check.patch
 
        eautoreconf
 
@@ -42,7 +39,7 @@ src_unpack() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake DESTDIR="${D}" install || die
        dodoc Documentation/Documentation/* Documentation/Documentation/DCextensions/*
        dodoc AUTHORS ChangeLog KNOWN_BUGS NEWS README TODO
 }

diff --git a/net-p2p/dctc/files/dctc-0.85.9-skip_db_ver_check.patch b/net-p2p/dctc/files/dctc-0.85.9-skip_db_ver_check.patch
new file mode 100644 (file)
index 0000000..4d92c02
--- /dev/null
+++ b/net-p2p/dctc/files/dctc-0.85.9-skip_db_ver_check.patch
@@ -0,0 +1,13 @@
+--- configure.in
++++ configure.in
+@@ -222,10 +222,6 @@
+       CPPFLAGS="$CPPFLAGS -DBDB_V4"
+       fi
+ 
+-      if test $db_major -ne 3 -a $db_major -ne 4; then
+-              AC_MSG_ERROR(no supported BerkeleyDB found (4.x or 3.x). Your version is $db_version)
+-      fi
+-
+       AC_CHECK_LIB(db-$db_version,db_env_create,HAVE_DB=yes)
+       if test "x$HAVE_DB" = "xyes"; then
+               AC_SUBST(berkeleydb_libs)