old

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 5 insertions, 148 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index ffcf86f01245..8a64b43b608a 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.197 2012/08/08 19:52:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.198 2012/08/20 16:25:31 mr_bones_ Exp $
+
+  20 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org> -libsdl-1.2.15-r1.ebuild:
+  old
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> libsdl-1.2.15-r2.ebuild:
   Marking libsdl-1.2.15-r2 ppc for bug 425900
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 42471cf3e162..66409dfde84c 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -8,8 +8,7 @@ AUX libsdl-1.2.15-sdl-config.patch 780 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f2
 DIST SDL-1.2.14.tar.gz 4014154 SHA256 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6 SHA512 61ab65661492038d319b83521a27dc80dc71c76b63965ec094c9f53fbb76466e612d119297f9797d62147a0641808136181d0926e8082cb9b3e8d2a8e688a8b2 WHIRLPOOL 67dc18b19f9f97c5b9052cc96b38462085df91df743953426fabb1dacacbe28c4325c75e65c04ac383ea688383a46d9fc79dc91a6d54599ddd72528c30c5cfea
 DIST SDL-1.2.15.tar.gz 3920622 SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc WHIRLPOOL 21b9aadb7b00002a6f3760902cd40aeb1b145228348b887049b40a435c2b9a1a3679a83100421e9634178b9da32d524371d6912c190a75e83ef3170ad45bc159
 EBUILD libsdl-1.2.14-r6.ebuild 4602 SHA256 721475233becb6a6893ed72480790ad2a477618f4bdb6566dae938e11d8b1975 SHA512 2a3c43469831e522f84de8948d9cd30bf6eefcffebed53e75ecbc4281ca728b786fefcb2b544947370a780d31f42e94d44ff8d3860d25768a2b56d82d8ca8c23 WHIRLPOOL fe0873079822b6d4d548ffe3ceb2449c882402c1b7959d0ed759cc8adf5f7a44cfeca1859c7697881cc0feb0e3527cb6ef9fa920bcda7a6509661ed48bbf5421
-EBUILD libsdl-1.2.15-r1.ebuild 4124 SHA256 3ebec42950f60bd7fb1af9acf015fc743f6706ec99f89c1daf51dc8032ca657a SHA512 a1c510f1e04f996bb0f003e8ea734a4ecefb5b1e3d98a596f43bb1c5bd9ce7e950829ab61574dfe8f1802444abe2ad3d4e71dde793d0290d3da16833ad20f771 WHIRLPOOL 0e650976dedc082feb0115fcfec835c2d99e4fdf145f6e5f29bf52a0dcc87f7bb939a37c3bcf9723bfc12ec69b6d67c59871137df4905e444511eae9de5b347f
 EBUILD libsdl-1.2.15-r2.ebuild 4141 SHA256 2975b66a68abab419233cd12ac5ed7d7a53926824c7007090fc8e1b29d64f264 SHA512 5bfb2a30592406d503e29f3d502a4ffccb5605559ee24e1171b3bcab346e34c2aee73af2dec02f16890f7e16eb296fb7a869f90415bcb482eb26eae024b74c67 WHIRLPOOL 94fb7d43507f7eab1cb6da776add354ad31524c5d9006ec5fd4c68d2d8c3b3ff11218bc5836622d113c6def26152d63e3a205f25eab6f98326662afd1f202474
 EBUILD libsdl-1.2.15.ebuild 4056 SHA256 9188148a9cd6af3da208cc03eaf4643ebe5762870035058c53317af4cc386883 SHA512 f91ef852a3d23a9be24e6e2f4a49478bc1abb50f33dd2e6af6228eee9800450cd69d066ccc5167d8e349e2b29f4a654f35a01f97359ebf15f78b532fa67e80a7 WHIRLPOOL 813cd7416fdd160b3ebee71426915d640d708ab8682ec8e9704465edefcbfe718c37a13a666de4be939252621adc6b29e4eca78f2c24c7b15c3583d20e293301
-MISC ChangeLog 30473 SHA256 db46411a5260ff9257a7318de1e24d93c00f3aec755431a0e06a20b7e12f4fec SHA512 f6da6b25b4194f3257b18065531252ff8b4bb1e92d7e8dae785cb3c0ce841f30b247ee3ef6a3ba47ae4f7f01c39fe5b7065a74b42934da28b54de07f38144564 WHIRLPOOL c13c3d795af808e694415da60af1f2003b613cb499fbb0ab04b88c60ce421cc1243bd329c17af2923e802b3bbf3dc01eb183b5ff059a8a898ce6657ee8a7b508
+MISC ChangeLog 30564 SHA256 89681b767b62d8f9cd7cea8d359d735b4d682927668290ce9b7038528e6df87c SHA512 d376476e9d18414a99b24a5fb74b12d4b7424f963d602414864911b63e978fee1ce5e5f0aec8a465a9a9e7543c80be0d00e0616bd3773e89625b8148c724c18a WHIRLPOOL 314e2e93f24f042f69ea4c61977bc38867d9a0a1576972c75e61fc85df5734debc2522bd113fbf769827263c804521be27712d1d5e3720a0231eb57c5ab1e9df
 MISC metadata.xml 1357 SHA256 a19b0d85c597bbe4d3dffa744d2ed9365660f8082145ab6b6f0813e36e174827 SHA512 aaabdbafa1a26c83936c528b9cd70be8769b62a050436ce8b2425c4080876f9d9ebe79532f0dee09337ec1a05e00065f4e2dcccdc644bded6283666b0a868851 WHIRLPOOL 1007bc0bf222d774696b82cb24d5363c1974fa8801b82088bce9c72b00500438538e26ffc5db3e2e18605a658f9c52dfb934b65a8bc61acd4fedd28c5b02c531
diff --git a/media-libs/libsdl/libsdl-1.2.15-r1.ebuild b/media-libs/libsdl/libsdl-1.2.15-r1.ebuild
deleted file mode 100644
index 847bf58303be..000000000000
--- a/media-libs/libsdl/libsdl-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.2 2012/05/09 13:15:36 aballier Exp $
-
-EAPI=2
-inherit flag-o-matic multilib toolchain-funcs eutils libtool
-
-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 +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
-
-RDEPEND="audio? ( >=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."
-		epause 10
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-sdl-config.patch \
-		"${FILESDIR}"/${P}-resizing.patch
-
-	elibtoolize
-}
-
-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 audio || 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 || die "emake install failed"
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-	dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
-	dohtml -r ./
-}