Stabilize the systemd ebuild for bug #484914.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

4 files changed, 22 insertions, 108 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 833da298ced5..648e4b4fcc6f 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/opensmtpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.25 2013/09/20 19:22:00 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.26 2013/09/21 14:04:35 zx2c4 Exp $
+
+  21 Sep 2013; Jason A. Donenfeld <zx2c4@gentoo.org> -opensmtpd-5.3.3_p1.ebuild,
+  opensmtpd-5.3.3_p1-r1.ebuild:
+  Stabilize the systemd ebuild for bug #484914.
 
 *opensmtpd-5.3.3.201309201537_p1 (20 Sep 2013)
 
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 8c16f5859b25..dad16844c33c 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -9,24 +9,23 @@ AUX smtpd.socket 114 SHA256 0d4e598dcee849b9baf9a35f42c91e49545ffd611cfa425958d1
 DIST opensmtpd-201309201537p1.tar.gz 787578 SHA256 af803c9233c89b1d4473a610dcb9bd83860ab7ef8f5be19462c52c11e5d1fd3d SHA512 c9cb7a9efe609f82ca416d40b66444a5e38c851bcd7286d6ea79d8bcd2ee4c295b49368e0e73bd4d5b8c08b6ceb31617157c9445b733399b495894de1848f9e7 WHIRLPOOL 92af9f1abc924750ce9b4ce7682b2c390d9f985439c19b8615d63d732fa685fb972676ac54b9165f2c4d81a84dd711ca1d04ee9ba93bb4d9756cd09a392644f8
 DIST opensmtpd-5.3.3p1.tar.gz 343733 SHA256 34f0e208e6fdde5c5c25bb11f468436c4d6148a8b640c32117869cad140b823c SHA512 8ea72773dca4f907d2b8285fc7abcd5c4c19ceb50b547cc4a217ec296a222f8134bfc4bc7707439b0c5d58b5354f92ebed65966179d7598c4793cad4370b087b WHIRLPOOL 1df185264da3edae4a1a1a56251af2a7e81dd1b4deabaf8d68f043beb16ca22488f775ff656dc8b84c3a3d024c0e4e67240f0c248edfb85bb2835290a28f12fe
 EBUILD opensmtpd-5.3.3.201309201537_p1.ebuild 1939 SHA256 fa51fa6c27452e170b63068401d05242298f0ab3e51bef38e57b4fca1852cf6d SHA512 9da68b0483054f650203a37824d33746c0e01136d0e200c2f1b855c3ca2908dad427555568e542884f699fb959259f67bad34c8f02dbd9860565b36182e5d037 WHIRLPOOL 1f4f9dfe9dc52e57c7dc0c8bf12fa84b850f1d13ca865c178bf01652ffe16147fcc7027d431e92487c5a5d6b1ebd6a7f3dafdf963c3b7d6de38fdd58aefaa910
