Fix again db-4.2 issue, bug 135320

Package-Manager: portage-2.1.2-r2

diff --git a/net-p2p/dctc/ChangeLog b/net-p2p/dctc/ChangeLog
index c70c806b29863d71f7bf89b63548c9a23f29660d..35f9910777d6847bda306dc35dd9a5207d90f4e5 100644 (file)
--- a/net-p2p/dctc/ChangeLog
+++ b/net-p2p/dctc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.33 2007/01/11 19:50:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.34 2007/01/22 20:04:29 armin76 Exp $
+
+  22 Jan 2007; Raúl Porcel <armin76@gentoo.org> dctc-0.85.9.ebuild:
+  Fix again db-4.2 issue, bug 135320
 
   11 Jan 2007; Raúl Porcel <armin76@gentoo.org> dctc-0.85.9.ebuild:
   Fix bug 135320, thanks to Ryan Hill <dirtyepic at gentoo dot org> for the fix

diff --git a/net-p2p/dctc/Manifest b/net-p2p/dctc/Manifest
index 717bae4b6b187fe16e3e5e7787c41fa255795eb4..893e28a51c27f59931120b7b7f5256034a5df674 100644 (file)
--- a/net-p2p/dctc/Manifest
+++ b/net-p2p/dctc/Manifest
@@ -7,14 +7,14 @@ MD5 6956e270bdb8da1eedcce9abc4252e7f files/dctc-0.85.9-gcc41.patch 1395
 RMD160 03c9557e16dcb268e3c47f267c84e96000518fad files/dctc-0.85.9-gcc41.patch 1395
 SHA256 b0ccf2e044c1679d7bbbc24d1e48141c6fe814bf055cb5a77f0b20ed19ab1951 files/dctc-0.85.9-gcc41.patch 1395
 DIST dctc-0.85.9.tar.gz 506477 RMD160 dde07b6802e5a421a86fcb83480cdc720b2985b6 SHA1 4d68d394ea2429f645073f22805eca31e87e345c SHA256 68ba3757419499277255d4febf375aba4b45362b3b35be1d07a5489f12d15fcc
-EBUILD dctc-0.85.9.ebuild 1235 RMD160 abd1be96258f0d1645128ed4d9d11b5997821777 SHA1 361c5eda96be20f100a69190b5c672c75c255a3d SHA256 3c0c0e016e8848521140efd3ee02fe27483cd184cc449b98977b6a4aa65909b4
-MD5 701b7153463b595a370406e588f2fbf4 dctc-0.85.9.ebuild 1235
-RMD160 abd1be96258f0d1645128ed4d9d11b5997821777 dctc-0.85.9.ebuild 1235
-SHA256 3c0c0e016e8848521140efd3ee02fe27483cd184cc449b98977b6a4aa65909b4 dctc-0.85.9.ebuild 1235
-MISC ChangeLog 4773 RMD160 21238e80a849de06c9e405197d597de54f68c127 SHA1 4eb2a84f71c947153b873642d4cfa972883a4449 SHA256 3d8571fab2cab459c0106320799a7775a309bb9030755f6da90c7009c755a965
-MD5 fa3c61323116d47ca1c2e804befafcff ChangeLog 4773
-RMD160 21238e80a849de06c9e405197d597de54f68c127 ChangeLog 4773
-SHA256 3d8571fab2cab459c0106320799a7775a309bb9030755f6da90c7009c755a965 ChangeLog 4773
+EBUILD dctc-0.85.9.ebuild 1304 RMD160 5125375eb9aaeaa7dc8054101cf19981f100d587 SHA1 5e62e66782f47fb25e41dc7aca3fdbc3b6534baa SHA256 e8dee473c86487cd5465d96f293dd810c9190a00be39a5e88110716130941d7b
+MD5 101320d9123d8d78131832e6aaa8998e dctc-0.85.9.ebuild 1304
+RMD160 5125375eb9aaeaa7dc8054101cf19981f100d587 dctc-0.85.9.ebuild 1304
+SHA256 e8dee473c86487cd5465d96f293dd810c9190a00be39a5e88110716130941d7b dctc-0.85.9.ebuild 1304
+MISC ChangeLog 4880 RMD160 8c61f3b26114147243b6c48d8557996aa09f72fe SHA1 f481f5a3e95c0b2aeb9e5d9c373b5814f04aa293 SHA256 30e0373992f824e5e4d094f8da773d6cb17d39ff0378bf50e716efa020ca9984
+MD5 5d10dbb8b6ae8edef15e32e5dc449235 ChangeLog 4880
+RMD160 8c61f3b26114147243b6c48d8557996aa09f72fe ChangeLog 4880
+SHA256 30e0373992f824e5e4d094f8da773d6cb17d39ff0378bf50e716efa020ca9984 ChangeLog 4880
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160

diff --git a/net-p2p/dctc/dctc-0.85.9.ebuild b/net-p2p/dctc/dctc-0.85.9.ebuild
index 85e70191e9922708c070732554d044e2263708e1..5ea7cad7c0245eaf8319c1698431f6191a16c262 100644 (file)
--- a/net-p2p/dctc/dctc-0.85.9.ebuild
+++ b/net-p2p/dctc/dctc-0.85.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.16 2007/01/11 19:50:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.17 2007/01/22 20:04:29 armin76 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -32,16 +32,17 @@ src_unpack() {
 
        eautoreconf
 
-
-       # fix for #26708 (db4 support)
-       local dbfunc="`grep '^#define.*db_env_create' /usr/include/db.h | awk '{print $NF}'`"
-       if [ "${dbfunc}" != "db_env_create" ] ; then
-               sed -i "s:db_env_create:${dbfunc}:g" configure
+       # This fix fails with db-4.3
+       if has_version "=sys-libs/db-4.2*" && ! has_version ">=sys-libs/db-4.3*"; then
+               local dbfunc="`grep '^#define.*db_env_create' /usr/include/db.h | awk '{print $NF}'`"
+               if [ "${dbfunc}" != "db_env_create" ] ; then
+                       sed -i "s:db_env_create:${dbfunc}:g" configure
+               fi
        fi
 }
 
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
        dodoc Documentation/Documentation/* Documentation/Documentation/DCextensions/*
-       dodoc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO
+       dodoc AUTHORS ChangeLog KNOWN_BUGS NEWS README TODO
 }