disable wrapping of headers (also disables nasm for 32bit on amd64), wrt #512430

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

3 files changed, 171 insertions, 18 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 75b1862871b3..2deb114e2fb6 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.217 2014/06/18 19:48:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.218 2014/06/22 13:39:57 hasufell Exp $
+
+*libsdl-1.2.15-r6 (22 Jun 2014)
+
+  22 Jun 2014; Julian Ospald <hasufell@gentoo.org> +libsdl-1.2.15-r6.ebuild:
+  disable wrapping of headers (also disables nasm for 32bit on amd64), wrt
+  #512430
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libsdl-1.2.15-r5.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 0899ca354505..387a30e0c35b 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -17,24 +17,25 @@ EBUILD libsdl-1.2.15-r2.ebuild 4135 SHA256 bf8d565a61eade20d767a1273023a6b439e6b
 EBUILD libsdl-1.2.15-r3.ebuild 4179 SHA256 5e891e51838911016feaab3b819b35e1cf3a8b4329495e25c272141b9d2b2e69 SHA512 7a1822664e523eb33cd184110e66b0e587aa0a0c7ce9e507b74e3bbc29754ec0d8cc496d3de5efd915c668be8bdf0565b973bce1705830c3e71415e9e7e68f61 WHIRLPOOL e5d4ee7f7fd1bc5c3e0d4794a0ce1cc800386ca44a4e52445f0844611abf27ed87d87a6715b0503559fdf6d3836229c6f2bf73edfd41fb29c82d1b0eafb5dcab
 EBUILD libsdl-1.2.15-r4.ebuild 4213 SHA256 b5a1380c46ac5805f55a5906477b42c4a7e96781c40fb3fe2c63b32addf20eb0 SHA512 2187394d63d9bc174804af1c921b4a1fe52cb7fb15e0616ddb0773552f158bb53cb371801f026f025355ef84de6dd5bfa54769279b6822a238e6666a7d0b415b WHIRLPOOL 8b03cae279068d9888e674021c83e787ff4973cc6d881c13d0b60590051ea2ae47df9f302a34bae88377dc142fa4863896a3264ccd1af679711081af54c50b9a
 EBUILD libsdl-1.2.15-r5.ebuild 4877 SHA256 f93a821f09daaa11ab16446afacdef3fd9db70bca867e78de718662fbc30e1b4 SHA512 e44dd1512a748eecd16593098e775c747be3fbdb59ff7fabfd4f19f8ba1595c9d1682be206e315c0912f11a7e863673adce0bb7d4471b8077a3b826acc2362d5 WHIRLPOOL cfdef28576d69c7264aaa673844f6f15a287706ef2325c76e4e22af1fca697d53b067782767b9362638dd7bee89724d36eecccc196568c736f9e2d4df3319bdd
-MISC ChangeLog 33177 SHA256 d1a5741d02e0195d84a0a624c50ddd37a71e4adbfc2743227d1354937ace5c6f SHA512 9d06706537e23f3f0538547b860358b6399a9297b95c3264762ffa4047b460ecfb74daf11a2e14e4815a3bdb63e8e4aec79df401e239bb915388b50f6c89d16f WHIRLPOOL 54b50ae169f52aefb5a1d3940b798d3183b91b1dedf58bf28a4b1abfb7c066fec596308573333b7ab1a68f3d42c53c2528a5bff983d752da2598a11cc8b1b46c
+EBUILD libsdl-1.2.15-r6.ebuild 4614 SHA256 f2ea95fed9a555f29bc304906169047d427c393fda833dd1c6ca7907436b8e55 SHA512 aba6dd9b18b5c7c587bc325aa9967d42c0d9cca437219878a0bc01cd3eb474af0c8a5a3e807b066e10d219e0ba86cbd192c16c3f1c7b8c7208cf872cc4ad30e5 WHIRLPOOL bdcea5f1a0fb80174f8a7dc4d11715282037a139da310aa9502de0ad9cda4cee6e8ff9de751270b1099abbd8ec82964316262d14d7e1f010bc446a519f1bd52a
+MISC ChangeLog 33375 SHA256 1b178ef02f1c7bb47cbc8d0ba8aa29ef83c07edfb295d94ece6d9e498efda3a5 SHA512 0080b70f789a1c70e7d38a8f53eee0cd8586f4c2907076c48176ead82a7010e9087b53dd5253a6aac0992ad6a4b33b8cfbfae6bf58cf5ecd732e20730c22bfa9 WHIRLPOOL 41de4df6d07191aeaba88077a87e704658ad2c3756fea215a13fa2033f3d5aa2875585d0699d8a8308a5fc91ed7e5880c9f0b1f0ca09ac3a245b068bc238b717
 MISC metadata.xml 1357 SHA256 c30d6116cdf83062fc106ea80d843c5613ea0e7a91ea6afe17ab11077b2b7574 SHA512 e516d46b97979f83d286fb61a349cdd31e02db3de02ad2147a90e528c3ad19aab46c13c3fc72f8fcc418524b3bc50b37cf77ea2b1d05dce090d0b018dcb34224 WHIRLPOOL 02d5acf8972de51c728d469b24adb110204a0f70e57772322a65b62982a1c17d1150da36311260a606e02b694a117ced89c161ca2001b0713903caa15610da75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJToe0jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtLgQALITMJjdxLneiHYk2oJXDx1o
