Version bump per bug #279490.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 92 insertions, 10 deletions

diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index db862275c9be..2b157974eafc 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/qpsmtpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.5 2009/04/28 07:50:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.6 2009/07/31 08:06:40 robbat2 Exp $
+
+*qpsmtpd-0.83_pre9999 (31 Jul 2009)
+*qpsmtpd-0.82 (31 Jul 2009)
+
+  31 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  -qpsmtpd-0.82_pre9999.ebuild, +qpsmtpd-0.82.ebuild,
+  +qpsmtpd-0.83_pre9999.ebuild:
+  Version bump per bug #279490.
 
 *qpsmtpd-0.82_pre9999 (28 Apr 2009)
 
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild
new file mode 100644
index 000000000000..65d1ed0e90a9
--- /dev/null
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.82.ebuild,v 1.1 2009/07/31 08:06:40 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils perl-app
+
+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="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postfix ipv6 syslog"
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	dev-perl/Net-DNS
+	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-badhelo_disconnect.patch
+	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
+	epatch "${FILESDIR}"/${PN}-0.40-clamd_conf.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/
+
+	diropts -m 0755 -o smtpd -g smtpd
+	dodir /var/spool/qpsmtpd
+	keepdir /var/spool/qpsmtpd
+
+	dodir /etc/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
+	if use syslog; then
+		echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+	else
+		diropts -m 0755 -o smtpd -g smtpd
+		dodir /var/log/qpsmtpd
+		keepdir /var/log/qpsmtpd
+		echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+	fi
+
+	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
+
+	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd || die "Installing conf.d file"
+	newinitd "${FILESDIR}"/qpsmtpd.initd qpsmtpd || die "Installing init.d file"
+
+	dodoc CREDITS Changes README README.plugins STATUS
+}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.82_pre9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.83_pre9999.ebuild
index c76cc9b236ca..e5c8e4d48936 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.82_pre9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.83_pre9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.82_pre9999.ebuild,v 1.1 2009/04/28 07:50:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.83_pre9999.ebuild,v 1.1 2009/07/31 08:06:40 robbat2 Exp $
 
 EAPI=2
 
-inherit eutils git
+inherit eutils git perl-app
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://git.develooper.com/qpsmtpd.git"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS=""
-IUSE="postfix async ipv6 syslog"
+IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
 	dev-perl/Net-DNS
@@ -42,13 +42,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.40-clamd_conf.patch
 }
 
-src_compile() {
-	perl Makefile.PL PREFIX=/usr || die "Running Makefile.PL failed"
-	emake || die "make failed"
-}
-
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	perl-module_src_install
 
 	insinto /etc/xinetd.d
 	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd