add multilib support wrt #496376

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

3 files changed, 154 insertions, 1 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/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
+}