commit: 288a2f63a449736b4a2af033ed84efba7f458098 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed May 15 15:35:05 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed May 15 18:38:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288a2f63
net-irc/epic5: Drop 1.1.10-r2 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-irc/epic5/Manifest | 1 - net-irc/epic5/epic5-1.1.10-r2.ebuild | 78 ------------ .../epic5-1.1.10-ruby-automagic-as-needed.patch | 134 --------------------- .../epic5/files/epic5-1.1.10-socks5-libsocks.patch | 32 ----- .../epic5-1.1.10-tcl-automagic-as-needed.patch | 116 ------------------ .../files/epic5-1.1.10-without-localdir.patch | 66 ---------- net-irc/epic5/files/epic5-1.1.10-xlocale.patch | 11 -- .../files/epic5-1.1.2-libarchive-automagic.patch | 53 -------- .../epic5-1.1.2-perl-automagic-as-needed.patch | 114 ------------------ 9 files changed, 605 deletions(-) diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest index 84edd9778ef..577557d4501 100644 --- a/net-irc/epic5/Manifest +++ b/net-irc/epic5/Manifest @@ -1,2 +1 @@ -DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25 diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild deleted file mode 100644 index 85532830333..00000000000 --- a/net-irc/epic5/epic5-1.1.10-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24" - -inherit autotools ruby-single 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=" - >=dev-libs/openssl-0.9.8e-r3:0 - >=sys-libs/ncurses-5.6-r2:0 - virtual/libiconv - archive? ( app-arch/libarchive ) - perl? ( >=dev-lang/perl-5.8.8-r2 ) - tcl? ( dev-lang/tcl:0 ) - socks5? ( net-proxy/dante ) - ruby? ( ${RUBY_DEPS} )" -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind )" - -S=${WORKDIR}/${P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch - "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch - "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch - "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch - "${FILESDIR}"/${P}-without-localdir.patch - "${FILESDIR}"/${P}-socks5-libsocks.patch - "${FILESDIR}"/${P}-xlocale.patch -) - -src_prepare() { - default - eautoconf -} - -src_configure() { - # Because of our REQUIRED_USE constraints above, we know that - # ruby_get_use_implementations will only ever return one ruby - # implementation. - econf \ - --libexecdir="${EPREFIX}"/usr/lib/misc \ - $(use_with archive libarchive) \ - $(use_with ipv6) \ - $(use_with perl) \ - $(use_with 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 () { - default - - dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES - - cd "${S}"/doc || die - docinto doc - dodoc \ - *.txt colors EPIC* IRCII_VERSIONS missing \ - nicknames outputhelp README.SSL SILLINESS TS4 -} diff --git a/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch deleted file mode 100644 index ba277ca8f60..00000000000 --- a/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Nathan Phillip Brink <bi...@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,34 +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 --) -- --if test "x$rubyexe" = "xyes"; then -- 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 --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) diff --git a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch deleted file mode 100644 index 4aef0c7d6af..00000000000 --- a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Nathan Phillip Brink <bi...@gentoo.org> -Subject: Use -lsocks instead of -lsocks5 for `./configure --with-socks5`. - ---- a/configure.in -+++ b/configure.in -@@ -861,7 +861,7 @@ - - AC_MSG_CHECKING(whether to support SOCKS) - AC_ARG_WITH(socks, --[ --with-socks[=PATH] Compile with SOCKS firewall traversal support.], -+[ --with-socks[=PATH] Compile with SOCKS (libsocks without socks.h) firewall traversal support.], - [ case "$withval" in - no) - AC_MSG_RESULT(no) -@@ -887,7 +887,7 @@ - - AC_MSG_CHECKING(whether to support SOCKS5) - AC_ARG_WITH(socks5, --[ --with-socks5[=PATH] Compile with SOCKS5 firewall traversal support.], -+[ --with-socks5[=PATH] Compile with SOCKS5 (libsocks with socks.h) firewall traversal support.], - [ case "$withval" in - no) - AC_MSG_RESULT(no) -@@ -899,7 +899,7 @@ - fi - - AC_MSG_RESULT(yes) -- LIBS="$LIBS -lsocks5" -+ LIBS="$LIBS -lsocks" - AC_DEFINE(SOCKS) - AC_DEFINE(USE_SOCKS5) - ;; diff --git a/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch deleted file mode 100644 index 5b5b932b06b..00000000000 --- a/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: Nathan Phillip Brink <bi...@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 $localdir/lib $localdir/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.10-without-localdir.patch b/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch deleted file mode 100644 index 4caccad764a..00000000000 --- a/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Nathan Phillip Brink <bi...@gentoo.org> -Subject: Drop some automatic probing of /usr/local and /opt and etc., Gentoo users know to use CPPFLAGS/CFLAGS/LDFLAGS. -Date: 2014-08-30 - ---- a/configure.in -+++ b/configure.in -@@ -33,58 +33,6 @@ - AC_AIX - - dnl ---------------------------------------------------------- --AC_MSG_CHECKING([for an extra library directory]) --AC_ARG_WITH([localdir], --[ --with-localdir=/usr/local An extra directory to look for stuff.],[ -- if test "x$withval" = "x" ; then -- if test -d /usr/local/lib ; then -- withval="/usr/local" -- elif test -d /usr/pkg/lib ; then -- withval="/usr/pkg" -- elif test -d /opt/lib ; then -- withval="/opt" -- else -- with_extra_libdir="no" -- fi -- elif test -d "$withval" ; then -- with_extra_libdir="yes" -- else -- with_extra_libdir="no" -- fi -- -- if test "x$withval" != "x" ; then -- LIBS="-L$withval/lib $LIBS" -- CFLAGS="-I$withval/include/ $CFLAGS" -- localdir=$withdir -- with_extra_libdir="yes" -- else -- with_extra_libdir="no" -- fi --],[ -- if test "x$withval" = "x" ; then -- if test -d /usr/local/lib ; then -- withval="/usr/local" -- elif test -d /usr/pkg/lib ; then -- withval="/usr/pkg" -- elif test -d /opt/lib ; then -- withval="/opt" -- else -- with_extra_libdir="no" -- fi -- fi -- -- if test "x$withval" != "x" ; then -- LIBS="-L$withval/lib $LIBS" -- CFLAGS="-I$withval/include/ $CFLAGS" -- localdir=$withdir -- with_extra_libdir="yes" -- else -- with_extra_libdir="no" -- fi --]) --AC_MSG_RESULT([$with_extra_libdir, $withval]) -- --dnl ---------------------------------------------------------- - dnl ---------------------------------------------------------- - dnl - dnl System specific checks - diff --git a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch b/net-irc/epic5/files/epic5-1.1.10-xlocale.patch deleted file mode 100644 index 8c5c7e44bff..00000000000 --- a/net-irc/epic5/files/epic5-1.1.10-xlocale.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN epic5-1.1.10.orig/source/recode.c epic5-1.1.10/source/recode.c ---- epic5-1.1.10.orig/source/recode.c 2014-04-11 17:12:26.000000000 +0200 -+++ epic5-1.1.10/source/recode.c 2018-04-30 22:55:11.976293375 +0200 -@@ -41,7 +41,6 @@ - #include <langinfo.h> - #include <locale.h> - #include <wctype.h> --#include <xlocale.h> - - /* - * Here's the plan... diff --git a/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch b/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch deleted file mode 100644 index 522610f9fb5..00000000000 --- a/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Nathan Phillip Brink <bi...@gentoo.org> -Subject: Prevent libarchive check from being automagic. - ---- a/configure.in -+++ b/configure.in -@@ -231,22 +231,28 @@ - dnl XXX I don't understand why this is even necessary. --have_libarchive="" --orig_LIBS="$LIBS" --AC_CHECK_LIB(archive, archive_read_new, [LIBS="$LIBS -larchive"]) --AC_MSG_CHECKING(whether libarchive works the way I expect) --AC_TRY_LINK([#include <archive.h>], [ -- struct archive *x; -- const char *s = "bogus.zip"; -- x = archive_read_new(); -- archive_read_support_format_all(x); -- archive_read_open_file(x, s, 10240); --], have_libarchive="yes") --if test "x$have_libarchive" = "x"; then -- LIBS="$orig_LIBS" -- AC_MSG_RESULT(no) --else -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LIBARCHIVE) --fi -+AC_ARG_WITH([libarchive], [AS_HELP_STRING([--without-libarchive], [Disable libarchive support.])], -+ [], [with_libarchive=maybe]) -+AS_IF([test "x$with_libarchive" != "xno"], -+ [ -+ have_libarchive="" -+ orig_LIBS="$LIBS" -+ AC_CHECK_LIB(archive, archive_read_new, [LIBS="$LIBS -larchive"]) -+ AC_MSG_CHECKING(whether libarchive works the way I expect) -+ AC_TRY_LINK([#include <archive.h>], [ -+ struct archive *x; -+ const char *s = "bogus.zip"; -+ x = archive_read_new(); -+ archive_read_support_format_all(x); -+ archive_read_open_file(x, s, 10240); -+ ], have_libarchive="yes") -+ if test "x$have_libarchive" = "x"; then -+ LIBS="$orig_LIBS" -+ AC_MSG_RESULT(no) -+ AS_IF([test "x$with_libarchive" = "xyes"], -+ [AC_MSG_ERROR([--with-libarchive was specified but libarchive could not be found. Please do not specify --with-libarchive or install libarchive.])]) -+ else -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_LIBARCHIVE) -+ fi]) - - dnl ----- - AC_ARG_WITH(ssl, - diff --git a/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch deleted file mode 100644 index e211fa14b27..00000000000 --- a/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch +++ /dev/null @@ -1,114 +0,0 @@ -From: Nathan Phillip Brink <bi...@gentoo.org> -Subject: Fix perl being automagic and to be safe with - LDFLAGS=-Wl,--as-needed. - ---- a/configure.in -+++ b/configure.in -@@ -1033,37 +1033,38 @@ - dnl - dnl Perl support? - dnl --AC_ARG_WITH(perl, --[ --with-perl[=PATH_TO_PERL_EXE] Compile with perl support.], --[ -- perlexe=$withval --], -- perlexe=yes --) -- --if test "x$perlexe" = "xyes"; then -- perlexe=perl --fi -- --if test "x$perlexe" = "xno"; then -+AC_ARG_WITH([perl], [AS_HELP_STRING([--with-perl=[PATH_TO_PERL_EXE]], [Compile with perl support.])], -+ [], [with_perl=maybe]) -+AS_IF([test "x$with_perl" = "xno"], -+ [ - AC_MSG_CHECKING(whether to support Perl) - AC_MSG_RESULT(no) --else -- AC_CHECK_PROG(PERLPROG, $perlexe, "yes", "no") -- AC_MSG_CHECKING(whether to support Perl) -- if test $PERLPROG != "yes" ; then -+ ], -+ [ -+ with_perl_errormsg="You specified --with-perl=$with_perl but I could not find a working perl. Please run ./configure with --without-perl or specify a path to a working perl executable." -+ AS_IF([test "x$with_perl" = "xyes" -o "x$with_perl" = "xmaybe"], -+ [perlexe=perl], -+ [perlexe="$with_perl"]) -+ dnl Allow a full path to be specified in --with-perl -+ AS_IF([test -x "$perlexe"], -+ [PERLPROG=yes], -+ [AC_CHECK_PROG(PERLPROG, $perlexe, "yes", "no")]) -+ AC_MSG_CHECKING([whether to support Perl]) -+ if test $PERLPROG != "yes" ; then -+ AS_IF([test "x$with_perl" != "xmaybe"], -+ [AC_MSG_ERROR([$with_perl_errormsg])]) - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - PERLCFLAGS=`$perlexe -MExtUtils::Embed -e ccopts` -- PERLLDFLAGS=`$perlexe -MExtUtils::Embed -e ldopts` -+ PERLLIBS=`$perlexe -MExtUtils::Embed -e ldopts` - - AC_MSG_CHECKING(whether embedded perl works the way I expect) - have_embedded_perl="no" - old_CFLAGS="$CFLAGS" -- old_LDFLAGS="$LDFLAGS" -+ old_LIBS="$LIBS" - CFLAGS="$CFLAGS $PERLCFLAGS" -- LDFLAGS="$LDFLAGS $PERLLDFLAGS" -+ LIBS="$LIBS $PERLLIBS" - AC_TRY_RUN([ - #include <EXTERN.h> - #include <perl.h> -@@ -1101,20 +1102,22 @@ - have_embedded_perl="no",:) - - CFLAGS="$old_CFLAGS" -- LDFLAGS="$old_LDFLAGS" -+ LIBS="$old_LIBS" - if test $have_embedded_perl = "yes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PERL) - AC_DEFINE(PERLCFLAGS) -- AC_DEFINE(PERLLDFLAGS) -+ AC_DEFINE(PERLLIBS) - PERLDOTOH="perl.o" - else -+ AS_IF([test "x$with_perl" != "xmaybe"], -+ [AC_MSG_ERROR([$with_perl_errormsg])]) - PERLCFLAGS="" -- PERLLDFLAGS="" -+ PERLLIBS="" - AC_MSG_RESULT(no, sorry) - PERLCFLAGS="" -- PERLLDFLAGS="" -+ PERLLIBS="" - fi - fi --fi -+ ]) - -@@ -1392,7 +1395,7 @@ - AC_SUBST(TCLLIBS) - AC_SUBST(PERLDOTOH) - AC_SUBST(PERLCFLAGS) --AC_SUBST(PERLLDFLAGS) -+AC_SUBST(PERLLIBS) - AC_SUBST(WSERV_BIN) - AC_SUBST(WSERV_INSTALL) - AC_SUBST(bindir) - ---- 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@ @TCLLIBS@ @RUBYLIBS@ $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLIBS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS) - $(RM) info.c info.o - clean:: - $(RM) epic5 $(OBJECTS)
