Drop few older releases. Stabilise latest 6.12 series on ppc given the fact it is just bugfix release.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

4 files changed, 9 insertions, 88 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 0acd9378dd23..b0ceabb70983 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.138 2011/02/14 23:56:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.139 2011/02/18 12:41:35 scarabeus Exp $
+
+  18 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ati-6.12.6.ebuild, xf86-video-ati-6.12.7.ebuild,
+  -xf86-video-ati-6.13.1.ebuild:
+  Drop few older releases. Stabilise latest 6.12 series on ppc given the fact
+  it is just bugfix release.
 
   14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   xf86-video-ati-6.14.0.ebuild:
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.6.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.6.ebuild
deleted file mode 100644
index 2d359c442544..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.6.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.6.ebuild,v 1.7 2010/09/30 15:12:37 scarabeus 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.4.22 x11-libs/libdrm[video_cards_radeon] )
-	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.12.7.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.7.ebuild
index b2e5243779d9..e8fdf58b03df 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.7.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7.ebuild,v 1.6 2011/01/06 15:57:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.7.ebuild,v 1.7 2011/02/18 12:41:35 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -11,7 +11,7 @@ inherit x-modular eutils
 
 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=""
 
 #SRC_PATCHES="http://dev.gentooexperimental.org/~scarabeus/${PV}-patches-01.tar.bz2"
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
deleted file mode 100644
index 1a4a2d3aa796..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.1.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.1.ebuild,v 1.6 2010/09/30 15:12:37 scarabeus 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.22 x11-libs/libdrm[video_cards_radeon] )
-	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
-	"
-}