Restore stable ebuild. Again.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 176 insertions, 2 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 5689ec9f05fb..829e1987b2d2 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.234 2015/03/31 15:50:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.235 2015/03/31 20:15:36 mgorny Exp $
+
+*libsdl-1.2.15-r4 (31 Mar 2015)
+
+  31 Mar 2015; Michał Górny <mgorny@gentoo.org> +libsdl-1.2.15-r4.ebuild:
+  Restore stable ebuild. Again.
 
   31 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> -libsdl-1.2.15-r4.ebuild:
   old
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index e5790327134a..a4b488a20800 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libsdl-1.2.15-bsd-joystick.patch 1079 SHA256 e621c2c67b5e2774b69b207f4614250cd3994cd5d6e5612a248bba237c994b09 SHA512 18ba45c8e0f676852168bf2e13616777dc0616e976b459c93c1f4a41bf219b13cac8f63e1daa1038ea9d7a648888836fad268b3c076fa9416d5044ac2365b0cd WHIRLPOOL 8c1a0740b9e019b4fb50e0b03e4eb9821603e21b8abc74e789fed8ea208246355e7c7bfd997aef0d50efe2a2ea4f6d1444728239657cd12990352d87531b6d77
 AUX libsdl-1.2.15-caca.patch 1086 SHA256 4673baf63eeaf44eabc5e8c11305dfc074253ed584cfe1c5442e2ae2ff581bac SHA512 3b41306c21bca41f27a5a6857f958ba3d594c27ee36b865a7a5e08db871025fe5aab7177d72b8534cd53a7aa9f943e268e8a2453eb48cdadcbe8d40ad81d6a58 WHIRLPOOL c3d175d0f2ccb10a4db26d6a793151697d7c8923c6e0353432749d38284db49c12afc4e4c096a1f6f6a803d9e34eced9c66d31e7798c961d2632b74ea7115c2a
 AUX libsdl-1.2.15-const-xdata32.patch 2253 SHA256 b0560f37c8927d00cfb034580f15d08ebfd31bca38f470761957c02590b87f9e SHA512 f1804afb7e70f80a7262df8affc5c1c71b3da1a448085e88fc0b50df4fa293f595542e5456e988ba1477c8aaefea3ba81d7c3e729307da21ce3560b369abe327 WHIRLPOOL d32d5ad03a34b41bff6c693bbba7e65fce6e8346e66aaf9d58b157de04abed2e88744fa0ff26d26da882415b57d6612bb226171977cb313a36ce5dee18a6c46e
@@ -6,6 +9,26 @@ AUX libsdl-1.2.15-joystick.patch 315 SHA256 fa912a36cf6a0926e91a34efa756d3514bb4
 AUX libsdl-1.2.15-resizing.patch 2098 SHA256 0e4c2c4a11dbf611e317be4e866f99bde619eb1ca3942524e96b7ef94d8180f4 SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b WHIRLPOOL a298ec48388f2f34dfd3c40a5912fc1ec47ff9a19983054f78544f6794873a42090010b4b606c9c9f2dfa7ea6ee447e87915a733e34431b7db7ae39a23c605ee
 AUX libsdl-1.2.15-sdl-config.patch 780 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03 WHIRLPOOL 5762b64726808967cd51215b1fd04c3cd52baa9517b25c30c99e669d450f19666d7179c9c69bf8d6a09ac109d52148fee0bbaa458ab77aacddf793914faf1c80
 DIST SDL-1.2.15.tar.gz 3920622 SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc WHIRLPOOL 21b9aadb7b00002a6f3760902cd40aeb1b145228348b887049b40a435c2b9a1a3679a83100421e9634178b9da32d524371d6912c190a75e83ef3170ad45bc159
+EBUILD libsdl-1.2.15-r4.ebuild 4216 SHA256 a318a9ed90e6d7b94aaa4ca3ac53924f106c1f11dc137d01743d969b7858f6a6 SHA512 3e28de06cfe8cab3d1207c5b7ffb37bd50a22a74d0605ca59562a66adcd25b532b41cc8f21557e1d31e323d9b05dc70692168ba90ef81f35a3e99e86a16aabf1 WHIRLPOOL 068fb261a671091b06831b1880d14b76c522307ddc1248f550a65798dae11aca0594046ecb08ba4b784b761195577c9a46c569bbf9b6a87b1e1ca064ade5e961
 EBUILD libsdl-1.2.15-r8.ebuild 4396 SHA256 120bb8ba56e606684a1c7015f65fe599bfa090c86f95bfa607a434b630f985d9 SHA512 266f505517d63838ef0c63d26dbd9070ead6e4171e8c720d29b8c253bcfb187d39af0893356391b8616dd1ed0fbfa49c045d18a987bebe4433186f1d9152c597 WHIRLPOOL 47efa2269c88c7d290551d4c0e22809ba9e7e026af30e42017ee00baa3af09f907a780ac8499b87c4987806b59a9ecb8e9d285a808b6ed6c3e36728826ac1334
