Add xrandr use flag. Bug #334491

Package-Manager: portage-2.1.10.49/cvs/Linux i686

5 files changed, 65 insertions, 18 deletions

diff --git a/games-sports/speed-dreams/ChangeLog b/games-sports/speed-dreams/ChangeLog
index d76e8c486513..638a11addac1 100644
--- a/games-sports/speed-dreams/ChangeLog
+++ b/games-sports/speed-dreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/speed-dreams
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/ChangeLog,v 1.10 2012/03/12 13:02:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/ChangeLog,v 1.11 2012/03/13 13:01:30 tupone Exp $
+
+  13 Mar 2012; Tupone Alfredo <tupone@gentoo.org> speed-dreams-1.4.0.ebuild,
+  +files/speed-dreams-1.4.0-automake.patch, metadata.xml:
+  Add xrandr use flag. Bug #334491 by Ben
 
   12 Mar 2012; Alfredo Tupone <tupone@gentoo.org> speed-dreams-1.4.0.ebuild:
   Make it build with new automake
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest
index 11220add26a4..8a39be2e3620 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX speed-dreams-1.4.0-asneeded.patch 4190 RMD160 dd486c345ce8535a39491be735bf7b453ea534b1 SHA1 48593efbb208776a4d576f2dc15534f970a195f8 SHA256 52620e323b663e6fdd60caf2522506588d08a8ea7b1915eb6de704babb3c901d
+AUX speed-dreams-1.4.0-automake.patch 984 RMD160 4daa70d1870cc0dba7cb41f9ae28f1094b67fd60 SHA1 c7b191fc5d8155b6593c2ada989f24634593f2e3 SHA256 aa1a0ed7aadc33fb75bfacd2999de20ffcef0136179dbd9d95871a8b0b8124a0
 AUX speed-dreams-1.4.0-libpng15.patch 516 RMD160 f4853bf2989d1200727d743af52295370d334177 SHA1 6c231fbce242e7c54317b892c1033dc570b127f8 SHA256 8fe1de4656ee42c6ef4910658e18999fa85e59711608d271834452d6eec62500
 DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 RMD160 9be038c8e124d0ab230b55bef2e1c13f6b408b23 SHA1 5f55e001ae1eb1660001cf11dd22e9afaa97b111 SHA256 c109bb77785e33ab66992db8566584f4393d2f141fb12e32a58793953fcd6893
