old

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

5 files changed, 12 insertions, 142 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index e3466dd7c0b1..5335a31c38b9 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,10 +1,14 @@
-AUX imlib2-1.4.2-CVE-2008-5187.patch 678 RMD160 fd7b0078640a3bc7a297d6b32f3063ed48227319 SHA1 aafad3c0692b6f1d78b3d0db902b2c3e7c4a178e SHA256 30e1e7a1185e71efb0c822a01553b2322d4f25dc4da997a02366ab7b365b5852
-AUX imlib2-1.4.2-libpng14.patch 454 RMD160 410ae852f25c3bcc374195e542b3397840531199 SHA1 549f5a26fc5fb5c85b164c5d5fdcd92219c40f10 SHA256 694606bfb3678600aac675ecd392af1d45508eef328f3490def7cda1c5b093ba
-DIST imlib2-1.4.2.tar.gz 932684 RMD160 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695 SHA1 769ea1da26774cd7531d1d66432cf8d7d7b30c2b SHA256 9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a
-DIST imlib2-1.4.3.tar.gz 939175 RMD160 99641dc7169ad71189e5bee109653fb7f0930437 SHA1 0ae7dcfb66eea189d9a3e853ed1830f942386351 SHA256 74cf2dad4e7ec87b5d70596364d7f407398dd64fac2effa7d8beefed1e36af75
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST imlib2-1.4.4.tar.gz 977630 RMD160 5428899e202a56e91a0421d6c44dd41b0d3011f7 SHA1 3e1fc356a78fbc902a6199241b75cd9830b7fa5f SHA256 a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198
-EBUILD imlib2-1.4.2-r1.ebuild 1610 RMD160 91ff8c9477b05e62e18f8d538f9c305ebfba152b SHA1 eec3237898dee2bbde0cfaf299dfd059c207039e SHA256 1e5a595c031bfa8d2a11121d7a98c288aa0b54f3547c87c93151f46af478ec20
-EBUILD imlib2-1.4.3.ebuild 1391 RMD160 b22a582ab35338ee2c4cd64b3369b15e087d922f SHA1 8fe3c0f8ac4dde4329a08d810c5863db0ec8c0ba SHA256 20e893912e83bf3d26b79a3d9016ba52220f208608638344d7bffd5d7c7ae48b
-EBUILD imlib2-1.4.4.ebuild 1375 RMD160 7d4dd27dfd90aff15dd4fff2df9a8a4b45ebef07 SHA1 0b43b572825fbf999396971f8bb0a25efd249de9 SHA256 6ceae1fa0e6583fba384afb7be375e32fb17678e8d1d9ad08c794e3a654bba49
-MISC ChangeLog 12175 RMD160 bbf3678b3ccee33047d16f85f1812fae5214c004 SHA1 f6fa1896fc9f84d04d661b98811b1ac49d5d5442 SHA256 a2757b99878d7fc5487c67537884fcd137734c5d1bf3f60cc266bb53cdfbaff2
+EBUILD imlib2-1.4.4.ebuild 1374 RMD160 67a88df8f0c289e69facb2fa6b0b3265238f71f7 SHA1 3d5be19dfa7d5f1c76cf9f3b4b454b1404484cb7 SHA256 4d20091e8e5ccec60c89e2822a08f415fc95bc5b1773b938a3d89aeb5140109b
+MISC ChangeLog 12274 RMD160 4e7b284cea8ce1e56b20e67a9a0a2d3c2c1e6b68 SHA1 cc52c5f25a0de9534f056c14023ec413540c7691 SHA256 d9644385cb9aef089463cbc650baa498e03979977ff3a3960311c2a01d027bbc
 MISC metadata.xml 2255 RMD160 da6c5bba4102a0a0bf263ed8f986704d74292a8f SHA1 5e968e9ca6c3640ee5e3c98c6939099014edbb27 SHA256 81f9771e8e64255ed50d174fe917f9ed0507db9afe88df9f29ce311a6075b30f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAk0g3A4ACgkQaC/OocHi7JacvQD/RZ3+97Ac8yXgmJz+YOeiImjC
