Version bump per bug #279490.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 96 insertions, 12 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/Manifest b/mail-mta/qpsmtpd/Manifest
index 6261293d717c..a8656a0f2287 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -8,8 +8,10 @@ AUX qpsmtpd.envd 74 RMD160 963ae15c132be3f99226bf5efed7da5b8f3c2570 SHA1 3a99752
 AUX qpsmtpd.initd 2068 RMD160 5a809569722c8930bd4cc4d6b8bfd458fca2056d SHA1 2ebdb7ef090fcf56a6eb69540bef88600edf15b6 SHA256 13473280234660bb314289d79c79c57a5e25a2be913469cdb4ab66fefcfc14ce
 AUX qpsmtpd.xinetd 526 RMD160 040c159e3c637dc00f1816088852207766c286fa SHA1 81deb67094386ab4ae341572270c47c140f16e89 SHA256 45729911251be13007d95bb9e25b6c9c951a6419b8badae4e4097dfc603edcdd
 DIST qpsmtpd-0.81.tar.gz 175691 RMD160 945029280222e6221445a89c61e124f266ba4bed SHA1 8bfe4142565f9aaf407bcdc94da62cf09e00190e SHA256 302f16be06c62aac3135a5ab8fe29612e7831769e11861e5a98190987b58517d
+DIST qpsmtpd-0.82.tar.gz 176806 RMD160 8d7642f1887278ce45b3355de7da7f6b2c98a7d4 SHA1 540155086c0b5e553f951ef4f8967886384dca24 SHA256 794af76a1be3cc766ce034311a351ff76b0323c2decc49af96d626e3f3de4df9
 EBUILD qpsmtpd-0.43_rc2_pre955.ebuild 2496 RMD160 057e325094aa85dc264a570b4f13dfad2b88094c SHA1 60a5fb8e09c1660c7dd7a0077b5329d4d936af1a SHA256 3b19c2fb0516a78a6403d2faded4f388ba10ca0d1f0ef73208447e3d94daae11
 EBUILD qpsmtpd-0.81.ebuild 2334 RMD160 26d7f5faaea8ab0acaae8d08c12acb0bfd0080ed SHA1 1ac279d8a1f7908143ea16ada54b218bff3f8b22 SHA256 ffb06381ad72b21ce16a75fc2a6a39a41de440011832e573f6816ff0024cbb9c
-EBUILD qpsmtpd-0.82_pre9999.ebuild 2314 RMD160 bb04f4ef67c5b13238ae46e88169f6fd92a21ecd SHA1 4d2a784284fc7f2ce600ff08c1ec40fe8668091d SHA256 9cd09d205bb6fe0b8318eba5e113cb065f370ed9781e52a0ea7dab0eb6a186bc
-MISC ChangeLog 1394 RMD160 5e475fbb5ce8a49bc254af9b69eec9341993de5f SHA1 c60788b0f9ac092848a89f5b3d75a1deb3c97fc5 SHA256 314c819b4e7d40ffdd70ba1a6d80b3ee7978ac72e373c10298ba5ed0af0f5d01
+EBUILD qpsmtpd-0.82.ebuild 2173 RMD160 da339be1d8e7ea2a6d537649d16d6d9e9efcfe1a SHA1 543f8ecdd9a0098588d39f1cf4bd8a5d4ab704f7 SHA256 0b6007749b592edeafcff31c285d2a87f3db9b5ba032c9d6b8bed0ec8fa2329c
+EBUILD qpsmtpd-0.83_pre9999.ebuild 2171 RMD160 e412176362d2fb8b889370de80290ed69a604238 SHA1 8e4bc59703c6a8bc48e780c1f2be7888b1ce3682 SHA256 f011763afac5b0c14b705d12acdcdeee4ac40310e32327df68631bca883c30bc
+MISC ChangeLog 1633 RMD160 b9002dce6584ec8011ae5df2ca6a5abba9653dfe SHA1 330a7075aa6e8cee5736ab9a12b2e5c7cd280c60 SHA256 06e67d4cae259005beb10005afac8b5509725c78ab2f06eaf9e0aba3a1e76173
 MISC metadata.xml 485 RMD160 0362a983d522720988a075feb3fe643ef09d7e36 SHA1 2fa98543a44b5b9a73f248f4fd605c1de32f56d1 SHA256 5f825ec7910cf1e3486d9d490f2bdbbacb68a2532a7a691500150c1b10c09e06
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