use ecvs_clean; Bump to EAPI=5

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

4 files changed, 133 insertions, 20 deletions

diff --git a/net-irc/ptlink-ircd/ChangeLog b/net-irc/ptlink-ircd/ChangeLog
index 30079c99395d..4fc164d88d60 100644
--- a/net-irc/ptlink-ircd/ChangeLog
+++ b/net-irc/ptlink-ircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/ptlink-ircd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ChangeLog,v 1.16 2014/08/10 20:53:43 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ChangeLog,v 1.17 2015/03/21 13:55:32 jlec Exp $
+
+*ptlink-ircd-6.19.6-r2 (21 Mar 2015)
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> +ptlink-ircd-6.19.6-r2.ebuild,
+  ptlink-ircd-6.19.6-r1.ebuild:
+  use ecvs_clean; Bump to EAPI=5
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   ptlink-ircd-6.19.6-r1.ebuild:
diff --git a/net-irc/ptlink-ircd/Manifest b/net-irc/ptlink-ircd/Manifest
index 5c7cc4c274f3..6a00a1d96183 100644
--- a/net-irc/ptlink-ircd/Manifest
+++ b/net-irc/ptlink-ircd/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ptlink-ircd.confd 284 SHA256 868ed59b8ef41bc93375163cd90590844e4073c0a45916d6c4ce1b2ba596c7dc SHA512 28004789e49bccfca909d0ffd560141f80a4d48f5266724e1b6c5090937b5f6e2c0d2d801edbc7efb91e36e81d62ec34a9243e0a33790ded9427875308993d76 WHIRLPOOL eab7c42a48b9a1725d40d10af4e849ae64b577cb6a21167c323f785b0cac7bc36e757ae4a20561fab40d01d5980f2f5f1ac667194a847a87f214315191d070b0
 AUX ptlink-ircd.initd 621 SHA256 8ec98ca9850448bce320381dd1ec5997d820c3784d1d24148d64862e33de733e SHA512 8965b01f39b9c0dc5a75706afea0a8fc9ef922fef5b323c53ebe50baf428b60c5a528d9cff7eb21a16bd063b126b22c46bedc925e492e4f28a8a7b591c3a4c64 WHIRLPOOL d14b613bae64ea63e4885576d2e64622158336b72c7d64a6e7f7501c4f4988616185cbde1e2f7b7e5f0d909abf8483d962099ba0912d48d73760cd79ad0677e1
 DIST PTlink6.19.6.tar.gz 799388 SHA256 80a9100b0f0c41c914dda6c576207721fa05bb4a0ccf77c6337d6740d1ce0131 SHA512 5036efc429d8c5dbb5076cc690221b9409990bfe71a710bf6f8ce60e8779ff8f55e695c1fc1ca56435928d416bc1907c91105cf533538dafeea4344cd038d4d5 WHIRLPOOL 7328e2c550592422beb29ae0895a80b98541ae91932963df9338983bf86053886ba309f7a775d2cfb0dce12ff91ee08d1148dec32f0788304150ec90d556d4f9
