From 9308e3e4632f2dc6a7ab27d14ddb5f95cb21bd84 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sat, 6 Sep 2014 05:35:29 +0000 Subject: EAPI=5; tidy; clean old Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 --- games-mud/tf/ChangeLog | 8 +++++-- games-mud/tf/Manifest | 9 ++------ games-mud/tf/files/tf-40-gcc4.patch | 44 ------------------------------------ games-mud/tf/files/tf-40-gentoo.diff | 44 ------------------------------------ games-mud/tf/tf-40-r2.ebuild | 44 ------------------------------------ games-mud/tf/tf-50_beta8-r1.ebuild | 24 ++++++++++++-------- 6 files changed, 23 insertions(+), 150 deletions(-) delete mode 100644 games-mud/tf/files/tf-40-gcc4.patch delete mode 100644 games-mud/tf/files/tf-40-gentoo.diff delete mode 100644 games-mud/tf/tf-40-r2.ebuild (limited to 'games-mud') diff --git a/games-mud/tf/ChangeLog b/games-mud/tf/ChangeLog index 298cbfb51cd5..b145be65b427 100644 --- a/games-mud/tf/ChangeLog +++ b/games-mud/tf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-mud/tf -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.28 2013/09/16 21:34:10 mr_bones_ Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.29 2014/09/06 05:35:23 mr_bones_ Exp $ + + 06 Sep 2014; Michael Sterrett -files/tf-40-gcc4.patch, + -files/tf-40-gentoo.diff, -tf-40-r2.ebuild, tf-50_beta8-r1.ebuild: + EAPI=5; tidy; clean old 16 Sep 2013; Michael Sterrett +files/tf-50_beta8-stdarg.patch, tf-50_beta8-r1.ebuild: diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest index 7e7a3ed88222..1df10aeb39b0 100644 --- a/games-mud/tf/Manifest +++ b/games-mud/tf/Manifest @@ -1,14 +1,9 @@ -AUX tf-40-gcc4.patch 1955 SHA256 c6db5fa3a77a50c012f9a2e516dae708022d99bc0c111cc7af7d3553221af90c SHA512 ba11d127389cd4ddc9a48c25b56aa81c85b916c30974aa6ecdc276ea4ac621f10e56f2b205b05c150ec8d4a3e4539e27902ffa21a74cafd4f1ea80dec21104a2 WHIRLPOOL 4e8ab5a84229cbc0f22694fa2433aca944c5616527e8d2e8b69febe79857d0a2c65f4761759117ec8ca0c8f795aa5ccd52b02614022dd6fe88e4f13838f110a8 -AUX tf-40-gentoo.diff 1093 SHA256 8c31afa6845a429f5b4623b40459672849a54d275d8847d63ec0aa102b2a80ac SHA512 c93f61658b4618a6dde9abf56f6518b52208757287f840eebae628945c15db19553eaaa182f6bbb1e9eef1a0ef7e6083d254cfe0bc49dd4af5f63836b513432a WHIRLPOOL cb31f2788ca2d412945c7127ab64d7b4df13813f1d26a9bd1f913230d384a4833687bcd5c9637193dfc742a28d77b43e4094ec66c656a520445a0cb2e531040b AUX tf-50_beta8-pcre.patch 1917 SHA256 01b9cd92ed205b4a2d750cec9e8cc21d9a541e4e47c46140a53cae05f5458628 SHA512 942574f4a24f5c2660124caf6cc41438e42fb20b5d1781c60341da96ace2338a3b69a744454e5c2319d83d83a8de21af26029ec6f328a50facbc56db7091c092 WHIRLPOOL 14c974b6257469c6d21d160bd4793bdca25479ceed76b0079be53a41aabfbcbe39041cc3dc546fb3e3d671a5ff2f18e69d1d2f098e70b4c7428bfaba4419f2b3 AUX tf-50_beta8-stdarg.patch 1092 SHA256 460e8ce3299039264c9d2603ed64f9c0814d7bb37d2d4e89e479c87d8adb487a SHA512 1d6be5e3b9f2b14c5bcd234d61e8c6fa4bf2e3a3ed09af876d202c1ab9146dfcd9059baa1f31a49e7909d906d193b71b96f910374948edd2c4ec23ba78c9eba3 WHIRLPOOL e0315a17e5b1eca1086daccb47eca177da0dd01ce5a9f4de4f92e543115436ca7c4ef90b9590705dc617cf12ba50903218287b63e15e6211d3b5bf1782638858 -DIST tf-40s1-help.tar.gz 121936 SHA256 057668bdbe63e7cd1b5121343ebbfc182956e75feb9e273dd42fe22ce0d45a48 SHA512 4f4d30fe0c7155e04cfdaec4a977a415ae68e676590b541c073e449cd26eb8000c438e4988341d684ce4cb5bd5ac54437a376f5393ccc7bfa3107523ddc1f3b7 WHIRLPOOL 52607f7cb7a46af781671aea352127cafa28953c442cd61ec3545c8e9e1ed1882084a94ae682027c979ed6c81919fcfd703ab7e5cebfd5c2d36376e6b426a863 -DIST tf-40s1.tar.gz 349239 SHA256 488715d3c75ff05c08a518b0e1cd4518245842fbc1e4178c6da515e415101beb SHA512 cd51bdf60989891dd3f0f3a0e9f2fb92e6260a2dda120269713b29e58ba619abeebe9cb47a6381e26539a895071e02f34a23d914896fc5e089c5c801337b8581 WHIRLPOOL 38523dfd214cf4054e63882f86d98b889952c21c5dbdaa39a58ddd60a7ab15e743ba2b742913edb92a2d08296a68c73dc3eafb196c25748402d68882c1e2ced9 DIST tf-50b8-help.tar.gz 175591 SHA256 d9f7c2475c6641100ff3f2e877917d4ec4660df1aaa46e0a4d510479f5d11b83 SHA512 fd0fcf7e96772cbb61a97d24d0327c45b31b280bca329dfe6c680137cc25b7db5b4b79c0f608ad213cd24a0f2a67ee471ce7ee1c405b039f52033d7d87974b74 WHIRLPOOL 41d7de945730c32c845fd1b530b996a49779e5ed6701f4ee6a7e7818bcea1fe7b4d9aa7b08fd2e37e647c7561d679b98d6f71383b5d1bf49c7982c58e590178f DIST tf-50b8.tar.gz 719553 SHA256 3750a114cf947b1e3d71cecbe258cb830c39f3186c369e368d4662de9c50d989 SHA512 3b99c039d7a9c6ab7ee7b1040ff7c99fe39cbe991f373333ea7c130d54383f102f14ae33303a415f5419cd43238caffc46114e842c6964329c0999e0f506e3d0 WHIRLPOOL 35f90e6f0880b21c269bdee11c04c251918cfb46d699731045b03d709ae6699e27b4c880b0af443f09fd6d392657ae9faf3ecef693cc3ddf7be3a3bf5837b3e7 DIST tf-allrootpatch.txt 3349 SHA256 c11c5480666d7e0045680abd16e2dbd004e42036964b6a7862005402fbfe4600 SHA512 3fe44e7291d133abd04040f0f8258da6a2b7f67cab79cb1628897a4a483a0998495b6cf97eaf29ee447a650fdb16a48c846599807e570f687a256bb58179495e WHIRLPOOL 08db8f58f11a3469553c1ea1059190ea45b2c936443b12447b13acbbde5135d84bc0bcbcb3df72766d11ee38b023ea88ddbbeafe51904eacfd72e3cbfef95513 DIST tf-allsrcpatch.txt 10392 SHA256 f2829b3de7cdf99fe636bbc90e72e9c6203fd64e6ff319dd018be50145084b9a SHA512 3ac2447e05911d156509bb44e8809c06c4b1a92cbc8067d196c7e5f688fccd5186a9073001958ca0e757c9db20e9f96889fe7a5b6255495539f23208f72ec613 WHIRLPOOL de040a72a9b4a79c2cdfd30ccea06ae812ca49159e53fbcc404c4ea1006394970ad41f2d45de032d28533e1cb8d2d6018737df839d9a3f29c0de4eac053d9d3c -EBUILD tf-40-r2.ebuild 1012 SHA256 5e48a7aa0450fbd415f2a7c960275a8dcf03cb3a03cf583070ce4d083d56f638 SHA512 310a63047e138221bcb83b67cc06c8e8132ff1f4dd719eb5b1d1b313472cedc800a108cb9a9c81587d3a7ed14c722d0825591ea5a3ae4caccf430abf3099a82a WHIRLPOOL 35a577c0a011c617435af781e045f921a0f7b67c0a10f206d8d1941a2caeffbb802eb0bb99f888f8e2401879ed1c1c0d55ab58c7aef87f15f7a124f53cb4197e -EBUILD tf-50_beta8-r1.ebuild 1927 SHA256 2c52519f7c522bf1bd80d76e878debae4ce96a6e4f3827b8ecdae8c431cf30a5 SHA512 0edfe38b9f3c982ca83cb6aae9fb3d1bc755f219863f3e021ac7ef0db62b1deaed4c7edf4e1a8edb1b5b9458465260d61ecee2f8c25c54b316877fe38d845261 WHIRLPOOL 3bc52721290aa5c68e73b49433a12fac80f66a5286fa5aac565bba8bb9b4e231eb6a68e342206c1887804bdcebc0ba9b40bc0e0b9202b2be0db71ca35826b719 -MISC ChangeLog 4413 SHA256 28f8992b2951c5f277e861eaadffb16fee2d076bf041d58ec24c25de8e97c0eb SHA512 a7385bf2ab336147f02b2118b9c1ecc57c5664430ee367733dd5896adfa2a638d46d5a01e8d4e2288abeb8581d9f55da019c2d4afc20627143ddbab64e88992c WHIRLPOOL b52e9defa7efbff7debbe5fa1df5f6dc3f8de73dd705b39b7be0f645b80b51ae8f3e6429664446679cb76f0de53a4fd0e7f3338e36bdd747baca88cad57749d1 +EBUILD tf-50_beta8-r1.ebuild 1924 SHA256 4e6fa03720c8402e1d62f49afa5dc25717b0ffc13a6d54fa575b09070008fd79 SHA512 bc2f258e3d5b4300c1f0650c9569f8f08c4ee45d9248768acbd14e20ef2c7761e3ba12c880ba22ff4e075e053ed82cd8a6ffd84dca89dabe5c08ca22881bc3cf WHIRLPOOL 77f438a2bd52cf8e2ccfd314e14aa3756d3054c4cc8a0d6fda65e20609c84f453c157b5ec855f5be0aa61e8529d654137e8e5d0852b2db52a4584cc0d9499b89 +MISC ChangeLog 4589 SHA256 819c73aa861c8f17599d6447d3b1c83017ae2161d6f29dd7f406fe40bc1c5c30 SHA512 99f8445b129c74c4ba924f44f174fec6d3a1449a74a5fb3c6fa9f7a680902567734901c29b0b00e541427d7b8f2726060862597879e030c386d92d24f7dd05e1 WHIRLPOOL 8c782f18ba4287b17d847c43d78ae8dac2561015c2cc98107bfe0513b8e02b24f2fd1c1cfbe2de0b75a125ab2b97529f75c2fa6bc7db36ebea7cdb120640e7df MISC metadata.xml 343 SHA256 0bddfed9b721467cc6c068928d4b1f044d380a1eff9f2d934ca0bd52d7fcff52 SHA512 0e782524396df4b04e435b45a5fff918b9c73798116678d849842bdf0ff9c4f52b75c53ebf28ad38e3bd903855a56f75e79b691fa8771e7fd9bdf68459eafb8d WHIRLPOOL 122c735b2ae24b789c5f11666a2410dce4ce152e37e7e7753747602baa630f94b2aa6bdbab06b37e51b7095001f1181f8096770f8407292d6376e7beecf2d6d8 diff --git a/games-mud/tf/files/tf-40-gcc4.patch b/games-mud/tf/files/tf-40-gcc4.patch deleted file mode 100644 index 2b96ac03bdd0..000000000000 --- a/games-mud/tf/files/tf-40-gcc4.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 deleted file mode 100644 index e980f9d1c202..000000000000 --- a/games-mud/tf/files/tf-40-gentoo.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - --# TF="/usr/local/bin/tf-${TFVER}" --# LIBDIR="/usr/local/lib/tf-${TFVER}-lib" --# SYMLINK="/usr/local/bin/tf" -+TF="/usr/bin/tf-${TFVER}" -+LIBDIR="/usr/lib/tf-${TFVER}-lib" -+SYMLINK="/usr/bin/tf" - - - ### Manual Page. -@@ -44,8 +44,8 @@ - # uses nroff format; set MANTYPE=cat if your man uses pre-formatted - # vt100 "catman" pages. Default is "cat". - --# MANTYPE="nroff" --# MANPAGE="/usr/local/man/man1/tf.1" -+#MANTYPE="nroff" -+MANPAGE="/usr/share/man/man1/tf.1" - - - ### Flags. -@@ -109,7 +109,7 @@ - # If unixmake told you to set CC=cc, be sure to uncomment the line below - # by removing the leading "#". - --# CC=cc -+CC=gcc - # 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 deleted file mode 100644 index 137e0d8320f9..000000000000 --- a/games-mud/tf/tf-40-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2007 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.11 2008/07/18 16:15:32 mr_bones_ Exp $ - -inherit eutils - -MY_P=${P}s1 -DESCRIPTION="A small, flexible, screen-oriented MUD client (aka TinyFugue)" -HOMEPAGE="http://tf.tcp.com/~hawkeye/tf/" -SRC_URI="mirror://tinyfugue/${MY_P}.tar.gz - doc? ( mirror://tinyfugue/${MY_P}-help.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -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" \ - "${FILESDIR}/${P}-gcc4.patch" -} - -src_compile() { - echo 'y' | ./unixmake config || die - ./unixmake all || die -} - -src_install() { - dobin src/tf || die - newman src/tf.1.catman tf.1 - exeinto /usr/lib/${MY_P}-lib - doexe tf-lib/* - insinto /usr/lib/${MY_P}-lib - doins CHANGES - dodoc CHANGES CREDITS README - use doc && dohtml -r "${WORKDIR}"/${MY_P}-help -} diff --git a/games-mud/tf/tf-50_beta8-r1.ebuild b/games-mud/tf/tf-50_beta8-r1.ebuild index b428a7c2b4ad..b8a3f6695661 100644 --- a/games-mud/tf/tf-50_beta8-r1.ebuild +++ b/games-mud/tf/tf-50_beta8-r1.ebuild @@ -1,8 +1,8 @@ -# 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-mud/tf/tf-50_beta8-r1.ebuild,v 1.6 2013/09/16 21:34:09 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.7 2014/09/06 05:35:23 mr_bones_ Exp $ -EAPI=2 +EAPI=5 inherit games MY_P="${P/_beta/b}" @@ -22,11 +22,17 @@ IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl" RDEPEND="ssl? ( dev-libs/openssl ) dev-libs/libpcre" -DEPEND="${RDEPEND}" +DEPEND=${RDEPEND} S=${WORKDIR}/${MY_P} -PATCHES=( "${DISTDIR}"/tf-all*patch.txt "${FILESDIR}"/${P}-pcre.patch "${FILESDIR}"/${P}-stdarg.patch ) + +src_prepare() { + epatch \ + "${DISTDIR}"/tf-all*patch.txt \ + "${FILESDIR}"/${P}-pcre.patch \ + "${FILESDIR}"/${P}-stdarg.patch +} src_configure() { STRIP=: egamesconf \ @@ -36,20 +42,20 @@ src_configure() { $(use_enable ssl) \ $(use_enable debug core) \ $(use_enable ipv6 inet6) \ - --enable-manpage || die + --enable-manpage } src_install() { - dogamesbin src/tf || die + dogamesbin src/tf newman src/tf.1.nroffman tf.1 dodoc CHANGES CREDITS README insinto "${GAMES_DATADIR}"/${PN}-lib # the application looks for this file here if /changes is called. # see comments on bug #23274 - doins CHANGES || die + doins CHANGES insopts -m0755 - doins tf-lib/* || die + doins tf-lib/* if use doc ; then cd ../${MY_P}-help dohtml -r *.html commands topics -- cgit v1.2.3-65-gdbad