-MISC ChangeLog 35498 SHA256 77a1ee04ff9c8d766630473cbb3408e8d6cf97482da583dd1ba315a62e825b5a SHA512 d9c24c6b5fd9fe497c9a7cdd56a3fe8fac4b711b59b2fe0a4c82617f08dab019ea2ca4b6cc4fa6cb3f60aeafe2a2e58692baf9398c0d30f93f95edda86761bd4 WHIRLPOOL 69b9bea0d6245583f32c6c627aa503cf1295efe98bd498aa2e9efe749e68e3e6ac01bfc1fe38b02f5d68edc0ae496894ae79516c1ce0b9c752a9e521f1b63275
+MISC ChangeLog 35637 SHA256 0089d4b1af1ff46d9f5246480cbefaf4339121a01441aaa54184f57d1fc5cd6d SHA512 32213e34989fb2ed2373a26a166cea2edd0675374eaf5affce2f7347d70b5bf5475efb2ae67fbcf70c3719c516e6b86b3abb7d7fee3f912a21ced5ef0a3cfc42 WHIRLPOOL ef635e4b68e5e3c1cef85221dd763ab31f33ca38981dda9218a6a8b68fae73a63988d2435d74d17fc0d8aef458e5cf4775cb9ff778c7ff6bb6d12ceae1429a03
 MISC metadata.xml 1357 SHA256 c30d6116cdf83062fc106ea80d843c5613ea0e7a91ea6afe17ab11077b2b7574 SHA512 e516d46b97979f83d286fb61a349cdd31e02db3de02ad2147a90e528c3ad19aab46c13c3fc72f8fcc418524b3bc50b37cf77ea2b1d05dce090d0b018dcb34224 WHIRLPOOL 02d5acf8972de51c728d469b24adb110204a0f70e57772322a65b62982a1c17d1150da36311260a606e02b694a117ced89c161ca2001b0713903caa15610da75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJVGwBtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOuREP/3PpMjMzDdi5OrzggJUO0ZP4
+7B8lFmvmnn4uCCvJ4SLUNW68j4DhUOS2BIE8xSdortokIKwzOBjUXodeGW5ZQFKy
+OYjmne5cWo6NRGcyX5jpYtd1NXGbPkAS5WF3PelNgYBH0po7IFcZt5AG5qWWg5q2
+b3UK+3spPJTE4X8OsMo1LStOkyYLdiwzsbEgx/yt4uoApeb/fOpj5udNpk31nVDD
+AVGhh9u1WaqkJan/H4FCZA0GxRuBMBwzJq9dZiWXyziKDdnrQNNaPYsh+Ip37FXh
+DLnrwwz1/wE9pp+VkCq/cgZguYdF4j4tjyfvC/teOZCBUyWAACQuPm8vvl/6tvIJ
+tBuAac4dhs3ctWgFkxFSb16fOhztUrHNLMqnm5kqj7Uqs0BzWlPVWaTQlZZmq3/4
+a99hog2sdpwl6n1cmkVLorOHaScOjfRIocRSAOz0TjRoz2yCYvP5+Fy+30QAo1++
++E+18vNMLOv6KRXOBYNzfyzudLdAtQ8YFnV8fivD0+k/qUwVoa+a/J3PWcxrYlva
+XE8fZto03sDk6YFy0JBPCjjx1D21A/Nwmw6X4/5Zz794xzZ1ZvWGFGZEuv+u7KsZ
+5qlFWtlEWTTlEFHJzF0JPOHOvD2iuNn5lAR6e3ZYUEeFYiSHsVldzKp0gO82i1GK
+/nK2ZC4TDlQxGTtTbJup
+=+0ba
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/libsdl-1.2.15-r4.ebuild b/media-libs/libsdl/libsdl-1.2.15-r4.ebuild
new file mode 100644
index 000000000000..a07ab341fa5e
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15-r4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 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-r4.ebuild,v 1.16 2015/03/31 20:15:36 mgorny Exp $
+
+EAPI=5
+inherit autotools flag-o-matic multilib toolchain-funcs eutils
+
+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 directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
+
+RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 )
+	alsa? ( media-libs/alsa-lib )
+	nas? (
+		media-libs/nas
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+	)
+	X? (
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+	directfb? ( >=dev-libs/DirectFB-0.9.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	aalib? ( media-libs/aalib )
+	libcaca? ( >=media-libs/libcaca-0.9-r1 )
+	opengl? ( virtual/opengl virtual/glu )
+	ppc64? ( ps3? ( sys-libs/libspe2 ) )
+	tslib? ( x11-libs/tslib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	nas? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	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
+}
+
+src_configure() {
+	local myconf=
+	if [[ $(tc-arch) != "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"
+
+	local directfbconf="--disable-video-directfb"
+	if use directfb ; then
+		# since DirectFB can link against SDL and trigger a
+		# dependency loop, only link against DirectFB if it
+		# isn't broken #61592
+		echo 'int main(){}' > directfb-test.c
+		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+			&& directfbconf="--enable-video-directfb" \
+			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
+	fi
+
+	myconf="${myconf} ${directfbconf}"
+
+	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) \
+		$(use_enable ggi video-ggi) \
+		$(use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		$(use_enable ps3 video-ps3) \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use static-libs || prune_libtool_files --all
+	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
+	dohtml -r ./
+}