+a9qHr4IOtK9GH3LD5s0A/2G9n1wBXzJXDtZvS2l8aark6nYfOT1Cf1+nCt1kGmf+
+=nIDm
+-----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch b/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch
deleted file mode 100644
index 24bf7ad616a5..000000000000
--- a/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/248057
-
-Index: src/modules/loaders/loader_xpm.c
-===================================================================
---- src/modules/loaders/loader_xpm.c	(revision 37743)
-+++ src/modules/loaders/loader_xpm.c	(revision 37744)
-@@ -253,8 +253,8 @@ load(ImlibImage * im, ImlibProgressFunct
-                                  return 0;
-                               }
-                             ptr = im->data;
--                            end = ptr + (sizeof(DATA32) * w * h);
-                             pixels = w * h;
-+                            end = ptr + (pixels);
-                          }
-                        else
-                          {
diff --git a/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch b/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch
deleted file mode 100644
index a338bc693dd6..000000000000
--- a/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/imlib2/trunk/libpng14.patch
-
---- src/modules/loaders/loader_png.c
-+++ src/modules/loaders/loader_png.c
-@@ -38,7 +38,7 @@
- 
-         /* if we haven't read the header before, set the header data */
-         fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--        if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+        if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-           {
-              fclose(f);
-              return 0;
diff --git a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild b/media-libs/imlib2/imlib2-1.4.2-r1.ebuild
deleted file mode 100644
index fb3d6deed839..000000000000
--- a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,56 +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/imlib2/imlib2-1.4.2-r1.ebuild,v 1.10 2010/03/08 15:00:32 ssuominen Exp $
-
-EAPI=1
-inherit enlightenment toolchain-funcs eutils
-
-MY_P=${P/_/-}
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib"
-
-DEPEND="=media-libs/freetype-2*
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( media-libs/jpeg:0 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( x11-libs/libXext x11-proto/xextproto )
-	mp3? ( media-libs/libid3tag )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-	epatch "${FILESDIR}"/${P}-CVE-2008-5187.patch #248057
-	sed -i '/bumpmap_la_LIBADD/s:$: -lm:' src/modules/filters/Makefile.in #276285
-}
-
-src_compile() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	local myconf=""
-	if [[ $(tc-arch) == "amd64" ]] ; then
-		myconf="$(use_enable mmx amd64) --disable-mmx"
-	else
-		myconf="--disable-amd64 $(use_enable mmx)"
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
-
-	export MY_ECONF="
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with gif) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with mp3 id3) \
-		${myconf} \
-	"
-	enlightenment_src_compile
-}
diff --git a/media-libs/imlib2/imlib2-1.4.3.ebuild b/media-libs/imlib2/imlib2-1.4.3.ebuild
deleted file mode 100644
index abb844a2ca0c..000000000000
--- a/media-libs/imlib2/imlib2-1.4.3.ebuild
+++ /dev/null
@@ -1,49 +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/imlib2/imlib2-1.4.3.ebuild,v 1.1 2010/04/13 22:29:17 vapier Exp $
-
-EAPI="1"
-
-inherit enlightenment toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib"
-
-DEPEND="=media-libs/freetype-2*
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( media-libs/jpeg:0 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( x11-libs/libXext x11-proto/xextproto )
-	mp3? ( media-libs/libid3tag )"
-
-src_compile() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	local myconf=""
-	if [[ $(tc-arch) == "amd64" ]] ; then
-		myconf="$(use_enable mmx amd64) --disable-mmx"
-	else
-		myconf="--disable-amd64 $(use_enable mmx)"
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
-
-	export MY_ECONF="
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with gif) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with mp3 id3) \
-		${myconf} \
-	"
-	enlightenment_src_compile
-}