remove libXt and libXmu dependency. Fix bug #515750

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 41 insertions, 11 deletions

diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog
index e58dbf07d30b..e03fe809cee0 100644
--- a/games-sports/torcs/ChangeLog
+++ b/games-sports/torcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/torcs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.39 2013/01/30 18:32:18 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.40 2014/07/19 13:55:10 tupone Exp $
+
+  19 Jul 2014; Tupone Alfredo <tupone@gentoo.org> torcs-1.3.4.ebuild,
+  +files/torcs-1.3.4-noXmuXt.patch:
+  remove libXt and libXmu dependency. Fix bug #515750 by Patrick Lauer
 
   30 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   -files/torcs-1.3.1-as-needed.patch, -files/torcs-1.3.1-libpng15.patch,
@@ -28,7 +32,7 @@
   +files/torcs-1.3.1-libpng15.patch:
   add patch for building with libpng from wrstwssr@yahoo.com via bug #369231
 
-  16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> torcs-1.3.1.ebuild:
+  16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> torcs-1.3.1.ebuild:
   virtual/glut -> media-libs/glut
 
   02 May 2010; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.3.1.ebuild:
@@ -123,7 +127,7 @@
 *torcs-1.2.3 (17 Jul 2005)
 
   17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +torcs-1.2.3.ebuild:
-  Version bump #80983 by Kåre Baastrup et al.
+  Version bump #80983 by KÃ¥re Baastrup et al.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index f77b3ed6fd95..db8ff37d88ed 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX torcs-1.3.4-as-needed.patch 4503 SHA256 47874c2562e3ae2a7f11fed9d19acf08a2da18a1af1a5489cb4d81a0bbc043a8 SHA512 4a165120028160a2fc2032a155266c41c3386bb1132b9158badfe13d9f26ee5d3ead91a14922950610ec5c57041dd52fb42c2a4e58dd384b555f439c7da8e6dc WHIRLPOOL 999999c7d37ee14476ace14911f17ca16c8f5ff90c89751270cdd1ebca7a86f4f9b55cfea867558e191f8808c1676124c2605ff8d20e8e0b47de88da98577ae4
 AUX torcs-1.3.4-flags.patch 412 SHA256 4509cda9a445b116c976cd731fce19226f9e90c0e9d8b208d823c0e66a8324b8 SHA512 9eb4f15f32fc76bcbfb019c56ddc4132b835a258f1167476426c1141f6f00717aba296f05ae6434661f9ead7aed28edebe6fe5b84d410c8dc48966c92ef10db8 WHIRLPOOL b4d6919c454a2b8b5f18b8212fb01184db1741d131a4dcc1e4023818ed53a004be80a423c6bbd454dc384fba633191b8a2436567788a0a0a36a9ea0419959c16
 AUX torcs-1.3.4-no-automake.patch 592 SHA256 91be55dab0355e14a9ce2a64280a2711d0d87d8c46fd9df7bdf04fc6dd8230e9 SHA512 be70370176675c0cc15a13caf2eb3344611b354085537b9fbbd27be587a598e1512521036302c116a319f7d34e9eae0ca6ef0c992a327ee59d9edfe6952518ec WHIRLPOOL 3e2bbe840f0bf0dddbb99ec9485d5d23878e3e4a19b76cb80c72c2ca002c394ee3b13ad96f1ed5dbfab70ea898569578f3e927a6e10c62d2a6151bb3c794ec81
+AUX torcs-1.3.4-noXmuXt.patch 2179 SHA256 69165947a7db8890686c95c06c5af8f992800fcf0b08a26fa68ef3d3e927e949 SHA512 86d1f92e57ab48488530d93e15e3348657bd57b2b60732c590dc0eaf9dbf1541a4e78bb7f55ffebc6519155be0b474f388bab768caa50ef70da45d201e94e134 WHIRLPOOL 419e948390e6676006d3a12376a68ee6bf9c7b8224cd21d3627042138eb7d96df505e6b1123fbbdb9bcad004518ca211f1819b3c9e0f4c2ec2bfd819346ac9bc
 DIST torcs-1.3.4.tar.bz2 414704098 SHA256 be50a42e4a32b322411a786ce4ab2fed44a1a2431511aef9925017858168e485 SHA512 8998ebaa92cb9d6c45cef5743b0cf6da04d88bb3eea18c863c4b3542eaff4b4c09cf47755dd47f5103fe4c0701125c8492cf6220bec97f1825e8cc549aa8270e WHIRLPOOL a73f3b8c4334d0d6795e1053d6131de84d2179cfc2451abf27bff05f57fdc5281deffae4a1f4c48333846e4aaaee7a5a1f6965cc353ba3b718327e494dae757a
