Cleanups, comments, stable change, warning

8 files changed, 25 insertions, 88 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index aa7e60a4d794..6f4c0596b661 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2003/11/16 20:18:31 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.17 2003/11/16 21:18:36 lostlogic Exp $
+
+  16 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+  gtk-gnutella-0.91.9.1.ebuild, gtk-gnutella-0.92.ebuild,
+  gtk-gnutella-0.92_rc.ebuild, gtk-gnutella-0.93.ebuild:
+  Move 0.92 to stable
+  Comments and a warning about gtk2 in 0.93
+  Remove unneeded ebuilds
 
 *gtk-gnutella-0.93 (16 Nov 2003)
 
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 4521402de4ce..8a5892d354fb 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,13 +1,9 @@
-MD5 03aa43b45815082b8648f732dfc0479c gtk-gnutella-0.93.ebuild 1343
-MD5 73e3a89f78620270bb570649200bd92d gtk-gnutella-0.92_rc.ebuild 995
-MD5 77b60008281e866e470cdd4b1f0ee556 gtk-gnutella-0.91.9.1.ebuild 977
-MD5 7249b60b6111bbdccb38723bff7c9023 gtk-gnutella-0.92.ebuild 993
-MD5 1b38e7867d289685bcb56673013cb1b9 ChangeLog 3714
+MD5 c9f0976826fc6181e8a773a623e9fe90 gtk-gnutella-0.93.ebuild 1656
+MD5 533578443185d82c04bc2c657431d5f0 gtk-gnutella-0.92.ebuild 993
+MD5 d3949eef6647d1f7fd6e8cb7e54c5c7d ChangeLog 3972
 MD5 2312ebd8e8f4b6b25e64e880bd080ab9 gtk-gnutella-0.91.1.ebuild 839
-MD5 d9d5c7e123dc5d1827358bd121690faa files/digest-gtk-gnutella-0.92_rc 71
 MD5 dd86fcdefbd3fdb0a115c277b0087e60 files/0.93-Configure.patch 498
 MD5 f3ea5611e91933a99e10202e5b6860b1 files/digest-gtk-gnutella-0.91.1 71
 MD5 0ad72608092146aa034f372e4230dc05 files/digest-gtk-gnutella-0.92 70
 MD5 3154e3f696fa08ebda08196cd6291459 files/digest-gtk-gnutella-0.93 71
-MD5 61c63ca4536bb8a7e7c166e7379fffe8 files/digest-gtk-gnutella-0.91.9.1 74
 MD5 27161f302c21270725ef71817111e01f files/gtk-gnutella.desktop 131
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.91.9.1 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.91.9.1
deleted file mode 100644
index 72e55d6bc144..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.91.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3618e030a54aa7c5488de86aed345a65 gtk-gnutella-0.91.9.1.tar.bz2 632259
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.92_rc b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.92_rc
deleted file mode 100644
index c602690fe483..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.92_rc
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5475b7f07a594657a6983962a14efdda gtk-gnutella-0.92c.tar.bz2 852726
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.1.ebuild
deleted file mode 100644
index 26329dcce2a0..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.9.1.ebuild
+++ /dev/null
@@ -1,37 +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/gtk-gnutella/gtk-gnutella-0.91.9.1.ebuild,v 1.3 2003/09/07 00:17:35 msterret Exp $
-
-IUSE="gnome"
-
-S=${WORKDIR}/${P}
-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="( gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
-#	      : ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* ) )"
-DEPEND="=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*"
-
-src_compile() {
-
-#	econf `use_enable gtk2`|| die "Configure failed"
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install () {
-
-	einstall || die "Install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/gtk-gnutella.desktop
-	)
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild
index 7508d720c090..4ffa5c6065e2 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild
@@ -1,6 +1,6 @@
 # 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.92.ebuild,v 1.2 2003/09/07 00:17:35 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild,v 1.3 2003/11/16 21:18:36 lostlogic Exp $
 
 IUSE="gnome"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 #DEPEND="( gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
 #	      : ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* ) )"
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.92_rc.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.92_rc.ebuild
deleted file mode 100644
index 11b41a8883ef..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.92_rc.ebuild
+++ /dev/null
@@ -1,38 +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/gtk-gnutella/gtk-gnutella-0.92_rc.ebuild,v 1.3 2003/09/07 00:17:35 msterret Exp $
-
-IUSE="gnome"
-
-MY_P=${P/_r}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-#DEPEND="( gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
-#	      : ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* ) )"
-DEPEND="=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*"
-
-src_compile() {
-
-#	econf `use_enable gtk2`|| die "Configure failed"
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install () {
-
-	einstall || die "Install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/gtk-gnutella.desktop
-	)
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild
index ad93d54e99a8..edb3c4376cee 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2003/11/16 20:18:31 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild,v 1.2 2003/11/16 21:18:36 lostlogic Exp $
 
 IUSE="gnome gtk2 nls"
 
@@ -34,6 +34,8 @@ src_compile() {
 
 #	econf `use_enable gtk2`|| die "Configure failed"
 	patch Configure < ${FILESDIR}/0.93-Configure.patch
+	#FIXME: This should use the commandline defaults modification
+	#stuff, fix this before next build
 	cat << EOF | ./Configure || die "Configure Failed"
 
 
@@ -76,3 +78,12 @@ src_install () {
 		doins ${FILESDIR}/gtk-gnutella.desktop
 	)
 }
+
+pkg_postinst () {
+	if [ `use gtk2` ]; then
+		ewarn "You have enabled the GTK2 build of gtk-gnutella, there"
+		ewarn "is a known bug which causes an invalid assertion if"
+		ewarn "you select passive search"
+	fi
+}
+