Fix underlink. Bug #370253

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

4 files changed, 78 insertions, 7 deletions

diff --git a/games-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index 6ab25c89ee1d..55279ca890e1 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecnc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.15 2010/09/08 12:20:36 tupone Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.16 2011/06/22 21:17:24 tupone Exp $
+
+  22 Jun 2011; Tupone Alfredo <tupone@gentoo.org>
+  freecnc-0.2.1.31072003.ebuild, +files/freecnc-0.2.1.31072003-underlink.patch:
+  Fix underlink. Bug #370253 by Diego Elio Pettenò
 
   08 Sep 2010; Tupone Alfredo <tupone@gentoo.org>
   files/0.2.1.31072003-makefile-cflags.patch,
diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest
index 34fafe2f514e..c5dfb6840c8d 100644
--- a/games-strategy/freecnc/Manifest
+++ b/games-strategy/freecnc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.2.1.31072003-gentoo-paths.patch 1583 RMD160 86f64dfb501eeced4602f2c6893bd77c24785a05 SHA1 b9b98145a30107af647bca2f0ff233f6145a4a35 SHA256 bb0d6527d3a87583eefa30b5e3fef99c5fd23dd6e9e040be5208ace045bdb664
 AUX 0.2.1.31072003-makefile-cflags.patch 511 RMD160 501ba619bc16d550ae53f49e902ca5b39795146d SHA1 0edbaf1dc2ca6b0b52ae4b914bba61e2d34af579 SHA256 04e49a9b7ae6f0a4eba25532286b01c22be6d3fa9101631bf6e717228f4c9481
 AUX 0.2.1.31072003-remove-root.patch 555 RMD160 7bd7afe0241e83308b8531ae09af974c04db2822 SHA1 458d98509dc767ceef7cce13bfc53e24955faf9e SHA256 b9450649620c70a2c4c11fcc4a16c2782d611f11c3e6eab802e4e057383ce207
@@ -5,9 +8,17 @@ AUX freecnc-0.2.1.31072003-as-needed.patch 1963 RMD160 dd1432700c90f366ab90aba23
 AUX freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 SHA1 3f884ae37f843ea8320f0e5e1f12695db661731c SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1
 AUX freecnc-0.2.1.31072003-gcc42.patch 725 RMD160 d738974841ec331a3865600c7484742d6c9228a8 SHA1 cf41e50df3053522147f74f37195c1f224e8062e SHA256 c4434062d2848a7d170d5dda9289b4b81a451c4b35f453f722c9b0bc11a1d06b
 AUX freecnc-0.2.1.31072003-glibc2.10.patch 296 RMD160 5b49549c07fddae640f0ea3d7c838f100bea481c SHA1 7a0e739aab49d0cc79201b2f1b0c950124faf2a1 SHA256 25f677d4953b5161d0f31e7aa9c28d71366e07888388b79e32e1412ef1be9f93
+AUX freecnc-0.2.1.31072003-underlink.patch 2394 RMD160 27c73aab900e1f3132e7b08badd656eb2d6a71ae SHA1 b84a405585cdbdcb325c87649c5e9ddcd0e10875 SHA256 88066643304c5a875681593cfc2980c0d8fa3db15ee9a6965ca0e05d336b2c76
 DIST cc1demo1.zip 9367945 RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 SHA1 fce488d0f9090cd96e6b064f0821ecf299b71962 SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87
 DIST cc1demo2.zip 17797920 RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 SHA1 a154a12f2479b76601081f2bdb49286b5bb040dc SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48
 DIST freecnc++-0.2.1.31072003-src.tar.bz2 271980 RMD160 e249a600a54a5a0aa791219360011724b8e273f2 SHA1 40d742f4acc9d175bb3b7ef1deddd1cdb18ba285 SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5
