remove directfb video support

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 28 insertions, 50 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index e4dbd394a827..e14d127385ba 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.10 2014/03/22 22:43:35 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.11 2014/04/05 15:59:09 hasufell Exp $
+
+  05 Apr 2014; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.1-r1.ebuild,
+  libsdl2-2.0.2.ebuild:
+  remove directfb video support
 
   22 Mar 2014; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.1-r1.ebuild,
   libsdl2-2.0.2.ebuild:
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 58f55f706223..dc8474f5e877 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -5,26 +5,26 @@ AUX libsdl2-2.0.1-static-libs.patch 4758 SHA256 51332febb398886c4163ea02774ded7b
 AUX libsdl2-2.0.2-static-libs.patch 4633 SHA256 aa3ce99668a0a504e22b8f4d6d22585592630120335b37d600a208aed29783d6 SHA512 ae43d0530d5dcc5250b304cf83320e45a853bbc17f59ffdc36e03222bdd51c283e55feaa9c1694d373a53ca92487f380934fdee52061ad738c3973ffd034c616 WHIRLPOOL bcc59ca0b7fa84eb5189d7849814c556305cd0b269724f1aab792cdb8012a1ba319dda03df9e535ed3c20c600f12a62008fea221e2509c286eec3e39fb40825b
 DIST SDL2-2.0.1.tar.gz 3660224 SHA256 0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0 SHA512 012125d72b6baa677c4c4d4747a058d7c0e406d84b21712fe538bd8ecfc1d74cbc0569ce25046a766266460c9e040d2f2c62ccc52fd6e371683999c95c314c33 WHIRLPOOL 353d2909e3738b13885b26d57f2d690ac55c4992650dba552b0ba17d35d4b04946828d76b621de69201aed1676be8dc7ce11bb4c72af95b96df0481fc3785084
 DIST SDL2-2.0.2.tar.gz 3812882 SHA256 590157f85a8a8b52723848169a74eec6ca07ab4a75cec15beedde648f980e850 SHA512 73f628a893d3e7efb2180783ab5ea0103e943dddbd4e0b2b7e1add5c2cf975c85179da6e09747ad1a9d8a25067d6fc9e4467927cf111762ae322600ab810a348 WHIRLPOOL 1e396f2621fbdb6bb10f06b5828271aad23ab5d5c07254ebeaf760cf1b170441ccc89db233749b4ac4fa7341e4204ba1cd705d08ed0490b07a1855d38aa08051
