Move docert from src_install() to install_cert in pkg_postinst for bug #201678

2 files changed, 17 insertions, 25 deletions

diff --git a/net-irc/ptlink-ircd/Manifest b/net-irc/ptlink-ircd/Manifest
index fce254265956..d9a7060daa87 100644
--- a/net-irc/ptlink-ircd/Manifest
+++ b/net-irc/ptlink-ircd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ptlink-ircd.confd 284 RMD160 54ee350d69937663da1f0e14329a2540b9cbd36f SHA1 962ff9bd5bf5ef5aa311ee06603b491004bfa7d5 SHA256 868ed59b8ef41bc93375163cd90590844e4073c0a45916d6c4ce1b2ba596c7dc
 MD5 ab4d97225237760bdbdd516e07eb3c1a files/ptlink-ircd.confd 284
 RMD160 54ee350d69937663da1f0e14329a2540b9cbd36f files/ptlink-ircd.confd 284
@@ -10,10 +7,10 @@ MD5 c9cc67ab7dc2d8c52519c2452a2c925c files/ptlink-ircd.initd 621
 RMD160 73c744bc8aabaafcfbb9bf86aaddd6b30c45c3a2 files/ptlink-ircd.initd 621
 SHA256 8ec98ca9850448bce320381dd1ec5997d820c3784d1d24148d64862e33de733e files/ptlink-ircd.initd 621
 DIST PTlink6.19.6.tar.gz 799388 RMD160 1b83b3449a4409c41e206181d831b42a5bb64ffe SHA1 87266b62d1c815d1def8214dc6a5608e6e07d667 SHA256 80a9100b0f0c41c914dda6c576207721fa05bb4a0ccf77c6337d6740d1ce0131
-EBUILD ptlink-ircd-6.19.6.ebuild 2830 RMD160 02f70065e223dbf0114d1b788ac8916606906cf6 SHA1 c511a6b5528cf4fac8a304de9bbe0dfd2fde0f3b SHA256 95c1e3be21f5f6e7475e1b19a19f3784fd7e904e0266c1972cee4934c1aa8462
-MD5 92e21719c7445db55efdaa3125b61503 ptlink-ircd-6.19.6.ebuild 2830
-RMD160 02f70065e223dbf0114d1b788ac8916606906cf6 ptlink-ircd-6.19.6.ebuild 2830
-SHA256 95c1e3be21f5f6e7475e1b19a19f3784fd7e904e0266c1972cee4934c1aa8462 ptlink-ircd-6.19.6.ebuild 2830
+EBUILD ptlink-ircd-6.19.6.ebuild 3004 RMD160 113266588faa225064e6fdffd8f956bdfd678ee8 SHA1 e39c145aae53ec84b3fc943ca22ece3e32691ea8 SHA256 166f1ad2778572398a0bd7eee5cee5abec591d977b2e3fc43c14fdea2e6a14f3
+MD5 f11c1eb4a801031ae4be8d656b8e9956 ptlink-ircd-6.19.6.ebuild 3004
+RMD160 113266588faa225064e6fdffd8f956bdfd678ee8 ptlink-ircd-6.19.6.ebuild 3004
+SHA256 166f1ad2778572398a0bd7eee5cee5abec591d977b2e3fc43c14fdea2e6a14f3 ptlink-ircd-6.19.6.ebuild 3004
 MISC ChangeLog 3014 RMD160 4d9a88da6877b9d0930ac0d558cac1d939af9dff SHA1 196491e5e5157186dd97c68c46537b6d77d3ca06 SHA256 f1cf568d50c3b167a469dfcb0b01ee1dd4cf11c85f1c47a9682250312cced7df
 MD5 236cc62d85af3d6a01fcd27e90670380 ChangeLog 3014
 RMD160 4d9a88da6877b9d0930ac0d558cac1d939af9dff ChangeLog 3014
@@ -25,10 +22,3 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 f8404fc828ebb5d4c7ba349b5b8ee524 files/digest-ptlink-ircd-6.19.6 238
 RMD160 a5614af2bbd018c723170cd9d7b710933c1db46e files/digest-ptlink-ircd-6.19.6 238
 SHA256 e68ecddd4cb2f75ed4a790fe69584e6a14e6b3be91cd0a4e670c196bd9695064 files/digest-ptlink-ircd-6.19.6 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGPcz56J2i8a8J4okRApGrAJ92b3vgXMymUuRfYgZ+RePctpn3igCfZt0F
-VpEsllKYUddUI/UsVb/JYaU=
-=f+xQ
------END PGP SIGNATURE-----
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6.ebuild
index 69d3ebd53de0..6a860bcaa913 100644
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6.ebuild
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.2 2007/05/06 12:44:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.6.ebuild,v 1.3 2007/12/09 01:04:05 cla Exp $
 
 inherit eutils ssl-cert
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ptlink.net/"
 SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ircd/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc ~x86"
 
 IUSE="ssl"
 DEPEND="sys-libs/zlib
@@ -57,22 +57,24 @@ src_install() {
 
 	newinitd "${FILESDIR}/ptlink-ircd.initd" ptlink-ircd || die "newinitd failed"
 	newconfd "${FILESDIR}/ptlink-ircd.confd" ptlink-ircd || die "newconfd failed"
+}
 
+pkg_postinst() {
+	# Move docert from src_install() to install_cert for bug #201678
 	use ssl && (
-		insinto /etc/ptlink-ircd
-		docert server || die "docert failed"
-		mv ${D}/etc/ptlink-ircd/server.crt ${D}/etc/ptlink-ircd/server.cert.pem
-		mv ${D}/etc/ptlink-ircd/server.csr ${D}/etc/ptlink-ircd/server.req.pem
-		mv ${D}/etc/ptlink-ircd/server.key ${D}/etc/ptlink-ircd/server.key.pem
+		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	"${ROOT}"/etc/ptlink-ircd/server.cert.pem
+			mv "${ROOT}"/etc/ptlink-ircd/server.csr "${ROOT}"/etc/ptlink-ircd/server.req.pem
+			mv "${ROOT}"/etc/ptlink-ircd/server.key "${ROOT}"/etc/ptlink-ircd/server.key.pem
+		fi
 	)
-}
 
-pkg_postinst() {
 	enewuser ptlink-ircd
 
 	chown ptlink-ircd \
-		${ROOT}/{etc,var/{log,lib}}/ptlink-ircd \
-		${ROOT}/etc/ptlink-ircd/server.key.pem
+		"${ROOT}"/{etc,var/{log,lib}}/ptlink-ircd \
+		"${ROOT}"/etc/ptlink-ircd/server.key.pem
 
 	elog
 	elog "PTlink IRCd will run without configuration, although this is strongly"