remove libXt and libXmu dependency. Fix bug #515750

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0145142D)

3 files changed, 28 insertions, 9 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/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
 }