Removing python dependency. Requiring virtual/glu. Fix bug #514598

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

4 files changed, 41 insertions, 17 deletions

diff --git a/media-libs/sdl-terminal/ChangeLog b/media-libs/sdl-terminal/ChangeLog
index e77f14089ca1..6ae0e682cab9 100644
--- a/media-libs/sdl-terminal/ChangeLog
+++ b/media-libs/sdl-terminal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/sdl-terminal
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-terminal/ChangeLog,v 1.13 2013/11/13 05:08:30 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-terminal/ChangeLog,v 1.14 2014/07/22 14:49:49 tupone Exp $
+
+  22 Jul 2014; Alfredo Tupone <tupone@gentoo.org> sdl-terminal-1.1.3-r1.ebuild,
+  +files/sdl-terminal-1.1.3-nopython.patch,
+  -files/sdl-terminal-1.1.3-python-libs-path.patch:
+  Removing python dependency. Requiring virtual/glu. Fix bug #514598 by 
+  Patrick Lauer
 
   13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
   sdl-terminal-1.1.3-r1.ebuild:
diff --git a/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch b/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch
new file mode 100644
index 000000000000..c9d3214dd091
--- /dev/null
+++ b/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch
@@ -0,0 +1,24 @@
+--- configure.ac.old	2014-07-22 14:19:33.797413503 +0200
++++ configure.ac	2014-07-22 14:19:55.293201011 +0200
+@@ -108,7 +108,6 @@
+ fi
+ AC_SUBST(GL_LIBS)
+ 
+-AC_PYTHON_DEVEL
+ 
+ # Finally create all the generated files
+ # The configure script takes "file.in" and substitutes variables to produce
+@@ -118,5 +117,4 @@
+ Makefile
+ src/Makefile
+ include/Makefile
+-examples/Makefile
+ ])
+--- Makefile.am.old	2014-07-22 14:19:40.729344917 +0200
++++ Makefile.am	2014-07-22 14:20:06.353091713 +0200
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = src include examples
++SUBDIRS = src include
+ 
diff --git a/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-python-libs-path.patch b/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-python-libs-path.patch
deleted file mode 100644
index b82c097a70cd..000000000000
--- a/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-python-libs-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2012-10-15 11:37:40.871135394 +0400
-+++ configure	2012-10-15 11:38:05.763136943 +0400
-@@ -22780,7 +22780,7 @@
-         echo "$as_me:$LINENO: checking for Python library path" >&5
- echo $ECHO_N "checking for Python library path... $ECHO_C" >&6
-         python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
--        for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
-+        for i in "${libdir}" ; do
-                 python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
-                 if test -n "$python_path" ; then
-                         break
diff --git a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
index 3230d03d0128..c41da109749d 100644
--- a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
+++ b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# 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/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild,v 1.6 2013/11/13 05:08:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild,v 1.7 2014/07/22 14:49:49 tupone Exp $
 
 EAPI=4
-inherit base libtool
+inherit base libtool autotools
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="library that provides a pseudo-ansi color terminal that can be used with any SDL application"
@@ -16,13 +16,18 @@ KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 DEPEND="virtual/opengl
+	virtual/glu
 	>=media-libs/libsdl-1.2.4
 	media-libs/sdl-ttf"
 
 S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS ChangeLog README )
-PATCHES=( "${FILESDIR}"/${P}-python-libs-path.patch )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nopython.patch
+	eautoreconf
+}
 
 src_configure() {
 	econf $(use_enable static-libs static)