-EBUILD opensmtpd-5.3.3_p1-r1.ebuild 2307 SHA256 fc18411f623eda8486601e224ce238e3433a8a6431349bdc8462ed96b5bb1ac5 SHA512 d97c67e759b443eae2609bd1a88396105f26008d39e4bc42f3ea16b712de01a6e0195232658ec742da9d37b8916ca7e0bdbb0d013ad3b35892af673dd0a52aa5 WHIRLPOOL 514d440c5054dbf298c10475c6c6748bfee7a653135fa327fbd74acd37608a32f262290db5beec832df44c82684dec1184670622efdc4129428603e605e8f16c
-EBUILD opensmtpd-5.3.3_p1.ebuild 2241 SHA256 ef6068ec5cc63feb0dd5c1f3bc0ba537d6106855c79205c22b3ad0cfb658a87d SHA512 22d9b708287efce446a50329058406f1ef7600673fb17acb8703933fe9661c3ffcd3a396dd5ecc704ffca4bb3b2f12d68b650155c8192ebb18b54d9f9013238d WHIRLPOOL d3ea07f26871dc0ea4019e2a2ed921e61958a92bc2464b66bdba5b5de384fef92492bc3d0a79a7f7ad54de40b1ed158f6f5e0734c2186a68224642202e970d43
-MISC ChangeLog 4703 SHA256 149992afc01a94073aaf15838a18fab775cc7f44191616670f20828bff538fd8 SHA512 3fb8ebc328a4f1b4cab00dea5b003bb90db39dd45843cf329c63cea284ad19d9b306e06751f7a105c6619b9fef5ae63ed38c4990d85c2253ae6e8a61bdb8064e WHIRLPOOL 54a6193554e2a9a5ad888d500415936cba10c0ddab22f6147607c1714d8a2f9e0e9a05c6acd12edef5d0fdc95670add5265140e4d4a30e771af25d0d896eae0c
+EBUILD opensmtpd-5.3.3_p1-r1.ebuild 2305 SHA256 d21ee278f9867ebe6da280f4ed97a16a1126a658be38cf95722cc3a94eb0a2ff SHA512 5a4936c7b96b906ac8b17fa2bbf21d503145be5a8b403499faf0f2068ca21bce281a7b16ad31886c17811bc5ed1bbedc217c9a51ec5cfb3c3f5dc8cc5bc062c6 WHIRLPOOL c0289c5269560a3d6ffc1d7036608036c86cdbb49db0984d45ffa61d200140ac5ef12ea6a5a0127ce6ed12b2ffb9c38e38e07cbeebc2c657b7c25729578e9485
+MISC ChangeLog 4865 SHA256 2d8644e04b7030b08ff57f2ad33d2e1dec975e3315500e507bd25915be5937a9 SHA512 e5382ec310fda8485bc9e8d2d0adf1a70f43f130a96c42114ced0e9731b37f4995f9d90afb6f4657f01ba47176222fb65e36597129eb8c7873dd537040d93af9 WHIRLPOOL 129df896320978dadee96326322b3d068862b05dd34c2d856774207be15457cf07d6176eb6003cee0ae5dc3504321f88f92083481af33e198e0b4b7a3ae44adf
 MISC metadata.xml 582 SHA256 c5c363648f6fecb0bccaae7b9202c2ec10c2413732300cfac851bf359945a40c SHA512 86d6970f9bc766f4c0da6d5bc3fc7c0df22620507c536b202e08c2ae753874e11ba386a3b366f1e1208e035ce6052f13cfa8ec07e0b61785f2c673929720b91b WHIRLPOOL 6547028efe39bd177e36b67e58802e320a16e3f96dffcb5be6dce4e4137ef24a7da53e0c49fdd7f396fa0ce9ff7c2981943bea02a024d6cbecb261a038d82375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSPKBIAAoJEEn8cBKl3gOus8kP/0pSE8yJyrVQcnJIqgNlGR6R
