Fix PIC patch as pointed out by Peter Beutner in #102519.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 78 insertions, 12 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 9850cea46c97..a2a664dec7a4 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.42 2005/08/13 07:59:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.43 2005/08/18 00:05:37 vapier Exp $
+
+*imlib2-1.2.0.007-r2 (18 Aug 2005)
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/imlib2-PIC.patch,
+  +imlib2-1.2.0.007-r2.ebuild:
+  Fix PIC patch as pointed out by Peter Beutner in #102519.
 
   13 Aug 2005; Fabian Groffen <grobian@gentoo.org> imlib2-1.1.2.ebuild:
   Marked stable on ppc-macos
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index c8915d948083..6d334834fdd0 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,16 +1,26 @@
-MD5 51354283edbb82dd3521decc05b03d3b imlib2-1.1.2.ebuild 1007
-MD5 806ab39476cce5d3e0206efc7e94c1db imlib2-9999.ebuild 935
-MD5 4795c0cb40349fb84538fe52668f893c imlib2-1.2.0-r2.ebuild 1149
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 81998f3d34c245e1c659d83daf551630 imlib2-1.2.0.007.ebuild 1161
-MD5 4ad990ccd6a5cf329a7931f100773e3c ChangeLog 4768
+MD5 4795c0cb40349fb84538fe52668f893c imlib2-1.2.0-r2.ebuild 1149
+MD5 806ab39476cce5d3e0206efc7e94c1db imlib2-9999.ebuild 935
 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
-MD5 d6409a0f3b318245ee5880717a143482 imlib2-1.2.0.007-r1.ebuild 1203
+MD5 51354283edbb82dd3521decc05b03d3b imlib2-1.1.2.ebuild 1007
+MD5 79da67e250cc153a8a523e4bc2209843 imlib2-1.2.0.007-r2.ebuild 1203
+MD5 48f5b3c292c95823c018c027606d2fd9 ChangeLog 4969
+MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007 68
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0
 MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r2 64
-MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
-MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007 68
 MD5 3a2a6d558d381a6e8355a223b8b0f842 files/imlib2-1.2.0.007-x-typo.patch 298
-MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007-r1 68
-MD5 540efed058c6dccad80586ddd3af9604 files/imlib-1.2.0-bounds-check.patch 1076
-MD5 7ef289771262a73dd638b78fab2b12a6 files/imlib2-PIC.patch 15063
+MD5 9495afd4021ac839ef2aff52b3520cf5 files/imlib2-PIC.patch 15063
 MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
+MD5 540efed058c6dccad80586ddd3af9604 files/imlib-1.2.0-bounds-check.patch 1076
+MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
+MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007-r2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDA9DrgIKl8Uu19MoRAs/FAJ0RYufccOVHBLqnKz3F93S7b58FOQCdH9hB
+08TzVySmcLXIWrY0CyhT8To=
+=nVzH
+-----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/digest-imlib2-1.2.0.007-r2 b/media-libs/imlib2/files/digest-imlib2-1.2.0.007-r2
new file mode 100644
index 000000000000..e451ab0695d6
--- /dev/null
+++ b/media-libs/imlib2/files/digest-imlib2-1.2.0.007-r2
@@ -0,0 +1 @@
+MD5 fb97ddb3ece42138f4cfb2531345de4a imlib2-1.2.0.007.tar.gz 887615
diff --git a/media-libs/imlib2/files/imlib2-PIC.patch b/media-libs/imlib2/files/imlib2-PIC.patch
index 4c58460c77d4..3dcde8c284b0 100644
--- a/media-libs/imlib2/files/imlib2-PIC.patch
+++ b/media-libs/imlib2/files/imlib2-PIC.patch
@@ -575,7 +575,7 @@
 -	movq m_g6, %mm6
 +	LOAD_IMMQ(m_rb, %mm5)
 +	LOAD_IMMQ(m_g6, %mm6)
-+	CLEANUP_IMMQ_LOADS(1)
++	CLEANUP_IMMQ_LOADS(2)
  
  	LOOP_START
  
diff --git a/media-libs/imlib2/imlib2-1.2.0.007-r2.ebuild b/media-libs/imlib2/imlib2-1.2.0.007-r2.ebuild
new file mode 100644
index 000000000000..efe3798e61ea
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.2.0.007-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.007-r2.ebuild,v 1.1 2005/08/18 00:05:37 vapier Exp $
+
+EKEY_STATE=snap
+inherit enlightenment
+
+MY_P=${P/_/-}
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="http://www.enlightenment.org/Libraries/Imlib2.html"
+
+IUSE="X gif jpeg mmx png tiff"
+
+DEPEND="=media-libs/freetype-2*
+	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? ( virtual/x11 )"
+
+src_unpack() {
+	enlightenment_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-x-typo.patch
+	epatch "${FILESDIR}"/imlib-1.2.0-bounds-check.patch
+	epatch "${FILESDIR}"/imlib2-PIC.patch
+}
+
+src_compile() {
+	local mymmx=""
+	if [[ ${ARCH} == "amd64" ]] ; then
+		mymmx="--disable-mmx --disable-amd64"
+		[[ ${PV} != "1.2.0.007" ]] && die "revisit amd64 check"
+	else
+		mymmx="$(use_enable mmx)"
+	fi
+
+	export MY_ECONF="
+		${mymmx} \
+		$(use_with X x) \
+	"
+	enlightenment_src_compile
+}
+
+src_install() {
+	enlightenment_src_install
+	docinto samples
+	dodoc demo/*.c
+}