Update configure.in patch to respect CXXFLAGS; Add patch for linking errors; Depend on dev-lang/swig, bug #144257

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 82 insertions, 33 deletions

diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index 0310ac6aed3d..9569d3bd4d26 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/adonthell
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.11 2006/09/23 12:18:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.12 2006/10/20 06:43:51 nyhm Exp $
+
+  20 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/adonthell-0.3.4a-inline.patch, files/0.3.4a-configure.in.patch,
+  adonthell-0.3.4a.ebuild:
+  Update configure.in patch to respect CXXFLAGS; Add patch for linking errors;
+  Depend on dev-lang/swig, bug #144257
 
   23 Sep 2006; Mike Frysinger <vapier@gentoo.org> adonthell-0.3.4a.ebuild:
   Cleanup autotools #148762 by David Philippi.
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index 2cec7cd0eb38..8414c8d53994 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.3.4a-configure.in.patch 2964 RMD160 251fac9fbb7bb6e1bd3ccc54faa392755181212e SHA1 3e2bc377d30833f6236733910b7a542597e0adc5 SHA256 fc9ffbc5cc1cba59f48909be92804e7d1d8b21c56e5dfff8449d84aff2cff2a2
-MD5 a0765112fe0c2b1b0d15cca93141c3eb files/0.3.4a-configure.in.patch 2964
-RMD160 251fac9fbb7bb6e1bd3ccc54faa392755181212e files/0.3.4a-configure.in.patch 2964
-SHA256 fc9ffbc5cc1cba59f48909be92804e7d1d8b21c56e5dfff8449d84aff2cff2a2 files/0.3.4a-configure.in.patch 2964
+AUX 0.3.4a-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab SHA1 818fe23ac15bba79712fb269078d41f4766345d1 SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e
+MD5 6c334d9d004049f2da64c82402cb70d7 files/0.3.4a-configure.in.patch 3310
+RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab files/0.3.4a-configure.in.patch 3310
+SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e files/0.3.4a-configure.in.patch 3310
 AUX adonthell-0.3.4a-gcc-41.patch 368 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 SHA1 9f2b8d4e3b3f2b3f56d468cacc65186e76a32b2b SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b
 MD5 e0df3c89f64308db7e23f21e9d654b5c files/adonthell-0.3.4a-gcc-41.patch 368
 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 files/adonthell-0.3.4a-gcc-41.patch 368
 SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b files/adonthell-0.3.4a-gcc-41.patch 368
+AUX adonthell-0.3.4a-inline.patch 432 RMD160 0df619b071ddd582cc34d819a10db234ba64fe58 SHA1 d2800639f56dfad8434a84e987e1fc357907b234 SHA256 b2a1ffec7e75fb1919873c14173ce7f821fb3b7388125c93cfaff551503ae661
+MD5 7d04d8d24758161c901a81309f8857c3 files/adonthell-0.3.4a-inline.patch 432
+RMD160 0df619b071ddd582cc34d819a10db234ba64fe58 files/adonthell-0.3.4a-inline.patch 432
+SHA256 b2a1ffec7e75fb1919873c14173ce7f821fb3b7388125c93cfaff551503ae661 files/adonthell-0.3.4a-inline.patch 432
 DIST adonthell-src-0.3.4a.tar.gz 680872 RMD160 0ad52d2940375fbddccd387346f84fa8f009a03c SHA1 01c07a138a7c41f5640d4306f2197f71a8554aee SHA256 05e0a282d15dfdac282f9a8fee077e43d09423eb30ae9a1654ada765e3052087
