move away from the no* use flags

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 167 insertions, 7 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index e568edc0825f..1e45ce964c22 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libsdl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.146 2008/09/27 17:02:41 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.147 2009/01/21 23:05:37 mr_bones_ Exp $
+
+*libsdl-1.2.13-r1 (21 Jan 2009)
+
+  21 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
+  +libsdl-1.2.13-r1.ebuild:
+  move away from the no* use flags
 
   27 Sep 2008; Raúl Porcel <armin76@gentoo.org> libsdl-1.2.13.ebuild:
   arm/sh stable wrt #236249
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index ba57180e56b5..cdb08b2fcb5b 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -12,6 +12,7 @@ AUX libsdl-1.2.13-pulseaudio.patch 1882 RMD160 85216ee5b297606d2cd7785294e818527
 DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SHA1 2259134d714e35ab1469d513674a3cd02510d198 SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
 DIST SDL-1.2.13.tar.gz 3373673 RMD160 ed8825fc98f4b3759cf9e5cf8357d71c50df9925 SHA1 51fcaa3e1d5c01fd813ea08688780f86b19cf539 SHA256 94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
 EBUILD libsdl-1.2.11-r2.ebuild 5038 RMD160 2d593ac1df95978f505cd3ee8db264e76d3bc2b4 SHA1 cfe854ceef113c2b258b1a451b0caf6a6680935e SHA256 05ce09e9a1f127df19437083726b3e1510887d96d3a5f2d609823f408ba7e129
+EBUILD libsdl-1.2.13-r1.ebuild 4470 RMD160 b515cdc4c3a114984d1ac5577c6d8701f5a3506a SHA1 71fa71229b7aa8ea02fbc54ddaeb277df5da038a SHA256 c9e84ea820d15500cf71ab7d29ca2aacb4127536023207900dfb6ba9f400c43e
 EBUILD libsdl-1.2.13.ebuild 4476 RMD160 dcd0276f36ec24a05deaed2af6ec7d5c718deb3c SHA1 388dda922fc80d2ed96da90ecb9b297db8ce426b SHA256 1d59999bb3ad0e977e6e8fd7f601e2ec37c280b0d6368362f5445de6152a4fb2
-MISC ChangeLog 22734 RMD160 59a0c52bfc2d540c81781c27768d876c2d99f526 SHA1 42d769fbb35377c301d12460962e1587d50bb822 SHA256 f7bc7dea2ac95fe8d662d7a11fcee42dca76c8568d3f75ad4c20f556e05e3776
-MISC metadata.xml 1410 RMD160 189f75e2e1ebd998d70f133564cb39dc27526123 SHA1 38757371b0501a8fc8106e83697255615925adeb SHA256 b46ebec5d16db168d103b26d972f785d20435c8967b2ec2676b2e2e03a773e1f
+MISC ChangeLog 22902 RMD160 cf562a277a13a1632f811db8ba12f978be191fec SHA1 ac7f93541c912cab868e416822763e56b83d3f69 SHA256 17af6d35b2dc6fe1e87fa41cece89abd7328722a9dbdc73af343bfe9e0618d46
+MISC metadata.xml 1749 RMD160 b8a87fd5d42c2b35ac066b71d9df4f2353faadb7 SHA1 b70f95b42e23a2a54ffa9694f3768df61f3997ca SHA256 b6c50bb4df677d1d52522cad958d4fb1162e927631e819ac699775cdceda5bd1
diff --git a/media-libs/libsdl/libsdl-1.2.13-r1.ebuild b/media-libs/libsdl/libsdl-1.2.13-r1.ebuild
new file mode 100644
index 000000000000..d1e2d65699a1
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.13-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.13-r1.ebuild,v 1.1 2009/01/21 23:05:37 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic toolchain-funcs eutils libtool autotools
+
+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 ~x86-fbsd"
+# WARNING:
+# if you disable the audio, video, joystick use flags or 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 esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio"
+
+RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+	alsa? ( media-libs/alsa-lib )
+	esd? ( >=media-sound/esound-0.2.19 )
+	arts? ( kde-base/arts )
+	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 )
+	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 !audio || use !video || use !joystick ; then
+		ewarn "Since you've chosen to turn off some of libsdl's functionality,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl with the audio, video, and joystick flags in USE."
+		ewarn "You need to know what you're doing to selectively turn off parts of libsdl."
+		epause 30
+	fi
+	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() {
+	# patches for bugs #40224 #145917 #198147 #217097
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.13-libcaca-new-api.patch \
+		"${FILESDIR}"/${PN}-1.2.11-sdl-config.patch \
+		"${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch \
+		"${FILESDIR}"/${P}-pulseaudio.patch \
+		"${FILESDIR}"/${P}-cld.patch
+
+	./autogen.sh
+	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-dependency-tracking \
+		--disable-rpath \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		--enable-cpuinfo \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable esd) \
+		$(use_enable pulseaudio) \
+		$(use_enable arts) \
+		$(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_with X x) \
+		--disable-video-x11-xme \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+	dohtml -r ./
+}
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index f6ce6454e020..b88d055ce2ca 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -20,8 +20,11 @@ PHP, Pike, Python, and Ruby.
 </longdescription>
   <use>
     <flag name="custom-cflags">Allow users to use any CFLAGS they like completely (at their own risk)</flag>
-    <flag name="noaudio">Allow users to disable audio support completely (at their own risk)</flag>
-    <flag name="nojoystick">Allow users to disable joystick support completely (at their own risk)</flag>
-    <flag name="novideo">Allow users to disable video support completely (at their own risk)</flag>
+    <flag name="noaudio">Allow users to disable audio support completely (at their own risk) (deprecated)</flag>
+    <flag name="nojoystick">Allow users to disable joystick support completely (at their own risk) (deprecated)</flag>
+    <flag name="novideo">Allow users to disable video support completely (at their own risk) (deprecated)</flag>
+    <flag name="audio">Allow users to disable audio support completely (at their own risk)</flag>
+    <flag name="joystick">Allow users to disable joystick support completely (at their own risk)</flag>
+    <flag name="video">Allow users to disable video support completely (at their own risk)</flag>
   </use>
 </pkgmetadata>