-EBUILD libsdl2-2.0.1-r1.ebuild 3982 SHA256 3f8408bfa1c147ddc0c0bcfed0bf73a52cba478e34a7b93a18d2416a1eee7712 SHA512 030ee65efa12ca4729e324bd1e6418a9ceec4ac5770aae298339374ef043c49173780d73610fd1aecffedccfae9620691687dfa0b25be5f8cfe77abcedb9edad WHIRLPOOL 6b7a0afd08f7ffc254d8906e65c40f86d5fb56cc2b48c579f9604899d4bb3f99b4e83614fe367adec26ccaa9de34e1f482a2c02b2a9d6eb4d620f8a705c62cbb
-EBUILD libsdl2-2.0.2.ebuild 3979 SHA256 8944db60d0360cd8276ee4ea1c64f05bbaccff73a7268fd6d35a98a2e11da19a SHA512 ec08ed59b5af5a5ce812608f523e2bf4112ea8a5a0009cca472a344f43c52d76d0579d2570230b53f6b1db8f284e4160d240c2f84f099977de3a26bd2d128bf3 WHIRLPOOL e8afe220afe37ef7e4035c39ea831a0296b464ff1f2fbf12c0f802ccf22453922d1384e914c40110eb28ec7f88898c5e04aad6cf8367f47c43360b6687b6fc92
-MISC ChangeLog 1966 SHA256 480b432e15a5982d070b6269215f41d808ed39e51dab6624a79b1f5fecab1efb SHA512 593a34a1b55b01ebaa8ddeba34eca1a5ab3e84cc549ffc61011df35cf92e2334ebbdfc31fb90a151eadc673aab6644a38c6b1b90aeee63e6940286bbfc46efc2 WHIRLPOOL a0eb41ef95c6274e3e139ae0cc6812e194b437f57ee29cd37473ad1a05a83e030e76cd4b83547c2478d4976092c5c65fafe1bb883da5c7efdbdbdacdcc3fb588
+EBUILD libsdl2-2.0.1-r1.ebuild 3497 SHA256 b58f136902cb96dd79a0537a684dbd6a8e5d38c9a62a223ad6a1e4eb6e1e4761 SHA512 ccaadae89739986ee3b19ad3bed0e3cb319e2603cdbfcc47ec7d8be87b798b2c04dca813316942939a74ec97d63e1c729288a27a4f7b3b674064705acbe6c539 WHIRLPOOL a499471c4c9d3ab9ab0fa8049fd688d9f38343bed1416d8333b1e787c6f26f47d3876f1a29bc7539af0387757a3d0b514fa969bd1b8aefe13a8d3b8ed95942a2
+EBUILD libsdl2-2.0.2.ebuild 3494 SHA256 c999a442f19fb1818fdeb9323aa4f40483e85162f9f0c18ade8c5ecfde4cd257 SHA512 17cb93af4d94931c82d9529b12f29d61fd0df5a8bb9a56577e28c599166ec58edc7aa0a9241ad26833a44428c4a70f28f9c282e26fa627b4e26edbebbdeff21b WHIRLPOOL d50c84f900981b793dd1971b943499d33f8c63a740232ccd349e49e98c5ed78b7211b40663ab0dc11222b80affd901ac5f4f41659fbadf394476b9fab185724b
+MISC ChangeLog 2099 SHA256 3f79bddcf7236df36fa7874a14dd644664ed18cb2951241d7ba853a4cacdb028 SHA512 d0923fbb43bc92f03f4aaaf16e905467a19acacef84480f92fbb3fe0a1280255dc3c472f457d875e511f2fa6d091f35520891189d3181e5defcec9eb1633ea01 WHIRLPOOL 686334801684b226d29a1a0a539a000ac04bd5d12f30d739a65e08a5bbc53af443ea5f54530c25fd50e6555d8d965253cdbca9cdacee2a068e00c0f1249982dc
 MISC metadata.xml 1532 SHA256 b0de84edcfbcf286934f7adf119917dcd138c0570d78b25286f25b3a2d110da9 SHA512 fe8e84981baee1567e80430a2352feffa03915864b871916c13cfec4fd734c12dd6d9195ed20da26e7985dcd39c55498d1f55ac0a5dd61c2d4100e6e964b5e79 WHIRLPOOL dfda175811d3dc27eadc3e7b61920c6257ad9e062626cd786adaf0a1c52ab283f8814feb85d0121bfd01ce52cab56f587c078b3d20aa1fc954a1986d176bb4aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTLhIaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTQChSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAggKIQAL/dG5k48ud7mCK2WrrbvO6L
