Additional minor fixes

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

4 files changed, 14 insertions, 90 deletions

diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index 1a5a2b9fbba8..784a75d49882 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/qpsmtpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.22 2014/07/25 00:19:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.23 2014/07/25 00:23:41 zlogene Exp $
+
+  25 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> -qpsmtpd-0.84-r1.ebuild,
+  qpsmtpd-0.84-r2.ebuild, qpsmtpd-9999.ebuild:
+  Additional minor fixes
 
   25 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> -qpsmtpd-0.84.ebuild,
   qpsmtpd-0.84-r1.ebuild, qpsmtpd-9999.ebuild:
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
deleted file mode 100644
index 9d582d401499..000000000000
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild,v 1.3 2014/07/25 00:19:07 zlogene Exp $
-
-EAPI=5
-
-inherit eutils perl-app user
-
-DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
-HOMEPAGE="http://smtpd.develooper.com"
-SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postfix ipv6 syslog"
-
-RDEPEND=">=dev-lang/perl-5.8.0
-	<dev-perl/Net-DNS-0.690.0
-	virtual/perl-MIME-Base64
-	dev-perl/MailTools
-	dev-perl/IPC-Shareable
-	dev-perl/Socket6
-	dev-perl/Danga-Socket
-	dev-perl/ParaDNS
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	syslog? ( virtual/perl-Sys-Syslog )
-	virtual/inetd"
-
-pkg_setup() {
-	enewgroup smtpd
-	local additional_groups
-	if use postfix; then
-		additional_groups="${additional_groups},postdrop"
-	fi
-	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
-	#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
-	epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
-}
-
-src_install() {
-	perl-module_src_install
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
-
-	dodir /usr/share/qpsmtpd
-	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
-
-	insinto /etc/qpsmtpd
-	doins config.sample/*
-
-	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
-	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
-	cat >"${D}"/etc/qpsmtpd/logging <<-EOF
-		#logging/syslog loglevel LOGINFO priority LOG_NOTICE
-		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
-	EOF
-	if use syslog; then
-		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
-	else
-		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
-	fi
-
-	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
-
-	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
-	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
-
-	dodoc CREDITS Changes README README.plugins STATUS
-
-	diropts -m 0755 -o smtpd -g smtpd
-	dodir /var/spool/qpsmtpd /var/log/qpsmtpd
-	keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
-
-}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
index 715fc6c534c9..dbbcb40416fb 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild,v 1.1 2013/04/15 23:19:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild,v 1.2 2014/07/25 00:23:41 zlogene Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils perl-app user
 
@@ -62,15 +62,15 @@ src_install() {
 		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
 	EOF
 	if use syslog; then
-		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
 	else
-		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
 	fi
 
 	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
 
-	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd || die "Installing conf.d file"
-	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd || die "Installing init.d file"
+	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
+	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
 
 	dodoc CREDITS Changes README README.plugins STATUS
 
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index 81eec254e3c3..6e597eb7ad3a 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.8 2014/07/25 00:19:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.9 2014/07/25 00:23:41 zlogene Exp $
 
 EAPI=5
 
@@ -70,7 +70,7 @@ src_install() {
 	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
 
 	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
-	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd 
+	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
 
 	dodoc CREDITS Changes README README.plugins STATUS
 }