-EBUILD torcs-1.3.4.ebuild 1421 SHA256 d7eee56be3796313a38365f43e7df3dd13bf9c71bbf2c7d0e49a6fb1afb77692 SHA512 640724a67aab7810566681e71429679137744fde55edf1f987df3cac05d9ac0caa4af1f73415406c8a2b0df09bdd239eabcc3773f1cddb613c8a6a4a2f65170e WHIRLPOOL c8f75cfe4b6db4d11bd191ae498d4b34cc86d28c0a79a54af663b28eb102e5f13bb7903f0debd5a08ad458a3d2049ded948419773ebb4b5196a2bb39d7b0e3f6
-MISC ChangeLog 6116 SHA256 0f7beaf93763f66c246baa3b7599892f586fb1edfc0e6d4869bb1e699193171f SHA512 2baa9aa77951a45cec7e8325bba473e38722c7bb683731f31e9321759d670adc72583c3c167abb1ff87a5300f85c0f8e32342ea6242c22ea97290499c3d4080c WHIRLPOOL 31c74714f05f3dd44d1a15f61949a2a8fb01ef9b4e8ffd90c145cc63b1beddbba8a85d039ad47bd718f32b99e6458403af3aa4b0dc69d1b464437e1fabcf950d
+EBUILD torcs-1.3.4.ebuild 1445 SHA256 9f3b1734187a650a48f5c503de89accadae8f5edd4d79813a73fe2026501583d SHA512 1477e364e1211a601a28dc496c190956ed1d56665d36451f5be117c66b6f982e625fc8f8ebbe587b77f0f5a5057fc679c869f4322acf59db7ff4798f27e3e9cd WHIRLPOOL 7f25e516846efd7e8c7588ae578d879657144e0249cea1317cbc8b6da78e506157b84ffd0d366faec7752b46fae9abcf2d2d7ed565eca9ac3c47387ff1b3fce5
+MISC ChangeLog 6299 SHA256 49b020b0f1e348336c3883d26441ff1a5174797617458f4799d3eaba8f0a0478 SHA512 b3417eaeb33803e62745cc7ad6b7456af9e84ed54f73b2b17bdba82057b99fcdaace872b916991d1f18121a39a8dae83f628866089cbc2d504ebe0387a0feaac WHIRLPOOL cbdb1db3d48de2183c5236ce63dbd01f5a4094044f7587502ac40953596e047dd43618a3f47aa9571531b2d1319a98620e5a2202daaaa1c3b07211f244287faa
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPKeMQACgkQIY77eQFFFC02XgCfUBdSK3NzdOXcVnw5OISw/v6x
+yBYAni/xPcqhMZ6pTThDOJquOe6QLrck
+=/MiZ
+-----END PGP SIGNATURE-----
diff --git a/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch
new file mode 100644
index 000000000000..200c6522c9c0
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch
@@ -0,0 +1,15 @@
+--- configure.in.old	2014-07-19 15:43:50.480681694 +0200
++++ configure.in	2014-07-19 15:44:12.487294592 +0200
+@@ -116,12 +116,8 @@
+ AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ dnl Replace `main' with a function in -lSM:
+ AC_CHECK_LIB(SM, SmsSetErrorHandler,,AC_MSG_ERROR([Can't find libSM. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+-dnl Replace `main' with a function in -lXt:
+-AC_CHECK_LIB(Xt, XtDisplay,,AC_MSG_ERROR([Can't find libXt. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ dnl Replace `main' with a function in -lXi:
+ AC_CHECK_LIB(Xi, XOpenDevice,,AC_MSG_ERROR([Can't find libXi. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+-dnl Replace `main' with a function in -lXmu:
+-AC_CHECK_LIB(Xmu, XmuSimpleErrorHandler,,AC_MSG_ERROR([Can't find libXmu. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
diff --git a/games-sports/torcs/torcs-1.3.4.ebuild b/games-sports/torcs/torcs-1.3.4.ebuild
index 4762db73e5f3..d04079f79d6d 100644
--- a/games-sports/torcs/torcs-1.3.4.ebuild
+++ b/games-sports/torcs/torcs-1.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.4.ebuild,v 1.3 2013/01/30 18:06:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.4.ebuild,v 1.4 2014/07/19 13:55:10 tupone Exp $
 
 EAPI=5
 inherit autotools eutils multilib games
@@ -24,8 +24,7 @@ RDEPEND="media-libs/freealut
 	virtual/opengl
 	virtual/glu
 	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXt"
+	x11-libs/libXrandr"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
@@ -33,7 +32,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-no-automake.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-flags.patch
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-noXmuXt.patch
 	eautoreconf
 	ecvs_clean
 }