remove gtk2 useflag

(Portage version: 2.0.51.22-r3)

3 files changed, 13 insertions, 37 deletions

diff --git a/gnome-extra/shermans-aquarium/ChangeLog b/gnome-extra/shermans-aquarium/ChangeLog
index 0a1c654c3354..73111cc645ed 100644
--- a/gnome-extra/shermans-aquarium/ChangeLog
+++ b/gnome-extra/shermans-aquarium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/shermans-aquarium
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/ChangeLog,v 1.9 2005/02/24 19:28:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/ChangeLog,v 1.10 2005/11/17 13:39:01 allanonjl Exp $
+
+  17 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
+  shermans-aquarium-2.2.0.ebuild:
+  remove gtk2 useflag, force gtk2 deps.
 
   24 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   shermans-aquarium-2.2.0.ebuild:
diff --git a/gnome-extra/shermans-aquarium/Manifest b/gnome-extra/shermans-aquarium/Manifest
index 8a69914e573b..0cd382d76b12 100644
--- a/gnome-extra/shermans-aquarium/Manifest
+++ b/gnome-extra/shermans-aquarium/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8bceb43876064ca8beec7cb3a0f69948 ChangeLog 1354
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 9f41a47a9bc3f5dfa79f36a5aafad6c5 shermans-aquarium-2.2.0.ebuild 2023
-MD5 2e8ccc0d3063621b87a0f12b69420b99 files/digest-shermans-aquarium-2.2.0 75
+MD5 e7ffbe3824cb23ef2fef3966a3984675 shermans-aquarium-2.2.0.ebuild 1305
 MD5 db0ad320466766d2de4b54ef908f5639 files/shermans-aquarium-2.2.0-gcc-v.patch 508
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCHirvKRy60XGEcJIRApTIAJ0Rcvx2/34VOhDmxIlL1DfC0PDX/wCfeGuA
-sMdkKt9IPeMhMCssEF4crlE=
-=55Q3
------END PGP SIGNATURE-----
+MD5 2e8ccc0d3063621b87a0f12b69420b99 files/digest-shermans-aquarium-2.2.0 75
diff --git a/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild b/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
index a3c0ff5bbc91..fe9a4a47e5c0 100644
--- a/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
+++ b/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild,v 1.11 2005/02/24 19:28:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild,v 1.12 2005/11/17 13:39:01 allanonjl Exp $
 
 inherit eutils
 
@@ -12,20 +12,11 @@ SRC_URI="mirror://sourceforge/aquariumapplet/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc"
-# this applet contains support for either using gnome1, gnome2,
-# gtk1, or gtk2, so we could use something like
-# if gtk is enabled, then that infers to build for gnome1
-# if gtk2 is enabled, it infers to build for gnome2
-# it's not possible to cross build (eg, gtk1 and gnome2)
-# as outlined in the INSTALL file provided with the source
-IUSE="gtk2 sdl"
+IUSE="sdl"
 
 DEPEND="virtual/x11
-		!gtk2? (  =x11-libs/gtk+-1.2*
-				   media-libs/gdk-pixbuf
-				  =gnome-base/gnome-applets-1.4* )
-		gtk2?  ( >=gnome-base/libgnome-2
-				 >=gnome-base/gnome-applets-2 )
+		>=gnome-base/libgnome-2
+		>=gnome-base/gnome-applets-2
 		sdl?   ( >=media-libs/libsdl-1.2
 				   x11-misc/xscreensaver )"
 
@@ -43,10 +34,6 @@ src_compile( ) {
 
 	cd ${S}
 	local myconf
-	# if we dont want gtk2 support
-	if ! use gtk2; then
-		myconf="${myconf} --disable-gtk2 --disable-gnome2"
-	fi
 	# if we dont want sdl (fullscreen support)
 	if ! use sdl; then
 		myconf="${myconf} --disable-fullscreen"
@@ -60,13 +47,8 @@ src_compile( ) {
 src_install( ) {
 
 	# we need to create some dirs that arent created in the
-	# Makefile. which ones depend on whether we're building
-	# for gtk1 or gtk2
-	if use gtk2; then
-		dodir /usr/lib/bonobo/servers /usr/share/gnome-2.0/ui
-	else
-		dodir /etc/CORBA/servers /usr/share/applets/Amusements
-	fi
+	# Makefile.
+	dodir /usr/lib/bonobo/servers /usr/share/gnome-2.0/ui
 	dodir /usr/share/pixmaps
 	make DESTDIR=${D} install || die