use ecvs_clean; drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 19 insertions, 102 deletions

diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 0e5885479634..54a33d20fb36 100644
--- a/net-irc/epic4/ChangeLog
+++ b/net-irc/epic4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/epic4
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.95 2012/12/23 20:12:41 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.96 2015/03/21 13:40:29 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -epic4-2.10.ebuild,
+  epic4-2.10.1.ebuild:
+  use ecvs_clean; drop old
 
   23 Dec 2012; Ulrich Müller <ulm@gentoo.org> epic4-2.10.ebuild,
   epic4-2.10.1.ebuild:
@@ -399,4 +403,3 @@
  
   13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Added missing changelog entry.
-
diff --git a/net-irc/epic4/epic4-2.10.1.ebuild b/net-irc/epic4/epic4-2.10.1.ebuild
index 4a8853d3583c..714535c7c2aa 100644
--- a/net-irc/epic4/epic4-2.10.1.ebuild
+++ b/net-irc/epic4/epic4-2.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.10.1.ebuild,v 1.7 2012/12/23 20:12:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.10.1.ebuild,v 1.8 2015/03/21 13:40:29 jlec Exp $
 
 EAPI=4
 
@@ -10,7 +10,8 @@ HELP_V="20050315"
 
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
+SRC_URI="
+	ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
 	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz
 	mirror://gentoo/epic4-local.bz2"
 
@@ -19,20 +20,22 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 perl ssl"
 
-DEPEND=">=sys-libs/ncurses-5.2
+DEPEND="
+	>=sys-libs/ncurses-5.2
 	perl? ( dev-lang/perl )
-	ssl? ( >=dev-libs/openssl-0.9.5 )"
+	ssl? ( >=dev-libs/openssl-0.9.5:0 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/epic-defaultserver.patch \
+	epatch \
+		"${FILESDIR}"/epic-defaultserver.patch \
 		"${FILESDIR}"/${P}-make-recursion.patch \
 		"${FILESDIR}"/${P}-perl.patch
 
 	eautoconf
 
 	rm -f "${WORKDIR}"/help/Makefile || die
-	find "${WORKDIR}"/help -type d -name CVS -print0 | xargs -0 rm -r
+	ecvs_clean
 }
 
 src_configure() {
@@ -57,7 +60,7 @@ src_install () {
 		sharedir="${ED}"/usr/share \
 		libexecdir="${ED}"/usr/libexec/${PN}
 
-	dodoc BUG_FORM COPYRIGHT README KNOWNBUGS VOTES
+	dodoc BUG_FORM README KNOWNBUGS VOTES
 
 	cd "${S}"/doc || die
 	docinto doc
@@ -65,8 +68,8 @@ src_install () {
 		*.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
 		nicknames outputhelp SILLINESS TS4
 
-	insinto /usr/share/epic/help
-	doins -r "${WORKDIR}"/help/*
+	insinto /usr/share/epic
+	doins -r "${WORKDIR}"/help
 }
 
 pkg_postinst() {
diff --git a/net-irc/epic4/epic4-2.10.ebuild b/net-irc/epic4/epic4-2.10.ebuild
deleted file mode 100644
index d99e026f4c25..000000000000
--- a/net-irc/epic4/epic4-2.10.ebuild
+++ /dev/null
@@ -1,89 +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/epic4/epic4-2.10.ebuild,v 1.9 2012/12/23 20:12:41 ulm Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils toolchain-funcs
-
-HELP_V="20050315"
-
-DESCRIPTION="Epic4 IRC Client"
-HOMEPAGE="http://epicsol.org/"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
-	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz
-	mirror://gentoo/epic4-local.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="ipv6 perl ssl"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	perl? ( >=dev-lang/perl-5.6.1[-ithreads] )
-	ssl? ( >=dev-libs/openssl-0.9.5 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/epic-defaultserver.patch
-
-	rm -f "${WORKDIR}"/help/Makefile
-	find "${WORKDIR}"/help -type d -name CVS -print0 | xargs -0 rm -r
-}
-
-src_configure() {
-	replace-flags "-O?" "-O"
-
-	econf \
-		--libexecdir=/usr/lib/misc \
-		$(use_with ipv6) \
-		$(use_with perl) \
-		$(use_with ssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install () {
-	einstall \
-		sharedir="${D}"/usr/share \
-		libexecdir="${D}"/usr/lib/misc || die "einstall failed"
-
-	dodoc BUG_FORM COPYRIGHT README KNOWNBUGS VOTES
-
-	cd "${S}"/doc
-	docinto doc
-	dodoc \
-		*.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
-		nicknames outputhelp SILLINESS TS4
-
-	insinto /usr/share/epic/help
-	doins -r "${WORKDIR}"/help/* || die "doins failed"
-}
-
-pkg_postinst() {
-	if [ ! -f "${ROOT}"/usr/share/epic/script/local ]
-	then
-		elog "/usr/share/epic/script/local does not exist, I will now"
-		elog "create it. If you do not like the look/feel of this file, or"
-		elog "if you'd prefer to use your own script, simply remove this"
-		elog "file.  If you want to prevent this file from being installed"
-		elog "in the future, simply create an empty file with this name."
-		cp "${WORKDIR}"/epic4-local "${ROOT}"/usr/share/epic/script/local
-		elog
-		elog "This provided local startup script adds a number of nifty"
-		elog "features to Epic including tab completion, a comprehensive set"
-		elog "of aliases, and channel-by-channel logging.  To prevent"
-		elog "unintentional conflicts with your own scripting, if either the"
-		elog "~/.ircrc or ~/.epicrc script files exist, then the local script"
-		elog "is *not* run.  If you like the script but want to make careful"
-		elog "additions (such as selecting your usual servers or setting your"
-		elog "nickname), simply copy /usr/share/epic/script/local to ~/.ircrc"
-		elog "and then add your additions to the copy."
-	fi
-
-	# Fix for bug 59075
-	chmod 755 "${ROOT}"/usr/share/epic/help
-}