Remove USE gtk and imlib (media-libs/imlib[deprecated]).

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

5 files changed, 13 insertions, 201 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index a6430c23f2ee..937a87959f83 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.168 2009/11/05 18:34:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.169 2009/11/24 16:28:52 ssuominen Exp $
+
+  24 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -fvwm-2.5.18-r1.ebuild, fvwm-2.5.27-r1.ebuild, fvwm-2.5.28.ebuild:
+  Remove USE gtk and imlib (media-libs/imlib[deprecated]).
 
   05 Nov 2009; Raúl Porcel <armin76@gentoo.org> fvwm-2.5.28.ebuild:
   ia64/sparc stable wrt #290126
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index eeaea63dbfb9..83207b3287b2 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -2,12 +2,9 @@ AUX README.translucency 3723 RMD160 f09c9cb205731ae97781dd8a59a9b1633851ef36 SHA
 AUX fvwm-2.5.27-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
 AUX fvwm-menu-directory-security.diff 651 RMD160 4c33671109d1d1f0927bbb755b86691040535bfc SHA1 9b2609a33c85e72c7735de1b3d5fa0fd866819bb SHA256 5ad90a20f6d5f32d718e54347dde66f863971f46a05f6c83c9a294a74cfc24df
 AUX fvwm-menu-xlock-xlockmore-compat.diff 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
-DIST fvwm-2.5.18-translucent-menus.diff.gz 82595 RMD160 175e2dc93ca4e265a5022655deeede32dd653b38 SHA1 58e7120717e9dc581d9c6b61770aa740ef33bcbe SHA256 ffdaf69a93f626a709541e15ecbbb8842c306543beebd4adc909a6edbda42516
-DIST fvwm-2.5.18.tar.bz2 2034340 RMD160 68bd7a5d3e1c5fb3776de0fbda75414d9e7ad54b SHA1 b7ef45dfe3975deab38dd9ae306c5fd280f307c6 SHA256 8489b32ad488d91898d9be0ff4ec4697590feee66f10de88301511efc617e9c5
 DIST fvwm-2.5.27.tar.bz2 2524965 RMD160 3b08849931d026619a45583f26528088efc51f6f SHA1 52a3300c5f13468fa61205477a07f0e5d4767a6b SHA256 149fc5a0a170473b6bea79127eb9f2a19c507929500fd6560162d7a12461c855
 DIST fvwm-2.5.28.tar.bz2 2521994 RMD160 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1 SHA1 26b83b88656faa3d21ab55544269954e534abe08 SHA256 37a90e443b7f9388d6e696f7be37104ab9ba27194a1008d45ea489c0d906d9fb
-EBUILD fvwm-2.5.18-r1.ebuild 5363 RMD160 166152c3c5ca70a2e63209796881b8a3d725b153 SHA1 7c049074fddfb4079af6b984454c353407b5f335 SHA256 81b1f71bc53a1366d61ef5e73de313272749a13efcb5120f56c0923606e96c30
-EBUILD fvwm-2.5.27-r1.ebuild 4942 RMD160 8ca93eeec5cb516705e831c5276144f6150f7e78 SHA1 ed49768719bc80337606d4ccaba8373af0ef1436 SHA256 8614eeb36f4952fa2afe028e8a832f232d90f7dd9ea4e21b3c2f8ba06b68a4d4
-EBUILD fvwm-2.5.28.ebuild 4843 RMD160 6f830971dc19ad62fe50f6bf4a71c86f97736cd2 SHA1 99f18394d7475ebac208eb9d9ade255dca60aaf2 SHA256 6dcf486d0def5eb9c1f8e3f9c6803471b9e95467d1176577987ab7a70a8e6080
-MISC ChangeLog 26276 RMD160 416538fbd5b5a6aac1b2ef0129c82187458fc71c SHA1 eea0f13f5ee1877f12db39cdfdc0301da2a2c099 SHA256 7ecad6a35d9a0b3d120e30fd498ba7cb924ff147702c42a260e119b03f0f9dc0
+EBUILD fvwm-2.5.27-r1.ebuild 4652 RMD160 024fdbf789b260e7d222658fd5da62116a8b72fa SHA1 c018fe6c08723bf7c68c2af4a17060384c524b11 SHA256 ebb723fc0868b12a0f556e6234869831cf1bcb9119f441c8041fd8265ccb0bd7
+EBUILD fvwm-2.5.28.ebuild 4588 RMD160 968c6d570ec344b5e20b72430a68d151bc600f0b SHA1 4dc1fcf72ec237316a4e5afd2e2dbd6b77c51125 SHA256 7e74e72ed0f007bc4bf556be5f2ff6ca7c4e901c6de414a217f02adb2ed3436a
+MISC ChangeLog 26461 RMD160 48c94b6f653cee93648026e84e2e9172cf954d38 SHA1 bbdadbbe98c914e983bf85979fbf160a48acd9d8 SHA256 bfe2bc2114208c1523ed53b415f253f463ebe040cc7a03ac9959996925f7cb27
 MISC metadata.xml 1030 RMD160 b260d643a074659f85850fa34e70bbd8c75bace1 SHA1 95ca4f850821b546bf56cc053bb800cbfe67c54e SHA256 2bc103425bb6eb407042640f5768da44c559fc1e14cd21b7670a0d7c63f823b0
