use dobin instead of exeinto /usr/bin/ && doexe; drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 11 insertions, 135 deletions

diff --git a/mail-filter/milter-regex/ChangeLog b/mail-filter/milter-regex/ChangeLog
index 3fa0e108d071..eb4eabbaa6bb 100644
--- a/mail-filter/milter-regex/ChangeLog
+++ b/mail-filter/milter-regex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/milter-regex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/ChangeLog,v 1.14 2014/03/02 08:05:32 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/ChangeLog,v 1.15 2015/03/21 16:41:53 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -milter-regex-1.7-r2.ebuild,
+  -milter-regex-1.8.ebuild, milter-regex-1.9.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
   02 Mar 2014; Agostino Sarubbo <ago@gentoo.org> milter-regex-1.9.ebuild:
   Stable for x86, wrt bug #462828
diff --git a/mail-filter/milter-regex/milter-regex-1.7-r2.ebuild b/mail-filter/milter-regex/milter-regex-1.7-r2.ebuild
deleted file mode 100644
index dc314644f426..000000000000
--- a/mail-filter/milter-regex/milter-regex-1.7-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/milter-regex-1.7-r2.ebuild,v 1.3 2012/06/04 23:54:25 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils user
-
-DESCRIPTION="A milter-based regular expression filter"
-HOMEPAGE="http://www.benzedrine.cx/milter-regex.html"
-SRC_URI="http://www.benzedrine.cx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-rules.patch # fix a typo in upstream sample rules
-	epatch "${FILESDIR}"/${P}-yacc.patch
-}
-
-src_compile() {
-	emake -f Makefile.linux milter-regex || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe milter-regex
-
-	keepdir /var/run/milter-regex
-
-	insinto /etc/mail
-	newins rules milter-regex.conf
-
-	newconfd "${FILESDIR}"/milter-regex-conf milter-regex
-	newinitd "${FILESDIR}"/milter-regex-init milter-regex
-
-	doman *.8
-}
-
-pkg_preinst() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-
-	fowners milter:milter /var/run/milter-regex
-}
-
-pkg_postinst() {
-	elog "If you're using Sendmail, you'll need to add this to your sendmail.mc:"
-	elog "  INPUT_MAIL_FILTER(\`milter-regex', \`S=unix:/var/run/milter-regex/milter-regex.sock, T=S:30s;R:2m')"
-	elog
-	elog "If you are using Postfix, you'll need to add this to your main.cf:"
-	elog "  smtpd_milters     = unix:/var/run/milter-regex/milter-regex.sock"
-	elog "  non_smtpd_milters = unix:/var/run/milter-regex/milter-regex.sock"
-}
diff --git a/mail-filter/milter-regex/milter-regex-1.8.ebuild b/mail-filter/milter-regex/milter-regex-1.8.ebuild
deleted file mode 100644
index ab07bdbb1cb2..000000000000
--- a/mail-filter/milter-regex/milter-regex-1.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/milter-regex-1.8.ebuild,v 1.3 2012/06/04 23:54:25 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils user
-
-DESCRIPTION="A milter-based regular expression filter"
-HOMEPAGE="http://www.benzedrine.cx/milter-regex.html"
-SRC_URI="http://www.benzedrine.cx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-rules.patch # fix a typo in upstream sample rules
-}
-
-src_compile() {
-	emake -f Makefile.linux milter-regex || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe milter-regex
-
-	keepdir /var/run/milter-regex
-
-	insinto /etc/mail
-	newins rules milter-regex.conf
-
-	newconfd "${FILESDIR}"/milter-regex-conf milter-regex
-	newinitd "${FILESDIR}"/milter-regex-init milter-regex
-
-	doman *.8
-}
-
-pkg_preinst() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-
-	fowners milter:milter /var/run/milter-regex
-}
-
-pkg_postinst() {
-	elog "If you're using Sendmail, you'll need to add this to your sendmail.mc:"
-	elog "  INPUT_MAIL_FILTER(\`milter-regex', \`S=unix:/var/run/milter-regex/milter-regex.sock, T=S:30s;R:2m')"
-	elog
-	elog "If you are using Postfix, you'll need to add this to your main.cf:"
-	elog "  smtpd_milters     = unix:/var/run/milter-regex/milter-regex.sock"
-	elog "  non_smtpd_milters = unix:/var/run/milter-regex/milter-regex.sock"
-}
diff --git a/mail-filter/milter-regex/milter-regex-1.9.ebuild b/mail-filter/milter-regex/milter-regex-1.9.ebuild
index a134ec16b7d8..d0147a5f2535 100644
--- a/mail-filter/milter-regex/milter-regex-1.9.ebuild
+++ b/mail-filter/milter-regex/milter-regex-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/milter-regex-1.9.ebuild,v 1.3 2014/03/02 08:05:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/milter-regex-1.9.ebuild,v 1.4 2015/03/21 16:41:53 jlec Exp $
 
 EAPI=4
 
@@ -24,12 +24,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" -f Makefile.linux milter-regex || die "emake failed"
+	emake CC="$(tc-getCC)" -f Makefile.linux milter-regex
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe milter-regex
+	dobin milter-regex
 
 	keepdir /var/run/milter-regex
 
@@ -55,7 +54,7 @@ pkg_preinst() {
 pkg_postinst() {
 	elog "If you're using Sendmail, you'll need to add this to your sendmail.mc:"
 	elog "  INPUT_MAIL_FILTER(\`milter-regex', \`S=unix:/var/run/milter-regex/milter-regex.sock, T=S:30s;R:2m')"
-	elog
+	echo
 	elog "If you are using Postfix, you'll need to add this to your main.cf:"
 	elog "  smtpd_milters     = unix:/var/run/milter-regex/milter-regex.sock"
 	elog "  non_smtpd_milters = unix:/var/run/milter-regex/milter-regex.sock"