old

Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64

4 files changed, 14 insertions, 77 deletions

diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog
index 074652a36291..b97196a41a10 100644
--- a/media-libs/imlib/ChangeLog
+++ b/media-libs/imlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/imlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.77 2011/10/11 20:19:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.78 2011/10/11 20:21:46 ssuominen Exp $
+
+  11 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -imlib-1.9.15-r2.ebuild:
+  old
 
   11 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> imlib-1.9.15-r3.ebuild:
   ppc/ppc64 stable wrt #385215
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index f7bea8f14415..a64f4f2c577a 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -9,18 +9,17 @@ 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 1706 RMD160 32cf7930130705beb79da2bf9c83e15be6723d0c SHA1 65fb5b1a8fb2a53087039b4d33c6242fc39068c5 SHA256 c469065c4ec327d70178ae1a12eacbcf8a6e59dbc53bdefd2c5a335a04a159c8
 EBUILD imlib-1.9.15-r3.ebuild 1708 RMD160 6d36fe9fcc19f26e26911f8b143ef19cec68c3fb SHA1 7194bb0c48af2affaf9b83463e9109a6a5615bee SHA256 639d54c60bd809a39aa9458cf030c6e887bc49fd5fa1ae705efa03ed5d45e838
-MISC ChangeLog 10636 RMD160 26c83d827389875d4cb487339ac9fc4cd12792d9 SHA1 73f821d15fdc904545a32531ea99c81f0dc2c000 SHA256 a5489298363b0bb37d96215e23e9b60f039f8f715cbcddc3b29b566ae244c317
-MISC metadata.xml 250 RMD160 26ecc4f7f424a15794ee06cb19ab93b11cf3d937 SHA1 df66486e314d9857f2ab3543655a40969a1b2a36 SHA256 2ed34a6973e57fed2c303880c124436cc1e74d7e2b38fe0575778d8b29d62fbb
+MISC ChangeLog 10722 RMD160 85e002f988c8f092855a4e16e0404fc6d9defcad SHA1 a3afc6c0e5d91cc3b6fba205f70091abfe4240c6 SHA256 05aa3a5742e266a4e3b8b4185d2d436078bb3c45a440312eebe0de7a2e755b2e
+MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOlKTyAAoJEEdUh39IaPFNbDcH/0/PxUSB772yY0GUm565vkmk
-CY0Tbx9kx5PlbGjslpa3OsTSrA1jikagnZko3zpE3KUAUBEfHzPZbjtssEsZQHVg
-kPtFHiFt/1QxF8/1Rg8qsYIwH1snYm/J6LXkex++BKsAzoYuMXJKG2IDm4pCxIEv
-JUKK8dxrAgicZybDCJoTa4gK30PhzUSSMR3lMefH/AUNDBYTIPJGJsmh/Nhx9Iv/
-rdrzwc2RtCxXXNI3s/absgunNYhSQlMLkKywpcxI/M4qiQ6dfmLw67ZzxMu95ErG
-eEffp0JT3MCp2CvBCq/GMNWAGgKn+vmAUZ2QEj7C7KlazEW0CktacH4AjNDYnHM=
-=mQgS
+iQEcBAEBAgAGBQJOlKVoAAoJEEdUh39IaPFN2twH/RVo9N8+EMYJW/vNcaQg3cQn
+//K9zhbs5c0YYQiywOLJDe25sApM7xeK9H8zHQK/vQ/hITlmfFcERVui4mlFTPyx
+qOsuIEnWtx+hjP/wrkDzxCFmhCchi8m7klC+vYVi85h1KijBiSucRc+QyTVsNRF9
+uN17MkX8k8TKwGuV8FALjctMFyPFXs2pLbQCvYzjKSKtqKo8/Y9RSgA8088nJg9F
+bnclbAnmPoTjJDGszZfgQHpc4rREiRjjAlg5/P8Rnxhfp0spmJxOmEzC+/WAsbVA
+e9zUprqzq4mWRbjgOu20q9YB7389dkSde9JS89vyao8D/2M+aPqsPIF8lF3yaIU=
+=2nfx
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib/imlib-1.9.15-r2.ebuild b/media-libs/imlib/imlib-1.9.15-r2.ebuild
deleted file mode 100644
index 5a5aad8bc29f..000000000000
--- a/media-libs/imlib/imlib-1.9.15-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 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.13 2010/11/08 23:15:09 maekke Exp $
-
-inherit autotools eutils
-
-PVP=(${PV//[-\._]/ })
-DESCRIPTION="Image loading and rendering library"
-HOMEPAGE="http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/"
-SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
-	mirror://gentoo/gtk-1-for-imlib.m4.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc deprecated"
-
-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
-	virtual/jpeg
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix aclocal underquoted definition warnings.
-	# Conditionalize gdk functions for bug 40453.
-	# Fix imlib-config for bug 3425.
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${PN}-security.patch #security #72681
-	epatch "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887
-	epatch "${FILESDIR}"/${P}-fix-rendering.patch #197489
-	epatch "${FILESDIR}"/${P}-asneeded.patch #207638
-
-	mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf --sysconfdir=/etc/imlib \
-		$(use_enable deprecated gdk) \
-		$(use_enable deprecated gtktest)
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml doc/*
-
-	# Hack to avoid installing pkgconfig file.
-	use deprecated || rm "${D}"/usr/lib*/pkgconfig/imlibgdk.pc
-}
diff --git a/media-libs/imlib/metadata.xml b/media-libs/imlib/metadata.xml
index cb5d07099066..e770d1bc9a96 100644
--- a/media-libs/imlib/metadata.xml
+++ b/media-libs/imlib/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>graphics</herd>
-  <use>
-    <flag name='deprecated'>Enable deprecated GTK+-1.2 support</flag>
-  </use>
+<herd>graphics</herd>
 </pkgmetadata>