-EBUILD freecnc-0.2.1.31072003.ebuild 2655 RMD160 217316ad3ece8dc380c4303e92a5c0a76c3ad74f SHA1 7078cdc7f3f4ce34631ad9ce6a19c533ebdcf626 SHA256 1d81a197a6ec18e76e5d1b59d11b1312790dd1df573ef523d1c137ebe5fa3745
-MISC ChangeLog 2393 RMD160 f402593922e1aac64755ba71cebef8b2d56fef9b SHA1 5d4e632ada4bc61a933c9d2e1c6f3dbaca8c44d3 SHA256 01b16db0a286821862c2dab1221bae26209768250cc2297244adea6174801477
+EBUILD freecnc-0.2.1.31072003.ebuild 2691 RMD160 42326c5c46d2c039a35cc798beeeb2f9598a2fc2 SHA1 5a91d11811f7d17e90768cb53600d1a7591d5f8c SHA256 c67c0273c7d5a1a709cdefb78fa84705c03219b3c0f1b6647d540e1ab03c3213
+MISC ChangeLog 2576 RMD160 a5abfa90e4b24ff99940a49910795c963856348a SHA1 3f47ba58e609ebe28e63144526f614c02a27ec10 SHA256 80d9f8e7223d6045e6fa75c551dc6454b64d6680b73950cc1d174b91c0fd3eda
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4CW+8ACgkQIY77eQFFFC00GACfXy6WmSS+fAPWabUyUAR6mlGW
+n94AoK6XbQYkupIBMudhwwY5M9VTh9pC
+=oOrd
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freecnc/files/freecnc-0.2.1.31072003-underlink.patch b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-underlink.patch
new file mode 100644
index 000000000000..e310d0f0f312
--- /dev/null
+++ b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-underlink.patch
@@ -0,0 +1,55 @@
+--- src/Makefile.old	2011-06-22 22:57:59.000000000 +0200
++++ src/Makefile	2011-06-22 22:58:27.000000000 +0200
+@@ -35,7 +35,7 @@
+ all: freecnc-bin plugins
+ 
+ ../freecnc: $(OBJECTS)
+-	$(CXX) $(LDFLAGS) -o ../freecnc $(DEBUG_FLAGS) $(OBJECTS) `sdl-config --libs` $(LIBS) $(EFENCE)
++	$(CXX) $(LDFLAGS) -o ../freecnc $(DEBUG_FLAGS) $(OBJECTS) `sdl-config --libs` $(LIBS) -lm -ldl $(EFENCE)
+ 
+ freecnc-bin: ../freecnc
+ 
+--- tools/shpview/Makefile.old	2011-06-22 23:00:10.000000000 +0200
++++ tools/shpview/Makefile	2011-06-22 23:00:32.000000000 +0200
+@@ -13,7 +13,7 @@
+ CFLAGS = -g  -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS)
+ 
+ ../../shpview: $(LOCALOBJS) $(OBJECTS)
+-	$(CXX) -o ../../shpview -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS)
++	$(CXX) -o ../../shpview -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS) -lm -ldl
+ clean:
+ 	\rm -f $(LOCALOBJS) ../../shpview
+ 
+--- tools/tmpinied/Makefile.old	2011-06-22 23:01:44.000000000 +0200
++++ tools/tmpinied/Makefile	2011-06-22 23:02:12.000000000 +0200
+@@ -13,7 +13,7 @@
+ CFLAGS = -g -Wall  -I../../src/include `sdl-config --cflags`
+ 
+ ../../tmpinied: $(LOCALOBJS) $(OBJECTS)
+-	$(CXX) -g $(LDFLAGS) -o ../../tmpinied $(LOCALOBJS) $(OBJECTS) $(LIBS) `sdl-config --libs`
++	$(CXX) -g $(LDFLAGS) -o ../../tmpinied $(LOCALOBJS) $(OBJECTS) $(LIBS) `sdl-config --libs` -lm -ldl
+ clean:
+ 	\rm -f $(LOCALOBJS) ../../tmpinied
+ 
+--- tools/audplay/Makefile.old	2011-06-22 23:10:33.000000000 +0200
++++ tools/audplay/Makefile	2011-06-22 23:10:49.000000000 +0200
+@@ -12,7 +12,7 @@
+ CFLAGS = -g  -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS)
+ 
+ ../../audplay: $(LOCALOBJS) $(OBJECTS)
+-	$(CXX) -o ../../audplay -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS)
++	$(CXX) -o ../../audplay -g $(LDFLAGS) $(LOCALOBJS) $(OBJECTS) `sdl-config --libs` $(LIBS) -lm -ldl
+ clean:
+ 	\rm -f $(LOCALOBJS) ../../audplay
+ 
+--- tools/mixshell/Makefile.old	2011-06-22 23:12:13.000000000 +0200
++++ tools/mixshell/Makefile	2011-06-22 23:12:32.000000000 +0200
+@@ -6,7 +6,7 @@
+ CFLAGS = -g -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS)
+ 
+ mixshell: $(LOCALOBJ) $(OBJ)
+-	$(CXX) -o mixshell $(LDFLAGS) $(LOCALOBJ) $(OBJ) `sdl-config --libs` $(LIBS)
++	$(CXX) -o mixshell $(LDFLAGS) $(LOCALOBJ) $(OBJ) `sdl-config --libs` $(LIBS) -lm
+ 
+ clean:
+ 	\rm -rf $(LOCALOBJ) mixshell
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index 17e20c211d43..d6c2f6b21d4e 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.16 2009/12/07 18:57:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.17 2011/06/22 21:17:24 tupone Exp $
 
 EAPI=2
 inherit flag-o-matic eutils games
@@ -43,7 +43,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-gcc42.patch \
 		"${FILESDIR}"/${P}-glibc2.10.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-underlink.patch
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \