use ecvs_clean; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 38 insertions, 121 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/Manifest b/net-irc/epic4/Manifest
index 2ef6548b3c19..5b96257dd921 100644
--- a/net-irc/epic4/Manifest
+++ b/net-irc/epic4/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX epic-defaultserver.patch 620 SHA256 54d016eb90d1b1aab13d399398ba69450876941f947f53e9b9341d32e24403ea SHA512 5f939cac74194e0e92e7ce48fe668244201ae24590be9e8c71bf6fe74adbbd7cdfad6b43b3ccd755cbf22c4362467e72d7a0e7877c0b0f04340f58a039b67e7d WHIRLPOOL c111c87c73c115c94253cb41d23a309751ad7de2f1c1cddbe11b50d7186c627831385b754fe982620d047de4d405d1c357ac5a6c1bd30945f740271167d2dba2
 AUX epic4-2.10.1-make-recursion.patch 275 SHA256 5a8792c5febb7bafc1b895189e47e9ba35e60bb71ba52b04b090a99008774234 SHA512 e5def43f987585aa66761260f507049f67eca75a3cbef3b6f0a7283d0412388cb810ce7692877a62582816bca9887ee2c87429b8246442774bcecd5e195e4d1b WHIRLPOOL badae6ee1bde6d02d8d4739d804d97c59190110315b1a9a69e0beec52c0f13537c62630304de9acb7f0ad44a993085c8dab40e100680d83e0ab38e162a085128
 AUX epic4-2.10.1-perl.patch 1405 SHA256 9c192f37c314c348f0965daa2e212cc5c0127285b998ee43766b72650aad675e SHA512 958e54d18199b412a7f03917d62169227e0ac3be73793698c518cf676375879227d6c754622e722729369197853a2c22f1e6f7de97841c01471dd7b020d42781 WHIRLPOOL d7bf18f8a364b6915791bde71be1de8ed75ed8f3d1188ae6fe52b17cf0e0554ee2535a25810ebef12e4880b80057bebfebd4c7478bcba02430d909ad112d6c59
 DIST epic4-2.10.1.tar.bz2 629722 SHA256 7eb6294c0a1a5aee8bc47f9c6904b2240bf7163e4e07d295296f6b2e214e9935 SHA512 382a0ad6d2778aba037ee1cf065ec7d2ea3827957010f9eea36072fbb8bf14cdba5baffa9a3ce7888305a2451ae61a4b5b5823336fc80b73997fe0d609918656 WHIRLPOOL 0d7ccf95886124ccc0cefe5674990fd778eaa84c836404ab1b74cde090e89e91b59950a3c7ce3eecd33e83a8abaa00bfbf7d192d16c69dd4bf94fcfca37c0c79
-DIST epic4-2.10.tar.bz2 629828 SHA256 b9043d9b039d3566a9b1b09426eda19bf6ad650ea47f79f68e89273b0fc6b089 SHA512 2722d3605887386ae657291a3b711d35f8fc0fbcf6b6e4814c5bbe003cfdf659a9b45c8c816d698e30260bcb8cd416a325fb8b5f67d86c86156c0f58a73bc7f5 WHIRLPOOL 77c1bd6f5819f54facb78ce091bbf7dae06cd6267094f807d39c7f31b155eac207a14fa24638a12f779746192df3ee618b4842be1871ae973adbe699f87cca61
 DIST epic4-help-20050315.tar.gz 332502 SHA256 714afd07348731e6ac82e1f6548acc12e84539b3106ab27fa5d00ed5696256f7 SHA512 f59339d4f2c339cb4c3cbc0cce7db8fadbfe469884c16ab9add42e98eb318851e48ce8a04b4920d33c42afff8b39ec41186744eda0460af544c43fe14658e7e6 WHIRLPOOL c2d3783d99692c562490707f68e6b2f2c50c11ef3053e7574c8f049e01504f171f8d86e189e8849e30bb0f3097dc5c7ebb61db9f869b22345ebbfdcdb2daaf38
 DIST epic4-local.bz2 6530 SHA256 4509ac8e491ac0b75dc5ddcef845b02b3610804dd98de9b5b98d58630be322cd SHA512 2f4bb0aee284ddedd95dd97b17bd1756fcc700ec07b2814d84f3185e215134600fdd0fadf7ecb1d490ebb449f5e9530fcb207ebfaec27cfce1f9570e73103cc1 WHIRLPOOL 437ab54779f6579a77870b792bf1f763f94c2faf29ca3adfa0d465385dd67b8bf3fc315130761ba8a305c3c01f01e46fe3c1f708110b3ee5a79221a17fb32ab1
