Removed surplus dependancies as per bug #79274

(Portage version: 2.0.51.16)

4 files changed, 9 insertions, 63 deletions

diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index c0c97fde9556..8f2233928297 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/electricsheep
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.19 2004/12/21 08:21:34 dragonheart Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.20 2005/02/15 11:05:02 dragonheart Exp $
+
+  15 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  -electricsheep-2.4-r2.ebuild, electricsheep-2.5.ebuild:
+  Removed surplus dependancies as per bug #79274. Thanks to Christopher Culver
+  <crculver@users.sourceforge.net>. Remove old version too.
 
   21 Dec 2004; Daniel Black <dragonheart@gentoo.org> electricsheep-2.5.ebuild:
   remove nas from dependancies as per email by Simone
diff --git a/x11-misc/electricsheep/electricsheep-2.4-r2.ebuild b/x11-misc/electricsheep/electricsheep-2.4-r2.ebuild
deleted file mode 100644
index 2a30a441c2ba..000000000000
--- a/x11-misc/electricsheep/electricsheep-2.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.4-r2.ebuild,v 1.6 2004/06/24 22:16:55 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
-HOMEPAGE="http://electricsheep.org/"
-SRC_URI="http://electricsheep.org/${P}.tar.gz"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-
-DEPEND="virtual/x11
-	dev-libs/expat
-	sys-apps/groff
-	dev-lang/perl
-	>=sys-apps/sed-4
-	media-libs/libmpeg2"
-RDEPEND="virtual/x11
-	dev-libs/expat
-	net-misc/curl
-	media-gfx/xloadimage"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:/usr/local/share:/usr/share/${PN}:" \
-		electricsheep.c \
-		|| die "sed electricsheep.c failed"
-	sed -i '/OPT_CFLAGS=/s:=".*":="$CFLAGS":' \
-		mpeg2dec/configure \
-		|| die "sed mpeg2dec failed"
-	epatch ${FILESDIR}/nice.patch
-}
-
-src_install() {
-	# prevent writing for xscreensaver
-	sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
-		Makefile || die "sed Makefile failed"
-
-	# install the xscreensaver config file
-	insinto /usr/share/control-center/screensavers
-	doins electricsheep.xml
-
-	# install the main stuff ... flame doesn't create /usr/bin so we have to.
-	dodir /usr/bin
-	make install DESTDIR=${D} || die "make install failed"
-	dodir /usr/share/electricsheep
-	mv ${D}/usr/share/electricsheep-* ${D}/usr/share/electricsheep/
-
-	# remove header files that are installed over libmpeg2
-	rm -rf ${D}/usr/include
-}
diff --git a/x11-misc/electricsheep/electricsheep-2.5.ebuild b/x11-misc/electricsheep/electricsheep-2.5.ebuild
index b836250f1b3a..702f10f7138a 100644
--- a/x11-misc/electricsheep/electricsheep-2.5.ebuild
+++ b/x11-misc/electricsheep/electricsheep-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.5.ebuild,v 1.6 2004/12/21 08:21:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.5.ebuild,v 1.7 2005/02/15 11:05:02 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -26,11 +26,9 @@ DEPEND="virtual/x11
 	media-libs/libsdl
 	virtual/libc
 	sys-libs/zlib
-	!sparc? ( media-libs/svgalib )
 	!sparc? ( media-libs/alsa-lib )"
 
 #
-# Note about !sparc? ( media-libs/svgalib ) and alsa-lib too
 # I did a ldd /usr/bin/anim-flame /usr/bin/hqi-flame /usr/bin/pick-flame /usr/bin/convert-flame \
 #   /usr/bin/mpeg2dec_onroot /usr/bin/electricsheep | cut -f3 -d ' ' | xargs -n 1 qpkg -f -v | sort | uniq
 #
@@ -46,12 +44,11 @@ RDEPEND="virtual/x11
 	media-libs/jpeg
 	media-libs/libpng
 	media-libs/libsdl
-	!sparc? ( media-libs/svgalib )
 	!sparc? ( media-libs/alsa-lib )
 	virtual/libc
 	sys-libs/zlib"
 
-# Also detects and ties in sys-libs/slang, media-libs/aalib
+# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
 # if they exist on the user machine although these aren't deps.
 
 src_unpack() {
diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.4-r2 b/x11-misc/electricsheep/files/digest-electricsheep-2.4-r2
deleted file mode 100644
index dd89926f636f..000000000000
--- a/x11-misc/electricsheep/files/digest-electricsheep-2.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36886181194de0b9776665fb9e8820f4 electricsheep-2.4.tar.gz 591369