-omVOiG8tz6Y3hgMF5VqfqciqHCba2YVfLBmGMBxMZ8MSPaOaBw9ZbEJqufBYv1Oi
-190hVIsmRuWH7SCBduvipNPnYiQOWPUKdsJPwP2o+H7crx606gCQIgcID3saJqr2
-T1WwoIakc99x5dFS+oNTIs8aOg7mgMBeaVKp3wNtSpU2M3yjIr89uNDmAtcQsEyP
-j8c+wo8fPP51Xt9yOMJIMXRWSUVwtro6Fp/FaGUiFohWuM21MQE6JOMKy5CDhbwj
-FQ1Sxqb6b1EvE4FSlQoO2FdeTFK/rcw4Iy4Q6sGKcYwQUItO9qto/AOgGl6Hc1H8
-xWjFKj07AvUArS+eEzkVeIEAe5O7fjdyrHxznDpAOI6pIa9ndmL49iXvYYsxaVdj
-wl/SGxU7lPitrEEy9FFXnMAXw7cFju0ptO6vt7i8U2fp9EfAt8jH+0Z71PdV+2St
-gknabxbYg9unrLVq04er5CgXsKLEzq+tTXCuxVXUkDAvz0iLRKx7HHlHHPjI7GLJ
-aYVWCFatdE4gPlARC+VBpcLDP+VAEtXHvjLKM3d65WJF3k7IV4j5xeB+3vxQEdL9
-VHxrCOXAoUpNV/4eKhbcusgwEBrJm7hCEpeI1WsXphnWhRc6sejRBwDjdRsAzckL
-4WkBW81Z70yT87yRDNO+
-=I+e3
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgsokP/R2p8BFV2Up4BEAsnpkXVfvX
+a4YorUQjqaRsPMLJ1XK49y6e5/3WFlZFx/CTl/rbLmCiWIe0hbDPnuwbdFnGCHmY
+SMZO/qlSKx05hCHCyxr90CZM/NVrfg8wNQYSj6Mn9+2soZpPJuSG4UFaRUT2wPv1
+kEWwzLYDqksgo3O1DdlUliysDX2juvtdjwF8ME2YrThSan7DK+PkAnzg+iwguWrL
+gQ4oT5vVKs8gsHIuLudTXCDZPzJzjNZY8dZpTX7CXuR/lmZ4KF60/m5miOxDjva5
+yMdPR6uk+OHuMdov2kzH0L1Me/As+pcRoy1dSTpdbU+k63JW2PDQXxLBSbQrbRAY
+UmNo2piwd0rFQgevofIyVkyK3iC1+PA90U85qnWHOkGHRwZQmviOAU1n0aWn1303
+IiAMgglCxECgelHIrs7bAZ4N6RJn0mIOQSyeFiaMI2Uk4Kdc/aArjpY5UQSK3OGx
+zYbJcS1NF/0vnyduZby4Tv7R6I7/Mr+m9mWE9lZf0Xia8Q+x+sN919SJMCgjdf3H
+xBwNbVlx+jHih4Ck2TRBme0QT1LK0RiDkClcoOb71tjTFzFD/jHP5bDmRxwCm3B7
+9dE5sDLQi4w4uVUlTBZmGQPMfaUn2E+h54iCjHOVY+pssFF9tLSQ+1jl5LDpyxQx
+/VB2OfQYUTqnbmn1JcjF
+=A+Nv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild
index 94a7127e3200..d0d966f58dcf 100644
--- a/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild,v 1.3 2014/03/22 22:43:35 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild,v 1.4 2014/04/05 15:59:09 hasufell Exp $
 
 EAPI=5
 inherit autotools flag-o-matic toolchain-funcs eutils
@@ -14,7 +14,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( audio )
 	fusionsound? ( audio )
@@ -28,7 +28,6 @@ REQUIRED_USE="
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
-	directfb? ( >=dev-libs/DirectFB-1.6.3 )
 	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
 	gles? ( media-libs/mesa[gles2] )
 	nas? ( media-libs/nas )
@@ -65,17 +64,6 @@ src_prepare() {
 src_configure() {
 	use custom-cflags || strip-flags
 
-	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
-
 	# sorted by `./configure --help`
 	econf \
 		$(use_enable static-libs static) \
@@ -122,8 +110,7 @@ src_configure() {
 		$(use_enable X video-x11-xshape) \
 		$(use_enable X video-x11-vm) \
 		--disable-video-cocoa \
-		${directfbconf} \
-		--disable-directfb-shared \
+		--disable-video-directfb \
 		$(use_enable fusionsound) \
 		--disable-fusionsound-shared \
 		$(use_enable video video-dummy) \
diff --git a/media-libs/libsdl2/libsdl2-2.0.2.ebuild b/media-libs/libsdl2/libsdl2-2.0.2.ebuild
index 4dd6d65b4362..0db26c3ded82 100644
--- a/media-libs/libsdl2/libsdl2-2.0.2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2.ebuild,v 1.2 2014/03/22 22:43:35 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2.ebuild,v 1.3 2014/04/05 15:59:09 hasufell Exp $
 
 EAPI=5
 inherit autotools flag-o-matic toolchain-funcs eutils
@@ -14,7 +14,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( audio )
 	fusionsound? ( audio )
@@ -28,7 +28,6 @@ REQUIRED_USE="
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
-	directfb? ( >=dev-libs/DirectFB-1.6.3 )
 	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
 	gles? ( media-libs/mesa[gles2] )
 	nas? ( media-libs/nas )
@@ -65,17 +64,6 @@ src_prepare() {
 src_configure() {
 	use custom-cflags || strip-flags
 
-	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
-
 	# sorted by `./configure --help`
 	econf \
 		$(use_enable static-libs static) \
@@ -122,8 +110,7 @@ src_configure() {
 		$(use_enable X video-x11-xshape) \
 		$(use_enable X video-x11-vm) \
 		--disable-video-cocoa \
-		${directfbconf} \
-		--disable-directfb-shared \
+		--disable-video-directfb \
 		$(use_enable fusionsound) \
 		--disable-fusionsound-shared \
 		$(use_enable video video-dummy) \