-EBUILD ptlink-ircd-6.19.6-r1.ebuild 3007 SHA256 eb180996016824a88dfeb12dd1b6568a7a61945926cb7d2db379048828474bb7 SHA512 164ebc959bf9b0bc3dfe77c61f21620a282887bcc94a1abe1b2c06e5f25343e7ee3a27eeb1ad0ff003464af6959aa3027baef0d221e638d5720b2444b9500aaa WHIRLPOOL fd081dff47c13d79f7be0acd6f1c7b29527a2b4a7a7aaab191d8108a80562c6e029b2ffc255729337476899a5ecf58d3f17416f55c7275c03c4ff935388ebb44
-MISC ChangeLog 3672 SHA256 88a16c4e8c0e1ed3d990d16e8a4ca678dd425446fe38aca3e94291fcff1931cf SHA512 89d167c2663762b9b3dea83cf8dea0ef748107d0022ca1427f3f026b953dd089219ea31d16ce51519486f00c54883e2356aca752b6ada2baccd938effd154686 WHIRLPOOL 79d81f39a2a8d98c79c11713a876630d99d5bce22b8b54b79cc89a915debff9bee086a5ff45f43f020a899e2776437ebe3f877bf68a8ff6e34a246aaefcb3a3d
+EBUILD ptlink-ircd-6.19.6-r1.ebuild 2924 SHA256 9720416dad902243aebf028dbb2e4824fe74cadeb1f88c80f67fa808490a14a3 SHA512 4cb3c21cad28348543ff66c61d9d23a3dc8fa6f1cd5a69cb5bb2c96b16c4da2a674cebcb03ce3448645bdeb9a25ca0e5ac1a00ef735aea04980a34f8d22e2c04 WHIRLPOOL fdb9c03b1fa330e4a3bdb1b5035a854c8454b8baf22287d7fa44c22b8e7139823d312ac7f55ff47e6445e941b64c080a3471551f86a0dadc767ab8d05438390b
+EBUILD ptlink-ircd-6.19.6-r2.ebuild 2440 SHA256 a78fbba9d8b2c3394bd9933a21d4bb1a5586f5b73eae194b856751e92842fd5e SHA512 93d95ab9b311498af48b9078c0c02800f749c1e02c57576a3c8637d045f6b019f9814150c5e6999fb33fb31fe5841740bd68e3a970103c73f98c9acc1068736f WHIRLPOOL 60a6b5fb75c93583cef0318b88db671cea181edcfd9945f8516b0ebb474c96d2b8e57a85b9caef9211eba99a593c8df4053842957a6844d3d67a1b4527a53f31
+MISC ChangeLog 3852 SHA256 2e3cae8889d09fcd1b71980e50d935e14c9c49cfa39062a079b0925daae3e7c2 SHA512 beeaa255405285d7ed70ce04cb5feddb3cfe107ff13ec5bdd9d508748ab0f7debf696d1ee477294cec02cef9d987a86080bed1bd6ee622cf21f38449d8c27a07 WHIRLPOOL 26091344bb93a949c5cdbfd81758ac8e4b56498b9de82aea7199945a0a4ca68723b841731f3bfa81d230b84f1f6357f237d7252d607fdb8e368434af381e49be
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn29gACgkQcaHudmEf86qorQCeKieplKxh0br066yiv+vwM78L
-aL0An3LyLZRhVfWMQHotU008t1qNufKQ
-=L78s
+iQJ8BAEBCgBmBQJVDXhZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirsxgP+wYYYeshrLzVNwssiegeItfM
+w1hKfpv1QFnSqJ7LzggAOxGA7qnymdCs/j3pdhr6p4LDaUEN9j/YfbDCYgKPYG8r
+fBgFUe+2/Wa0oPcT8yRfQU7muFDbV3iskPpZulX4F79IG3Oi70l44RySQRvBy6yh
+SmBNI+ogfC5iOkkBcFiEDM3aa333qhZEx5f3kodD6uvPHqTkWhWNZP8Rv46aDr1R
+v8dS7WDHUjiT7EVXZZ8WLozBYUTUEP6RfQjUBWYvzfovOOpsOVMA3zCIWVs5EAr0
+1m92honZqP5QH+D4+AaClA6sNBxRigeZWb9kacT8SAVvKXRc00sH/yGIR0TLJY/q
+y2mJGPJN6L1U6GgMtDvlQ6kns1TAbjHhZ++AFuCDxHN1FFhpOnFuWaP9wGxPT8Am
+Qu06gSVHjPNdd8SnAVxI5oErMS4N/eCZmmC7eym180l9PvRdiqwJmKPdGLk4jk3h
+/K0L60V/3IiLHdbHpjmJxPPvbXvkKeB9jVDgUOUiFlLGgKzVeZmetQ7rhRv/zjgw
+UylmyMvz3lK4IENOIDpymQuZRBuaCFk02UQMbFAi+ctguKWdRvHVS+lIkE/tyu3z
+Bc1N15XS4qcyIaA6PCfZfiKfIP4Q7u3AZqwZPvx2m8Ut/6KlYiZgQQDF6xeHFk0q
+GF4Xg9Vh1akB+vqD1r0Z
+=KkgU
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild
index d20fb88ef734..a63f4c7449f4 100644
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 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/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild,v 1.4 2014/08/10 20:53:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild,v 1.5 2015/03/21 13:55:32 jlec Exp $
 
 inherit eutils ssl-cert user
 
