Drop old librm's

(Portage version: 2.2_rc78/cvs/Linux x86_64)

12 files changed, 10 insertions, 463 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index d08081375c24..3b9e30a27188 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.126 2010/08/02 18:38:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.127 2010/09/10 17:26:35 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch,
+  -libdrm-2.4.13.ebuild, -libdrm-2.4.15.ebuild, -libdrm-2.4.16.ebuild,
+  -libdrm-2.4.17.ebuild, -libdrm-2.4.18_pre20100211.ebuild,
+  -libdrm-2.4.18.ebuild, -libdrm-2.4.19.ebuild, -libdrm-2.4.20.ebuild,
+  -files/2.4.15-0002-configure-Typo-in-error-message.patch,
+  -files/2.4.15-0003-intel-Fallback-to-atomic-ops.h-libatomic-ops-dev.patch:
+  Drop old librm's
 
   02 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   libdrm-2.4.18_pre20100211-r1.ebuild:
diff --git a/x11-libs/libdrm/files/2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch b/x11-libs/libdrm/files/2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch
deleted file mode 100644
index fa800efdf72d..000000000000
--- a/x11-libs/libdrm/files/2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fc8f6be5a9bd84e10149770b76ff9353d25ce2a7 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 12 Oct 2009 23:58:47 +0100
-Subject: [PATCH 1/3] configure: Conditionally build libdrm_intel
-
-Only build libdrm_intel automatically if we have support for atomic
-operations. To force configure to build drm pass --enable-intel, which
-will cause the configure to error if no support is found. Or pass
---disable-intel to explicitly prevent libdrm_intel from being built.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- configure.ac |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 870c056..0c216ce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,8 +45,8 @@ AC_ARG_ENABLE(udev,	AS_HELP_STRING([--enable-udev],
- 
- AC_ARG_ENABLE(intel,
- 	      AS_HELP_STRING([--disable-intel],
--	      [Enable support for intel's KMS API (default: enabled)]),
--	      [INTEL=$enableval], [INTEL=yes])
-+	      [Enable support for intel's KMS API (default: auto)]),
-+	      [INTEL=$enableval], [INTEL=auto])
- 
- AC_ARG_ENABLE(nouveau-experimental-api,
- 	      AS_HELP_STRING([--enable-nouveau-experimental-api],
-@@ -151,9 +151,7 @@ if test "x$HAVE_LIBUDEV" = xyes; then
- fi
- AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes])
- 
--AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes])
--
--if test "x$INTEL" = xyes; then
-+if test "x$INTEL" != "xno"; then
-     # Check for atomic intrinsics
-     AC_CACHE_CHECK([for native atomic primitives], drm_cv_atomic_primitives,
-     [
-@@ -170,8 +168,19 @@ if test "x$INTEL" = xyes; then
- 	    AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1,
- 		      [Enable if your compiler supports the Intel __sync_* atomic primitives])
-     fi
-+
-+    if test "x$drm_cv_atomic_primitives" = "xnone"; then
-+	    if test "x$INTEL" != "xauto"; then
-+		    AC_MSG_ERROR([libdrm_intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or disable support for Intel GPUs by passing --disable-intel to ./configue])
-+	   else
-+		    INTEL=no
-+	   fi
-+    fi
- fi
- 
-+AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" != "xno"])
-+
-+
- AC_SUBST(WARN_CFLAGS)
- AC_OUTPUT([
- 	Makefile
--- 
-1.6.5.5
-
diff --git a/x11-libs/libdrm/files/2.4.15-0002-configure-Typo-in-error-message.patch b/x11-libs/libdrm/files/2.4.15-0002-configure-Typo-in-error-message.patch
deleted file mode 100644
index 4cc3e907b941..000000000000
--- a/x11-libs/libdrm/files/2.4.15-0002-configure-Typo-in-error-message.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 24c905f84120a7b0bcd7c5e86c58e908b9e850f9 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 13 Oct 2009 14:25:54 +0100
-Subject: [PATCH 2/3] configure: Typo in error message.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0c216ce..fd6f696 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -171,7 +171,7 @@ if test "x$INTEL" != "xno"; then
- 
-     if test "x$drm_cv_atomic_primitives" = "xnone"; then
- 	    if test "x$INTEL" != "xauto"; then
--		    AC_MSG_ERROR([libdrm_intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or disable support for Intel GPUs by passing --disable-intel to ./configue])
-+		    AC_MSG_ERROR([libdrm_intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or disable support for Intel GPUs by passing --disable-intel to ./configure])
- 	   else
- 		    INTEL=no
- 	   fi
--- 
-1.6.5.5
-
diff --git a/x11-libs/libdrm/files/2.4.15-0003-intel-Fallback-to-atomic-ops.h-libatomic-ops-dev.patch b/x11-libs/libdrm/files/2.4.15-0003-intel-Fallback-to-atomic-ops.h-libatomic-ops-dev.patch
deleted file mode 100644
index 98d043131774..000000000000
--- a/x11-libs/libdrm/files/2.4.15-0003-intel-Fallback-to-atomic-ops.h-libatomic-ops-dev.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 901bacd29cb5b242f68302b8384de6e193413a49 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 13 Oct 2009 15:13:00 +0100
-Subject: [PATCH 3/3] intel: Fallback to atomic-ops.h [libatomic-ops-dev]
-
-Use the external implementation for atomic operations across a wide
-range of architectures.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- configure.ac                |   10 +++++++++-
- libdrm/intel/intel_atomic.h |   17 +++++++++++++++++
- 2 files changed, 26 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fd6f696..7efc4d4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -163,15 +163,23 @@ if test "x$INTEL" != "xno"; then
-     ], [],
- 	      drm_cv_atomic_primitives="Intel"
- 	      )
-+
-+	    if test "x$drm_cv_atomic_primitives" = "xnone"; then
-+		    AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops")
-+	    fi
-+
-     ])
-     if test "x$drm_cv_atomic_primitives" = xIntel; then
- 	    AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1,
- 		      [Enable if your compiler supports the Intel __sync_* atomic primitives])
-     fi
-+    if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then
-+	    AC_DEFINE(HAVE_LIB_ATOMIC_OPS, 1, [Enable if you have libatomic-ops-dev installed])
-+    fi
- 
-     if test "x$drm_cv_atomic_primitives" = "xnone"; then
- 	    if test "x$INTEL" != "xauto"; then
--		    AC_MSG_ERROR([libdrm_intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or disable support for Intel GPUs by passing --disable-intel to ./configure])
-+		    AC_MSG_ERROR([libdrm_intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package, or, failing both of those, disable support for Intel GPUs by passing --disable-intel to ./configure])
- 	   else
- 		    INTEL=no
- 	   fi
-diff --git a/libdrm/intel/intel_atomic.h b/libdrm/intel/intel_atomic.h
-index 9eb50a1..e725c4a 100644
---- a/libdrm/intel/intel_atomic.h
-+++ b/libdrm/intel/intel_atomic.h
-@@ -54,6 +54,23 @@ typedef struct {
- 
- #endif
- 
-+#if HAVE_LIB_ATOMIC_OPS
-+#include <atomic_ops.h>
-+
-+#define HAS_ATOMIC_OPS 1
-+
-+typedef struct {
-+	AO_t atomic;
-+} atomic_t;
-+
-+# define atomic_read(x) AO_load_full(&(x)->atomic)
-+# define atomic_set(x, val) AO_store_full(&(x)->atomic, (val))
-+# define atomic_inc(x) ((void) AO_fetch_and_add1_full(&(x)->atomic))
-+# define atomic_dec_and_test(x) (AO_fetch_and_sub1_full(&(x)->atomic) == 1)
-+# define atomic_cmpxchg(x, oldv, newv) AO_compare_and_swap_full(&(x)->atomic, oldv, newv)
-+
-+#endif
-+
- #if ! HAS_ATOMIC_OPS
- #error libdrm-intel requires atomic operations, please define them for your CPU/compiler.
- #endif
--- 
-1.6.5.5
-
diff --git a/x11-libs/libdrm/libdrm-2.4.13.ebuild b/x11-libs/libdrm/libdrm-2.4.13.ebuild
deleted file mode 100644
index e93fead64820..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.13.ebuild,v 1.7 2009/12/15 15:37:24 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit autotools x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-IUSE=""
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-RESTRICT="test" # see bug #236845
-
-CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.15.ebuild b/x11-libs/libdrm/libdrm-2.4.15.ebuild
deleted file mode 100644
index 8ba45d5ce981..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.15.ebuild,v 1.10 2010/01/19 20:35:24 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
-# Fails to build on ARM if dev-libs/libatomic_ops is installed
-use arm && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-intel"
-
-PATCHES=(
-"${FILESDIR}/2.4.15-0001-configure-Conditionally-build-libdrm_intel.patch"
-"${FILESDIR}/2.4.15-0002-configure-Typo-in-error-message.patch"
-"${FILESDIR}/2.4.15-0003-intel-Fallback-to-atomic-ops.h-libatomic-ops-dev.patch"
-)
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.16.ebuild b/x11-libs/libdrm/libdrm-2.4.16.ebuild
deleted file mode 100644
index f781393766ca..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.16.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.16.ebuild,v 1.2 2010/01/12 21:10:10 armin76 Exp $
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
-# Fails to build on ARM if dev-libs/libatomic_ops is installed
-use arm && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-intel"
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.17.ebuild b/x11-libs/libdrm/libdrm-2.4.17.ebuild
deleted file mode 100644
index 4bda7ea0c1c3..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.17.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.17.ebuild,v 1.2 2010/01/12 21:10:10 armin76 Exp $
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api"
-# Fails to build on ARM if dev-libs/libatomic_ops is installed
-use arm && CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-intel"
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.18.ebuild b/x11-libs/libdrm/libdrm-2.4.18.ebuild
deleted file mode 100644
index 7919162c3ff3..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.18.ebuild,v 1.1 2010/02/17 18:22:20 chithanh Exp $
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# Fails to build on ARM if dev-libs/libatomic_ops is installed, bug 297630
-	CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api $(use_enable !arm intel) $(use_enable !arm radeon)"
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.18_pre20100211.ebuild b/x11-libs/libdrm/libdrm-2.4.18_pre20100211.ebuild
deleted file mode 100644
index b26ad39d9719..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.18_pre20100211.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.18_pre20100211.ebuild,v 1.1 2010/02/15 20:43:51 chithanh Exp $
-
-EAPI=2
-SNAPSHOT="yes"
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# Fails to build on ARM if dev-libs/libatomic_ops is installed, bug 297630
-	CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api $(use_enable !arm intel) $(use_enable !arm radeon)"
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.19.ebuild b/x11-libs/libdrm/libdrm-2.4.19.ebuild
deleted file mode 100644
index 42d6326e3a13..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.19.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.19.ebuild,v 1.1 2010/03/16 16:03:12 chithanh Exp $
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# Fails to build on ARM if dev-libs/libatomic_ops is installed, bug 297630
-	CONFIGURE_OPTIONS="--enable-udev
-			--enable-nouveau-experimental-api
-			--enable-vmwgfx-experimental-api
-			$(use_enable !arm intel)
-			$(use_enable !arm radeon)"
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.20.ebuild b/x11-libs/libdrm/libdrm-2.4.20.ebuild
deleted file mode 100644
index 0329d5dca6e7..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.20.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.20.ebuild,v 1.6 2010/07/14 17:08:10 jer Exp $
-
-inherit x-modular
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="kernel_linux"
-RESTRICT="test" # see bug #236845
-
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is
-	# installed, bugs 297630, bug 316421 and bug 316541, and is presently only
-	# useful on amd64 and x86.
-	CONFIGURE_OPTIONS="--enable-udev
-			--enable-nouveau-experimental-api
-			--enable-vmwgfx-experimental-api
-			$(use_enable kernel_linux libkms)
-			$(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")"
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "libdrm's ABI may have changed without change in library name"
-	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
-	ewarn "your video drivers in x11-drivers/*."
-}