add multilib support wrt #496376

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 172 insertions, 15 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index eb3b04bd5ca6..b9cd965c1502 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.120 2014/01/18 20:19:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.121 2014/04/18 15:24:11 hasufell Exp $
+
+*imlib2-9999-r1 (18 Apr 2014)
+*imlib2-1.4.6-r2 (18 Apr 2014)
+
+  18 Apr 2014; Julian Ospald <hasufell@gentoo.org> +imlib2-1.4.6-r2.ebuild,
+  +imlib2-9999-r1.ebuild:
+  add multilib support wrt #496376
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org>
   +files/imlib2-1.4.5-giflib-5.patch, imlib2-1.4.5-r1.ebuild,
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index cf095306296a..22c0e862f64a 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -7,23 +7,27 @@ DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866
 DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c
 EBUILD imlib2-1.4.5-r1.ebuild 1777 SHA256 0a31e394a6f507a23757023afc933894eab79cb20d6f5a96d5a988e086d04bb2 SHA512 f204428f402c698bc0cdca2985aa8746551faa3e880a938a754d38fa6ae03b4c24b819d59df3eda542d518dc1ef0b06f82543df224ec8387c7e450ab7eee1608 WHIRLPOOL edb8d980511245bfe35d5e1429bb00476ebd542b0746ac752a8c516a36505d9611ee4c21c8a3289f2ebdf1fafe6de4c8bc5bacdc98ee8b67b22c9669fdfd266b
 EBUILD imlib2-1.4.6-r1.ebuild 1774 SHA256 f27cedffadd9768c0b5ff4d1f8d5cb9653c1cd94fd380afaf940c233951f7479 SHA512 c4b133b05da40487a326f21456bf47ef83c25b108fd068556ed4144aecf2e0fec91ca2da5f6d30568c5d7611447b371aad3e4cba488bb4c89a0d0ab8f2094ac1 WHIRLPOOL 8a2aa70271484a4024fa64f3b1849a5ed9717254da1f58c92052b9a10f112b68e5a28e652059d5d58ae4260537a82cf60ffb7cdc5b0f18da1d0a5f74de236854
+EBUILD imlib2-1.4.6-r2.ebuild 2075 SHA256 48ab14174657fc5814c77e614d06546cef517f129fc5cc8029c462478622c6d6 SHA512 2636a4c661ab2836591e34920cd000d72c510e01e3c0d99c673cc8fa0658df838f23ac23fea84204a939148b67bf350af6cb18b79c135b46e3db572b16dcd823 WHIRLPOOL 55667a0ada4980d54acb544aa88ec1d808781393e92b7ebd0af15c9777bac1c3ac33348e1db7ba112e964e1d9e4e7990a06c43e5972ec8bb1f45d93993e37563
+EBUILD imlib2-9999-r1.ebuild 1787 SHA256 307962dcf6043f2ad82969a841d9cf50c4a525c861cd3c44f173ebdd5669bb4a SHA512 fd83b1e4dd5d2d3ca0a78fcf178257bf21a51f21969581e974835f1b749156d0d81d27a64b14997ea81cddd59ec1fe23b25acf506b408bd667bb7ccc6ee61c97 WHIRLPOOL 579e053380017274aab4c6017b08e5eb6869431f52098f8795df690517f261f73053604ec6a0eb20d2cf5110224608d78de3da326c996852ad7a91e387a8bfa6
 EBUILD imlib2-9999.ebuild 1638 SHA256 d7866fd2dfbc16f6c175ef4241a93bcd743ab8677974f1bc17434e69ef991b94 SHA512 af1d51138de619470f7bf8dfe16204b0e7eee56a711b25d79d4e30bf03c436b2bee4506b1596c83dd6cf80e0e2def633a823fdf5045ea18871765b7b30e2c549 WHIRLPOOL e424e2942d72f690d8601e5e6d8ed4c2b5c7e3a7ff2c0a5197e8cfb84316f0ae0a55a76f196dc9d3848fca1a5f8554433401ec6fbc6dbbda9b0cd203a8db9220