-EBUILD speed-dreams-1.4.0.ebuild 1861 RMD160 9a3ff384abcfc6070318c21c7ef1ce0a93d48891 SHA1 3bb55fb0355b8da7c0e3c3aaf7357efaa9cde05c SHA256 f333fd16340289775697df0b7bb2ddd4b8b9bce676e43a7cbf600ee37ce60f37
-MISC ChangeLog 1749 RMD160 495c308cd1bbf2940433e5fb3a8ca381072d22bc SHA1 ef502e86c79dc81546b24f9531993d51b2f4873e SHA256 1cad6b500b90a33b088278fd8ff344b269cb595b064000bd04569219c5298f69
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+EBUILD speed-dreams-1.4.0.ebuild 1781 RMD160 2c2ca4a742303b14fa8aa790aaa0de4c95f42f79 SHA1 0979bb8e33cd7aafd0314421e81109bfc63e1aa4 SHA256 f1d4eca6a3f2462c60eeb98ef86c04bf7954b7c959fcdb3c6c401922f0c93315
+MISC ChangeLog 1927 RMD160 ee01e4b60cad20d91fddff83cc34402ba85ebc4d SHA1 24954c32f5c2058a19920c074556ec9cd59082bf SHA256 854db0b3264ee0f692b71242dd88b0e23d74eff49a714ef60c1d5abb99c52444
+MISC metadata.xml 245 RMD160 8d2c4783648c76510e51955157ff9bf55fe29891 SHA1 9b7526a627729e71b6865daec718a9e1325d07fe SHA256 f897524d4227461269aa899898ef3770c765db4a3b081dd7b3a3070436aa3722
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk9fRTQACgkQIY77eQFFFC0g+ACgzJ7HabL7Rv+vD2nhb/+fPYIT
+OVgAoLOJ7w/+1z+UseAPO+NnbpMhBR59
+=BLkP
+-----END PGP SIGNATURE-----
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
new file mode 100644
index 000000000000..1e34990da7f1
--- /dev/null
+++ b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
@@ -0,0 +1,35 @@
+--- configure.in.old	2012-03-13 08:15:34.891163505 +0100
++++ configure.in	2012-03-13 08:18:40.154092687 +0100
+@@ -14,9 +14,10 @@
+ #
+ ##############################################################################
+ 
+-AC_INIT(Make-config.in)
++AC_INIT([speed-dreams], [1.4.0-r2307])
++AC_CONFIG_SRCDIR([Make-config.in])
+ AC_CONFIG_HEADERS(config.h)
+-AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307)
++AC_DEFINE(VERSION, ["1.4.0-r2307"])
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+--- Makefile.old	2012-03-13 10:43:30.563720337 +0100
++++ Makefile	2012-03-13 10:44:26.339794119 +0100
+@@ -88,17 +88,7 @@
+ -include ${MAKE_DEFAULT}
+ 
+ Make-config: configure Make-config.in
+-	rm -f config.status config.log config.cache
+ 	./configure
+-	rm -f config.status config.log config.cache
+-
+-configure: configure.in config.h.in aclocal.m4
+-	rm -f config.status config.log config.cache
+-	autoheader
+-	autoconf
+-
+-aclocal.m4: acinclude.m4
+-	aclocal
+ 
+ distclean: clean
+ 	rm -f config.status config.log config.cache
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
index d3c2cc926f0b..503f277f7014 100644
--- a/games-sports/speed-dreams/metadata.xml
+++ b/games-sports/speed-dreams/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+  <use>
+	<flag name="xrandr">Enable support for the X xrandr extension</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
index 77590d3c3ffc..440fee3c8ad9 100644
--- a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
+++ b/games-sports/speed-dreams/speed-dreams-1.4.0.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/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild,v 1.6 2012/03/12 13:02:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild,v 1.7 2012/03/13 13:01:30 tupone Exp $
 
 EAPI=2
 inherit autotools eutils versionator games
@@ -12,29 +12,22 @@ SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+IUSE="xrandr"
 
 RDEPEND="virtual/opengl
 	virtual/glu
 	media-libs/freeglut
-	>=media-libs/plib-1.8.3
 	media-libs/openal
 	media-libs/freealut
 	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	x11-libs/libXi
-	x11-libs/libXmu
 	x11-libs/libXxf86vm
-	x11-libs/libXrender
-	x11-libs/libXrandr
+	xrandr? ( x11-libs/libXrandr )
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.40"
 DEPEND="${RDEPEND}
+	>=media-libs/plib-1.8.3
 	x11-proto/xproto
-	x11-proto/randrproto"
+	xrandr? ( x11-proto/randrproto )"
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src
 
@@ -44,6 +37,7 @@ src_prepare() {
 
 	epatch \
 			"${FILESDIR}"/${P}-asneeded.patch \
+			"${FILESDIR}"/${P}-automake.patch \
 			"${FILESDIR}"/${P}-libpng15.patch
 
 	sed -i \
@@ -56,7 +50,7 @@ src_prepare() {
 		-e "/^datadir/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
 		Make-config.in || die
 
-	AT_NOEAUTOMAKE=yes eautoreconf
+	eautoreconf
 }
 
 src_configure() {
@@ -65,7 +59,7 @@ src_configure() {
 	egamesconf \
 		--prefix=/usr \
 		--bindir="${GAMES_BINDIR}" \
-		--disable-dependency-tracking
+		$(use_enable xrandr)
 }
 
 src_install() {