diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-12-20 22:24:27 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-20 22:24:27 +0000 |
| commit | 229996246459eb087c152ab066cf16576df97c8f (patch) | |
| tree | 3f00c16bc63d600ed562e771d67a2ce62f8e4bd8 /x11-misc/electricsheep | |
| parent | Removing problem version, marking stable on amd64/x86 and making sure -* is i... (diff) | |
| download | gentoo-2-229996246459eb087c152ab066cf16576df97c8f.tar.gz gentoo-2-229996246459eb087c152ab066cf16576df97c8f.tar.bz2 gentoo-2-229996246459eb087c152ab066cf16576df97c8f.zip | |
Add modular X dependencies. Also fix up (R)DEPEND so DEPEND inherits from RDEPEND to remove lots of duplicated deps.
(Portage version: 2.1_pre1)
Diffstat (limited to 'x11-misc/electricsheep')
| -rw-r--r-- | x11-misc/electricsheep/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild | 38 |
2 files changed, 27 insertions, 18 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/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 |