fix compile with gcc4 (bug #149079) with patch from Alexander Graf; avoid prestripped binaries; tidy

Package-Manager: portage-2.1.2_pre1-r4

6 files changed, 97 insertions, 28 deletions

diff --git a/games-mud/tf/ChangeLog b/games-mud/tf/ChangeLog
index 63a57ae73e51..d67c43790b27 100644
--- a/games-mud/tf/ChangeLog
+++ b/games-mud/tf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-mud/tf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.16 2006/09/02 08:52:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.17 2006/10/01 23:49:32 mr_bones_ Exp $
+
+  01 Oct 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/tf-40-gcc4.patch, files/tf-40-gentoo.diff, tf-40-r2.ebuild:
+  fix compile with gcc4 (bug #149079) with patch from Alexander Graf; avoid
+  prestripped binaries; tidy
 
   02 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org> tf-50_beta7.ebuild:
   avoid prestripped binaries; touchups (patch from Tristan Heaven bug #137835)
diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest
index 5d5b8312b1a2..ba51222d047a 100644
--- a/games-mud/tf/Manifest
+++ b/games-mud/tf/Manifest
@@ -1,30 +1,34 @@
-AUX tf-40-gentoo.diff 947 RMD160 0acd89013ed105c2d16b16f896427a9b53197396 SHA1 8f9dfe9ecf69a0a493f2cfabf350925f46079ec3 SHA256 a6770f796795ac17c9a7a9e5c46b56188135b9f15e166a1994cf85dc6d3ed8b1
-MD5 6ab320993d05aa512f0811632cbde7c3 files/tf-40-gentoo.diff 947
-RMD160 0acd89013ed105c2d16b16f896427a9b53197396 files/tf-40-gentoo.diff 947
-SHA256 a6770f796795ac17c9a7a9e5c46b56188135b9f15e166a1994cf85dc6d3ed8b1 files/tf-40-gentoo.diff 947
-DIST tf-40s1-help.tar.gz 121936
-DIST tf-40s1.tar.gz 349239
+AUX tf-40-gcc4.patch 1955 RMD160 409fb0205eaa12843b965574774f14f1b7e5bdae SHA1 0013b98568310baba645fb1aff00504fd580de58 SHA256 c6db5fa3a77a50c012f9a2e516dae708022d99bc0c111cc7af7d3553221af90c
+MD5 bd065354c73868cb8ac6acae70051347 files/tf-40-gcc4.patch 1955
+RMD160 409fb0205eaa12843b965574774f14f1b7e5bdae files/tf-40-gcc4.patch 1955
+SHA256 c6db5fa3a77a50c012f9a2e516dae708022d99bc0c111cc7af7d3553221af90c files/tf-40-gcc4.patch 1955
+AUX tf-40-gentoo.diff 1093 RMD160 7b448315ab46d18c8ef546be65bf8f38328ab766 SHA1 f0aa1b6a9ad58871ac1012f8902388b9e0663ba2 SHA256 8c31afa6845a429f5b4623b40459672849a54d275d8847d63ec0aa102b2a80ac
+MD5 56a722826f31c2b2e1cf38084537612b files/tf-40-gentoo.diff 1093
+RMD160 7b448315ab46d18c8ef546be65bf8f38328ab766 files/tf-40-gentoo.diff 1093
+SHA256 8c31afa6845a429f5b4623b40459672849a54d275d8847d63ec0aa102b2a80ac files/tf-40-gentoo.diff 1093
+DIST tf-40s1-help.tar.gz 121936 RMD160 847833d010f82869e411a87294fa3dd53f2c59ba SHA1 26e328ce88bd9739f8d409cea229272edab34762 SHA256 057668bdbe63e7cd1b5121343ebbfc182956e75feb9e273dd42fe22ce0d45a48
+DIST tf-40s1.tar.gz 349239 RMD160 2852daa3363bb134f29cc25d3177e9599ecacc1f SHA1 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746 SHA256 488715d3c75ff05c08a518b0e1cd4518245842fbc1e4178c6da515e415101beb
 DIST tf-50b7-help.tar.gz 174146
 DIST tf-50b7.tar.gz 651772 RMD160 59278842ee57f101a7e3e2c8b7c282af3adbbff5 SHA1 04a89eb8441315afcb0f1ead0cffa56ef2886847 SHA256 a08ea71fe34a62798396a5ccc4e65316c262b55075f8114ea654dd8ef2ca68d7
-EBUILD tf-40-r2.ebuild 938 RMD160 b38b4c822f9cc8891c5475e4692baf91e0dfe566 SHA1 422d9489f1298c90cc627bd1bfc2465468f75c58 SHA256 f3f7e3fa6b00eb84d710946ea3122591d9908e4ce2bffd359559ae990736e5af
-MD5 b53bc606895cf2606af89621f605b9ba tf-40-r2.ebuild 938
-RMD160 b38b4c822f9cc8891c5475e4692baf91e0dfe566 tf-40-r2.ebuild 938
-SHA256 f3f7e3fa6b00eb84d710946ea3122591d9908e4ce2bffd359559ae990736e5af tf-40-r2.ebuild 938
+EBUILD tf-40-r2.ebuild 980 RMD160 f44a908ccd0f38ba54445e83c17e2371db6aa5a4 SHA1 116c57f4f082b1a342513df07e6a9626da551b88 SHA256 986c19b8e3582b4207f3cb58073bec5dc18ae7f21b2dfe2d91d100cbdbb36703
+MD5 d90a9f735131c8c3486e46989680a356 tf-40-r2.ebuild 980
+RMD160 f44a908ccd0f38ba54445e83c17e2371db6aa5a4 tf-40-r2.ebuild 980
+SHA256 986c19b8e3582b4207f3cb58073bec5dc18ae7f21b2dfe2d91d100cbdbb36703 tf-40-r2.ebuild 980
 EBUILD tf-50_beta7.ebuild 1584 RMD160 8fa3b70cf58e8cd952b8ec3a19fc148a5a15d03f SHA1 28815e7c858e03aa36bb94421dc7e4baba3d7ef0 SHA256 6bb0be7d3b2962ec5d547837334c5ba93165b88789142be9e332f747e8be7bae
 MD5 37fd1c592aed0449e83dadddfa53bbce tf-50_beta7.ebuild 1584
 RMD160 8fa3b70cf58e8cd952b8ec3a19fc148a5a15d03f tf-50_beta7.ebuild 1584
 SHA256 6bb0be7d3b2962ec5d547837334c5ba93165b88789142be9e332f747e8be7bae tf-50_beta7.ebuild 1584
-MISC ChangeLog 2713 RMD160 d8fd3328eab863e1b041b8d75107c13c71b0fd5a SHA1 3fa9b4b731f73ff9b93951774505b24ef5fb6227 SHA256 e6792111b19469d9fbe06a483d0be0b6c3c61fb82d7d0691551204198e976ff4
-MD5 72bdfe8f851f3325417401438b41cbcd ChangeLog 2713
-RMD160 d8fd3328eab863e1b041b8d75107c13c71b0fd5a ChangeLog 2713
-SHA256 e6792111b19469d9fbe06a483d0be0b6c3c61fb82d7d0691551204198e976ff4 ChangeLog 2713
+MISC ChangeLog 2943 RMD160 437b76fe270f1c3f1361cac60d3fdefba23c10f8 SHA1 99907c117c2418a2254e465b47c9f2c9fdfb7d0c SHA256 ab162192c9e588b7487ba8b916dc8c15fb6b95bda9e3651966c65e746c41ae10
+MD5 1fa1c35db630c5871b81316f28db1ca8 ChangeLog 2943
+RMD160 437b76fe270f1c3f1361cac60d3fdefba23c10f8 ChangeLog 2943
+SHA256 ab162192c9e588b7487ba8b916dc8c15fb6b95bda9e3651966c65e746c41ae10 ChangeLog 2943
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 80b8971f6e45f11a3aae2860b99150bd files/digest-tf-40-r2 123
-RMD160 7d7ce686aba904a51fb23ec4e80d4aab0b2584f0 files/digest-tf-40-r2 123
-SHA256 0a89bdedabc650d26961888a8878159031b618ebb16ab12e503878f621e0d629 files/digest-tf-40-r2 123
+MD5 b7f5ef4e6f086545319e714d166bb754 files/digest-tf-40-r2 461
+RMD160 ad2e3e08e4607a8477be1ff3122a1cbca79f8681 files/digest-tf-40-r2 461
+SHA256 9e8dac0019ec0015b84b94a1d8073813b69743268f5763b307e008ded7e80289 files/digest-tf-40-r2 461
 MD5 6bf1b3d14c93cc294e11f0c3afb52d5f files/digest-tf-50_beta7 287
 RMD160 f99df10350a49bfb7b72ccf3de86356d7552d197 files/digest-tf-50_beta7 287
 SHA256 029c15358ffc79ccebb3cb25fa30c43dfa47ebce4829b424918b4e88aadde438 files/digest-tf-50_beta7 287
diff --git a/games-mud/tf/files/digest-tf-40-r2 b/games-mud/tf/files/digest-tf-40-r2
index 6addb20e5c07..28a8c36cab35 100644
--- a/games-mud/tf/files/digest-tf-40-r2
+++ b/games-mud/tf/files/digest-tf-40-r2
@@ -1,2 +1,6 @@
-MD5 db6fa9a1aac0b7f199567d81c4b5c81d tf-40s1.tar.gz 349239
 MD5 59b5a3dee0aacabc5472cc041e71961d tf-40s1-help.tar.gz 121936
+RMD160 847833d010f82869e411a87294fa3dd53f2c59ba tf-40s1-help.tar.gz 121936
+SHA256 057668bdbe63e7cd1b5121343ebbfc182956e75feb9e273dd42fe22ce0d45a48 tf-40s1-help.tar.gz 121936
+MD5 db6fa9a1aac0b7f199567d81c4b5c81d tf-40s1.tar.gz 349239
+RMD160 2852daa3363bb134f29cc25d3177e9599ecacc1f tf-40s1.tar.gz 349239
+SHA256 488715d3c75ff05c08a518b0e1cd4518245842fbc1e4178c6da515e415101beb tf-40s1.tar.gz 349239
diff --git a/games-mud/tf/files/tf-40-gcc4.patch b/games-mud/tf/files/tf-40-gcc4.patch
new file mode 100644
index 000000000000..2b96ac03bdd0
--- /dev/null
+++ b/games-mud/tf/files/tf-40-gcc4.patch
@@ -0,0 +1,44 @@
+diff -urpN tf-40s1.orig/src/history.c tf-40s1/src/history.c
+--- tf-40s1.orig/src/history.c	1999-03-06 23:43:24.000000000 +0100
++++ tf-40s1/src/history.c	2006-09-30 18:16:43.000000000 +0200
+@@ -38,18 +38,6 @@
+ #define LOCALSIZE      100	/* local history size */
+ #define INPUTSIZE      100	/* command history buffer size */
+ 
+-typedef struct History {	/* circular list of Alines, and logfile */
+-    struct Aline **alines;
+-    int size;			/* actual number of lines currently saved */
+-    int maxsize;		/* maximum number of lines that can be saved */
+-    int first;			/* position of first line in circular array */
+-    int last;			/* position of last line in circular array */
+-    int index;			/* current recall position */
+-    int total;			/* total number of lines ever saved */
+-    TFILE *logfile;
+-    CONST char *logname;
+-} History;
+-
+ #define empty(hist) (!(hist)->alines || !(hist)->size)
+ 
+ static void     FDECL(alloc_history,(History *hist, int maxsize));
+diff -urpN tf-40s1.orig/src/history.h tf-40s1/src/history.h
+--- tf-40s1.orig/src/history.h	1999-03-06 23:43:24.000000000 +0100
++++ tf-40s1/src/history.h	2006-09-30 18:16:39.000000000 +0200
+@@ -31,6 +31,18 @@ extern void   NDECL(free_histories);
+ #define record_global(aline)  recordline(globalhist, (aline))
+ #define record_local(aline)   recordline(localhist, (aline))
+ 
++typedef struct History {	/* circular list of Alines, and logfile */
++    struct Aline **alines;
++    int size;			/* actual number of lines currently saved */
++    int maxsize;		/* maximum number of lines that can be saved */
++    int first;			/* position of first line in circular array */
++    int last;			/* position of last line in circular array */
++    int index;			/* current recall position */
++    int total;			/* total number of lines ever saved */
++    TFILE *logfile;
++    CONST char *logname;
++} History;
++
+ extern struct History globalhist[], localhist[];
+ extern int log_count, norecord, nolog;
+ 
diff --git a/games-mud/tf/files/tf-40-gentoo.diff b/games-mud/tf/files/tf-40-gentoo.diff
index 6fc7739c3339..e980f9d1c202 100644
--- a/games-mud/tf/files/tf-40-gentoo.diff
+++ b/games-mud/tf/files/tf-40-gentoo.diff
@@ -1,6 +1,5 @@
-diff -Nur tf-40s1/unix/Config tf-40s1-new/unix/Config
---- tf-40s1/unix/Config	Sat Mar  6 16:43:28 1999
-+++ tf-40s1-new/unix/Config	Tue Jul  3 15:04:45 2001
+--- unix/Config.orig	2006-10-01 00:13:05.000000000 -0400
++++ unix/Config	2006-10-01 00:14:11.000000000 -0400
 @@ -33,9 +33,9 @@
  #   even if an old version is currently in use.  You can remove
  #   the old version manually later when it is no longer in use.
@@ -34,3 +33,12 @@ diff -Nur tf-40s1/unix/Config tf-40s1-new/unix/Config
  # CCFLAGS="-g"
  
  
+@@ -117,7 +117,7 @@
+ # tfconfig will use "strip" on the tf binary unless you tell it otherwise.
+ # Set STRIP='' to disable stripping.
+ 
+-# STRIP=''
++STRIP=''
+ 
+ 
+ ### Other Compiler Libraries.
diff --git a/games-mud/tf/tf-40-r2.ebuild b/games-mud/tf/tf-40-r2.ebuild
index 70e938d3cad8..8ccacb88919a 100644
--- a/games-mud/tf/tf-40-r2.ebuild
+++ b/games-mud/tf/tf-40-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-40-r2.ebuild,v 1.8 2004/06/24 23:01:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-40-r2.ebuild,v 1.9 2006/10/01 23:49:32 mr_bones_ Exp $
 
 inherit eutils
 
 MY_P=${P}s1
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="A small full-featured MUD client"
 HOMEPAGE="http://tf.tcp.com/~hawkeye/tf/"
 SRC_URI="mirror://tinyfugue/${MY_P}.tar.gz
@@ -13,16 +12,21 @@ SRC_URI="mirror://tinyfugue/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~sparc"
+KEYWORDS=" ~amd64 ~sparc x86"
 IUSE="doc"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}-gentoo.diff"
+	cd "${S}"
+	epatch \
+		"${FILESDIR}/${P}-gentoo.diff" \
+		"${FILESDIR}/${P}-gcc4.patch"
 }
+
 src_compile() {
 	echo 'y' | ./unixmake config || die
 	./unixmake all || die