add multilib support wrt #484130

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

3 files changed, 162 insertions, 16 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index e14d127385ba..bd3d80b9e017 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.11 2014/04/05 15:59:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.12 2014/04/18 17:05:02 hasufell Exp $
+
+*libsdl2-2.0.2-r1 (18 Apr 2014)
+
+  18 Apr 2014; Julian Ospald <hasufell@gentoo.org> +libsdl2-2.0.2-r1.ebuild:
+  add multilib support wrt #484130
 
   05 Apr 2014; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.1-r1.ebuild,
   libsdl2-2.0.2.ebuild:
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index dc8474f5e877..493adec876f9 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,25 +6,26 @@ AUX libsdl2-2.0.2-static-libs.patch 4633 SHA256 aa3ce99668a0a504e22b8f4d6d225855
 DIST SDL2-2.0.1.tar.gz 3660224 SHA256 0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0 SHA512 012125d72b6baa677c4c4d4747a058d7c0e406d84b21712fe538bd8ecfc1d74cbc0569ce25046a766266460c9e040d2f2c62ccc52fd6e371683999c95c314c33 WHIRLPOOL 353d2909e3738b13885b26d57f2d690ac55c4992650dba552b0ba17d35d4b04946828d76b621de69201aed1676be8dc7ce11bb4c72af95b96df0481fc3785084
 DIST SDL2-2.0.2.tar.gz 3812882 SHA256 590157f85a8a8b52723848169a74eec6ca07ab4a75cec15beedde648f980e850 SHA512 73f628a893d3e7efb2180783ab5ea0103e943dddbd4e0b2b7e1add5c2cf975c85179da6e09747ad1a9d8a25067d6fc9e4467927cf111762ae322600ab810a348 WHIRLPOOL 1e396f2621fbdb6bb10f06b5828271aad23ab5d5c07254ebeaf760cf1b170441ccc89db233749b4ac4fa7341e4204ba1cd705d08ed0490b07a1855d38aa08051
 EBUILD libsdl2-2.0.1-r1.ebuild 3497 SHA256 b58f136902cb96dd79a0537a684dbd6a8e5d38c9a62a223ad6a1e4eb6e1e4761 SHA512 ccaadae89739986ee3b19ad3bed0e3cb319e2603cdbfcc47ec7d8be87b798b2c04dca813316942939a74ec97d63e1c729288a27a4f7b3b674064705acbe6c539 WHIRLPOOL a499471c4c9d3ab9ab0fa8049fd688d9f38343bed1416d8333b1e787c6f26f47d3876f1a29bc7539af0387757a3d0b514fa969bd1b8aefe13a8d3b8ed95942a2
+EBUILD libsdl2-2.0.2-r1.ebuild 4082 SHA256 2263cc78c0e6ca744f4f84f4cb9ddcda3fd2b1521b0f82d9a2efc5f7a28ac890 SHA512 19aec9b4f5d764e830cd9b3315d0c158342eabe0c32cd744f4a107e7acea5bf89540d16b1eaacdce3c283dccb259267ab213799ebe14321823ca859dcf1d4ccd WHIRLPOOL fa0813a6a5777b89f5ec36bae4eaccfc213df4f7472c00e06eb8d267c23760680b3ec97ab860249a60fa057c8f6044a292d189c4788f4f2873a50b0db17754b8
 EBUILD libsdl2-2.0.2.ebuild 3494 SHA256 c999a442f19fb1818fdeb9323aa4f40483e85162f9f0c18ade8c5ecfde4cd257 SHA512 17cb93af4d94931c82d9529b12f29d61fd0df5a8bb9a56577e28c599166ec58edc7aa0a9241ad26833a44428c4a70f28f9c282e26fa627b4e26edbebbdeff21b WHIRLPOOL d50c84f900981b793dd1971b943499d33f8c63a740232ccd349e49e98c5ed78b7211b40663ab0dc11222b80affd901ac5f4f41659fbadf394476b9fab185724b
-MISC ChangeLog 2099 SHA256 3f79bddcf7236df36fa7874a14dd644664ed18cb2951241d7ba853a4cacdb028 SHA512 d0923fbb43bc92f03f4aaaf16e905467a19acacef84480f92fbb3fe0a1280255dc3c472f457d875e511f2fa6d091f35520891189d3181e5defcec9eb1633ea01 WHIRLPOOL 686334801684b226d29a1a0a539a000ac04bd5d12f30d739a65e08a5bbc53af443ea5f54530c25fd50e6555d8d965253cdbca9cdacee2a068e00c0f1249982dc
+MISC ChangeLog 2245 SHA256 efcb6dafed766e5b921b4ef983278d9ad35627360b850c7f2966598a7d2f23f5 SHA512 a7f47ddaf414afc6e19ad5611fd244e8e051682d7e88090b10317120f9c4c85cc45df0e7032b92fe9ef885c273cde6959acc217d5f63c26323f5078f74f3f049 WHIRLPOOL 93a3622a306b09a3213f63027cbf7b21c0a0313b8b029d729cb682be703b15d278a7abbaa86be17c7363e497ed99a73fd45e61adb271606e2f597ce29c93d041
 MISC metadata.xml 1532 SHA256 b0de84edcfbcf286934f7adf119917dcd138c0570d78b25286f25b3a2d110da9 SHA512 fe8e84981baee1567e80430a2352feffa03915864b871916c13cfec4fd734c12dd6d9195ed20da26e7985dcd39c55498d1f55ac0a5dd61c2d4100e6e964b5e79 WHIRLPOOL dfda175811d3dc27eadc3e7b61920c6257ad9e062626cd786adaf0a1c52ab283f8814feb85d0121bfd01ce52cab56f587c078b3d20aa1fc954a1986d176bb4aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTQChSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTUVs/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgsokP/R2p8BFV2Up4BEAsnpkXVfvX
-a4YorUQjqaRsPMLJ1XK49y6e5/3WFlZFx/CTl/rbLmCiWIe0hbDPnuwbdFnGCHmY
-SMZO/qlSKx05hCHCyxr90CZM/NVrfg8wNQYSj6Mn9+2soZpPJuSG4UFaRUT2wPv1
-kEWwzLYDqksgo3O1DdlUliysDX2juvtdjwF8ME2YrThSan7DK+PkAnzg+iwguWrL
-gQ4oT5vVKs8gsHIuLudTXCDZPzJzjNZY8dZpTX7CXuR/lmZ4KF60/m5miOxDjva5
-yMdPR6uk+OHuMdov2kzH0L1Me/As+pcRoy1dSTpdbU+k63JW2PDQXxLBSbQrbRAY
-UmNo2piwd0rFQgevofIyVkyK3iC1+PA90U85qnWHOkGHRwZQmviOAU1n0aWn1303
-IiAMgglCxECgelHIrs7bAZ4N6RJn0mIOQSyeFiaMI2Uk4Kdc/aArjpY5UQSK3OGx
-zYbJcS1NF/0vnyduZby4Tv7R6I7/Mr+m9mWE9lZf0Xia8Q+x+sN919SJMCgjdf3H
-xBwNbVlx+jHih4Ck2TRBme0QT1LK0RiDkClcoOb71tjTFzFD/jHP5bDmRxwCm3B7
-9dE5sDLQi4w4uVUlTBZmGQPMfaUn2E+h54iCjHOVY+pssFF9tLSQ+1jl5LDpyxQx
-/VB2OfQYUTqnbmn1JcjF
-=A+Nv
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgjlEP/RMxmGyL6JXYpvAhVilKSeQO
+EsWltatwtjxEk60DwHDMV67FvXcGcYPRMhzlvDnHbxvBZ2zeFE8PXMpomuNBvAhZ
+4YmuqlkffwhtVlBj3MSLGBtvOOQGEHpYM1aWGwtM53D9eJJxSqnuI4NWV2FkWrmS
+mxDyGwH8wql9e5QM9HNrUjOq8uLzYIJYs8wsFggFArAkps6FYQtVfpq0teXV1SBG
+b83ChY4YEUUL0pdF+9NmlgL4LuPTo4yO5XbFlqPa6s0eGSu13ULkFdVt5aiCklNm
+8cJAd4rNHqPuulL/YEuF0Os7o7ZGH7buO01tjQadYd+5OodcEn9/T9XPQTGVoy5P
+T8Ydhv4u3ncFGEfhwVARZ7n6D4btgs6xKRuHeNmE580xB9GXXY3XbFIpais4NVDZ
+uERVmDE0dZpbPaWeSzO2sjNHeVFjWGELBjBuMBbWOO3YF7XfONCDUL36netY1qPM
+yHOtYW5crENSseNgOokyqVTQd4mkEhLyez9A5N8PpOVAi4bsXmQ9oYyRJng9CmEI
+hLvTMWaHexWhG/gQ+a5+BA/EhmIDEaEHZexgTjXorl+go1sIaCk2insVUaX5cGRN
+QPO+fGv75KVwCQ5WwIrv/dbb7ab7flGEiZmq9V02m0/K15ckGcc50hWX7qJ3ROdO
+NIjQnD6PkpNd1I3uwFDV
+=GFrS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..0362d8de900d
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild,v 1.1 2014/04/18 17:05:02 hasufell Exp $
+
+# TODO: convert FusionSound #484250
+
+EAPI=5
+inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal
+
+MY_P=SDL2-${PV}
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org"
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+REQUIRED_USE="
+	alsa? ( audio )
+	fusionsound? ( audio )
+	gles? ( video )
+	nas? ( audio )
+	opengl? ( video )
+	pulseaudio? ( audio )
+	xinerama? ( X )
+	xscreensaver? ( X )"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus )
+	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
+	gles? ( media-libs/mesa[${MULTILIB_USEDEP},gles2] )
+	nas? ( media-libs/nas[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	tslib? ( x11-libs/tslib[${MULTILIB_USEDEP}] )
+	udev? ( virtual/udev[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXt[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+		xscreensaver? ( x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+	epatch "${FILESDIR}"/${P}-static-libs.patch
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	# sorted by `./configure --help`
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable audio) \
+		$(use_enable video) \
+		--enable-render \
+		--enable-events \
+		$(use_enable joystick) \
+		$(use_enable haptic) \
+		--enable-power \
+		$(use_enable threads) \
+		--enable-timers \
+		--enable-file \
+		--disable-loadso \
+		--enable-cpuinfo \
+		--enable-atomic \
+		--enable-assembly \
+		$(use_enable sse ssemath) \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable altivec) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-alsa-shared \
+		--disable-esd \
+		$(use_enable pulseaudio) \
+		--disable-pulseaudio-shared \
+		--disable-arts \
+		$(use_enable nas) \
+		--disable-nas-shared \
+		--disable-sndio \
+		--disable-sndio-shared \
+		$(use_enable audio diskaudio) \
+		$(use_enable audio dummyaudio) \
+		$(use_enable X video-x11) \
+		--disable-x11-shared \
+		$(use_enable X video-x11-xcursor) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xinput) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable xscreensaver video-x11-scrnsaver) \
+		$(use_enable X video-x11-xshape) \
+		$(use_enable X video-x11-vm) \
+		--disable-video-cocoa \
+		--disable-video-directfb \
+		$(multilib_is_native_abi && use_enable fusionsound || echo "--disable-fusionsound") \
+		--disable-fusionsound-shared \
+		$(use_enable video video-dummy) \
+		$(use_enable opengl video-opengl) \
+		$(use_enable gles video-opengles) \
+		$(use_enable udev libudev) \
+		$(use_enable dbus) \
+		$(use_enable tslib input-tslib) \
+		--disable-directx \
+		--disable-rpath \
+		--disable-render-d3d \
+		$(use_with X x)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files
+	dodoc {BUGS,CREDITS,README,README-SDL,README-hg,TODO,WhatsNew}.txt
+}