Version bump.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25 x86_64

4 files changed, 84 insertions, 9 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 4c00fb1d6c78..914ce9a425cc 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.70 2008/06/05 18:07:07 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.71 2008/06/13 22:50:35 vapier Exp $
+
+*imlib2-1.4.1 (13 Jun 2008)
+
+  13 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/imlib2-1.4.1-rgb.patch, +imlib2-1.4.1.ebuild:
+  Version bump.
 
   05 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   imlib2-1.4.0-r1.ebuild:
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 426b3d58d67f..e49ba1fd2b7b 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA1
 
 AUX imlib2-1.4.0-CVE-2008-2426.patch 2101 RMD160 6619bbfdc37689384072bd5b1dcfc7de9a1cf165 SHA1 60084081357e6859bf89774e59258995cd3ac7e7 SHA256 1ecc404c073f58933cce608559bee482b5c6968c6df9716d8a07a643b3084601
+AUX imlib2-1.4.1-rgb.patch 744 RMD160 a18f8da1265416d17d11247c29ca3f09fe6ccb33 SHA1 267995c2363af0888019d1f3a2e7969348417967 SHA256 feec18c4dde53f1374a603558899fd5aeada6b4298bdeb32c363a4168254c978
 DIST imlib2-1.4.0.tar.gz 955897 RMD160 5b663a420e1008ddc047665912cad473323803da SHA1 2bbd65b82a690d21dab2bfeb33cc370f6bb49393 SHA256 4dd8c996bb466c10e8936eb283da1f90a820042c74f6de9207b51f4e87e2198b
-DIST imlib2-1.4.1.000.tar.bz2 861125 RMD160 719c8e7be30705e90778c606e99f9f06d9be96f5 SHA1 27693677208ff5602e4646626294bee8e645e61d SHA256 bfd6871c19ca26b23116b5418962844b0db179bccbb0465176464780d483be79
+DIST imlib2-1.4.1.tar.gz 895269 RMD160 29b4393e298825d4eb5922fb91a2dc558bde86d8 SHA1 d1894311e9e84015a0a9451748f6f37387fe693d SHA256 c1c86650607dff51ee05001b1d596064b325cfa6724fbde1a4946606898f7f66
 EBUILD imlib2-1.4.0-r1.ebuild 1415 RMD160 a929d55dcf7499b9db530dadad0fea50eef9604b SHA1 8c1c7a7c1cba6101758e7b2b59f54ea782e3cf7c SHA256 3e494a596bc270a4c14c29ba3900ce2dc04901401e30817c6b6f04b29bfdfa43
-EBUILD imlib2-1.4.0.ebuild 1303 RMD160 5acc5076c1cc442919b80ce02d2f93554adf6a71 SHA1 125b0087e8000c7290e19343f4fa60e9b287fbfe SHA256 bba18013ef3a4cf9d16e0995519a9c7fd0b10c1a1df82410f6393cd60d718eb2
-EBUILD imlib2-1.4.1.000-r1.ebuild 1581 RMD160 04df70c9846bb0925560bf54e3b0cf9a5818db21 SHA1 cba1c8fa9e9b35cd82ae5d50add325002d6578a6 SHA256 7a04591c374dd0dbfabe28e24a941caae606f68c1e97fc4e6741b031e09d69af
-EBUILD imlib2-1.4.1.000.ebuild 1461 RMD160 659883ef4ea90890615820c325a3b0bc328ab833 SHA1 7e52a62a17f2b8c013136a5df18b65756400fb87 SHA256 ff7353fc538a6cc551bd57aa348c0669bfb963987e4253fd773197d5601d782a
-MISC ChangeLog 8316 RMD160 330f4266edf01e2e38d16c0f45411d8b9a263169 SHA1 5afac46394d9cfdf869c442db0f703f4b902b68e SHA256 acdaf9e2d012957f0dcfb82249146787bc4a5c9590679794003cc5f37c345313
+EBUILD imlib2-1.4.1.ebuild 1471 RMD160 4182b8d5a23bf8809e146ec8f7d46cc712a36e2f SHA1 2a184fb424c2cb0e6381a62f1ff070585eac7c23 SHA256 3fd161552841b5080d1114626950f713023fb57f400e8a2fab78e4ebc206b43a
+MISC ChangeLog 8463 RMD160 42efd0f499d64ef2b84cbf7396c2f20b635aa8f4 SHA1 9d81531fd6294db263bcb6a05b2a197e6921baf3 SHA256 71769eec9a4219c6ec2dbac7d52a290c13042136a47f6f63f6a7bf0662d9ab11
 MISC metadata.xml 2255 RMD160 da6c5bba4102a0a0bf263ed8f986704d74292a8f SHA1 5e968e9ca6c3640ee5e3c98c6939099014edbb27 SHA256 81f9771e8e64255ed50d174fe917f9ed0507db9afe88df9f29ce311a6075b30f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhS92UACgkQj9hvisErhMJw6QCgrObNLLam5NAuLIDXrTFZJaen
-/UwAoJ7WqOMX2aHzbs08EtTYhApBPTR2
-=3hSX
+iEYEARECAAYFAkhS+cAACgkQj9hvisErhMJIMQCgiF7lNSNBl6QPchxybC8FbREL
+kYEAoI/XfgHDiYvUdiNm99t1cmqk9PI5
+=Xx4r
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib2-1.4.1-rgb.patch b/media-libs/imlib2/files/imlib2-1.4.1-rgb.patch
new file mode 100644
index 000000000000..ce4f4eab5afe
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.4.1-rgb.patch
@@ -0,0 +1,17 @@
+Index: imlib2/src/modules/loaders/loader_xpm.c
+===================================================================
+RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -p -r1.9 -r1.10
+--- imlib2/src/modules/loaders/loader_xpm.c	27 May 2008 14:35:17 -0000	1.9
++++ imlib2/src/modules/loaders/loader_xpm.c	13 Jun 2008 22:39:27 -0000	1.10
+@@ -52,6 +52,8 @@ xpm_parse_color(char *color, int *r, int
+    /* look in rgb txt database */
+    if (!rgb_txt)
+ #ifndef __EMX__
++     rgb_txt = fopen("/usr/share/X11/rgb.txt", "r");
++   if (!rgb_txt)
+      rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
+    if (!rgb_txt)
+      rgb_txt = fopen("/usr/openwin/lib/X11/rgb.txt", "r");
diff --git a/media-libs/imlib2/imlib2-1.4.1.ebuild b/media-libs/imlib2/imlib2-1.4.1.ebuild
new file mode 100644
index 000000000000..a6eee78e9b96
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.1.ebuild,v 1.1 2008/06/13 22:50:35 vapier Exp $
+
+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 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	X? ( x11-libs/libXext x11-proto/xextproto )
+	mp3? ( media-libs/libid3tag )"
+
+src_unpack() {
+	enlightenment_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-rgb.patch
+}
+
+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
+}