[gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/

[Azamat H. Hackimov]

commit:     ce8b1e2ed84bd7e70e9027d68e68b96ddfffd41d
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 18:13:55 2013 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Mar  5 18:13:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ce8b1e2e

[media-libs/libsdl] Bump to 6963 revision, remove old obsolete 1.2.14 and buggy 9999-r2,
metadata cleanup.

Package-Manager: portage-2.1.11.52
Manifest-Sign-Key: A018DE8C

---
 media-libs/libsdl/ChangeLog                        |   10 +
 .../libsdl/files/libsdl-1.2.13-sdl-config.patch    |   20 --
 media-libs/libsdl/files/libsdl-1.2.14-click.patch  |   23 ---
 .../files/libsdl-1.2.14-disappearingcursor.diff    |   19 --
 media-libs/libsdl/libsdl-1.2.14-r3.ebuild          |  155 ----------------
 media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild      |   12 +-
 ..._pre6799.ebuild => libsdl-2.0.0_pre6963.ebuild} |   12 +-
 media-libs/libsdl/libsdl-9999-r2.ebuild            |  187 --------------------
 media-libs/libsdl/metadata.xml                     |   12 +-
 9 files changed, 24 insertions(+), 426 deletions(-)

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 74bf865..60b8f6a 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libsdl-2.0.0_pre6963 (05 Mar 2013)
+
+  05 Mar 2013; Azamat H. Hackimov <azamat.hackimov@×××××.com>
+  +libsdl-2.0.0_pre6963.ebuild, -Manifest,
+  -files/libsdl-1.2.13-sdl-config.patch, -files/libsdl-1.2.14-click.patch,
+  -files/libsdl-1.2.14-disappearingcursor.diff, -libsdl-1.2.14-r3.ebuild,
+  -libsdl-9999-r2.ebuild, libsdl-2.0.0_pre6799.ebuild, metadata.xml:
+  [media-libs/libsdl] Bump to 6963 revision, remove old obsolete 1.2.14 and
+  buggy 9999-r2, metadata cleanup.
+
   07 Jan 2013; Sergey Popov <pinkbyte@g.o> libsdl-2.0.0_pre6799.ebuild:
   Use versionator eclass for getting revision
 

diff --git a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
deleted file mode 100644
index f430428..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Only output -L -rpath cruft if using a non-standard install location.
-
-Makes ABI / cross-compiling easier on the soul.
-
---- sdl-config.in
-+++ sdl-config.in
-@@ -44,7 +44,12 @@
-       echo -I@includedir@/SDL @SDL_CFLAGS@
-       ;;
- @ENABLE_SHARED_TRUE@    --libs)
--@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      if test x"${prefix}" != x"/usr" ; then
-+@ENABLE_SHARED_TRUE@          libdirs="-L@libdir@"
-+@ENABLE_SHARED_TRUE@      else
-+@ENABLE_SHARED_TRUE@          libdirs=""
-+@ENABLE_SHARED_TRUE@      fi
-+@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)

diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
deleted file mode 100644
index 7d3e5ac..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-click.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( this->input_grab == SDL_GRAB_OFF ) {
--			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-+			if ( this->input_grab == SDL_GRAB_OFF ) {
-+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+			}
-+			posted = SDL_PrivateMouseMotion(0, 0,
-+					xevent.xcrossing.x,
-+					xevent.xcrossing.y);
- 		}
--		posted = SDL_PrivateMouseMotion(0, 0,
--				xevent.xcrossing.x,
--				xevent.xcrossing.y);
- 	    }
- 	    break;
- 