-EBUILD epic4-2.10.1.ebuild 2894 SHA256 26ef6860d00672a14d765fcf80e97464c2fe7114421facc143f6a159c36560ed SHA512 7e481fe1b6f49dbe16cb2b3330789d8969484a7565a9a41e6b60a58bc0ff04b58a39a2e8c6fd3844e1b901f771c390ee073833f41b0bf8f5411a94e344267518 WHIRLPOOL edbf5934b85931f071f391378f08001916801aa8e4236d6bed2448e7eb67ca03186798e58440bb3a178b538448ca08b033cb9468a6f0c7a98b43a104866258a0
-EBUILD epic4-2.10.ebuild 2722 SHA256 49e2b65544fb078cfbf1c136e00e5e85f5695443ffa86c4ba4d6558766318bc3 SHA512 95ce8f184022e08ed3576736ff0fe25d36aadf0f49b93f55ab9ae30cf61dfa5d93c9183f556f5d0b04d402508283139ebd03a71e2797ee655ed3346e4fc47297 WHIRLPOOL 3141deca0f4aced643cf109ee1c9fad9e0afecbe98b1e93b9de8fcfa789ffadc41e9f3dd27de44cef4391c7581f2d7255547dedc4d55e077545b5775fad2a790
-MISC ChangeLog 13821 SHA256 2b6fb4610221178dbc4a029625cd02a2a283d944fa0a5a1eca6695e44c2c7cfd SHA512 3e850064f3a523a81aad701ec5657a0938e5ec888efb0a11effff06df1f4dc93e6d785141c51904ffec73bdee88e085d36cbd21c25bdf6fd08f308d8656928ea WHIRLPOOL 5d6ed92e9e8ee562ef03fe20ca3bbcd9d2dbc0a8469175f6ab1b485fc6958f7cf4830b11b256c3df174d9796d51883bd9a528b5a6269308dbaa78ddcad9a61e5
+EBUILD epic4-2.10.1.ebuild 2833 SHA256 5e25d04b6c34c8babef16ebcdf48f76bd92ff94d57ac5b369487d13bba3c6040 SHA512 7c5684873b280b85ec3504a94e27e29bbe16ed85106e2ac9d9bbb365de6bbbfb09a32c8e40031972d6eb90e5ce1bdb898ab74fc41a81a7e5e4c6500ef63bead6 WHIRLPOOL 9f506a98a9c10dbeea86c1962d0daf3650dae214a6a19e936b2cbec9e39f44a24c738d37c4a41f09b07781ba062d7ecc63b33984e55cddc9e094aafdd1793dcd
+MISC ChangeLog 13939 SHA256 f48ade7c97f0486ca31b3957648f1a34c0d2e20bfccd0e50338916229b7aa8ea SHA512 4984c59c13980cacda3e0fe19734e7ac85db8543b186e2ecd6d93410feb576d47edae237e2afa3ed8406a42b7b0c81cfafc55358312f026d7d2235e7977daa59 WHIRLPOOL 2b5c84cbefcdc61f52a2e5b58a0191fbff5f3a599c81c3255495a43fd8dc08743449666b935a3faa2252b3dcf1ca35dcb6c2123a14c7d37f4d41c2a291a01b5f
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQ12Y7AAoJEDxpGckxwJCBFzgP/09f9Qw39UYGyhYBR2rkQ3WD
-OF6Fx9eAlg3GKXEryHwM1gdcERrjHi9x66CFn3xCu7RBmX0IRxceAnlzV8BnI/mS
-QuUtJ2RAltSu6SdBb66bRFgmiAO/78Or299GZ/9liNxtV6kfyXnUrsUOG/sVkKJA
-jPX0gj4XjVmqLmcLo1NgHhCiEN7a5Ji4mVVAPKF5kpCuQEt0+bC/Zudk4YormV+8
-RcKopXEZ52v6WlMr9gvwpbIcIYGwDiGIJ2iRb4Q+b/StbYmAos4uOJ2MmMJv+8SI
-W2nd7GEYjZPDgjFbib5HRxaCnMBq/WjRnWMTei1uXDUA0dlRThAG8xk4l99SmmJM
-GLt/bZEdHqLQ92B5v99Q6IPT9Y/WkftGKHObfEBSS5jdHIj13n5t2TSox1BVMi1B
-ttY9iFgrHPVF/gCK1Z2X3kw8b37k/av8kKWmaeGWSed9XmGbP25e5/du+QQ/WZDg
-uONfqIEN32Mj3B7DfA8RMP49gDZ13S/iy/lANrli1RXWaDob2AjzgyHfPtQhOecS
-K93JU0QeER/di+dauFUkAe1iXLphz77mvzzqzCyFC8rtCV/2ko2fOCso9sKLVCgS
-lNNrJYftfREItHPVuu5DsPXw01Vvvm2vy+ongyjYJ6AXoUx3vgRIHiz1KXA21KLu
-OcFo7Ocd+bOxc4eNdma4
-=LmLw
+iQJ8BAEBCgBmBQJVDXTcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirIWsP/0jH9247JnO2WLi9TVC9vVNG
+aixKMrOaoX4WeOla94btNxZlr0BDg3w6q4G2SHkSAWRorbJ0d6xh7ZrnAkGuJFX8
+uMwx1GqF5zXExflj+/zeNmJ1KX0KYlS5+OFKq5zJQAGJ+hZvTEYnqEzUpe+J0RoP
+6i5kNxVjQtJzzpPaqDnoK5Rbj99Ny44UmlxAAyEPX+DgByHrYX0CWLNOqSzbYIci
+BJ9dN1Uq/pnrLg7rY3BF8Gqg4yXAVi2hNSznMLiiLO3HfyFYO8lsHVSy9Gx2x07r
+7AHBVAeC4mAfFR+H1Ln0rSMullvHFDxdg+jt0YLM+mSirdpgEg9uYi0UpWBWuv4L
+Izjh2PmRdlDgPoqUiT+Dcf5Fe5nJEvO478Nudj2hDEwRY7v7ak24NoJxZ7j9UqyO
+jV3rIIibral9Q4OjCU0uPxxmq8o+sUmbH/d8qqMo6aYE6pIIj7n1+VO6d748bmvz
+xNIs1PD8PRU9/DhzZy42yhptGfLWlTL0/agoa/HT8pawL/uf5SL9dnvx+DBB7cEv
+jwKEbPilBh2r2OwLlU7FO6jTNq409P9jAYhlIEomUTEtTMnOolfqk/YaJ4rpjjx8
+XVCkGi+1bmY1WrCrFRN/+JsC4b5aqZFuMLoru+L61ukjMu8IPN2Fg/vyTfFMstfX
+aYkTXJShQrK1+JRYLeBZ
+=24Tj
 -----END PGP SIGNATURE-----
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
-}