Revision bump to avoid accidental automagicness.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 18 insertions, 32 deletions

diff --git a/x11-drivers/xf86-video-savage/ChangeLog b/x11-drivers/xf86-video-savage/ChangeLog
index 8c7a5603add5..4e895ec88765 100644
--- a/x11-drivers/xf86-video-savage/ChangeLog
+++ b/x11-drivers/xf86-video-savage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-savage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.71 2012/05/16 01:55:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.72 2012/06/11 13:08:46 scarabeus Exp $
+
+*xf86-video-savage-2.3.4-r1 (11 Jun 2012)
+*xf86-video-savage-2.3.3-r1 (11 Jun 2012)
+
+  11 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-video-savage-2.3.2.ebuild, -xf86-video-savage-2.3.3.ebuild,
+  +xf86-video-savage-2.3.3-r1.ebuild, -xf86-video-savage-2.3.4.ebuild,
+  +xf86-video-savage-2.3.4-r1.ebuild:
+  Revision bump to avoid accidental automagicness.
 
   16 May 2012; Alexis Ballier <aballier@gentoo.org>
   xf86-video-savage-2.3.4.ebuild:
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.2.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.2.ebuild
deleted file mode 100644
index 8b3efc1e010c..000000000000
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-savage/xf86-video-savage-2.3.2.ebuild,v 1.5 2011/03/05 15:40:42 armin76 Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="S3 Savage video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-	xorg-2_pkg_setup
-}
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild
index c805eba5616e..089fb145183a 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3.ebuild,v 1.5 2012/02/19 15:04:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild,v 1.1 2012/06/11 13:08:46 scarabeus Exp $
 
 EAPI=4
 
@@ -15,6 +15,8 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xextproto-7.0.99.1"
 
 pkg_setup() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
 	xorg-2_pkg_setup
 }
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild
index 8908224987dc..dba78c39c092 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4.ebuild,v 1.2 2012/05/16 01:55:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild,v 1.1 2012/06/11 13:08:46 scarabeus Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -15,6 +15,8 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xextproto-7.0.99.1"
 
 pkg_setup() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
 	xorg-2_pkg_setup
 }