Stabilize the systemd ebuild for bug #484914.

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)

3 files changed, 7 insertions, 92 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/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
-}