Drop svga useflag.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 20 insertions, 20 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ff8c9b3cf22a..a66ec2862240 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.753 2010/06/30 16:41:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.754 2010/06/30 16:45:23 scarabeus Exp $
+
+  30 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+  Drop svga useflag.
 
   30 Jun 2010; Fabio Erculiani <lxnay@gentoo.org>
   mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20100506.ebuild,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 74ad3d02aaae..c3016decab4d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mplayer-1.0_rc4_p20091026-arm_neon.patch 591 RMD160 339c545419fd815a4b2aa1db9214620ce1b90f85 SHA1 219300d43e567fb3a0df9388798015bef09ddc01 SHA256 71d95820bc0d61a16469e42fa2fe42d4c46ca5339876f926259ed390cbbc899c
 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
@@ -10,6 +13,13 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18994 RMD160 f807c6148e2f8cea8fe18b773aa706e7c663ffd1 SHA1 a7e5dbd9f121c7cb079db2a0c628f884b8cd89c5 SHA256 cb82702d386515cb06615c711f63aef91210b1525db05608ffc18fe1ec628efd
 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20272 RMD160 9284ca79cb4b5f4bd9b16bdeb61d4d4167b8c639 SHA1 5e8e01f60ee7fd2d1cc3a91ddb7df4c9aea2a9c6 SHA256 810888ad44ae79260adf052c52cfd751878e8cf65e5235e46fbf25261c9c75c4
 EBUILD mplayer-1.0_rc4_p20100612.ebuild 20254 RMD160 7a2f833b5f1f43bf30d8b7fcb0a34cfe9127b734 SHA1 9e454fd9a85d244327d293378358344469912972 SHA256 4e66bcefa7e83de29338a1124102870e44d5c107bc6a1708c8ddbc8500e868ae
-EBUILD mplayer-9999.ebuild 20459 RMD160 d6b2bc13cc5be4ceb5ca1aedeb9f148c13d8bdfc SHA1 cafe40a2aa59a6fab9331fe4e81b3225ed68b03d SHA256 a56985f2ff9735ef89aba7028719c878d88a17579ba74fe0251691df1c7106fa
-MISC ChangeLog 132852 RMD160 6772ee84898aa698bd9f506b4d58689f87f0295c SHA1 9fc66b4bace5f20787455438e907a152794f25f0 SHA256 fa4319577530f450da6a30310a83a8140f9bab3fadd5c875798a51e447b76f05
+EBUILD mplayer-9999.ebuild 20054 RMD160 66e87b241d7303f34982fbe5c627b123df9ecb9e SHA1 1d62982ab14c461b6c3028069ba1927259711037 SHA256 bf884ff9c2691f5b057588210dc43b0658de8294b63db99fab59df56f36a0abd
+MISC ChangeLog 132954 RMD160 85086e4a1b8e01c4c3108429932adfd0e16ab616 SHA1 3cb369dae4d414497c5eaa17dfc413d1ff4bf733 SHA256 5531a4cb1543c6f4586e38a100ceb3323edbe718429594e81eab761298d43073
 MISC metadata.xml 3650 RMD160 c3598892a1a7d707670114f5308ba6e0b9099de4 SHA1 e6a81d9be804eb7998c5986c989fdf4af3456be5 SHA256 918d8349f1b79921e6640d28de306ee6f930d95aca93f88f8686dee8d4722967
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwrdEsACgkQHB6c3gNBRYdkbwCdGb8FWuLvVAt5bSKN5cEQ9OAi
+MnoAn0JMkZid/flA9eWGGPwd5jytS3DS
+=aceJ
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 5f13273454c4..5259a2e17ac7 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.69 2010/06/30 16:41:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.70 2010/06/30 16:45:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
-samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
+samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
 win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
@@ -42,8 +42,7 @@ else
 fi
 SRC_URI="${RELEASE_URI}
 	!truetype? ( ${FONT_URI} )
-	gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )
-	svga? ( mirror://gentoo/svgalib_helper-${SVGV}-mplayer.tar.gz )"
+	gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 )"
 
 DESCRIPTION="Media Player for Linux"
 HOMEPAGE="http://www.mplayerhq.hu/"
@@ -143,7 +142,6 @@ RDEPEND+="
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
-	svga? ( media-libs/svgalib )
 	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
@@ -248,7 +246,6 @@ src_unpack() {
 	fi
 
 	use gmplayer && unpack "Blue-${BLUV}.tar.bz2"
-	use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.gz"
 }
 
 src_prepare() {
@@ -261,16 +258,6 @@ src_prepare() {
 		sed -i -e "s/UNKNOWN/${MPLAYER_REVISION}/" "${S}/version.sh" || die
 	fi
 
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo "to actually use this)"
-		echo
-
-		mv "${WORKDIR}/svgalib_helper" "${S}/libdha"
-	fi
-
 	base_src_prepare
 }
 
@@ -290,6 +277,7 @@ src_configure() {
 	#Optional features#
 	###################
 	myconf+="
+		--disable-svga --enable-svgalib_helper
 		--disable-arts
 		--disable-kai
 		$(use_enable network)
@@ -306,7 +294,6 @@ src_configure() {
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
 	use samba || myconf+=" --disable-smb"
-	use svga || myconf+=" --disable-svga --enable-svgalib_helper"
 	if ! use lirc; then
 		myconf+="
 			--disable-lirc