From 4897ce70b10d4098e302442898ac9e3fa962df3e Mon Sep 17 00:00:00 2001
From: David Shakaryan <omp@gentoo.org>
Date: Fri, 25 Apr 2008 06:47:08 +0000
Subject: Organise and clean up dependencies.

svn path=/; revision=11
---
 x11-wm/fvwm/Manifest           |  2 +-
 x11-wm/fvwm/fvwm-2.5.25.ebuild | 61 +++++++++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index a27b75a..fd98048 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,5 +5,5 @@ AUX fvwm-2.5.23-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a6220
 AUX fvwm-menu-xlock-xlockmore-compat.patch 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
 DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 SHA1 8e0f0b1eb888f7fcc27a0dbcc32a5b0f2895df2b SHA256 212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
 DIST fvwm-patchset-20070901-r2.tar.bz2 37255 RMD160 787fe6f49e497a225648dbdd30b0636d3416a5b0 SHA1 9d56b1f2703feb52987e6aeb22dc151bc0e10d67 SHA256 9342142d216ca5b89c161a9796a08c4effc1b3d8dd41090e3419b051fac639fa
-EBUILD fvwm-2.5.25.ebuild 5113 RMD160 8ced8f9270f7cad09f576dbfd89db16c76baadd1 SHA1 d8b3d5763a7621080bb5cdb7147288bd122840de SHA256 bdd6c33b7ad72293da0bfbfdbf916eb2034115bfb2868b10c80a73e02dec16ca
+EBUILD fvwm-2.5.25.ebuild 5104 RMD160 8f88d6ac4adec486e14e85c56e4c97af562623ef SHA1 efb17efd6d5209aedd2ff6dafb98bd4a4ad8f321 SHA256 52de483c6f45bf933a64c9e8fa9704f1b2b70c5929e44648bfee9e2bb8096986
 EBUILD fvwm-9999.ebuild 6985 RMD160 fadfaa9ca384911f2a5930991a494c7ea80754ca SHA1 60c6c84d287b3c6c4fa2249bc8b7e1c816f8d0f2 SHA256 b7a725d6bd63582a89cfde414263acdf9b2c1709180039fce96d2273176e63a2
diff --git a/x11-wm/fvwm/fvwm-2.5.25.ebuild b/x11-wm/fvwm/fvwm-2.5.25.ebuild
index fbe1f5b..8a72a3c 100644
--- a/x11-wm/fvwm/fvwm-2.5.25.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.25.ebuild
@@ -13,35 +13,46 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bidi debug doc gtk imlib nls perl png readline rplay stroke svg tk truetype vanilla xinerama"
 
-RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
-		gtk? ( =x11-libs/gtk+-1.2* imlib? ( media-libs/imlib ) )
-		rplay? ( media-sound/rplay )
-		bidi? ( dev-libs/fribidi )
-		png? ( media-libs/libpng )
-		stroke? ( dev-libs/libstroke )
-		perl? ( tk? (
-					dev-lang/tk
-					dev-perl/perl-tk
-					>=dev-perl/X11-Protocol-0.56 ) )
-		truetype? ( virtual/xft media-libs/fontconfig )
-		userland_GNU? ( sys-apps/debianutils )
-		dev-lang/perl
-		sys-libs/zlib
-		x11-libs/libXpm
-		x11-libs/libXft
-		xinerama? ( x11-libs/libXinerama )
-		svg? ( gnome-base/librsvg )"
+RDEPEND="dev-lang/perl
+	sys-libs/zlib
+	x11-libs/libXpm
+	x11-libs/libXft
+	bidi? ( dev-libs/fribidi )
+	gtk? (
+		=x11-libs/gtk+-1.2*
+		imlib? ( media-libs/imlib )
+	)
+	perl? ( tk? (
+			dev-lang/tk
+			dev-perl/perl-tk
+			>=dev-perl/X11-Protocol-0.56
+		)
+	)
+	png? ( media-libs/libpng )
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
+	rplay? ( media-sound/rplay )
+	stroke? ( dev-libs/libstroke )
+	svg? ( gnome-base/librsvg )
+	truetype? (
+		media-libs/fontconfig
+		virtual/xft
+	)
+	userland_GNU? ( sys-apps/debianutils )
+	xinerama? ( x11-libs/libXinerama )"
 # XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
 # XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
 DEPEND="${RDEPEND}
-		doc? ( dev-libs/libxslt )
-		dev-util/pkgconfig
-		x11-libs/libXrandr
-		x11-proto/xextproto
-		x11-proto/xproto
-		dev-libs/libxslt
-		xinerama? ( x11-proto/xineramaproto )"
+	dev-libs/libxslt
+	dev-util/pkgconfig
+	x11-libs/libXrandr
+	x11-proto/xextproto
+	x11-proto/xproto
+	doc? ( dev-libs/libxslt )
+	xinerama? ( x11-proto/xineramaproto )"
 
 src_unpack() {
 	unpack ${A}
-- 
cgit v1.2.3-65-gdbad