From 8d24d516a127b04f4819268646ccc0f0fa98283b Mon Sep 17 00:00:00 2001 From: David Leverton Date: Tue, 9 Jul 2013 18:48:22 +0100 Subject: [PATCH] Bump command-line Inform 7 to 6G60 Now using Inform 6 from source, since 6.32 is out. --- dev-lang/inform/Manifest | 33 ++++---- dev-lang/inform/files/inform7-6G60-paths.patch | 34 ++++++++ dev-lang/inform/inform-7.6g_p60.ebuild | 113 +++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 15 deletions(-) rewrite dev-lang/inform/Manifest (100%) create mode 100644 dev-lang/inform/files/inform7-6G60-paths.patch create mode 100644 dev-lang/inform/inform-7.6g_p60.ebuild diff --git a/dev-lang/inform/Manifest b/dev-lang/inform/Manifest dissimilarity index 100% index ef66cac..8590bd6 100644 --- a/dev-lang/inform/Manifest +++ b/dev-lang/inform/Manifest @@ -1,15 +1,18 @@ -AUX glulx-statuswin.patch 2263 RMD160 45adb10652e33130632648837f4cb1c2aed13a83 SHA1 e626b3c82eae7342a9850cfe22b200eb275ef1e3 SHA256 820d5b0e67d3942c0f3bd5fa97a71009c804b6e86991ee03900bada247e6978d -AUX inform7-5J39-paths.patch 778 RMD160 88297b0c456d3206f776ae83f8f24192d06b5f7b SHA1 80be29ac03bc87839fcbd4a2976e1431ba7da304 SHA256 9eead021e95bd965df6f69f21c940b565f9816af11f2fcd519e0ea79b6557052 -EBUILD inform-7.5t_p18.ebuild 4216 RMD160 f2dba7831e74323bb801e884fbbc58b3e2865795 SHA1 f2b7ddedd53d473de1aa0266b75dba5b9d43e1e1 SHA256 988aa5e789c417aba61eb2484dbe22eb3697a4926893b55a04cfe91924863ece -EBUILD inform-7.5u_p92-r2.ebuild 4249 RMD160 686fa44b6f22508e0d8da6b3a811a6f2994b0995 SHA1 e2c555ba85bddb3d32524ba74dc8da00b1ad8c19 SHA256 144b9b5daecd1aae678e61d75426577bfb56b31ff9c0d2d66baf03fac36a7d5a -EBUILD inform-7.5z_p71.ebuild 4237 RMD160 b5fa99939f14fbfb296cc25ce3340e4e693b120c SHA1 78d92a77bcc1a4b2640d047b419ba147f69d7c2e SHA256 d2458b5402981b564b5926186c3fecd5f39dfaa0ce7c571f2c922c6fe5271199 -EBUILD inform-7.6e_p72.ebuild 4150 RMD160 2439a0c9d1ba88416421a71ca38b6d1c8dba63db SHA1 2d2bc03dac5c568503969f8fff950882473b049c SHA256 a0e2f2577c2f7aa8b2e88c8ee0422463119919da9593b8dd16701affe76c2061 -MISC metadata.xml 345 RMD160 7334f7182efbdc50efe436293c5a9fed6a8f5d70 SHA1 adebe1db6195e45d0672b56d071dc76a8e4018db SHA256 cec1e199e41849d774e309816144baf98de60422ff9c81539cec8238d60d90cf -DIST I7_6E72_Linux_all.tar.gz 21429098 RMD160 3d6a735f1a7153713f896e78779b6247a2ffcad3 SHA1 450b5e5c5c844a6ae9defe02c9ce3eea91830bf8 SHA256 15bf3a929a1e51b8b1bfa912e69036b340d779a4a88c4900684103fde171b816 -DIST I7_5U92_Linux_i386.tar.gz 7238203 RMD160 e9599505f9030f28275bde8d5a9045b06b79f35b SHA1 f85e983fd8d82a776ab91e05027867b8f8e31b9e SHA256 296a0719aff1b47039414aca84a046602ef949534da1cd496118ac672729114f -DIST I7_5U92_Linux_all.tar.gz 17019723 RMD160 37e626568813981922522e71ebce95d99c26c1eb SHA1 87364dd9c066d5a6d93726482190595019e4fcd0 SHA256 3d9c585f841ab313e857a2779ba640667f64dc2975fdc8b0b85808ad5a1a2ea5 -DIST I7_5T18_Linux_i386.tar.gz 7776160 RMD160 0a478fdaadac4019c0cb8d27e7d179d3d0f57d9d SHA1 a2db6cd55c30e6582d0a0e50ed633fc0bbfb9cd3 SHA256 6634fb9ee8802adbb30a821e319a4af40840270eda27dbe0964bf20a0577f8b7 -DIST I7_5T18_Linux_all.tar.gz 16096813 RMD160 a5659d9aed7800e7e27d7088a4e4ac7e494919f4 SHA1 7c6edda8c5c4bf38ab0500a0dbd70617a75830f7 SHA256 a5617fc92281a84f84b03b9d7ff204945cf05be234f5f5d2b229698860079a68 -DIST I7_5Z71_Linux_x86_64.tar.gz 8819453 RMD160 3469d79530b2159263b3ef2eb59752e1b1614476 SHA1 45e7bf63b8946b67811620bd7065a9d7ffc48804 SHA256 a344eba468a03af913db40befa40c9fc74446153f83b0f54139c5283e89e1cec -DIST I7_5Z71_Linux_i386.tar.gz 8007406 RMD160 3588eded90bcd1c5a232f3c84244e79dab859525 SHA1 d5551133f3744e814954cdff4e55f0d5e603f2ab SHA256 218c9e1e441ae300941cee7afe9551de162eb671d56929eaca0ad413b911c96f -DIST I7_5Z71_Linux_all.tar.gz 20029831 RMD160 3637d06936a66f983c2d18de820c84ada0a1e6e0 SHA1 4a6690028b78251e65bae5c4f1e4be3af00d13d5 SHA256 818251f8765885a95c332a97f43e417651670d0ffead57783c3742cff217dff3 +AUX glulx-statuswin.patch 2263 SHA256 820d5b0e67d3942c0f3bd5fa97a71009c804b6e86991ee03900bada247e6978d SHA512 6f250cbb122b38cbbe1edd0ff38b26b6b9b385bb6d19175086e5ca0765bc4be47190f946d849e9b4bcee634767f4a0346389db43517c120590b89beb7a98d999 WHIRLPOOL f29979904893262300e0c6d5d967ba1717b80ddba994c501b0dca2506bfc7b9ec3f409254857f42a5fe2cde1d1aae8206bcd9d4cb63a0417207ffa760adcb4a6 +AUX inform7-5J39-paths.patch 778 SHA256 9eead021e95bd965df6f69f21c940b565f9816af11f2fcd519e0ea79b6557052 SHA512 1c15200500363418c54fcff733e7d923ff4d90040ee2fa15d89cdb6c54e306e25b2db9b967599f0f3cbb37e1c9da28b18fb031b3c9299bc75adfdfa3723f999e WHIRLPOOL 909ca317c3d23ddd8ae4c4881863682b59c1d07a9bb67ba03c21dc59476f3e3fd34a71447ad8926a593f79b566d0bb3d15ff33adb3c10c113a2301f7d2f1459a +AUX inform7-6G60-paths.patch 949 SHA256 576a1c688c538d9bc3e8f818c77087686f1b484027bcf026d1132477352293c3 SHA512 962b8b9784adce8872f7d5d5b34cc545319b0938b5a8dcc553650f0a057bc00e0a81d26c432ba017e2395aaf356716f91644bc2bb42b937c55bf3443008a6eec WHIRLPOOL ff3d3c7032bf4084507da5be8b51e0579ec7c0c2607e7973d7e466b5d3bc45e58dc51a3d57fdd64ee96a626e5de7ce875a1284bb26984778989778c8e8f63e0a +DIST I7_5T18_Linux_all.tar.gz 16096813 SHA256 a5617fc92281a84f84b03b9d7ff204945cf05be234f5f5d2b229698860079a68 SHA512 89761f739098ab5cd7e56cd51cdbeb6bea4b5c5d8cdcfd16b89920cc29a795e2fe5a1da82e3aa5f227ff442c3b926c95de353fe0ba2dd498eced3aaf7235f5f7 WHIRLPOOL ba1a6e0e60f732adfb8ed861fb838716ae1c1f70ec9ec4935c82284bb55bc306ebc060589e0063ab74f652346615f6406c41420220b75f922007c37ceb4a209c +DIST I7_5T18_Linux_i386.tar.gz 7776160 SHA256 6634fb9ee8802adbb30a821e319a4af40840270eda27dbe0964bf20a0577f8b7 SHA512 b18d784cda9cde02dadc9d5456c8cc7bb3ee97b456f7ba28c028ae6ebca175a5298fd5bd2c151f697c9d5982461f609615f2565dce752907bb92a681df24e74c WHIRLPOOL 8f3f4027d23874e897bd9a2d150f0e3b1be505729f631989f4d20f99a580064f3047118938f3d0ecfb9fb1d97889ca1ee03b7c8a653791d55a9bbff1739c1b06 +DIST I7_5U92_Linux_all.tar.gz 17019723 SHA256 3d9c585f841ab313e857a2779ba640667f64dc2975fdc8b0b85808ad5a1a2ea5 SHA512 3a1bdf94b75b4c42a40701cb477e2c76dc39245617787650534e099066c031158933179befc59d09e6a2ffa408873d4f3c3fa05193b106641d35fdce9f5f3e4d WHIRLPOOL 2652866a34edad0245ed6608a9dc348f0a49e118577977d310cb7c7191d9a129ec88b7bf3b9ee90aac748b6e1b332e6aade3aa0239a1bc647695b66e2da0e642 +DIST I7_5U92_Linux_i386.tar.gz 7238203 SHA256 296a0719aff1b47039414aca84a046602ef949534da1cd496118ac672729114f SHA512 e4fabe2ae79532b45956da84c143bb51f48f05d11e17ea5e912f37df1110bb726544d1c67bcd057a64fb439478c94e802db633d42f185c3742d61ca7eb032e2e WHIRLPOOL 48ef5a3674edbbf3cbc486ac64d67642a2aced9ab108a64bb1fd2cb8ee9802e9edc8497860b876ba517fb9bc51efc90c226555117f7c96cc645d0d5a73ca9957 +DIST I7_5Z71_Linux_all.tar.gz 20029831 SHA256 818251f8765885a95c332a97f43e417651670d0ffead57783c3742cff217dff3 SHA512 2736bcf62eee7b92892141a0d86b819267c1a2191a5f4ba94d76251a025c7170284a41e170338e95615769df4414e5508e6fe96026ad4ee4035e4d740d62e776 WHIRLPOOL e3a4405212b9dcbd159f415dd3d06875b9117915b20c211b1ab6b53ce9c1e67a969c01204a8dc68bccd58819793800e84707b822a3932cae983bc3ad38e9deb5 +DIST I7_5Z71_Linux_i386.tar.gz 8007406 SHA256 218c9e1e441ae300941cee7afe9551de162eb671d56929eaca0ad413b911c96f SHA512 7df77d366542dcd338bec832076cabe5e837c3e0250a0fc1786acffb66bd15538147ac6e2de12ceaca389d0854200e307bcecc7ad779175fda3e4628ace45670 WHIRLPOOL 883b488c235e803cccb302842b7d35c4c8dd41da28de6818a5df0ac7e9314ffdbe06662290c646664ff7248b7015dc9aadc1be6f16250aac4d742a6cdf1db41b +DIST I7_5Z71_Linux_x86_64.tar.gz 8819453 SHA256 a344eba468a03af913db40befa40c9fc74446153f83b0f54139c5283e89e1cec SHA512 90cee1f7e41521a96ee64b535cca153bd32a776c573a6225b0e80bd2c2924206d092c29b27ac26595939c0df46e409e0335c590f471f95e5d49c2f16d28b4e63 WHIRLPOOL 15de3a2b70fe6467825ea6594857412f732c6bde525755c173c53face46a5b378cb7917d281a6754e529abca3f28e3c48933deebeb4d592fa8362e363439d9ee +DIST I7_6E72_Linux_all.tar.gz 21429098 SHA256 15bf3a929a1e51b8b1bfa912e69036b340d779a4a88c4900684103fde171b816 SHA512 c3a2f4ec9a96f95894195ca54dda145aad95b436f0639cba7cbcb0a68209881a6b823cae7f6db9f489986ab64651188a5f213554193918f79b45f77c651670c7 WHIRLPOOL fcaa8dbcddf15ae4e041b430c3e2167b044654f9932f41b8476b7842faeeadfcd3628bd75dc765a8562140b31c4077348460f0d9b392b67905d6c74b1187b3b8 +DIST I7_6G60_Linux_all.tar.gz 22446288 SHA256 b4db9211375bd4fe9d0ff79cf7fbdba1df3701bd4189b2e3da0e97a8da961561 SHA512 8d87e21703e27d6060184cd3f7c08496312a3edb0ecd1b7ee7477ba92dd8f65e852ec6435719c36b83043de5fbea39426108dd6295b05d6cd5388456163ae5b3 WHIRLPOOL c32796ce88b6faae1536d736045b1d1f9264e9651959554b8f571f979edad33278cfd9a77bc8158a89c4fb482398b86d6aedfa754d4c691a95f85d3b5a6219ae +EBUILD inform-7.5t_p18.ebuild 4216 SHA256 988aa5e789c417aba61eb2484dbe22eb3697a4926893b55a04cfe91924863ece SHA512 a52073c5d03a75bfeb50dd2e43ab8f375e92f75fd5155490ecd7f5afc1c08ba8b2cd0089e08fae3932655ef2878dce168f5c0b6faef44c8b73e51327374a0d80 WHIRLPOOL 68e3b30dad1a2095e4d8f71f707999b12019ebed5b0768c581a4716a39840e4cc9e8d3396a98cc28730bbc68d497883348d550a3234e3cd97e6b17d5f8edff35 +EBUILD inform-7.5u_p92-r2.ebuild 4249 SHA256 144b9b5daecd1aae678e61d75426577bfb56b31ff9c0d2d66baf03fac36a7d5a SHA512 19c69613291cdbe4abd71fc762ced7fe784797a41f2cebbc680c2db35acb99d1d2657699e7921951c6bf9d1c632ab62bdf001b6de8b7832eaacccd77522b4235 WHIRLPOOL 2e2974533f1b78b761b4d79e78fe5905f04cb116579165d5f9113210f936586919a011a7e9a4e7adf26b14840fe012ecac43f7c707ce1ce27637c7de4cc3f2dd +EBUILD inform-7.5z_p71.ebuild 4237 SHA256 d2458b5402981b564b5926186c3fecd5f39dfaa0ce7c571f2c922c6fe5271199 SHA512 3d732f409657aa4f855dde0e4ab9ceffcdadea3ae8ab476be20884602d54ea67b53d9551f684712654d1362a11d5319308c0bba2526cef3666aa678b77bb7a7c WHIRLPOOL 7e425e4e88e696fe28f88698cf9e9e2c71e32f1db648a2bd4935d202850d8a5924b4c8883eae01316209043ed444ed9187425b565ebf8cfb3a379817f6ca31bb +EBUILD inform-7.6e_p72.ebuild 4150 SHA256 a0e2f2577c2f7aa8b2e88c8ee0422463119919da9593b8dd16701affe76c2061 SHA512 c36939250297326a1c03cc987057025b6418469529eb59e6dd4f6dcd45a089570e9ce7474d35ff5072cba35baaf72e890ef0aa8f80e273d71c16dd90d43da192 WHIRLPOOL 9f9e115e6b8acc7435ebd70d21a95b4bef308f239ddb3efdcbec2ad20e164eb57255931f49f8e39e7dff122ef28d3c91541083f8a070295f84aae37d28edeefb +EBUILD inform-7.6g_p60.ebuild 3642 SHA256 a1a9d7853c838a898039373cfd267bc9cd95e4336f36dd5ff559c473cd1ca71f SHA512 5dc5a53b4cf0d5396ea8e1771e76791f045a485f8a63e321dbd313eab7bbcd9eae13de04db52f5e7b880cb4a3af1c31e3da62b924140a27954113a27ccfdf62c WHIRLPOOL 4a145bcb0e6479eeb9e776c4eda2976fdeefac6460fa87d785fa760cc7b1c2771ad1d6f2911944dab2965cf42b980247a3c5538a6215d732af95ff10fb161eed +MISC metadata.xml 345 SHA256 cec1e199e41849d774e309816144baf98de60422ff9c81539cec8238d60d90cf SHA512 46f8f74c3ec2136a000a33b0d68e03f818ba575b51e7af203f779b7f8f03954ce8abe940ba7f638fc2045731b51f32fc57404f0467a12319fc95651175d1d456 WHIRLPOOL 5cd5e379a9cbf767a27057334fb0eca10ee5e4f84051c588e665f3babc89c62ee19af75c3e3b6ed468bf36e2fa90cb8b24eca976ba3f946b8ac5c32afb0b7c64 diff --git a/dev-lang/inform/files/inform7-6G60-paths.patch b/dev-lang/inform/files/inform7-6G60-paths.patch new file mode 100644 index 0000000..cf9b0bb --- /dev/null +++ b/dev-lang/inform/files/inform7-6G60-paths.patch @@ -0,0 +1,34 @@ +Source: dleverton +Upstream: n/a +Reason: change some default paths around to better suit Gentoo + +--- bin/i7~ 2010-12-29 03:07:27.000000000 +0000 ++++ bin/i7 2013-07-09 18:33:39.000000000 +0100 +@@ -4,13 +4,13 @@ + use Getopt::Std; + $Getopt::Std::STANDARD_HELP_VERSION=1; + +-$idesettings{'PREFIX'}="/usr/local"; ++$idesettings{'PREFIX'}="/usr"; + $idesettings{'NAME'}=""; + + $VERSION = "6G60"; + + $NI = "$idesettings{'PREFIX'}/libexec/ni"; +-$I6 = "$idesettings{'PREFIX'}/libexec/inform-6.32-biplatform"; ++$I6 = "/usr/bin/inform"; + $BLORB = "$idesettings{'PREFIX'}/libexec/cBlorb"; + $NONINTERACTIVE = 0; + $STORY = ""; +@@ -48,9 +48,9 @@ + } + } + +-$idesettings{'ZTERP'}="$idesettings{'PREFIX'}/libexec/dumb-frotz"; ++$idesettings{'ZTERP'}="/usr/games/bin/glkfrotz"; + $idesettings{'ZTERPBG'}=0; +-$idesettings{'GTERP'}="$idesettings{'PREFIX'}/libexec/dumb-glulxe"; ++$idesettings{'GTERP'}="/usr/games/bin/glulxe"; + $idesettings{'GTERPBG'}=0; + + $CLEANUP = ""; diff --git a/dev-lang/inform/inform-7.6g_p60.ebuild b/dev-lang/inform/inform-7.6g_p60.ebuild new file mode 100644 index 0000000..26a5bea --- /dev/null +++ b/dev-lang/inform/inform-7.6g_p60.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=1 + +inherit eutils versionator + +MY_MAJOR=$(get_version_component_range 2) +MY_LETTER=$(get_version_component_range 3) +MY_MINOR=$(get_version_component_range 4) + +MY_LOWERS=abcdefghijklmnopqrstuvwxyz +MY_UPPERS=ABCDEFGHIJKLMNOPQRSTUVWXYZ +MY_INDEX=${MY_LOWERS%${MY_LETTER}*} +MY_UPPER=${MY_UPPERS:${#MY_INDEX}:1} + +MY_PV=${MY_MAJOR}${MY_UPPER}${MY_MINOR#p} +DESCRIPTION="Design system for interactive fiction" +HOMEPAGE="http://inform7.com/" +SRC_URI="http://inform7.com/download/content/${MY_PV}/I7_${MY_PV}_Linux_all.tar.gz" + +# "Inform" for the core, "GPL-2" for the i7 user-interface script +LICENSE="Inform GPL-2" +SLOT="7" +#KEYWORDS="-* ~amd64 ~arm ~ppc ~s390 ~x86" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RESTRICT="strip" + +DEPEND="" +# i7 is written in perl, and uses uuidgen from e2fsprogs +RDEPEND="dev-lang/perl + sys-fs/e2fsprogs + games-engines/glkfrotz + games-engines/glulxe + >=dev-lang/inform-6.32:0" + +S=${WORKDIR}/inform7-${MY_PV} + +src_unpack() { + unpack ${A} + cd "${S}" + + mkdir usr + cd usr + + case ${CHOST} in + # XXX if the arm team wants to keyword this, someone who knows + # how these things work should probably restrict this to + # compatible CHOSTS + arm*-*) MY_ARCH=armv5tel ;; + i?86-*) MY_ARCH=i386 ;; + # XXX does it work on ppc64? (statically linked, so doesn't + # need 32bit libs) + powerpc*-*) MY_ARCH=ppc ;; + s390-*) MY_ARCH=s390 ;; + s390x-*) MY_ARCH=s390x ;; + x86_64-*) MY_ARCH=x86_64 ;; + *) die "unsupported CHOST" + esac + + unpack ./../inform7-common_${MY_PV}_all.tar.gz + unpack ./../inform7-compilers_${MY_PV}_${MY_ARCH}.tar.gz + # We don't currently use anything from here, but a future version + # might include more interpreters. + unpack ./../inform7-interpreters_${MY_PV}_${MY_ARCH}.tar.gz + + epatch "${FILESDIR}"/inform7-6G60-paths.patch + + find . -name '._*' -delete || die "find failed" +} + +src_install() { + cp -pPR usr "${D}" || die "cp usr failed" + cd "${D}"/usr + + dodoc share/doc/inform7/README || die "dodoc README failed" + rm share/doc/inform7/README + docinto ChangeLogs + dodoc share/doc/inform7/ChangeLogs/*.txt || die "dodoc ChangeLogs failed" + rm share/doc/inform7/ChangeLogs/*.txt + rmdir share/doc/inform7/ChangeLogs + rm share/doc/inform7/INSTALL + rmdir share/doc/inform7 || die "rmdir doc/inform7 failed" + + if use doc; then + mv share/inform7/Documentation share/doc/${PF}/html || die "mv Documentation failed" + dosym /usr/share/doc/${PF}/html /usr/share/inform7/Documentation || die "dosym Documentation failed" + else + rm -r share/inform7/Documentation || die "rm -r Documentation failed" + fi + + # Don't use the bundled interpreter binaries or Inform 6 compiler. + # + # The binaries that we do keep are unpacked into /usr/share with + # symlinks in /usr/libexec, which is silly; move them to libexec + # (there doesn't seem to be any need to recreate the symlinks + # going the other way: the i7 script accesses them from libexec). + # List the kept binaries explicitly (instead of using a wildcard) + # so that if a future version adds more, the rmdir will fail and + # alert the maintainer that changes (new dependencies etc) might + # be required. + rm libexec/* || die "rm libexec failed" + mv share/inform7/Compilers/{ni,cBlorb} libexec || die "mv Compilers failed" + rm share/inform7/Compilers/inform-6.32-biplatform + rmdir share/inform7/Compilers || die "rmdir Compilers failed" + rm share/inform7/Interpreters/{dumb-frotz,dumb-glulxe,dumb-git} + rmdir share/inform7/Interpreters || die "rmdir Interpreters failed" + + mv man share/man || die "mv man failed" +} -- 2.11.4.GIT