Revison bump, apply upstream patches. Drop older releases.

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

4 files changed, 29 insertions, 85 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 0a45fca47677..906b30a51def 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-ati
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.100 2009/12/27 18:02:14 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.101 2010/01/11 15:14:18 scarabeus Exp $
+
+*xf86-video-ati-6.12.4-r1 (11 Jan 2010)
+
+  11 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-ati-6.11.0.ebuild, -xf86-video-ati-6.12.2.ebuild,
+  xf86-video-ati-6.12.4.ebuild, +xf86-video-ati-6.12.4-r1.ebuild:
+  Revison bump, apply upstream patches. Drop older releases.
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> ChangeLog:
   Marked ppc stable for bug #294958.
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
deleted file mode 100644
index 797c6f5afcc6..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 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.2.ebuild,v 1.5 2009/06/26 11:08:29 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
-	>=x11-misc/util-macros-1.1.3
-	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"
-
-#PATCHES=""
-
-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."
-	ebeep
-	epause
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.11.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4-r1.ebuild
index c78ad8039068..12d17053002c 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.11.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4-r1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.11.0.ebuild,v 1.5 2009/06/26 11:08:29 scarabeus Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4-r1.ebuild,v 1.1 2010/01/11 15:14:18 scarabeus Exp $
 
 EAPI=2
 
+SNAPSHOT="yes"
 inherit x-modular eutils
 
 DESCRIPTION="ATI video driver"
@@ -14,14 +12,13 @@ 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_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-misc/util-macros-1.1.3
 	x11-proto/fontsproto
 	x11-proto/glproto
 	x11-proto/randrproto
@@ -34,26 +31,30 @@ DEPEND="${RDEPEND}
 "
 CONFIGURE_OPTIONS="--enable-dri"
 
-#PATCHES=""
-
 src_prepare() {
-	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
 		EPATCH_SUFFIX="patch" \
 		epatch
 	fi
+	x-modular_src_prepare
+}
+
+pkg_preinst() {
+	if has_version '<x11-drivers/xf86-video-ati-6.10.0'; then
+		SHOW_WARNING="true"
+	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."
-	ebeep
-	epause
+	if [[ ${SHOW_WARNING} == true ]]; then
+		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."
+	fi
 }
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild
index b68afe0af28b..da5017ed0f9f 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.4.ebuild,v 1.6 2009/12/15 19:28:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.12.4.ebuild,v 1.7 2010/01/11 15:14:18 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -21,7 +21,6 @@ SRC_URI="${SRC_URI}
 RDEPEND=">=x11-base/xorg-server-1.2[-minimal]"
 DEPEND="${RDEPEND}
 	>=x11-libs/libdrm-2
-	>=x11-misc/util-macros-1.1.3
 	x11-proto/fontsproto
 	x11-proto/glproto
 	x11-proto/randrproto
@@ -34,8 +33,6 @@ DEPEND="${RDEPEND}
 "
 CONFIGURE_OPTIONS="--enable-dri"
 
-#PATCHES=""
-
 src_prepare() {
 	x-modular_src_prepare
 	if [[ -n "${SRC_PATCHES}" ]]; then
@@ -54,6 +51,4 @@ pkg_postinst() {
 	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."
-	ebeep
-	epause
 }