summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-14 11:16:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-14 11:16:35 +0000
commit3970b1ea60a6ec2a5efaf762090e634a824f06de (patch)
tree15f594d49175931c5f7cc12168547737a31f7e6b /net-p2p/dctc
parentStable on amd64 wrt bug #320205 (diff)
downloadgentoo-2-3970b1ea60a6ec2a5efaf762090e634a824f06de.tar.gz
gentoo-2-3970b1ea60a6ec2a5efaf762090e634a824f06de.tar.bz2
gentoo-2-3970b1ea60a6ec2a5efaf762090e634a824f06de.zip
Skip BerkDB sanity check resulting in AC_MSG_ERROR with 5.0 wrt #319951 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/dctc')
-rw-r--r--net-p2p/dctc/ChangeLog9
-rw-r--r--net-p2p/dctc/dctc-0.85.9.ebuild15
-rw-r--r--net-p2p/dctc/files/dctc-0.85.9-skip_db_ver_check.patch13
3 files changed, 26 insertions, 11 deletions
diff --git a/net-p2p/dctc/ChangeLog b/net-p2p/dctc/ChangeLog
index fd8b4b501287..bfc8e4ac1b1e 100644
--- 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/dctc-0.85.9.ebuild b/net-p2p/dctc/dctc-0.85.9.ebuild
index f4e102cbfe97..bd1eb918ba18 100644
--- 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
index 000000000000..4d92c02b53b7
--- /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)