Restore stable

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index b9f12decb4d051f59befe476ed7d9b14eaeb3b66..c2f9695cdb5a152c807ed10d096cb4f6bb86fdf2 100644 (file)
--- 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.232 2015/03/31 04:47:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.233 2015/03/31 09:25:24 patrick Exp $
+
+*libsdl-1.2.15-r4 (31 Mar 2015)
+
+  31 Mar 2015; Patrick Lauer <patrick@gentoo.org> +libsdl-1.2.15-r4.ebuild:
+  Restore stable
 
   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 ffc5f1bbd2c61274c3e02bd956f43dc2ec62cd2d..9e67da661e4261cf4224dbd2efed217b8d056bea 100644 (file)
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -6,6 +6,7 @@ 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 4217 SHA256 94b3e983bf0c077f68013eaf336bd75ea7e2b9627b950648a3fb2ef1399d25d4 SHA512 ff9ac5f477547162f7c068148b597df053b11c897506405ad9f25ad0d21bd32921a2319fa880786731c044fedc9a6afb4389a59c1fb51e94d2839cd4453a5bdc WHIRLPOOL 0b6584ec66c0edafc35f2edd9b978c0cb311f28e632ed0ca1d44b1b6a3bd312e89324938dde5567d8b91299e1333d78442433200caa7618992c2fb69836e4029
 EBUILD libsdl-1.2.15-r8.ebuild 4396 SHA256 120bb8ba56e606684a1c7015f65fe599bfa090c86f95bfa607a434b630f985d9 SHA512 266f505517d63838ef0c63d26dbd9070ead6e4171e8c720d29b8c253bcfb187d39af0893356391b8616dd1ed0fbfa49c045d18a987bebe4433186f1d9152c597 WHIRLPOOL 47efa2269c88c7d290551d4c0e22809ba9e7e026af30e42017ee00baa3af09f907a780ac8499b87c4987806b59a9ecb8e9d285a808b6ed6c3e36728826ac1334
-MISC ChangeLog 35283 SHA256 39d33a4594928fd377ab7023a252e0e9d816c5cf3491908fd798a74fcc556150 SHA512 8e407399b5ef0325e62236851d4e4cd3e8e3cdc4efe1a095e5aa12cda99a2934f2ea5a142dc31813d5a6df065c88042f9bc5f0be5a321a454c815014a4fc997d WHIRLPOOL 542ae9d8745558c0868435963a47454c7785b81c3354d3f8b4363ad816f59bf6364b8456558623db332da2934fcc42321b8da7075012d489c4bb02aa128dfc13
+MISC ChangeLog 35408 SHA256 c290c640151dd08233fc5b94513621b80f3604ab9fd0cb55f4a1f1d723a36d98 SHA512 e7b5124081f2d5d3219743304fe68c9e12f81935013246d670588c1aa64deeb88cdbb7b82d4ae628b4fcee608d089a37f5a71028633fbfd8d988c0b9964a2d69 WHIRLPOOL 62d7ce747fb9076035b1b9862452926ac8898e4ac16b934519e3474a958e313231ecfd972eeaa5c45c0d18ccb999023e18d192cf1aa6f5032739e11d5251b317
 MISC metadata.xml 1357 SHA256 c30d6116cdf83062fc106ea80d843c5613ea0e7a91ea6afe17ab11077b2b7574 SHA512 e516d46b97979f83d286fb61a349cdd31e02db3de02ad2147a90e528c3ad19aab46c13c3fc72f8fcc418524b3bc50b37cf77ea2b1d05dce090d0b018dcb34224 WHIRLPOOL 02d5acf8972de51c728d469b24adb110204a0f70e57772322a65b62982a1c17d1150da36311260a606e02b694a117ced89c161ca2001b0713903caa15610da75

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 (file)
index 0000000..e05d082
--- /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.14 2015/03/31 09:25:24 patrick 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 ./
+}