diff options
| author |   Jesús Guerrero <i92guboj@gentoo.org> | 2008-05-12 22:34:12 +0000 |
|---|---|---|
| committer | Jesús Guerrero <i92guboj@gentoo.org> | 2008-05-12 22:34:12 +0000 |
| commit | ec737e1f590f83d96d3d41255d9ccb80d8768f45 (patch) | |
| tree | 615b43b189ea919cd08918d8273f579e99d97aa8 | |
| parent | Rename patch to be more consistent with official tree. (diff) | |
| download | omp-ec737e1f590f83d96d3d41255d9ccb80d8768f45.tar.gz omp-ec737e1f590f83d96d3d41255d9ccb80d8768f45.tar.bz2 omp-ec737e1f590f83d96d3d41255d9ccb80d8768f45.zip | |
fixed DEPEND/RDEPEND stuff again
svn path=/; revision=19
| -rw-r--r-- | x11-wm/fvwm/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm/fvwm-2.5.26.ebuild | 39 |
2 files changed, 22 insertions, 19 deletions
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index b4074b0..16a44da 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -7,5 +7,5 @@ DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 DIST fvwm-2.5.26.tar.bz2 2509177 RMD160 47be927e61ef5411b668baec0e9a00d5691b3784 SHA1 26d9054c0f148a397eeaa9939be9329fb002831f SHA256 84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d DIST fvwm-patchset-20070901-r2.tar.bz2 37255 RMD160 787fe6f49e497a225648dbdd30b0636d3416a5b0 SHA1 9d56b1f2703feb52987e6aeb22dc151bc0e10d67 SHA256 9342142d216ca5b89c161a9796a08c4effc1b3d8dd41090e3419b051fac639fa EBUILD fvwm-2.5.25.ebuild 4302 RMD160 62659051a96557f70f75d488cfab3cfe67a0d81e SHA1 030bb71d97610417dbad250078d37487ca079c42 SHA256 e473c31ffbd365d79c44dd7168156c1d750fa6cb5bbf0bdc6f0f549a9f613b38 -EBUILD fvwm-2.5.26.ebuild 4829 RMD160 e53dd70b6674e9bd29dfa19fa01fdabaebda336c SHA1 b42365daf7d85c5a7f22d1e16e470045a1727e25 SHA256 3c85a4b160b853dceb00c35942525e5a211de187465a63a04ce3cfec6ddc4f38 +EBUILD fvwm-2.5.26.ebuild 4855 RMD160 49d456348cc811ae932158745a6022a3bb2cce10 SHA1 65028de9f8e0fae45dfd2bc62669de0148ef1364 SHA256 01b6b117c82c64003e8304fb2dc4bbd9e6dce59c984e5a43e26135ac9b38d6f6 EBUILD fvwm-9999.ebuild 6984 RMD160 a1357ac42e391886aa7fe5a0333afc28e49ced1e SHA1 939415d4da5e87fad7a2119988638262773e7404 SHA256 be46ac780b3c0b6c051942394b9912580c2e28fb67c9748685ba38678436f14d diff --git a/x11-wm/fvwm/fvwm-2.5.26.ebuild b/x11-wm/fvwm/fvwm-2.5.26.ebuild index feef37b..14c517c 100644 --- a/x11-wm/fvwm/fvwm-2.5.26.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.26.ebuild @@ -13,23 +13,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="bidi debug doc gtk gtk2-perl imlib netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama" -RDEPEND="dev-lang/perl - bidi? ( dev-libs/fribidi ) - gtk2-perl? ( - dev-perl/gtk2-perl - ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/perl-tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - rplay? ( media-sound/rplay ) - userland_GNU? ( sys-apps/debianutils )" - -DEPEND="${RDEPEND} - dev-libs/libxslt +COMMON_DEPEND=" dev-libs/libxml2 dev-util/pkgconfig sys-libs/zlib @@ -47,7 +31,6 @@ DEPEND="${RDEPEND} x11-libs/libXrender x11-proto/xextproto x11-proto/xproto - doc? ( dev-libs/libxslt ) gtk? ( =x11-libs/gtk+-1.2* imlib? ( media-libs/imlib ) @@ -68,6 +51,26 @@ DEPEND="${RDEPEND} x11-libs/libXinerama )" +RDEPEND="${COMMON_DEPEND} + dev-lang/perl + bidi? ( dev-libs/fribidi ) + gtk2-perl? ( + dev-perl/gtk2-perl + ) + netpbm? ( media-libs/netpbm ) + perl? ( tk? ( + dev-lang/tk + dev-perl/perl-tk + >=dev-perl/X11-Protocol-0.56 + ) + ) + rplay? ( media-sound/rplay ) + userland_GNU? ( sys-apps/debianutils )" + +DEPEND="${COMMON_DEPEND} + doc? ( dev-libs/libxslt ) + " + src_unpack() { unpack ${A} |