-EBUILD adonthell-0.3.4a.ebuild 1423 RMD160 552310a9fe766803c8bcd215955a7857f8af0f1d SHA1 cd6962cc0229bab384669cdc14139fc35b7a5374 SHA256 e5104015b302994cdf83221a627964bfd0162c41ee885c2bb44cc61c88b30c79
-MD5 c633e92ad89944673d3b02d2cc0f363b adonthell-0.3.4a.ebuild 1423
-RMD160 552310a9fe766803c8bcd215955a7857f8af0f1d adonthell-0.3.4a.ebuild 1423
-SHA256 e5104015b302994cdf83221a627964bfd0162c41ee885c2bb44cc61c88b30c79 adonthell-0.3.4a.ebuild 1423
-MISC ChangeLog 2103 RMD160 ee0ab6cdab309bf61aecc8a0af05590e8d07ec94 SHA1 288a80d5b290b3071418d4db0851427abe335fe2 SHA256 3cf22abdfb4a08fd22a5784ab56385f5b5ca340fd0a927d0a876c279f9476dbe
-MD5 47db0ba3cabf32d27f2030efe9e1b4f1 ChangeLog 2103
-RMD160 ee0ab6cdab309bf61aecc8a0af05590e8d07ec94 ChangeLog 2103
-SHA256 3cf22abdfb4a08fd22a5784ab56385f5b5ca340fd0a927d0a876c279f9476dbe ChangeLog 2103
+EBUILD adonthell-0.3.4a.ebuild 1457 RMD160 5f5740ccbb906c3ee1aa94cc7d2692e404983d1e SHA1 5edff2658e83682bc774aa803b880bcdffab3550 SHA256 18187d105afa6d8703b03498818cf450f41ef4f722a62131c1e3006034b15fc3
+MD5 3dbd6aaa05876ea190f57ea4a5f30e72 adonthell-0.3.4a.ebuild 1457
+RMD160 5f5740ccbb906c3ee1aa94cc7d2692e404983d1e adonthell-0.3.4a.ebuild 1457
+SHA256 18187d105afa6d8703b03498818cf450f41ef4f722a62131c1e3006034b15fc3 adonthell-0.3.4a.ebuild 1457
+MISC ChangeLog 2368 RMD160 a01e02d2a317a2afc377af2f25d59eb667584286 SHA1 f409d5bf3e6d2eef23ba165db1a4c0fb213bcf18 SHA256 aad083d6f3fcdecd1f297d4ae95d4bdd23bfb992eb32f9ab0e95d31369d9310e
+MD5 7cd58ce8abb1f464091491707145c372 ChangeLog 2368
+RMD160 a01e02d2a317a2afc377af2f25d59eb667584286 ChangeLog 2368
+SHA256 aad083d6f3fcdecd1f297d4ae95d4bdd23bfb992eb32f9ab0e95d31369d9310e ChangeLog 2368
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -28,7 +32,7 @@ SHA256 55ad2c29c969c3c38f0de77abb1e99f3672ce73d5f14f1c8ea5e5847ed185f6d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFFSY0amhnQswr0vIRAktPAJ9/7gPmxMiVVjFIobYxdL1SQ/tfHQCfaqU6
-SGx0IMhtP1pMtCJRdKM9Pkg=
-=CcfW
+iD8DBQFFOHAtdz7hIScOURERAq1rAJ4lUdDRvZJDFKk63Jh2+VNawIfbmwCg6yEJ
+dN4bfkf8gpm1auYG0V+APrc=
+=DbMG
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/adonthell/adonthell-0.3.4a.ebuild b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
index 4f727278a21d..2deb599d8483 100644
--- a/games-rpg/adonthell/adonthell-0.3.4a.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.6 2006/09/23 12:18:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.7 2006/10/20 06:43:51 nyhm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -20,7 +20,7 @@ RDEPEND="dev-lang/python
 	media-libs/libsdl
 	media-libs/libvorbis
 	media-libs/libogg
