diff options
author | Nathan Phillip Brink <binki@gentoo.org> | 2014-09-03 01:58:13 +0000 |
---|---|---|
committer | Nathan Phillip Brink <binki@gentoo.org> | 2014-09-03 01:58:13 +0000 |
commit | c88f1739b3d70081b9cbefd119dead62723230a9 (patch) | |
tree | fca906c002077f01f97ea804cf4564af35434c54 | |
parent | Bump to epic5-1.1.10 and eradicate einstall() for bug #521590. (diff) | |
download | historical-c88f1739b3d70081b9cbefd119dead62723230a9.tar.gz historical-c88f1739b3d70081b9cbefd119dead62723230a9.tar.bz2 historical-c88f1739b3d70081b9cbefd119dead62723230a9.zip |
Clean old unstable versions.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x743A52E86BA81050
-rw-r--r-- | net-irc/epic5/ChangeLog | 7 | ||||
-rw-r--r-- | net-irc/epic5/Manifest | 34 | ||||
-rw-r--r-- | net-irc/epic5/epic5-1.0.ebuild | 53 | ||||
-rw-r--r-- | net-irc/epic5/epic5-1.1.7.ebuild | 81 | ||||
-rw-r--r-- | net-irc/epic5/files/epic5-1.1.2-tcl-automagic-as-needed.patch | 116 | ||||
-rw-r--r-- | net-irc/epic5/files/epic5-1.1.7-ruby-automagic-as-needed.patch | 131 |
6 files changed, 20 insertions, 402 deletions
diff --git a/net-irc/epic5/ChangeLog b/net-irc/epic5/ChangeLog index bb50fcfe3e2f..9a426827d99f 100644 --- a/net-irc/epic5/ChangeLog +++ b/net-irc/epic5/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-irc/epic5 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.22 2014/09/03 01:36:35 binki Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.23 2014/09/03 01:58:07 binki Exp $ + + 03 Sep 2014; Nathan Phillip Brink <binki@gentoo.org> -epic5-1.0.ebuild, + -epic5-1.1.7.ebuild, -files/epic5-1.1.2-tcl-automagic-as-needed.patch, + -files/epic5-1.1.7-ruby-automagic-as-needed.patch: + Clean old unstable versions. *epic5-1.1.10 (03 Sep 2014) diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest index 7fb5c58b3c0b..15a8a9ad4ce4 100644 --- a/net-irc/epic5/Manifest +++ b/net-irc/epic5/Manifest @@ -7,32 +7,26 @@ AUX epic5-1.1.10-tcl-automagic-as-needed.patch 3453 SHA256 60e469a150c04cd720e0e AUX epic5-1.1.10-without-localdir.patch 1780 SHA256 487a5614ac4099264e7ef7568858a5d83568cebc8a64d490ecd0597455e99a35 SHA512 788683fe1448793a2d8a5e50dda3dfb0aef86c44cbec11ed0a92444967a1775050bdd3ac40c44989b6fce16a6e7db154aa26d4f4c6692538eca2e661d32af7a6 WHIRLPOOL f95418fde4ae9cc8585b49f8b314d958410dc13287ffa12fffd6720d8d76dd9febceba4ed3dc8ba123884b2f1da21db88d204df75ef8f89c93680241a60614b3 AUX epic5-1.1.2-libarchive-automagic.patch 1707 SHA256 c04768c6c2fb5dbb5c879d1025cdd6a7d02e7fd3cfc25b081e58e301c2e58439 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c WHIRLPOOL eb60683cc0424e3948bed3227467c8d39f13d6bc1a8e19f907c59595f2620282343b1649301ce35c4a86c8b68170043846d742ccc69eff3a2378fa1d6bc7928d AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 SHA256 2bdb85285e83a2ab1f68eb9b43313e9e0695f7de045312dfae4ec7dcdbabd10a SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c WHIRLPOOL 34091febf2784d7cd4ef5deb6485fb17bf32bcedda17e6f899e29da876204d57a6492b8250d2a1631e46aaf1c9c2438b452c7cf3bac005cdb29931f7e70873b4 -AUX epic5-1.1.2-tcl-automagic-as-needed.patch 3455 SHA256 6456e31fc774d9dd100d8c7604631fc74a7c4dbc1bd855e8d45e274c5f241ac8 SHA512 220073be8de6b581edbf9578dcbdb246918abe5b7dcc5d8a504edeec09007702b92dad87f6648f7d92f7743032a8fd972dfe10cca870d93b1378c3ea5cc440bf WHIRLPOOL e4844e0ebcbd34035fe5cf45586b0b08b946c192f17e75b5a43565c665973d74f2347d2b14b88643dfd1ec3025b6cddaabed855f480e1e7274486a7983ed3c4a -AUX epic5-1.1.7-ruby-automagic-as-needed.patch 4097 SHA256 ccd00c37524b505120f8137fe026c47cb843a0572f50652460508ae8585d40bf SHA512 bc7e44a23f79fff3c4bae54ac01332bd9e17285c311f52efb759007b65036a013b264a94a5b06509866f9eaa0ed671d652b1c27ccbb93e9d3594d45cb34dcd2f WHIRLPOOL 050ba48d252a0f82d1a0776dff553a3e9d2c462f2a62bc11a3672bbba61e4e0caa81e755d756bdd85ce4fab2b87e000f5624ef816c622ec828206c942d9a690a DIST epic5-0.3.5.tar.bz2 722469 SHA256 7cdefea991c0b08b16896dd34f3ee2aa190a84f7ee6594527ff9e8185fe881aa SHA512 aae754397bd04f7da9904c378e57eb01fe009d7c7620d2c5547064a1aa84a4abfdc6762336aa9e7a812e92cf890e6a1c85ec55c84ff66dea60fa4b907ea0e04d WHIRLPOOL 144d33ef6c5d32f8fd6a0930ee661ad15d9213022366521d041aa16e1f6b68df2466f40c7651d5f5a8bb966abdc58e9bbe16e9d64c5a3ca48d6ded8295edddaa -DIST epic5-1.0.tar.bz2 743330 SHA256 930a8db1225e16b56d27fc2b7a02072df24694b64e96e5069d9ee37a80ca38b9 SHA512 eae716c298fd2b2b1f88b3523e75b420523251a96f1d7a3b57def4bd9027b4c538fb58daf1b651ded5df631ec83a7cda6a6ab5de9a6b193801b90e844d450ab2 WHIRLPOOL 63c717f5fc06a6d19be91f7c3f71a0547492492873172cf33c44f1116697ea2fd9d57fb13328c430e4915ef21adc570ec4eee8b57b446ea42fa66689c5b68d8b DIST epic5-1.1.10.tar.bz2 851439 SHA256 a4f19214e8eb9a7aceaed62d924d96d8c9359b186ff230c01daff398dd62cdb5 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048 WHIRLPOOL 906b919e99a4bfed78bab153aae3964850be17de958382859547fc34ded75a546714c57c4b1857597fec210359f93a1f6da3b5375a689ac435be381b101ec64a -DIST epic5-1.1.7.tar.bz2 804336 SHA256 bc6d897efc531a08ca15a18eefc7889a06e8be14019fa7676ac6886f61c7be45 SHA512 614b3485b1fe75b21b3a18b8aeb5b6ee3c9fe25a1e671591f00a61aeca83680acdb56a7588366b84ad603336c64fc34034a88d07b39794a686ce32e93cf5fe4f WHIRLPOOL a63de1856b500688efa2de0f29d36305ac68938a016af27384388be40eeb4d8c984f9cbf293078ea3f60a27157e6faef071f92754d46a3a5d3f9c17ed211b8d9 EBUILD epic5-0.3.5.ebuild 1336 SHA256 71a1180cbf87ed550ede55a9c41b34b49b726ac4a4aab23967495f654a47a8b3 SHA512 9b4fe08e52237fd5225cd6540abdf35d792c92826bfeca6d2850bf9c31524b80445a74cb7b010e6129cc4b4d42412af63f3cba77c6c896fd42392da7dba53bc3 WHIRLPOOL e9ec7d74681e68744f8242f3b2043db329e87ccad7b4db92bc512aa46c2fc5a81d8b1a7ebe48f1e69a00b31f13fbda54fc6c743422bbb3e50c31764ee1998fc2 -EBUILD epic5-1.0.ebuild 1408 SHA256 0c04b14b155ae1bf6e583f3e928c9fb162b5ab488268e20fe0bf2d037fc9eea6 SHA512 c2eaefec7499b069c45338ec727dc98f14abcccdce87771402b520df24fe42a0064143aad1186174335887e5dcd275de5283b6bdd1e2d3ff7e98e822498446df WHIRLPOOL a83a60466376df210a21201b5058548838e3782c5a21865f0b6f026a703dfb5a236546340021b78f3cf12a2343e082dd0372fefd60b54ea1c7f2b55dca9bec67 EBUILD epic5-1.1.10.ebuild 2038 SHA256 c8e3dac766f00b62c771f37af01371acd75e4115deaeb823e1115fc6ee579801 SHA512 829f328e26ea1cad6849cce31f3d879e2970f646f41f144e564ddc0f702c5a14e0bcc2d7a796fa0a3fbddbbd067f1ecce71eced4973905761c065b3d603634fe WHIRLPOOL 44e65120c910842f10023d3adf310733a906f558c24ad704fc6bdc633826cb22f6d9c6e84a6a5fb7c9ee9e5a4068d71b14ab79555aa30682d1692184571bad3f -EBUILD epic5-1.1.7.ebuild 2063 SHA256 c5af302180db4976da6e58b9dd4cfac951198ad60fe4d997414c91e7bed92cd2 SHA512 5eeb331a079668565fb1e8ed72baaead21749dc902b0d7294ada2188200aac419c5c46ed5a193fa9dd03faf1952ac70e6a6bbb9218b4534140f2ec144ef75743 WHIRLPOOL a53749516557b92409a07f26d54d83c7571cec39d94c9ae70da216e7837bd64355089b15acffb184daf93be88bb90b306fc9b551ca77cb1fb7a21cf89652867b -MISC ChangeLog 3885 SHA256 fac27e5b615a4d6a48b0f9b183066b660a7eba8f4503f306972949bf5c092515 SHA512 c5bc5dda92960e15d25c0c32875c92a545fdd36cd25094865a4b1a3a5aa77d2117d7a097a7774426e48841da0ec94dd3f4d03aaec581a0b0004e3cb2a2ff9e2f WHIRLPOOL 4730711733572813a8d9c5d90f798dcb6feca0d67383eb311943b7cbef61e8565078ed066a25044d81c4eeec0b1d2f326321e9eefcb7519366c79e836f5db440 +MISC ChangeLog 4117 SHA256 706ecc713754483e3b2b5b115791149cfefac79b94ead38072261b17dac26699 SHA512 f018982f010ec9a509d15684a9c7238bfc43ac6fa8aabdb8c3ef4c5bf30e808aa10753498b876a489c42b56a8a033ce3136e9e6ce8ac28256df2f8c403b852b6 WHIRLPOOL eea0d5f54676fb6ea934f4a43bb9227f2e518d3f37aa3acd3a523484765f734c20c978750fa0d01c3800c45474638ada99ba7591f8498d9f5bcc70d2c6051cef MISC metadata.xml 441 SHA256 e20a2146057bc3d5e2e27e659d95b2b2139d8b5c3df752d5efc257a6750cfe3f SHA512 599eeeca94a2f27712b3f1356e9510ff74fb1fbb567dea9cdf97b0f195aeb166bdb6edfa28c6666e1d92e09a685507383ba065f99d8a71e565782d7115575884 WHIRLPOOL 430bce6fe7ee5787510c1fbe4b494f23d413be35f57631b93cae0439608d19140ada145b25d049f126c3f2830922a10be0f5a99521a0665cb0fe1e7082f832f9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iQIcBAEBCAAGBQJUBnCrAAoJEHQ6UuhrqBBQVFgP/260U05i6uonmAGnwE4thWY3 -B+63b9ebJGDkYZRJazx+edcP4X6ALpgQLf+6kjs04HWf9CTU2BvByW3K49CUNRfx -tT4ESK/N8qhA1/N0oOgXzGHkRhABYqi/aFhMDsrdYl9ne6vYVavMbx07eQ+lc/ZS -rU904k5hVjydP5w/R3EK7P8f7+pskjTp3IOCkJC0szDZvyonYKQwxC6OcUPBmlWw -bUDFTEUGcwyjjAfOWjEE3sbdziiMRRrAIYtT+5DcwCxqbU9Q8cTH7I004zoDe1Qz -Yaw8pfaiHTWUhQQmGvk1v7fYsokCaRqntYKmPsGcLK/P0B/VxKelTrQBD9N+o4rX -VUBgA3XuNvdC8Raffk+EQmP/fsMyOfTQW0fv7l81V1cXZ2hgDDFoEdzF/rP5RXfK -vWjOdTLrv79GkSXUa6bGv293dDs0UrvGmtcqj1S/PVa2llTbthG+Kz27DZrihzF8 -DEIpCWZkwEXrZo62dJb9wBpDSlCE+FsbbWi/rPSaMI/o4v9ew73/8dVb5SbbC7s0 -rVI3Jlgm2i0ELyhGhIQo50jwXnYVhDAEwx31Mx4vguizgd9ruk0KI6yeDPkNRiMt -nHZ8+TutRbs+umP2Roz1CjfqWgL9dVU4kWxH3DhBAUltQcLR2h+tCo4fXVn/ASsO -enlu2lwC1BtkNZsKVoSn -=to7U +iQIcBAEBCAAGBQJUBnWwAAoJEHQ6UuhrqBBQVq0P/jfS06MjMmtgmgc6C8LUiNuz +Yms0GqWnfEvUnjH6Ci8QtdXNxzKvoj+UmSTiLE8ZD/36TCH7O++DNCtB9a6s9954 +RO4AokMq1qbQPgeRmKUiM4Li12xL4u5oQVjAZsgz+FBMq6vT8i10GhLBA8dZfrqm +heNhh261nn9gh2jNgZ7KrakVJeohuwGhwOxSXkwpnJ8IWGgg5pQt2FC3JuoXjLDc +JuuCKTjsi97ACtB7ZIj1CWbonKheCm5iZVcq7C2cHPcNCz/aq6HnLcVksTJSV7QD +9uwX+h2miYy6dL5ufYQ3W1M71nRHCeevbIPQXcOotLOFLODVsdtMkY0HBIlUnpVH +6EM8HqixW3u4vFlMHVPMgsmtOkGefkvawQeKCXeauuFDf3G0UgptcpqxoRu7afot +MBLV9GgmO+jgIX9uXqhsdtf1T6Zo3NRXKnhuz8P60MqOx+5gOpIs7ZZk++cYHQsc ++ru+R6eNHn7V7phtB7AgiqZigISoUQ0/in/RWG2Uw+pdLI3TOBNh8NM3nItrRWcj +V6DaymRBLR9x+rOTGQcJALFMG9xVyBYRORtyNwoWfry1la3Rx6AqwY9gEfBXwIKA +OU6JDHPj76XW1gHyMi5mAuqwv6keYv6Va6Z/n8RkrF3ajpg8Eq6UTcBrcnrybOJa +ovx6BNGmSjrLtx6MYyz5 +=IhKT -----END PGP SIGNATURE----- diff --git a/net-irc/epic5/epic5-1.0.ebuild b/net-irc/epic5/epic5-1.0.ebuild deleted file mode 100644 index 2e231c821bcc..000000000000 --- a/net-irc/epic5/epic5-1.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.0.ebuild,v 1.4 2012/12/23 20:14:47 ulm Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Epic5 IRC Client" -SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2" -HOMEPAGE="http://epicsol.org/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="iconv ipv6 perl ssl tcl socks5" - -DEPEND=">=sys-libs/ncurses-5.6-r2 - iconv? ( virtual/libiconv ) - perl? ( >=dev-lang/perl-5.8.8-r2 ) - ssl? ( >=dev-libs/openssl-0.9.8e-r3 ) - tcl? ( dev-lang/tcl ) - socks5? ( net-proxy/dante )" -# ruby? ( >=dev-lang/ruby-1.8.6_p287-r1 ) # fails at the moment -RDEPEND="${DEPEND}" - -src_compile() { - econf \ - --libexecdir=/usr/lib/misc \ - --without-ruby \ - $(use_with iconv) \ - $(use_with ipv6) \ - $(use_with perl) \ - $(use_with ssl) \ - $(use_with tcl tcl) \ - $(use_with socks5) - # $(use_with ruby) fails at the moment - - # parallel build failure - emake -j1 CC="$(tc-getCC)" || die "emake failed" -} - -src_install () { - einstall \ - sharedir="${D}"/usr/share \ - libexecdir="${D}"/usr/lib/misc || die "einstall failed" - - dodoc BUG_FORM COPYRIGHT README KNOWNBUGS VOTES || die - - cd "${S}"/doc || die - docinto doc - dodoc \ - *.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \ - nicknames outputhelp README.SSL SILLINESS TS4 || die -} diff --git a/net-irc/epic5/epic5-1.1.7.ebuild b/net-irc/epic5/epic5-1.1.7.ebuild deleted file mode 100644 index cb838c0e2a2a..000000000000 --- a/net-irc/epic5/epic5-1.1.7.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.7.ebuild,v 1.1 2014/03/25 08:03:27 binki Exp $ - -EAPI=4 - -USE_RUBY="ruby19" -RUBY_OPTIONAL=yes -inherit autotools eutils multilib ruby-ng toolchain-funcs - -DESCRIPTION="Epic5 IRC Client" -SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2" -HOMEPAGE="http://epicsol.org/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="archive ipv6 perl tcl ruby socks5 valgrind" - -RDEPEND="virtual/libiconv - >=dev-libs/openssl-0.9.8e-r3 - >=sys-libs/ncurses-5.6-r2 - archive? ( app-arch/libarchive ) - perl? ( >=dev-lang/perl-5.8.8-r2 ) - tcl? ( dev-lang/tcl ) - socks5? ( net-proxy/dante ) - ruby? ( $(ruby_implementations_depend) )" -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind )" -REQUIRED_USE="ruby? ( $(ruby_get_use_targets) )" - -S=${WORKDIR}/${P} - -pkg_setup() { - # bug #489608, bug #497080 - use ruby && ruby-ng_pkg_setup -} - -# Don't use ruby-ng's separated sources support: -src_unpack() { - default -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \ - "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \ - "${FILESDIR}"/${PN}-1.1.2-tcl-automagic-as-needed.patch \ - "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch - eautoconf -} - -src_configure() { - econf \ - --libexecdir="${EPREFIX}"/usr/lib/misc \ - $(use_with archive libarchive) \ - $(use_with ipv6) \ - $(use_with perl) \ - $(use_with ruby ruby "$(ruby_implementation_command ${USE_RUBY})") \ - $(use_with socks5) \ - $(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \ - $(use_with valgrind valgrind) -} - -src_compile() { - # parallel build failure - emake -j1 -} - -src_install () { - einstall \ - sharedir="${D}"/usr/share \ - libexecdir="${D}"/usr/lib/misc - - dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES - - cd "${S}"/doc || die - docinto doc - dodoc \ - *.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \ - nicknames outputhelp README.SSL SILLINESS TS4 -} diff --git a/net-irc/epic5/files/epic5-1.1.2-tcl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.2-tcl-automagic-as-needed.patch deleted file mode 100644 index 94bf16ef3100..000000000000 --- a/net-irc/epic5/files/epic5-1.1.2-tcl-automagic-as-needed.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: Nathan Phillip Brink <binki@gentoo.org> -Subject: Make dependence on TCL not be automagic (so that --with-tcl - errors out if TCL can't be found and not specifying --with-tcl - does the normal automagic behavior). Support - LDFLAGS=-Wl,--as-needed by using LIBS instead of LDFLAGS for - -ltcl as appropriate. - ---- a/configure.in -+++ b/configure.in -@@ -1122,43 +1122,41 @@ - dnl - dnl Tcl support? - dnl --AC_ARG_WITH(tcl, --[ --with-tcl[=PATH_TO_tclConfig.sh] Compile with tcl support.], --[ -- tclconfig=$withval --], -- tclconfig="yes" --) -- --if test "x$tclconfig" = "xyes" ; then -- for i in /usr/lib /usr/local/lib /usr/local/lib/tcl8.4 ; do -- if test -r $i/tclConfig.sh ; then -- tclconfig=$i/tclConfig.sh -- break; -- fi -- done --fi -+AC_ARG_WITH([tcl], [AS_HELP_STRING([--with-tcl[=PATH_TO_tclConfig.sh]], [Compile with tcl support.])], -+ [], [with_tcl=maybe]) - - AC_MSG_CHECKING(whether to support TCL) --if test "x$tclconfig" = "xno"; then -+if test "x$with_tcl" = "xno"; then - AC_MSG_RESULT(no) - else -- if test ! -r $tclconfig ; then -+ with_tcl_errormsg="You specified --with-tcl=$with_tcl but I could not find TCL. Please specify --with-tcl=/path/to/tclConfig.sh or remove --with-tcl from ./configure's commandline." -+ if test "x$with_tcl" = "xmaybe" -o "x$with_tcl" = "xyes"; then -+ for i in /usr/lib /usr/local/lib /usr/local/lib/tcl8.4 ; do -+ if test -r "$i"/tclConfig.sh ; then -+ tclconfig="$i"/tclConfig.sh -+ break; -+ fi -+ done -+ else -+ tclconfig="$with_tcl" -+ fi -+ if test ! -r "$tclconfig" ; then -+ dnl Avoid being automagic unless if the user wants us to be. -+ AS_IF([test "x$with_tcl" != "xmaybe"], -+ [AC_MSG_ERROR([$with_tcl_errormsg])]) - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) -- TCLCFLAGS=`(. $tclconfig && echo $TCL_INCLUDE_SPEC)` -- TCLLDFLAGS1=`(. $tclconfig && echo $TCL_LIB_SPEC)` -- TCLLDFLAGS2=`(. $tclconfig && echo $TCL_LIBS)` -- TCLLDFLAGS=$(eval echo "$TCLLDFLAGS1 $TCLLDFLAGS2") -+ TCLCFLAGS=`(. "$tclconfig" && echo $TCL_INCLUDE_SPEC)` -+ TCLLIBS=`(. "$tclconfig" && echo $TCL_LIB_SPEC $TCL_LIBS)` - TCLDOTOH="tcl.o" - - AC_MSG_CHECKING(whether embedded tcl works the way I expect) - have_embedded_tcl="no" - old_CFLAGS="$CFLAGS" -- old_LDFLAGS="$LDFLAGS" -+ old_LIBS="$LIBS" - CFLAGS="$CFLAGS $TCLCFLAGS" -- LDFLAGS="$LDFLAGS $TCLLDFLAGS" -+ LIBS="$LIBS $TCLLIBS" - AC_TRY_LINK([ - #include <tcl.h> - Tcl_Interp *my_tcl; -@@ -1175,14 +1173,16 @@ - ], have_embedded_tcl="yes") - - CFLAGS="$old_CFLAGS" -- LDFLAGS="$old_LDFLAGS" -+ LIBS="$old_LIBS" - if test $have_embedded_tcl = "yes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_TCL) - AC_DEFINE(TCLCFLAGS) -- AC_DEFINE(TCLLDFLAGS) -+ AC_DEFINE(TCLLIBS) - else -- AC_MSG_RESULT(no, sorry) -+ AS_IF([test "$with_tcl" != "xmaybe"], -+ [AC_MSG_ERROR([$with_tcl_errormsg])]) -+ AC_MSG_RESULT(no, sorry) - fi - fi - fi -@@ -1383,7 +1383,7 @@ - AC_SUBST(RUBYLIBS) - AC_SUBST(TCLDOTOH) - AC_SUBST(TCLCFLAGS) --AC_SUBST(TCLLDFLAGS) -+AC_SUBST(TCLLIBS) - AC_SUBST(PERLDOTOH) - AC_SUBST(PERLCFLAGS) - AC_SUBST(PERLLDFLAGS) - ---- a/source/Makefile.in -+++ b/source/Makefile.in -@@ -38,7 +38,7 @@ - epic5: $(OBJECTS) - sh info.c.sh - $(CC) $(CFLAGS) $(INCLUDES) -c info.c -- $(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLIBS@ $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS) - $(RM) info.c info.o - clean:: - $(RM) epic5 $(OBJECTS) diff --git a/net-irc/epic5/files/epic5-1.1.7-ruby-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.7-ruby-automagic-as-needed.patch deleted file mode 100644 index c745d189c64c..000000000000 --- a/net-irc/epic5/files/epic5-1.1.7-ruby-automagic-as-needed.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Nathan Phillip Brink <binki@gentoo.org> -Subject: Fix up linking against libruby when using - LDFLAGS=-Wl,--as-needed. Also allow ruby to be a non-automagic - dependency. - ---- a/configure.in Tue Mar 25 07:39:34 2014 +0000 -+++ b/configure.in Tue Mar 25 07:55:14 2014 +0000 -@@ -1168,31 +1168,28 @@ - dnl - dnl Ruby support? - dnl --AC_ARG_WITH(ruby, --[ --with-ruby[=PATH_TO_RUBY_EXE] Compile with ruby support.], --[ -- rubyexe=$withval --], -- rubyexe=yes -- for i in ruby ruby20 ruby19 ruby18 ruby2.0 ruby1.9.1 ruby1.9 ruby1.8; do -- $i -h 2>&1 >/dev/null && rubyexe=$i && break -- done -- if test "x$rubyexe" = "xyes"; then -- rubyexe=no -- fi --) -+AC_ARG_WITH([ruby], -+ [AS_HELP_STRING([--with-ruby[=PATH_TO_RUBY_EXE]], [Compile with ruby support.])], -+ [], [with_ruby=maybe]) - --if test "x$rubyexe" = "xno"; then -+with_ruby_errormsg="--with-ruby was specified but I could not locate ruby. Please try specifying --with-ruby=/path/to/ruby or --without-ruby." -+AC_MSG_CHECKING([whether to support Ruby]) -+if test "x$with_ruby" = "xno" ; then - AC_MSG_CHECKING(whether to support Ruby) - AC_MSG_RESULT(no) - else -- AC_CHECK_PROG(RUBYPROG, $rubyexe, "yes", "no") -- AC_MSG_CHECKING(whether to support Ruby) -- if test $RUBYPROG != "yes" ; then -- AC_MSG_RESULT(no) -+ AC_MSG_RESULT(yes) -+ AS_IF([test "x$with_ruby" = "xyes" -o "x$with_ruby" = "xmaybe"], -+ [rubyexe=ruby], -+ [rubyexe="$with_ruby"]) -+ dnl Support --with-ruby being passed a full path instead of just an executable name. -+ AS_IF([test -x "$rubyexe"], -+ [RUBYPROG=yes], -+ [AC_CHECK_PROG([RUBYPROG], [$rubyexe], [yes], [no])]) -+ if test "x$RUBYPROG" = xno ; then -+ AS_IF([test "x$with_ruby" != "xmaybe"], -+ [AC_MSG_ERROR([$with_ruby_errormsg])]) - else -- AC_MSG_RESULT(yes) -- - dnl ---- - dnl Look first for Ruby 1.9 - incdir=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["rubyhdrdir"]]'` -@@ -1208,15 +1205,15 @@ - - rubylibs=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBYARG"]]'` - extralibs=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["LIBS"]]'` -- RUBYLDFLAGS="$rubylibs $extralibs" -+ RUBYLIBS="$rubylibs $extralibs" - RUBYDOTOH="ruby.o" - - AC_MSG_CHECKING(whether embedded ruby works the way I expect) - have_embedded_ruby="no" - old_CFLAGS="$CFLAGS" -- old_LDFLAGS="$LDFLAGS" -+ old_LIBS="$LIBS" - CFLAGS="$CFLAGS $RUBYCFLAGS" -- LDFLAGS="$LDFLAGS $RUBYLDFLAGS" -+ LIBS="$LIBS $RUBYLIBS" - AC_TRY_LINK([ - #include <ruby.h> - VALUE epic_echo (VALUE module, VALUE string) -@@ -1241,9 +1238,9 @@ - AC_MSG_RESULT(no) - AC_MSG_CHECKING(whether ruby requires -pthread to link) - RUBYCFLAGS="$RUBYCFLAGS -pthread" -- RUBYLDFLAGS="$RUBYLDFLAGS -pthread" -- CFLAGS="$CFLAGS $RUBYCFLAGS" -- LDFLAGS="$LDFLAGS $RUBYLDFLAGS" -+ RUBYLIBS="$RUBYLIBS -pthread" -+ CFLAGS="$old_CFLAGS $RUBYCFLAGS" -+ LIBS="$old_LIBS $RUBYLIBS" - - AC_TRY_LINK([ - #include <ruby.h> -@@ -1268,17 +1265,19 @@ - fi - - CFLAGS="$old_CFLAGS" -- LDFLAGS="$old_LDFLAGS" -+ LIBS="$old_LIBS" - if test $have_embedded_ruby = "yes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RUBY) - AC_DEFINE(RUBYCFLAGS) -- AC_DEFINE(RUBYLDFLAGS) -+ AC_DEFINE(RUBYLIBS) - else -+ AS_IF([test "x$with_ruby" != "xmaybe"], -+ [AC_MSG_ERROR([$with_ruby_errormsg])]) - RUBYDOTOH="" - HAVE_RUBY="" - RUBYCFLAGS="" -- RUBYLDFLAGS="" -+ RUBYLIBS="" - AC_MSG_RESULT(no, sorry) - fi - fi -@@ -1376,7 +1375,7 @@ - AC_SUBST(LDFLAGS) - AC_SUBST(RUBYDOTOH) - AC_SUBST(RUBYCFLAGS) --AC_SUBST(RUBYLDFLAGS) -+AC_SUBST(RUBYLIBS) - AC_SUBST(TCLDOTOH) - AC_SUBST(TCLCFLAGS) - AC_SUBST(TCLLDFLAGS) ---- a/source/Makefile.in Tue Mar 25 07:39:34 2014 +0000 -+++ b/source/Makefile.in Tue Mar 25 07:55:14 2014 +0000 -@@ -38,7 +38,7 @@ - epic5: $(OBJECTS) - sh info.c.sh - $(CC) $(CFLAGS) $(INCLUDES) -c info.c -- $(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLDFLAGS@ $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLIBS@ $(LIBS) - $(RM) info.c info.o - clean:: - $(RM) epic5 $(OBJECTS) |