Stable latest. Cleanup older versions.

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

4 files changed, 8 insertions, 88 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 5e4101e9ab9a..6a899e124f8a 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.120 2010/08/02 17:55:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.121 2010/09/10 16:48:56 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ati-6.12.5.ebuild, -xf86-video-ati-6.13.0.ebuild,
+  xf86-video-ati-6.13.1.ebuild:
+  Stable latest. Cleanup older versions.
 
   02 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   xf86-video-ati-6.12.6.ebuild:
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild
deleted file mode 100644
index 5daee66e4e10..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.5.ebuild,v 1.4 2010/03/14 17:40:54 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-EAPI=2
-
-inherit x-modular eutils
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-#SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.bz2"
-SRC_URI="${SRC_URI}
-	${SRC_PATCHES}"
-
-RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
-DEPEND="${RDEPEND}
-	>=x11-libs/libdrm-2
-	x11-proto/fontsproto
-	x11-proto/glproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86driproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-"
-CONFIGURE_OPTIONS="--enable-dri"
-
-src_prepare() {
-	x-modular_src_prepare
-	if [[ -n "${SRC_PATCHES}" ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	ewarn "If you have a mach64 or r128 video card, read this"
-	ewarn "The mach64 and r128 drivers moved to their own packages,"
-	ewarn "xf86-video-mach64 and xf86-video-r128. If these weren't installed"
-	ewarn "automatically by xorg-server and you have one of these cards,"
-	ewarn "check your VIDEO_CARDS settings."
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.0.ebuild
deleted file mode 100644
index ed1619be90c5..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.0.ebuild,v 1.4 2010/06/30 06:18:52 fauli Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.6.3[-minimal]"
-DEPEND="${RDEPEND}
-	>=x11-libs/libdrm-2.4.17
-	x11-proto/fontsproto
-	x11-proto/glproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xf86driproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	CONFIGURE_OPTIONS="
-		--enable-dri
-		--enable-kms
-	"
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.ebuild
index 850cb93f3825..32f7b8c36500 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.ebuild,v 1.1 2010/07/07 08:47:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.ebuild,v 1.2 2010/09/10 16:48:56 scarabeus Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="ATI video driver"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3[-minimal]"