Fix But 33660 using partly an ebuild from 32597

4 files changed, 95 insertions, 3 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index 6f4c0596b661..ec65a1b2f6b8 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/gtk-gnutella
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.17 2003/11/16 21:18:36 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.18 2003/11/24 08:07:29 lostlogic Exp $
+
+*gtk-gnutella-0.93-r1 (24 Nov 2003)
+
+  24 Nov 2003; Brandon Low <lostlogic@gentoo.org> gtk-gnutella-0.93-r1.ebuild:
+  Thanks to Keith Constable <kccricket@twistedgamer.com> on Bug 32597 for doing
+  the leg work to use the commandline arguments for the new gtk-gnutella
+  configurator that I didn't want to do, this ebuild should also fix Bug 33660
+  thanks to a little bit of additional hacking I did.
 
   16 Nov 2003; Brandon Low <lostlogic@gentoo.org>
   gtk-gnutella-0.91.9.1.ebuild, gtk-gnutella-0.92.ebuild,
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index a805b8861d83..d3209532b1e2 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,7 +1,7 @@
-MD5 69dbc70aff63249246edde103df705b8 gtk-gnutella-0.93-r1.ebuild 1867
+MD5 056c126574bafffb7cc2083e8b14a988 gtk-gnutella-0.93-r1.ebuild 2165
 MD5 c9f0976826fc6181e8a773a623e9fe90 gtk-gnutella-0.93.ebuild 1656
 MD5 533578443185d82c04bc2c657431d5f0 gtk-gnutella-0.92.ebuild 993
-MD5 d3949eef6647d1f7fd6e8cb7e54c5c7d ChangeLog 3972
+MD5 20ba3de685eebb5c442024df66432d12 ChangeLog 4375
 MD5 2312ebd8e8f4b6b25e64e880bd080ab9 gtk-gnutella-0.91.1.ebuild 839
 MD5 3154e3f696fa08ebda08196cd6291459 files/digest-gtk-gnutella-0.93-r1 71
 MD5 dd86fcdefbd3fdb0a115c277b0087e60 files/0.93-Configure.patch 498
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93-r1 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93-r1
new file mode 100644
index 000000000000..b3f1de4fae63
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93-r1
@@ -0,0 +1 @@
+MD5 78d099392a61064ca30fac84c888550b gtk-gnutella-0.93.tar.bz2 1164124
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild
new file mode 100644
index 000000000000..1f56a6aa817b
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild,v 1.1 2003/11/24 08:07:29 lostlogic Exp $
+
+IUSE="gnome gtk2 xml2 nls"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="xml2? ( dev-libs/libxml2 )
+	( gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
+	: ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* ) )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+
+src_compile() {
+
+	local myconf
+
+	if [ `use gtk2` ]; then
+		myconf="-Dgtkversion=2"
+	else
+		myconf="-Dgtkversion=1"
+	fi
+
+	if [ `use xml2` ]; then
+		myconf="${myconf} -Dd_libxml2"
+	else
+		myconf="${myconf} -Ud_libxml2"
+	fi
+
+	if [ `use nls` ]; then
+		myconf="${myconf} -Dd_enablenls -Dgmsgfmt=\"/usr/bin/msgfmt\" -Dmsgfmt=\"/usr/bin/msgfmt\""
+	else
+		myconf="${myconf} -Ud_enablenls"
+	fi
+
+	./Configure -d -s -e \
+		-Dprefix="/usr" \
+		-Dprivlib="/usr/share/gtk-gnutella" \
+		-Dccflags="${CFLAGS}" \
+		${myconf} \
+		-Doptimize=" " \
+		-Dofficial="true" || die "Configure failed"
+
+	emake || die "Compile failed"
+}
+
+src_install() {
+
+	dodir /usr/bin
+	make INSTALL_PREFIX=${D} install || die "Install failed"
+	find ${D}/usr/share -type f -exec chmod a-x {} \;
+	dodoc AUTHORS ChangeLog README TODO
+
+	use gnome && ( \
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/gtk-gnutella.desktop
+	)
+}
+
+pkg_postinst() {
+
+	if [ `use gtk2` ]; then
+		ewarn "The GTK2 interface currently does not have a maintainer--not all"
+		ewarn "options which are available in the GTK1 interface might have made"
+		ewarn "it in the GTK2 interface.  The GTK2 interface also"
+		ewarn "has a known bug which causes an invalid assertion if"
+		ewarn "you select passive search"
+		echo
+	fi
+
+	if [ ! `use xml2` ]; then
+		ewarn "You have installed gtk-gnutella without xml2 support. As such, your"
+		ewarn "search filters may not be saved when you quit the application."
+		einfo "If you would like this feature enabled, re-emerge with USE=\"xml2\"."
+		echo
+	fi
+}