fix db_env_create detection #41970

3 files changed, 3 insertions, 53 deletions

diff --git a/net-p2p/dc-gui/dc-gui-0.79.ebuild b/net-p2p/dc-gui/dc-gui-0.79.ebuild
deleted file mode 100644
index ef1e076b59a1..000000000000
--- a/net-p2p/dc-gui/dc-gui-0.79.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dc-gui/dc-gui-0.79.ebuild,v 1.2 2004/01/22 01:34:21 vapier Exp $
-
-MY_P=${PN/-/_}2-${PV}
-DESCRIPTION="GUI for dctc"
-HOMEPAGE="http://ac2i.homelinux.com/dctc/"
-SRC_URI="http://ac2i.homelinux.com/dctc/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc"
-IUSE="nls"
-
-DEPEND="=dev-libs/glib-2*
-	=x11-libs/gtk+-2*
-	=gnome-base/libgnomeui-2*
-	>=sys-libs/db-3.2*
-	>=net-p2p/dctc-0.85.8"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix for #26708 (db4 support)
-	local dbfunc="`nm /usr/lib/libdb.so | grep \ db_env_create | awk '{print $3}'`"
-	if [ "${dbfunc}" != "db_env_create" ] ; then
-		sed -i "s:db_env_create:${dbfunc}:g" configure
-	fi
-
-	cd src
-	cp ${FILESDIR}/split_interface_fast.pl .
-	perl split_interface_fast.pl || die "could not split interface up"
-}
-
-src_compile() {
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	use nls || rm -rf ${D}/usr/share/locale
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-p2p/dc-gui/dc-gui-0.80.ebuild b/net-p2p/dc-gui/dc-gui-0.80.ebuild
index 3163e8df55b9..f08ec4029cde 100644
--- a/net-p2p/dc-gui/dc-gui-0.80.ebuild
+++ b/net-p2p/dc-gui/dc-gui-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dc-gui/dc-gui-0.80.ebuild,v 1.1 2004/01/31 23:41:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dc-gui/dc-gui-0.80.ebuild,v 1.2 2004/02/21 06:07:13 vapier Exp $
 
 MY_P=${PN/-/_}2-${PV}
 DESCRIPTION="GUI for dctc"
@@ -9,7 +9,7 @@ SRC_URI="http://ac2i.homelinux.com/dctc/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE="nls"
 
 DEPEND="=dev-libs/glib-2*
@@ -27,7 +27,7 @@ src_unpack() {
 	cd ${S}
 
 	# fix for #26708 (db4 support)
-	local dbfunc="`nm /usr/lib/libdb.so | grep \ db_env_create | awk '{print $3}'`"
+	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
diff --git a/net-p2p/dc-gui/files/digest-dc-gui-0.79 b/net-p2p/dc-gui/files/digest-dc-gui-0.79
deleted file mode 100644
index eda464444b5b..000000000000
--- a/net-p2p/dc-gui/files/digest-dc-gui-0.79
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c86c280b1c06e48c01287c3425924d2 dc_gui2-0.79.tar.gz 953420