-ILoSW6lCk21FXYHYbgv9kJ6S72mEqgVhhyKX1kWGLrkBuWi2TRErVVBqA88e3ZEw
-P1CDry0FVGjD43RCcgwdNFcXEoCHPBMJYyPkHf+Puv7M4brh/q8i7ScJ7plStB7q
-/tClXdH77OIcVrLo/ep8BXyN3yJFbauZtCYKD5HA3+BqSJ+/uS81rnnWhhuDUw9G
-tuUGFiBUI7IPIFn1X3iLFX7/6WPuOtwgCpxKehAhFbzkmTOV5DepKlOxz6YIOtV1
-OxyUTRD3SjnyVajSu8IviFqors/SBFJWRODLxDSSfFSqyfBqrNYlwi+5lMPh7E02
-DOp++AU5Bjj01zT4bfjkZSQfHze4vsFhY/WBWgV8MytiMlNFDltUk0OhAp2WcSIc
-bPPh8RueKTYWGdbAxMX0NhlyQCxtH1Cpc/ol07ypfMpl5zxddPpRWZ/Jrszbgpoy
-ZBDiKoZ/LVTDdWyIEenPZZVIi1bhh749GE5ADkSci4QrB3WsQZvUVl1fgkymDloV
-CHQlW1tSfSBfE9l8RTAeA448esjDMvmwB2vlXBmw6plMQKshocoWJTbp3Sa3OV7B
-MoyLbsiUYo/hfQwbffyqhM4Q5cGGvIMrA2AGv6jgXtQg+Ochq5DumsjtlA2No40c
-/LBZz7Nj7VlUpdgqyn3A
-=YHv8
+iQJ8BAEBCABmBQJTptyxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgxBoQAOrA+d8dCZCjP0LAWoWoudoo
+1cpGXQCoJ6O+dbaX07t9LHvsnr1bSoPLSn+7V33B+PExP+0m0xMDi77vj9j52NJO
+6WIVvfaL6PbgEWbaOkJkgz/LJgUEaK5Eofb+A4dQgmNGIa84wcrkutkPyqKL+R5G
+0cbMBdRFMiece/t/XDytA7386KJM4kl39m3aV0cXP9rZa7UtYyU4Fsgcl3lyQb7D
+wUMR1xghm0uoQl9jZ1eqN6vD8PDn19U0Yvhzw2/wHD15YP8Hj7BxMbyiOAq4rfDH
+TlmRNUBKTEz0nsYXi/7ItizkDF0nsCCtxY9FITQBjbrB+xbCxf4Am/nuAA58oWw0
+DnZAUJVN0xwyBhw6jeTWy2RlYfQLlWslHHA0Qc3SWz3W2fQhKknheIw3UQn0OeQl
+iBTzT8ME3lD3eu6XzowHn+g914ZpQnVAkl3czxkw0mcjQgaGFYw0czRocqNLCboe
+DV7BnpvfBnc4S8JGjlzgVZUJGmlOrMvT9lEOUxHjgG7OJkbnUPp+0glWtRJOo8GE
+zEe3kyYNP7GCmWXUdEGgmORPaBli3h7EMKectmaO5qerNXL7SA6kZpL27PHT0POp
+QLDiANC7VqOc3O45v9bbByIOazQy08iW7ZaBGVbq1WBDRhz7EkifsqgGYwWZV6XO
+Fj4g+agtmWBodnqPMzBk
+=BJX1
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/libsdl-1.2.15-r6.ebuild b/media-libs/libsdl/libsdl-1.2.15-r6.ebuild
new file mode 100644
index 000000000000..1348f01a3c25
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15-r6.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r6.ebuild,v 1.1 2014/06/22 13:39:57 hasufell Exp $
+
+# TODO: convert media-libs/libggi to multilib
+
+EAPI=5
+inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+# WARNING:
+# If you turn on the custom-cflags use flag in USE and something breaks,
+# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
+IUSE="oss alsa nas X dga xv xinerama fbcon ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
+
+RDEPEND="
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-sdl-20140406
+	)
+	sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	)
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	ppc64? ( ps3? ( sys-libs/libspe2 ) )
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	nas? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
+
+S=${WORKDIR}/SDL-${PV}
+
+pkg_setup() {
+	if use custom-cflags ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the custom-cflags use flag in USE."
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sdl-config.patch \
+		"${FILESDIR}"/${P}-resizing.patch \
+		"${FILESDIR}"/${P}-joystick.patch \
+		"${FILESDIR}"/${P}-gamma.patch \
+		"${FILESDIR}"/${P}-const-xdata32.patch
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=
+	if use !x86 ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use sound || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-rpath \
+		--disable-arts \
+		--disable-esd \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		--disable-alsa-shared \
+		--disable-esd-shared \
+		--disable-pulseaudio-shared \
+		--disable-arts-shared \
+		--disable-nas-shared \
+		--disable-osmesa-shared \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		$(multilib_native_use_enable ggi video-ggi) \
+		$(multilib_native_use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		$(multilib_native_use_enable ps3 video-ps3) \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		--disable-video-directfb \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files --all
+	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
+	dohtml -r ./
+}