-4EMjKc4DBwl4BzQYy1rylzdyRRRBe+cT0Jl03BI9tK811ax3Mym6drK7wcOJaFuD
-0q9OXcfnEwoUm+OdtY1QvbGXQQeLth+9uvUGbooG58HMhgQjdPd/jNgIz7ZHwwWF
-nGmBoPBsnlMEk7sA+3eAU466JMuyCp1YTgNBlg363es36fhQwv6ixXIiWi0iPVXr
-ClFdyCXabR4LykMwxLLoKX6UipeJxxt3Iex8wecKXVbhUzQjfc0v0TWwyxtEFmPM
-2NL/4EFFThfdsCWXwKkoIiyU8vt8xnewJ2IjJKY1JFLev5j1ZrIrkzP9e/tZhjSM
-OLRuhkZLPS0ydc07q2OmR9GHZnAJ7wOPQUN5BLk2rn7q07CsKhXhbbdCBZCg0MHP
-k+TTtO1vQTeCakFbukJ8NfeFb4nQLjTERUaxJooNa7yaS9esPznIvV+lxaJPsppQ
-ciQa968GKObtHemOk9S+KlXBuHT6V6rAiSwj7kSlBZZMSBrJgB9lJyClx0wHGFmj
-MtN9qfQc3S49daq5zkXpvFBaQ76EarFCAJdsebsW1+pQJxuE8KFjh/8Z6OtLqZYU
-X/MaYmWdICJncN09wjuN6hZ9qVxyDv5oCHX/NAFeIIjLBCWPCNTAmXvTlmFaOjuH
-KzgcYXaRd6pyacbjRUKZ
-=UrHL
+iQIcBAEBCAAGBQJSPadcAAoJEEn8cBKl3gOuqFsP/0RnTmeX1lFhgBE28V3NHt+n
+JppJqsmjV/ucpP5WYCeLa88Sz/n6c6JaY1aGtl3uiAGYo9MKbis+eYvJ/wOMAOIQ
+vE/cngyvDB+bPPYvtU2ZahgfyrzalI1vqIiz57lNSRQQ+g5Jyo0cukPxzYwgRsPN
+7hUcXFIwgXIIf0FCd07+dAhkTPhydlhjDXUVgeDXlollqQ0kAMI/+5DPfZO+/guj
++gpMxSg5hfwtCkvscVfALczTbwLy9PWqPYsjxpzsFM1dcUcJpcJ8eFZX8AlqQmW6
+tE5lmBQKApQK0KdLJ2g404roR0+c3uhQmNngkMzsTblsgx4qId74hmNazu4PjDai
+lA7piHxMzxHEAQrAg69Is56vLh9X3JauztXC9MuaccUyWIdilaSQ8ppr47XIJeh1
+Q2yLNCsQMVdfCYw7O4mZWnmqAY/oAc6veA9xvoDW0LFaI8/LTb0DRtpSLDuAPrFN
+IA8yWkSRDBmPXvAWz35nEDK0qkXD+atnrjUNxCcXGSg1JigUW73VWTewLNVSvtsY
+kKzkOL45Y6HeLhe04d5ktEoC4HccY5cz3IB6FVQoQkaiS9C/jJJmKi/jXqZBdWL6
+KypbBHxrYRkFw+ch3mLWsG8/uOZv1cW6jzAJI0Y61zX3m9eWOjqVPdeK9jY6bnML
+CyO70IFjR8KYi2oEp7hx
+=+lya
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/opensmtpd/opensmtpd-5.3.3_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.3.3_p1-r1.ebuild
index 666d409faed8..d66e63fb3323 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.3.3_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.3.3_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.3_p1-r1.ebuild,v 1.1 2013/08/30 19:06:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.3_p1-r1.ebuild,v 1.2 2013/09/21 14:04:35 zx2c4 Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.opensmtpd.org/archives/${MY_DP/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pam sqlite +mta"
 
 DEPEND="dev-libs/openssl
diff --git a/mail-mta/opensmtpd/opensmtpd-5.3.3_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.3.3_p1.ebuild
deleted file mode 100644
index c2adac0a31c7..000000000000
--- a/mail-mta/opensmtpd/opensmtpd-5.3.3_p1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.3_p1.ebuild,v 1.1 2013/06/05 16:59:27 zx2c4 Exp $
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-MY_DP="${P}"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_DP="${PN}-$(get_version_component_range 4-)"
-	MY_P="${PN}-${PV/.$(get_version_component_range 4)}"
-fi
-SRC_URI="http://www.opensmtpd.org/archives/${MY_DP/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pam sqlite +mta"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		pam? ( virtual/pam )
-		sys-libs/db
-		sqlite? ( dev-db/sqlite:3 )
-		dev-libs/libevent
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/msmtp[mta]
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-	epatch "${FILESDIR}"/build-warnings.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-privsep-user=smtpd \
-		--with-filter-user=smtpf \
-		--with-queue-user=smtpq \
-		--with-privsep-path=/var/empty \
-		--with-sock-dir=/var/run \
-		--sysconfdir=/etc/opensmtpd \
-		$(use_with sqlite experimental-sqlite) \
-		$(use_with pam)
-		#--with-lookup-user=smtpl  will be available in the release after some point
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/smtpd.initd smtpd
-	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-	if use mta ; then
-		dodir /usr/sbin
-		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-		dosym /usr/sbin/smtpctl /usr/bin/sendmail
-		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-	fi
-}
-
-pkg_preinst() {
-	enewgroup smtpd 25
-	enewuser smtpd 25 -1 /var/empty smtpd
-	enewgroup smtpf 251
-	enewuser smtpf 251 -1 /var/empty smtpf
-	enewgroup smtpq 252
-	enewuser smtpq 252 -1 /var/empty smtpq
-
-	# For release after some point:
-	#enewgroup smtpl 253
-	#enewuser smtpl 253 -1 /var/empty smtpl
-}