Rename USE gtk (x11-libs/gtk+:1.2) to USE deprecated.

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

4 files changed, 22 insertions, 15 deletions

diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog
index e4f266255b0a..0cc3c341771c 100644
--- a/media-libs/imlib/ChangeLog
+++ b/media-libs/imlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.68 2008/07/16 10:00:37 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.69 2009/11/24 16:19:42 ssuominen Exp $
+
+  24 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  imlib-1.9.15-r2.ebuild, metadata.xml:
+  Rename USE gtk (x11-libs/gtk+:1.2) to USE deprecated.
 
   16 Jul 2008; Peter Volkov <pva@gentoo.org>
   +files/imlib-1.9.15-asneeded.patch, imlib-1.9.15-r2.ebuild:
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 0c96467615b0..2f4512569890 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -5,6 +5,6 @@ AUX imlib-1.9.15.patch 2253 RMD160 beb86753cc2024a9eb671acdc3886b7a5692b526 SHA1
 AUX imlib-security.patch 13040 RMD160 432377938bd85f9974bff8f08aca6d93d310057c SHA1 ec1b47281c1a7fb21abe841f948ecc56ed13f310 SHA256 d67a7faa2dba8d361cf25b6fc8125c1da92f25b612bffe909daacdeda577dd57
 DIST gtk-1-for-imlib.m4.bz2 2742 RMD160 11e0016ec8f37b617198b9cfc6d7bc703b50a808 SHA1 c099fbc5dd80b9db81b4e89481422ab40c06dfef SHA256 e024d822d64819e23f7ad7c8283086ffd1e112b859b4669f1624dda1c56d8c47
 DIST imlib-1.9.15.tar.bz2 683242 RMD160 195b80833167134ba2d9a9574d420279f9cf55f4 SHA1 c9a732a354fbb3c7e1a426e5d19fc92d73f8f720 SHA256 4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0
-EBUILD imlib-1.9.15-r2.ebuild 1716 RMD160 8a54f5b9ebeb1c6bea6abb5f6d448f1d6803ed9f SHA1 76731600d45edb15eed78f73270ba5b955063cf0 SHA256 d45018ac0ee0257bfb55f3ec0bbf3e2aba76065fdcbfd51dc7aabd9e80cfa1bc
-MISC ChangeLog 9414 RMD160 0250cb11f713831296ad02de14943e391243a6af SHA1 16bc2593f45fc3220b8b6efc5a62e7eab7f7e9b8 SHA256 3fd9d29d3b6b442eb52a17c8c067f4b2197cacde0f314a2545a9a64716a830f4
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+EBUILD imlib-1.9.15-r2.ebuild 1717 RMD160 7363cd919733b7ac451c630176aebce2c980d363 SHA1 d110b2fca6727b5a0ff360b0b46b6aefc721e7e4 SHA256 775fe4330971b5d3f7c39a9497e40b2496c4a004661f189851d3a6c3be9104fd
+MISC ChangeLog 9571 RMD160 4b6efea519b02e6d5ca00fc65216cc35b279d936 SHA1 db8d050bb3376f7e52da8cc0c7fdff5ed8fc35a8 SHA256 98e253e680cc90de6407337e6bb87ea8d3c57af3e4a43438070dc4c3d77a9298
+MISC metadata.xml 250 RMD160 26ecc4f7f424a15794ee06cb19ab93b11cf3d937 SHA1 df66486e314d9857f2ab3543655a40969a1b2a36 SHA256 2ed34a6973e57fed2c303880c124436cc1e74d7e2b38fe0575778d8b29d62fbb
diff --git a/media-libs/imlib/imlib-1.9.15-r2.ebuild b/media-libs/imlib/imlib-1.9.15-r2.ebuild
index a8fe16d0305d..8e4bb98f6076 100644
--- a/media-libs/imlib/imlib-1.9.15-r2.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r2.ebuild,v 1.11 2008/07/16 10:00:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r2.ebuild,v 1.12 2009/11/24 16:19:42 ssuominen Exp $
 
 inherit autotools eutils
 
@@ -13,9 +13,9 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc gtk"
+IUSE="doc deprecated"
 
-RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
+RDEPEND="deprecated? ( =x11-libs/gtk+-1.2* )
 	>=media-libs/tiff-3.5.5
 	>=media-libs/giflib-4.1.0
 	>=media-libs/libpng-1.2.1
@@ -45,18 +45,18 @@ src_unpack() {
 
 src_compile() {
 	econf --sysconfdir=/etc/imlib \
-		$(use_enable gtk gdk) \
-		$(use_enable gtk gtktest)
+		$(use_enable deprecated gdk) \
+		$(use_enable deprecated gtktest)
 
-	emake || die "emake failed."
+	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog README
 	use doc && dohtml doc/*
 
 	# Hack to avoid installing pkgconfig file.
-	use gtk || rm "${D}"/usr/lib*/pkgconfig/imlibgdk.pc
+	use deprecated || rm "${D}"/usr/lib*/pkgconfig/imlibgdk.pc
 }
diff --git a/media-libs/imlib/metadata.xml b/media-libs/imlib/metadata.xml
index 731225048652..cb5d07099066 100644
--- a/media-libs/imlib/metadata.xml
+++ b/media-libs/imlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+  <herd>graphics</herd>
+  <use>
+    <flag name='deprecated'>Enable deprecated GTK+-1.2 support</flag>
+  </use>
 </pkgmetadata>