diff --git a/media-libs/libsdl/files/libsdl-1.2.14-disappearingcursor.diff b/media-libs/libsdl/files/libsdl-1.2.14-disappearingcursor.diff
deleted file mode 100644
index bb637b9..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-disappearingcursor.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-This was retrieved from the debian patch tracker, and fixes an issue caused by the clicks patch,
-which we seem to have also gotten from debian.
-Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
-===================================================================
---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
-@@ -444,8 +444,10 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( xevent.xcrossing.detail != NotifyInferior ) {
--			if ( this->input_grab == SDL_GRAB_OFF ) {
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) &&
-+		     (xevent.xcrossing.detail != NotifyInferior) ) {
-+               		if ( this->input_grab == SDL_GRAB_OFF ) {
- 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
- 			} else {
- 				posted = SDL_PrivateMouseMotion(0, 0,

diff --git a/media-libs/libsdl/libsdl-1.2.14-r3.ebuild b/media-libs/libsdl/libsdl-1.2.14-r3.ebuild
deleted file mode 100644
index 174dcb9..0000000
--- a/media-libs/libsdl/libsdl-1.2.14-r3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.14-r2.ebuild,v 1.1 2010/04/08 20:25:47 mr_bones_ 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 ~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 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 !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() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.2.13-sdl-config.patch \
-		"${FILESDIR}"/${P}-click.patch \
-		"${FILESDIR}"/${P}-disappearingcursor.diff
-
-	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-x11-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.CVS TODO WhatsNew
-	dohtml -r ./
-}

diff --git a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
index fcae24b..0ec7027 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
@@ -17,7 +17,7 @@ EHG_REVISION="${REV/pre/}"
 LICENSE="ZLIB"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X +xcursor +xinput xinerama xscreensaver xrandr xvidmode"
+IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver"
 
 #FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
 RDEPEND="
@@ -95,12 +95,12 @@ src_configure() {
 		$(cmake-utils_use tslib INPUT_TSLIB)
 		$(cmake-utils_use video VIDEO_DUMMY)
 		$(cmake-utils_use X VIDEO_X11)
-		$(cmake-utils_use xcursor VIDEO_X11_XCURSOR)
-		$(cmake-utils_use xinerama VIDEO_X11_XINERAMA)
-		$(cmake-utils_use xinput VIDEO_X11_XINPUT)
-		$(cmake-utils_use xrandr VIDEO_X11_XRANDR)
+		$(cmake-utils_use X VIDEO_X11_XCURSOR)
+		$(cmake-utils_use X VIDEO_X11_XINERAMA)
+		$(cmake-utils_use X VIDEO_X11_XINPUT)
+		$(cmake-utils_use X VIDEO_X11_XRANDR)
 		$(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
-		$(cmake-utils_use xvidmode VIDEO_X11_XVM)
+		$(cmake-utils_use X VIDEO_X11_XVM)
 		#$(cmake-utils_use joystick SDL_JOYSTICK)
 	)
 	cmake-utils_src_configure

diff --git a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre6963.ebuild
similarity index 88%
copy from media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
copy to media-libs/libsdl/libsdl-2.0.0_pre6963.ebuild
index fcae24b..0ec7027 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre6963.ebuild
@@ -17,7 +17,7 @@ EHG_REVISION="${REV/pre/}"
 LICENSE="ZLIB"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X +xcursor +xinput xinerama xscreensaver xrandr xvidmode"
+IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver"
 
 #FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
 RDEPEND="
@@ -95,12 +95,12 @@ src_configure() {
 		$(cmake-utils_use tslib INPUT_TSLIB)
 		$(cmake-utils_use video VIDEO_DUMMY)
 		$(cmake-utils_use X VIDEO_X11)
-		$(cmake-utils_use xcursor VIDEO_X11_XCURSOR)
-		$(cmake-utils_use xinerama VIDEO_X11_XINERAMA)
-		$(cmake-utils_use xinput VIDEO_X11_XINPUT)
-		$(cmake-utils_use xrandr VIDEO_X11_XRANDR)
+		$(cmake-utils_use X VIDEO_X11_XCURSOR)
+		$(cmake-utils_use X VIDEO_X11_XINERAMA)
+		$(cmake-utils_use X VIDEO_X11_XINPUT)
+		$(cmake-utils_use X VIDEO_X11_XRANDR)
 		$(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
-		$(cmake-utils_use xvidmode VIDEO_X11_XVM)
+		$(cmake-utils_use X VIDEO_X11_XVM)
 		#$(cmake-utils_use joystick SDL_JOYSTICK)
 	)
 	cmake-utils_src_configure

diff --git a/media-libs/libsdl/libsdl-9999-r2.ebuild b/media-libs/libsdl/libsdl-9999-r2.ebuild
deleted file mode 100644
index da4ea64..0000000
--- a/media-libs/libsdl/libsdl-9999-r2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
-
-# Enable Bash strictness.
-set -e
-
-# SDL 2.0 officially distributes both autotools- and CMake-based builds. Due to
-# all the usual autotools problems, the former essentially doesn't work. The
-# latter, however, does. CMake it is!
-inherit cmake-utils eutils flag-o-matic mercurial multilib toolchain-funcs
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-EHG_REPO_URI="http://hg.libsdl.org/SDL"
-
-LICENSE="ZLIB"
-SLOT="2"
-KEYWORDS=""
-
-#FIXME: Add "test".
-# SDL 1.2 ebuilds prohibited unsafe CFLAGS unless "custom-flags" was enabled.
-# This appears to have been overly judicious, as the query "How does one build
-# an optimized SDL library?" at
-# http://osdl.sourceforge.net/main/documentation/rendering/SDL-optimizing.html
-# suggests. SDL supports at least a modicum of extreme optimization. If users
-# enable unsafe CFLAGS, SDL breaking is the least of their concerns.
-IUSE="
-+audio feedback joystick +threads static-libs +video
-3dnow altivec mmx sse sse2
-alsa fusionsound nas oss pulseaudio
-X xcursor xinerama xinput xrandr xscreensaver xvidmode
-aqua directfb gles opengl tslib
-"
-REQUIRED_USE="
-	feedback? ( joystick )
-	alsa?        ( audio )
-	fusionsound? ( audio )
-	nas?         ( audio )
-	oss?         ( audio )
-	pulseaudio?  ( audio )
-	aqua?     ( video )
-	directfb? ( video )
-	gles?     ( video )
-	opengl?   ( video )
-	tslib?    ( video )
-	X?        ( video )
-	xcursor?      ( X )
-	xinerama?     ( X )
-	xinput?       ( X )
-	xrandr?       ( X )
-	xscreensaver? ( X )
-	xvidmode?     ( X )
-"
-
-#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
-RDEPEND="
-	nas? (
-		media-libs/nas
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libXrender
-	)
-	xcursor?  ( x11-libs/libXcursor )
-	xinerama? ( x11-libs/libXinerama )
-	xinput?   ( x11-libs/libXi )
-	xrandr?   ( x11-libs/libXrandr )
-	xvidmode? ( x11-libs/libXxf86vm )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	alsa? ( media-libs/alsa-lib )
-	fusionsound? ( >=media-libs/FusionSound-1.1.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9 )
-	directfb? ( >=dev-libs/DirectFB-1.0.0 )
-	gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) )
-	opengl? ( virtual/opengl )
-	tslib? ( x11-libs/tslib )
-"
-DEPEND="${RDEPEND}
-	nas? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/renderproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	xinput?   ( x11-proto/inputproto )
-	xrandr?   ( x11-proto/randrproto )
-	xrandr?   ( x11-proto/randrproto )
-	xvidmode? ( x11-proto/xf86vidmodeproto )
-	xscreensaver? ( x11-proto/scrnsaverproto )
-"
-
-CMAKE_MIN_VERSION=2.6  # ...if "CMakeLists.txt" is to be believed.
-
-src_unpack() {
-	[[ -d "${EHG_STORE_DIR}/${PN}" ]] ||
-		einfo 'Cloning may take up to several minutes on slow connections.'
-	mercurial_src_unpack
-}
-
-#FIXME: SDL2's current "CMakeLists.txt" file leaks LDFLAGS into pkg-config
-#files, as confirmed by a QA notice. The offending CMake line appears to be:
-#
-#    target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
-#
-#Since target_link_libraries() is a core CMake function, it's unclear whether
-#we can patch around this on our end. I'm surprised I haven't seen similar
-#complaints from other CMake-dependent ebuilds, and thus suspect the issue *IS*
-#our fault. Somehow, anyway...
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-sdl2-config.in.patch"
-}
-
-src_configure() {
-	# DirectFB can link against SDL, triggering a dependency loop. Link against
-	# DirectFB only if it isn't currently being installed. (See issue #61592.)
-	local use_directfb="-DVIDEO_DIRECTFB=ON"
-	if use directfb; then
-		echo 'int main(){}' > directfb-test.c
-		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
-			&& use_directfb="-DVIDEO_DIRECTFB=OFF" \
-			|| ewarn "Disabling DirectFB, since \"libdirectfb.so\" is broken."
-		rm directfb-test.c
-	fi
-
-	# Required by cmake-utils_src_configure().
-	mycmakeargs=(
-		# Disable assertion tests.
-		-DASSERTIONS=disabled
-		# Avoid hard-coding RPATH entries into dynamically linked SDL libraries.
-		-DRPATH=NO
-		# Disable obsolete and/or inapplicable libraries.
-		-DARTS=NO
-		-DESD=NO
-		${use_directfb}
-		$(cmake-utils_use static-libs SDL_STATIC)
-		$(cmake-utils_use audio       SDL_AUDIO)
-		$(cmake-utils_use feedback    SDL_HAPTIC)
-		$(cmake-utils_use joystick    SDL_JOYSTICK)
-		$(cmake-utils_use video       SDL_VIDEO)
-		$(cmake-utils_use threads SDL_THREADS)
-		$(cmake-utils_use threads PTHREADS)
-		$(cmake-utils_use threads PTHREADS_SEM)
-		$(cmake-utils_use 3dnow)
-		$(cmake-utils_use altivec)
-		$(cmake-utils_use mmx)
-		$(cmake-utils_use sse)
-		$(cmake-utils_use sse SSEMATH)
-		$(cmake-utils_use sse2)
-		$(cmake-utils_use alsa)
-		$(cmake-utils_use fusionsound)
-		$(cmake-utils_use nas)
-		$(cmake-utils_use oss)
-		$(cmake-utils_use pulseaudio)
-		$(cmake-utils_use tslib INPUT_TSLIB)
-		$(cmake-utils_use X            VIDEO_X11)
-		$(cmake-utils_use xcursor      VIDEO_X11_XCURSOR)
-		$(cmake-utils_use xinerama     VIDEO_X11_XINERAMA)
-		$(cmake-utils_use xinput       VIDEO_X11_XINPUT)
-		$(cmake-utils_use xrandr       VIDEO_X11_XRANDR)
-		$(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
-		$(cmake-utils_use xvidmode     VIDEO_X11_XVM)
-		$(cmake-utils_use aqua   VIDEO_COCOA)
-		$(cmake-utils_use gles   VIDEO_OPENGLES)
-		$(cmake-utils_use opengl VIDEO_OPENGL)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# cmake-utils_src_install() installs all docs, except...
-	cmake-utils_src_install
-	for docfile in README* TODO BUGS CREDITS WhatsNew; do
-		dodoc "${docfile}"
-	done
-}

diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index 18a5a9c..6a3aa9f 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>leycec@×××××.com</email>
-		<name>leycec</name>
+		<email>azamat.hackimov@×××××.com</email>
+		<name>Azamat H. Hackimov</name>
 	</maintainer>
 	<longdescription>
 Simple DirectMedia Layer is a cross-platform multimedia library designed 
@@ -28,18 +28,10 @@ Pike, Pliant, Python, Ruby, Smalltalk, and Tcl.
 	</upstream>
 	<use>
 		<!--flag name="directx">Adds support for Windows DirectX audio and video</flag-->
-		<flag name="audio">Support video devices (strongly recommended!)</flag>
 		<flag name="asm">Enable assembly for optimization (3dnow, mmx, sse, sse2)</flag>
-		<flag name="feedback">Support tactile feedback (e.g., vibration) devices</flag>
 		<flag name="fusionsound">Enable FusionSound audio support</flag>
 		<flag name="gles">Enable OpenGL ES video support</flag>
-		<flag name="joystick">Support joystick devices</flag>
-		<flag name="ps3">Build the PS3 video driver</flag>
 		<flag name="tslib">Enable tslib-based touchscreen device support</flag>
 		<flag name="video">Control video support (disable at your own risk)</flag>
-		<flag name="xcursor">Enable Xcursor-based cursor theme support</flag>
-		<flag name="xinput">Enable xinput-based touchscreen and multiple input device support (recommended)</flag>
-		<flag name="xrandr">Enable XRandR-based resolution switching (recommended)</flag>
-		<flag name="xvidmode">Enable XVidMode-based resolution switching (not recommended)</flag>
 	</use>
 </pkgmetadata>