-MISC ChangeLog 14857 SHA256 2d2f7e64389daf4458c1a9cf58b2d66f98d40b80b627ac6471a1a9e72fdc55be SHA512 b0036e82598b3c9a21906c78d90ec1910ac0e5004385c69766f97102fbde6b42e482a712501082c8b50774e5a18b8931697b48f45b76ceecc65cab5c4a358d1b WHIRLPOOL bb21513f95918eb66acfc03c3c605244b65064fc18e33d41aa6f73c7f031b0fc49d8b5053fa95b5ecb08b04a8b9bdee480b128f2ab38d1acbf17e6a793bd641c
+MISC ChangeLog 15059 SHA256 fa2bd48a447b6308497e69477d4bcffe7964c5e54b1cd3759ea3c857f0307485 SHA512 34b4360ad9f2de0c782c5b3f03b552dbf87b2f259f9e2979a6b9399ad67f0223e20aad86fb714b1614c37799368d971115908a676af43da0069cef98d4cbab3a WHIRLPOOL 89379bae09c81738c66fa9e2c05c135b6ed8687196ebd4d69181da716702c63f374d0c1d1a9f7038505e7a4c9716880d005d65f7a9146c2410ec4b4239ae9430
 MISC metadata.xml 2200 SHA256 343b4e61546c7f2a89249bd63c4018975cbc53bd8622d641d27dc05f8aa5235a SHA512 1993bd9088534da0122db66e83017259423f79f4dd9de442f4f4dec6fe4398979813ae83f0a7640630da1f6fcf2b8ab59d64ed5cba09144cd243f232618501f1 WHIRLPOOL bbd8aafa47c63e0b32b888e89a62d321591a2c43ea0b3d816206c62f2a0381de89c554a84479727a281957c8b707175c8b125c47135ccf17d707928cadc51ff8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2uHKAAoJEPGu1DbS6WIA3vMP/i9EYgJszhmmP/TMd1ou7tZm