-	sys-libs/zlib"
+	dev-lang/swig"
 DEPEND="${RDEPEND}
 	doc? (
 		media-gfx/graphviz
@@ -34,7 +34,8 @@ src_unpack() {
 	cd "${S}"
 	epatch \
 		"${FILESDIR}"/${PV}-configure.in.patch \
-		"${FILESDIR}"/${P}-gcc-41.patch
+		"${FILESDIR}"/${P}-gcc-41.patch \
+		"${FILESDIR}"/${P}-inline.patch
 	rm -f ac{local,include}.m4
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/games-rpg/adonthell/files/0.3.4a-configure.in.patch b/games-rpg/adonthell/files/0.3.4a-configure.in.patch
index 9a3726133720..903bd9a5f67d 100644
--- a/games-rpg/adonthell/files/0.3.4a-configure.in.patch
+++ b/games-rpg/adonthell/files/0.3.4a-configure.in.patch
@@ -1,8 +1,17 @@
---- configure.in.orig	2005-03-12 18:01:25.000000000 -0500
-+++ configure.in	2005-03-13 00:12:26.000000000 -0500
-@@ -159,10 +159,8 @@
+--- configure.in
++++ configure.in
+@@ -13,7 +13,7 @@
+ AM_INIT_AUTOMAKE([])
+ AM_CONFIG_HEADER(config.h)
  
-    dnl Extract the version using Python, check against 1.5+
+-CFLAGS="-g -Wall -fno-exceptions"
++CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
+ CPPFLAGS=""
+ DEFS=""
+ 
+@@ -163,10 +163,8 @@
+ 
+    dnl Extract the version using Python, check against 2.2+
  
 -   changequote(<<, >>)
 -   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'`
@@ -11,9 +20,9 @@
 +   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'`
 +   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'`
  
-    if test $PYTHON_VERSION -lt 15; then
- 	echo "Sorry, you need to have Python 1.5+ installed - update your version!"
-@@ -172,9 +170,7 @@
+    if test $PYTHON_VERSION -lt 22; then
+ 	echo "Sorry, you need to have Python 2.2+ installed - update your version!"
+@@ -176,9 +174,7 @@
     dnl Find the Python.h header file
  
     AC_MSG_CHECKING(for Python header files)
@@ -24,8 +33,8 @@
  
     if test -r "$PYINCLUDE/Python.h"; then
        PY_CFLAGS="-I$PYINCLUDE"
-@@ -188,10 +184,8 @@
- 
+@@ -191,10 +187,8 @@
+    dnl Find the Python library
     AC_MSG_CHECKING(for Python library)
     PYLIB=""
 -   changequote(<<, >>)
@@ -34,10 +43,10 @@
 -   changequote([, ])
 +   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'`
  
-    py_paths="$PYPREFIX/lib/python$PYLIBVER/config $PYPREFIX/lib"
-    py_suffix="$PYLIBVER.so $PYLIBVER.a .so .a"
-@@ -220,19 +214,9 @@
- 
+    dnl look for a framework build of python first
+    fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'`
+@@ -233,19 +227,9 @@
+    fi
     dnl Get the libraries that python depends on
  
 -   AC_PATH_PROG(haveldd, ldd)
@@ -57,7 +66,7 @@
  
     case $target in
         *-sun-solaris*)
-@@ -280,11 +264,9 @@
+@@ -293,11 +277,9 @@
  if test "$P_SWIG" != "no" ; then
      $P_SWIG -version &> swig.ver
  
@@ -72,3 +81,12 @@
  
      rm -f swig.ver
  
+@@ -387,7 +369,7 @@
+ dnl Generate our compiler arguements
+ dnl ********************************
+ 
+-CXXFLAGS="$CFLAGS $DEFS $INCLUDES"
++CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES"
+ 
+ AC_SUBST(CXX) 
+ AC_SUBST(CXXFLAGS) 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.4a-inline.patch b/games-rpg/adonthell/files/adonthell-0.3.4a-inline.patch
new file mode 100644
index 000000000000..445f3b1ac58d
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.4a-inline.patch
@@ -0,0 +1,20 @@
+--- src/label.cc
++++ src/label.cc
+@@ -186,7 +186,7 @@
+ /**
+    Set if cursor is visible
+ */
+-inline void label::set_cursor_visible (const bool b)
++void label::set_cursor_visible (const bool b)
+ {
+     visible_cursor_ = b; 
+ }
+@@ -195,7 +195,7 @@
+ /**
+    Set the cursor moveable with arrow
+ */
+-inline void label::set_cursor_moveable (const bool b)
++void label::set_cursor_moveable (const bool b)
+ {
+    moveable_cursor_ = b;   
+ }