@@ -9,26 +9,27 @@ MY_P="PTlink${PV}"
 DESCRIPTION="PTlink IRCd is a secure IRC daemon with many advanced features"
 HOMEPAGE="http://www.ptlink.net/"
 SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ircd/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86"
-
 IUSE="ssl"
-DEPEND="sys-libs/zlib
+
+DEPEND="
+	sys-libs/zlib
 	ssl? ( dev-libs/openssl )"
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	find "${S}" -type d -name CVS -print0 2>/dev/null | xargs -0r rm -rf
+	ecvs_clean
 }
 
 src_compile() {
 	econf \
 		--disable-ipv6 \
-		$(use_with ssl ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl ssl openssl)
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
@@ -76,13 +77,13 @@ pkg_postinst() {
 		"${ROOT}"/{etc,var/{log,lib}}/ptlink-ircd \
 		"${ROOT}"/etc/ptlink-ircd/server.key.pem
 
-	elog
+	echo
 	elog "PTlink IRCd will run without configuration, although this is strongly"
 	elog "advised against."
-	elog
+	echo
 	elog "You can find example cron script ircd.cron here:"
 	elog "   /usr/share/doc/${PF}"
-	elog
+	echo
 	elog "You can also use /etc/init.d/ptlink-ircd to start at boot"
-	elog
+	echo
 }
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r2.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r2.ebuild
new file mode 100644
index 000000000000..2334bc1ae047
--- /dev/null
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r2.ebuild,v 1.1 2015/03/21 13:55:32 jlec Exp $
+
+EAPI=5
+
+inherit eutils ssl-cert user
+
+MY_P="PTlink${PV}"
+
+DESCRIPTION="Secure IRC daemon with many advanced features"
+HOMEPAGE="http://www.ptlink.net/"
+SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ircd/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	ecvs_clean
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		$(use_with ssl ssl openssl)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	newbin src/ircd ptlink-ircd
+	newbin tools/fixklines ptlink-ircd-fixklines
+	newbin tools/mkpasswd ptlink-ircd-mkpasswd
+
+	insinto /etc/ptlink-ircd
+	fperms 700 /etc/ptlink-ircd
+	doins samples/{kline.conf,{opers,ptlink}.motd,help.{admin,oper,user}}
+	newins samples/example.conf.short ircd.conf
+	newins samples/example.conf.trillian ircd.conf.trillian
+	newins samples/main.dconf.sample main.dconf
+	newins samples/network.dconf.sample network.dconf
+
+	insinto /usr/share/ptlink-ircd/codepage
+	doins src/codepage/*.enc
+	dosym /usr/share/ptlink-ircd/codepage /etc/ptlink-ircd/codepage
+
+	rm -rf doc/old
+	dodoc doc/* doc_hybrid6/* ircdcron/* CHANGES README
+
+	keepdir /var/log/ptlink-ircd /var/lib/ptlink-ircd
+	dosym /var/log/ptlink-ircd /var/lib/ptlink-ircd/log
+
+	newinitd "${FILESDIR}/ptlink-ircd.initd" ptlink-ircd
+	newconfd "${FILESDIR}/ptlink-ircd.confd" ptlink-ircd
+}
+
+pkg_postinst() {
+	# Move docert from src_install() to install_cert for bug #201678
+	use ssl && (
+		if [[ ! -f "${ROOT}"/etc/ptlink-ircd/server.key.pem ]]; then
+			install_cert /etc/ptlink-ircd/server || die "install_cert failed"
+			mv "${ROOT}"/etc/ptlink-ircd/server.{crt,cert.pem}
+			mv "${ROOT}"/etc/ptlink-ircd/server.{csr,req.pem}
+			mv "${ROOT}"/etc/ptlink-ircd/server.key{,.pem}
+		fi
+	)
+
+	enewuser ptlink-ircd
+
+	chown ptlink-ircd \
+		"${ROOT}"/{etc,var/{log,lib}}/ptlink-ircd \
+		"${ROOT}"/etc/ptlink-ircd/server.key.pem
+
+	echo
+	elog "PTlink IRCd will run without configuration, although this is strongly"
+	elog "advised against."
+	echo
+	elog "You can find example cron script ircd.cron here:"
+	elog "   /usr/share/doc/${PF}"
+	echo
+	elog "You can also use /etc/init.d/ptlink-ircd to start at boot"
+	echo
+}