Clean old unstable versions.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 743A52E86BA81050)

5 files changed, 6 insertions, 382 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/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)