summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-12-20 22:24:27 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-12-20 22:24:27 +0000
commit7f764f46d6d21937f41c80e43533b1a91058b350 (patch)
treee99c326dfb669240ef3b3737a88d042a6c4654fa /x11-misc/electricsheep
parentRemoving problem version, marking stable on amd64/x86 and making sure -* is i... (diff)
downloadhistorical-7f764f46d6d21937f41c80e43533b1a91058b350.tar.gz
historical-7f764f46d6d21937f41c80e43533b1a91058b350.tar.bz2
historical-7f764f46d6d21937f41c80e43533b1a91058b350.zip
Add modular X dependencies. Also fix up (R)DEPEND so DEPEND inherits from RDEPEND to remove lots of duplicated deps.
Package-Manager: portage-2.1_pre1
Diffstat (limited to 'x11-misc/electricsheep')
-rw-r--r--x11-misc/electricsheep/ChangeLog7
-rw-r--r--x11-misc/electricsheep/Manifest18
-rw-r--r--x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild38
3 files changed, 31 insertions, 32 deletions
diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index ab38012ad3b5..9afa04da5b3d 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/electricsheep
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.29 2005/09/10 22:40:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.30 2005/12/20 22:24:27 spyderous Exp $
+
+ 20 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ electricsheep-2.6.3-r1.ebuild:
+ Add modular X dependencies. Also fix up (R)DEPEND so DEPEND inherits from
+ RDEPEND to remove lots of duplicated deps.
10 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+files/electricsheep-2.6.3-cflagsfix.patch, electricsheep-2.6.3-r1.ebuild:
diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
index a12730b5449a..485c69d6494a 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b806ee7746d15f0675d36cc1e592b702 ChangeLog 4454
-MD5 ff208fd77969755ebfe343c32ab034d9 electricsheep-2.6.3-r1.ebuild 2097
-MD5 f84d0865990260d30b1b5180364dd6a8 metadata.xml 319
+MD5 f1d1fd0f49ffb7cbb347d3f083b2dade ChangeLog 4662
+MD5 3ae7aab21c41e69a06b3d46e40509b02 electricsheep-2.6.3-r1.ebuild 2129
+MD5 d74dadadc142bec28238e9e3994fc179 files/digest-electricsheep-2.6.3-r1 72
MD5 8573de509811af15cb08905c91a05864 files/electricsheep-2.6.3-cflagsfix.patch 16890
MD5 cf3d6d65b467f83063fea471d22e2f37 files/electricsheep.desktop 3973
-MD5 d74dadadc142bec28238e9e3994fc179 files/digest-electricsheep-2.6.3-r1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDI2DwmdTrptrqvGERAjMSAJwOkMnUO9N9dCyuLbkjy2tryxK2IQCeMRQM
-H2eyV02+vGAa7303icuaeBM=
-=Bgc+
------END PGP SIGNATURE-----
+MD5 f84d0865990260d30b1b5180364dd6a8 metadata.xml 319
diff --git a/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild b/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild
index 29a47af9f578..23df3551e6af 100644
--- a/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild
+++ b/x11-misc/electricsheep/electricsheep-2.6.3-r1.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/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild,v 1.2 2005/09/10 22:40:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild,v 1.3 2005/12/20 22:24:27 spyderous Exp $
inherit eutils flag-o-matic kde-functions
@@ -12,22 +12,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~sparc x86"
-DEPEND="virtual/x11
- dev-libs/expat
- sys-apps/groff
- dev-lang/perl
- >=sys-apps/sed-4
- media-libs/libmpeg2
- sys-apps/gawk
- sys-apps/grep
- sys-devel/libtool
- media-libs/jpeg
- media-libs/libpng
- media-libs/libsdl
- virtual/libc
- sys-libs/zlib"
-
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXv
+ x11-libs/libICE
+ x11-libs/libSM
+ )
+ virtual/x11
+ )
dev-libs/expat
net-misc/curl
media-gfx/xloadimage
@@ -37,6 +27,20 @@ RDEPEND="virtual/x11
virtual/libc
sys-libs/zlib"
+DEPEND="${RDEPEND}
+ || ( ( x11-proto/xextproto
+ x11-libs/libXt
+ )
+ virtual/x11
+ )
+ sys-apps/groff
+ dev-lang/perl
+ >=sys-apps/sed-4
+ media-libs/libmpeg2
+ sys-apps/gawk
+ sys-apps/grep
+ sys-devel/libtool"
+
src_unpack() {
unpack ${A}
# Detect PIC requirement from direct from compiler instead of