-dqJBe3rPOXkNdSy19wDlI9obQGvP09Npw+Vu8lri71IshiDI1w2LDrj2ULndRGjg
-nB0lA2Z0zR79MHgyPUoVDKO1E9T3V4i9xY8pxOytgmKHuR69O32CY3jn8Rwovviz
-iKTa94/9eNtV0DCc2W7XB5xTUUTzS5PSa9pK0zqRCnPHrp4XF4GQTeHcw3FvMgKh
-6DEMzCMMgEwKmlO/jeIVfoNImgt8Kv2m6xIYTCBGsJMP0mV+bBqDImkrAHaGsMSu
-/JIQPTxh6rpnA+9p3/qA8TNkLnXzOJlNn8bEMEmawfiLNggujFDXEnlfi30LGkhj
-qbJjHX31S3giPd0UKXo23kk2L23IQITJAd1JnPqu8OtcpGf+QObJEbdspqfOvKSP
-0QfoUSFE6grGhKzyYUYjA5iiCFlDk3JfCeqBa03BPINoT4iRNValvE8964xCpOCX
-qPs4qcx6AXZCpfi6qq6ulq+P3M/YxQ6pP+IT5EOQ3348oyWGyzIBwAGvnZZY6zAR
-xkrCgTz/ObtXHCCr4jCTPS7hTBQGHyRu+O0X5xRWE+U1wM+KEonpCaPZnnFHsnLZ
-LDRLJuxC1rlRDJT5otYp7QXlciPpGqrRmGkoTfGlqXiRsk0IeqmI2xgDSDPcHXzi
-1pqDgNLnu8GRlYYESLbe
-=iqj+
+iQJ8BAEBCABmBQJTUUOdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgFtcP/ju2AwPEV9n5YCGL0CNNGfPE
+sxo8kGJ/fO7GrKSZXte+EnzkET3OxZq8xAKq1SdqS6/pSR64/KHnrrOSW1h+MDgU
+HF4qVCWAo3ojyBSZERXp0SlQz+zEEL7Tsv+yOw5zBm5OUx+0j78n0rRI9psFGz2P
+CcDAn17dFblE+i6+5vq417LpcLqPBF0wwBvXav3IaCML/GBJ/W7zx3/mT100RZ2i
+BnxSbU4s9huGAuDKKTkuGdK//Y41V5dcufAfnPyu29r+WYUHsS57KAcwcln2H6jF
+Ak/y3uHU6aVLuNTDKy+vCfX0dbEvfKfiBLuNbXmINGO/qHsNYkYZeu2u4OaTUabF
+rgx4BF13N2nmWEwblP+yEjNVZV4kOnpr5m6PW957elEi9iZ+WuroUcs2JVZI7/mG
+FV2KJ7rfIiMmi1D83ko35lGDAgqdYchA/6vTRisOH90F7+hFlx5TanY3UjJwytnw
+mKS93bL1AYQEbbm50fJTL5Lh2Pp2waL2X4yi3rguH5H0tiASCCklnTj8FAOr7taG
+qva0XEBuor0xsEL5IM3qsjq/4TuQ40QFzkhp1ct8DAm3GKDM53qN4NuZbvyx4pND
+LlgmXnG2saV/VxazfCgcij/HDoqhTHb6vZZ7zrlaWedIPN3UdOhhoMoQNhqIINwy
+05rTGh8ij7ClCxTTIMWq
+=hW+E
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
new file mode 100644
index 000000000000..76dd46603ab8
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.1 2014/04/18 15:24:11 hasufell Exp $
+
+# NOTE!!!: to avoid masking of -9999 the
+# package.mask entry for multilib version
+# reads =media-libs/imlib2-1.4.6-r2
+# Keep this in mind when bumping!
+
+EAPI="4"
+
+EGIT_SUB_PROJECT="legacy"
+EGIT_URI_APPEND=${PN}
+
+if [[ ${PV} != "9999" ]] ; then
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment toolchain-funcs multilib-minimal
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="http://www.enlightenment.org/"
+
+IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+
+RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	gif? ( >=media-libs/giflib-4.1.0[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	png? ( virtual/pkgconfig )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894
+	epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634
+}
+
+multilib_src_configure() {
+	# imlib2 has diff configure options for x86/amd64 mmx
+	if [[ $(tc-arch) == amd64 ]]; then
+		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+	else
+		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+	fi
+
+	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
+
+	ECONF_SOURCE="${S}" \
+	E_ECONF+=(
+		$(use_enable static-libs static)
+		$(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)
+	)
+
+	enlightenment_src_configure
+}
+
+multilib_src_install() {
+	enlightenment_src_install
+}
diff --git a/media-libs/imlib2/imlib2-9999-r1.ebuild b/media-libs/imlib2/imlib2-9999-r1.ebuild
new file mode 100644
index 000000000000..ce1a4e92c743
--- /dev/null
+++ b/media-libs/imlib2/imlib2-9999-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999-r1.ebuild,v 1.1 2014/04/18 15:24:11 hasufell Exp $
+
+EAPI="4"
+
+EGIT_SUB_PROJECT="legacy"
+EGIT_URI_APPEND=${PN}
+
+if [[ ${PV} != "9999" ]] ; then
+	EKEY_STATE="stable"
+fi
+
+inherit enlightenment toolchain-funcs multilib-minimal
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="http://www.enlightenment.org/"
+
+IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+
+RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	gif? ( >=media-libs/giflib-4.1.0[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	png? ( virtual/pkgconfig )
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+multilib_src_configure() {
+	# imlib2 has diff configure options for x86/amd64 mmx
+	if [[ $(tc-arch) == amd64 ]]; then
+		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+	else
+		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+	fi
+
+	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
+
+	ECONF_SOURCE="${S}" \
+	E_ECONF+=(
+		$(use_enable static-libs static)
+		$(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)
+	)
+
+	enlightenment_src_configure
+}
+
+multilib_src_install() {
+	enlightenment_src_install
+}