diff --git a/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild
deleted file mode 100644
index 664f852fae57..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18-r1.ebuild,v 1.16 2009/08/03 10:17:16 ssuominen Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 mirror://gentoo/fvwm-2.5.18-translucent-menus.diff.gz"
-
-LICENSE="GPL-2 FVWM"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="bidi debug gtk imlib nls perl png readline rplay stroke tk truetype 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? ( x11-libs/libXft media-libs/fontconfig )
-		dev-lang/perl
-		sys-libs/zlib
-		sys-apps/debianutils
-		x11-libs/libXpm
-		x11-libs/libXft
-		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}
-		dev-util/pkgconfig
-		x11-libs/libXrandr
-		x11-proto/xextproto
-		x11-proto/xproto
-		xinerama? ( x11-proto/xineramaproto )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	export EPATCH_OPTS="-F3 -l"
-
-	# this patch enables fast translucent menus in fvwm. this is a
-	# minor tweak of a patch posted to fvwm-user mailing list by Olivier
-	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
-	epatch "${WORKDIR}"/fvwm-2.5.18-translucent-menus.diff
-
-	# fixing #51287, the fvwm-menu-xlock script is not compatible
-	# with the xlockmore implementation in portage.
-	epatch "${FILESDIR}"/fvwm-menu-xlock-xlockmore-compat.diff
-
-	# fix security issue in fvwm-menu-directory when parsing directories
-	# with newlines.
-	epatch "${FILESDIR}"/fvwm-menu-directory-security.diff
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
-
-	# use readline in FvwmConsole.
-	if use readline; then
-		myconf="${myconf} --without-termcap-library"
-	fi
-
-	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
-	if ! use gtk; then
-		myconf="${myconf} --disable-gtk --without-gnome"
-	else
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-		myconf="${myconf} --without-gnome"
-	fi
-
-	# set the local maintainer for fvwm-bug.
-	export FVWM_BUGADDR="taviso@gentoo.org"
-
-	# reccommended by upstream
-	append-flags -fno-strict-aliasing
-
-	econf ${myconf} `use_enable truetype xft` \
-					`use_with stroke stroke-library` \
-					`use_enable nls` \
-					`use_enable nls iconv` \
-					`use_enable png png-library` \
-					`use_enable bidi` \
-					`use_enable xinerama` \
-					`use_enable debug debug-msgs` \
-					`use_enable debug command-log` \
-					`use_enable perl perllib` \
-					`use_with readline readline-library` \
-					`use_with rplay rplay-library` || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use perl; then
-
-		local toolkits="gtk tcltk"
-
-		if ! use tk; then
-			# Remove the Tk bindings (requires perl-tk)
-			rm -f "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
-			toolkits=${toolkits/tcltk/}
-		fi
-		if ! use gtk; then
-			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
-			rm -f "${D}"/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
-				"${D}"/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-			toolkits=${toolkits/gtk/}
-		fi
-		toolkits=${toolkits// /}
-		if ! test "${toolkits}"; then
-			# No perl toolkit bindings wanted, remove the unneeded files
-			# and empty directories.
-			rm -f "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
-			find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
-		fi
-	else
-		# Remove useless script if perllib isnt required.
-		rm -rf "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
-	fi
-
-	# neat utility for testing fvwm behaviour on applications setting various
-	# hints, creates a simple black window with configurable hints set.
-	if use debug; then
-		dobin "${S}"/tests/hints/hints_test
-		newdoc "${S}"/tests/hints/README README.hints
-	fi
-
-	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
-	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
-	rm -f "${D}"/usr/bin/fvwm-convert-2.6 "${D}"/usr/share/man/man1/fvwm-convert-2.6.1
-	rm -f "${D}"/usr/share/man/man1/fvwm-convert-2.2.1
-
-	# ive included `exec` to save a few bytes of memory.
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
-
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
-
-	wm=fvwm2 make_session_desktop FVWM fvwm2
-
-	dodoc AUTHORS ChangeLog README NEWS docs/ANNOUNCE docs/BUGS \
-	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
-	docs/fvwm.lsm
-
-	dodoc "${FILESDIR}"/README.transluceny
-}
-
-pkg_postinst() {
-	einfo
-	einfo "For information about the changes in this release, please"
-	einfo "refer to the NEWS file."
-	einfo
-}
diff --git a/x11-wm/fvwm/fvwm-2.5.27-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.27-r1.ebuild
index dfabeb9bbd20..7913e48c043c 100644
--- a/x11-wm/fvwm/fvwm-2.5.27-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.27-r1.ebuild,v 1.4 2009/10/02 17:29:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.27-r1.ebuild,v 1.5 2009/11/24 16:28:52 ssuominen Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
 LICENSE="GPL-2 FVWM"
 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 lock"
+IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama lock"
 
 COMMON_DEPEND="
 	sys-libs/zlib
@@ -30,10 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	bidi? ( dev-libs/fribidi )
-	gtk? (
-		=x11-libs/gtk+-1.2*
-		imlib? ( media-libs/imlib[gtk] )
-	)
 	png? ( media-libs/libpng )
 	readline? (
 		sys-libs/ncurses
@@ -92,15 +88,6 @@ src_configure() {
 	# Signed chars are required.
 	use ppc && append-flags -fsigned-char
 
-	if use gtk; then
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-	else
-		myconf="${myconf} --disable-gtk"
-	fi
-
 	use readline && myconf="${myconf} --without-termcap-library"
 
 	econf ${myconf} \
diff --git a/x11-wm/fvwm/fvwm-2.5.28.ebuild b/x11-wm/fvwm/fvwm-2.5.28.ebuild
index a9eb8916f6f2..19e013c99fde 100644
--- a/x11-wm/fvwm/fvwm-2.5.28.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.28.ebuild,v 1.5 2009/11/05 18:34:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.28.ebuild,v 1.6 2009/11/24 16:28:52 ssuominen Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
 LICENSE="GPL-2 FVWM"
 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 lock"
+IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama lock"
 
 COMMON_DEPEND="
 	sys-libs/zlib
@@ -30,10 +30,6 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	bidi? ( dev-libs/fribidi )
-	gtk? (
-		=x11-libs/gtk+-1.2*
-		imlib? ( media-libs/imlib[gtk] )
-	)
 	png? ( media-libs/libpng )
 	readline? (
 		sys-libs/ncurses
@@ -89,14 +85,7 @@ src_configure() {
 	# Signed chars are required.
 	use ppc && append-flags -fsigned-char
 
-	if use gtk; then
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-	else
-		myconf="${myconf} --disable-gtk"
-	fi
+	myconf="${myconf} --disable-gtk"
 
 	use readline && myconf="${myconf} --without-termcap-library"