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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 13 insertions, 161 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/Manifest b/mail-filter/milter-regex/Manifest
index a3e34873bba5..c4c4c3a51996 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX milter-regex-1.7-gentoo.patch 1489 SHA256 9bbfd44ac27041421a3e8887db49057386628c52ac60fea4a9344493c560b209 SHA512 a6df75632ae3411ff2dd0b515e8137b3dbd4efcfdb8defa7aa6a85ff1e9dfd0ab9f67b080903092b1878268427f9bee6cc6be2ef774baa89f7d44f3a6e1c7659 WHIRLPOOL 92df594a2bd15ac4d0730cf39379322bdc6a46082f60756aa49fcef50a18bc492f790c735745b869c5764f95561f2b622c38d9521d52ebe0a62817ad8a8c6001
 AUX milter-regex-1.7-rules.patch 351 SHA256 8319e51b061a12d13b49fdb602e232d229fe25d418cddbe9e96c6001753724ae SHA512 71d9ce6b24ac4c816de5efea6909bbe347474c1e8230bb3e50881ca55bac5c24c61868d992d19b2013c5d03d96df929207b3c3fd50db028810eb05eebc6f0e28 WHIRLPOOL 788f1464f8fa56589cc26d827495481258e2a03653f565e11abde1c226bc81e839eee41d34ef6e95fc711565cf901ba6be7c07b2c83e390d963b227fd9cb9643
 AUX milter-regex-1.7-yacc.patch 428 SHA256 a2f40699187e9a075f6a306b1051fb71adfd430a0c3d1d2e65f8170f12535d05 SHA512 32050dae0dad98fb5bbc0165a3890cc6f3e9af8b8e84ca5f7344bc9e2704d9e56cad9380affbc978eada31bd23375b5fbd388b4922a2716d0e3e61e91ceb577f WHIRLPOOL 820bb0c14a9d1ae59b943a110c332b7e5baf92b4631117da39fb19e17ccaf4ab5afc615dc43e5ad12fa963754352a19fa711719daaf6834350532acb11674315
@@ -9,28 +6,7 @@ AUX milter-regex-1.8-rules.patch 450 SHA256 96454430f7ae9b3bb6460d3ee9a4121cec17
 AUX milter-regex-1.9-gentoo.patch 1074 SHA256 4e7c6d3e1eddc6c423a136b223fc380632226ced0a917125417946ed725881f5 SHA512 d7311e3da08aeb39b2706c110c67a1aaf3f114aeb3fe94a73f8c10a8327e1865cb911f992a887fb518a6c500a4bae5d4e8c39955820436b21dab8f3820dd27cc WHIRLPOOL 4b3c5a06b4c634d01f39a58525ed59e9df10d5f7452ed67e53b38b5fc14468e8cb4b94a957af0b74a01f27f2ea61959ed54312d9845443cf8e83644b6254f333
 AUX milter-regex-conf 177 SHA256 e26c4c6a876dd8c3c5a15e6093feec5da7e44b396636c96d2b4441f555a8a150 SHA512 b4fa346684bf2184021adad76c44fbf38e3127299792d5a3b0f0052019a6046deaab19b56bee2b44b7f4fced9c309f440cf4be18f8190d661fc08bedaadbc2e8 WHIRLPOOL c45cd63389ad11c5130c2d1a5ff425aa884052a7d722675b02176477492a2dd02c08f3a0afa1763403abd36a5cbf20f9741c6ade90c69911ec8eb12f4e876161
 AUX milter-regex-init 964 SHA256 3aa5c796e3b4c96378395aacb6defe489fc1018aa5544680508dd59525aa1145 SHA512 b6265c06e6f9723a7142abf9b6fb2aa2155c30079c7b5e322bdc9da61cfb3f6ca700471b0bf2cc34c88c315f101a03d6bb3ebf02aacdc12efaccf95cd99e4847 WHIRLPOOL 470aad316d5b46186061fa33d8d0fa34aaf5a384577d2e482361f1f43c19b53ec98268b1e445ea431e8776916ae0765dab34390147ed0e0ae11ea511fd7db00e
-DIST milter-regex-1.7.tar.gz 19321 SHA256 ca64e51c67a27962e2d258a0f69f832ffd56b5270dbe4440f960f457c74bbce6
-DIST milter-regex-1.8.tar.gz 19545 SHA256 6399ab230618a419c42b117e37fdb2def3c6e1ce368341df5105cd505f377c2e SHA512 0fec535926a85fd81d2d07e6d61594d76b1d254793ee1f1d02e6a2f22fc9e4600ec73233d0d9d1847b36d5585ec202d7c4dd1883349b2a686e9fd7bf1c6e78a3 WHIRLPOOL 2b795608f19417b747f8bfdb151c27eb1af019e513fcf198d0948a9a73c4b59a46abc82654e3748e3b91c452e3fc45d0edfab03f9e9efce759cd82a88ca25f3a
 DIST milter-regex-1.9.tar.gz 19880 SHA256 6a708b0ff31d9f6db0e5b96915354c15f65ca09a730c599970b37e30699b18e4 SHA512 55cb97eba01220eb57c29498a090152c05d259abbe6f771e47a67499e7c2a1d4121ec9d0bce84cc8b6490bcd20dea8eaaba753e61f1ce9002edd8440b13f7148 WHIRLPOOL a8c1d75c016f32ec357e80498b7de5a89da50cf8a32bcbfd9e0467c829870c468beb6b12f138a352f518ff26a3f95c83ed25892670bf1a7f76f2b728cf626f30
-EBUILD milter-regex-1.7-r2.ebuild 1898 SHA256 df733b01b45bece60d5052b706d1ed321e4c7bea3a222fca7a7f90cbd0791ac0 SHA512 ec9f4ece8bd7eddb92ad1e2799fcce2ba8f10d2620b204c9e0de6c30a76bc6510ae1946e64d11e3236a2da13327d4454f9c988465179250a3ac7515f49e92b5b WHIRLPOOL c86ccb1440057a072018e4de3b96064dc21ea16851d7277a468bcc9967fb9b19d0befe7077baac2864e546fe9071a4f96d6fc958f2953b03192160efe0396025
-EBUILD milter-regex-1.8.ebuild 1857 SHA256 10f66553ace194c35ccbb3f991d3609ce083bb21aceb181f966aab7802c95fa1 SHA512 0b7f7433b0b1e82966bee1faa1231acd76bbc85e15a039cdc31b64fbf44edc5f70e06a5b0aa9bd4b328cc7b872230de40e639c27583dd587e7e32e2bacf0f74e WHIRLPOOL 3679795cceb24e7191017cb71f749beb93302435e04190acd312ef599f7295cc7106fcdddfa1bbebbfaeef9557ec6e40828e809709de6c9abb1766f54e28e19b
-EBUILD milter-regex-1.9.ebuild 1789 SHA256 9ce0664db807a81e00ce4e30abd0b5dcf4d4ee15e1cd45457c5a417ef60e6dc0 SHA512 d69556b8757db452366ca4d4697eb3f30c700ddafa6d9c0aafe21d15aa016c7b6b67aae01ef5c747bb8e428f4e4b23a927e853c936097b126c74b13006ec6aad WHIRLPOOL 2ad8d38f533bb96c722431111878d5b3ab335b309ffa143cdd26ce132d8539b24d580f6f850ad14b4ad21da66fb06b2f6963e8f4d11526b562bf53e0e431281b
-MISC ChangeLog 2462 SHA256 442a4829c37c1c328aa2946f4c0cd68732aeb30b4fbc0fe83372e7aae95b53b4 SHA512 7fa8b9811a0d299173004238c80eadbdc7d1f41c37be8fd3372dc2d1a463ed1b47eaf1221149daa4d6a8347a06262689003730a96a84f5cf5bb1b0574304f166 WHIRLPOOL c3b71f8a5963d1929ca32bff05c30b3c9ff4ee728695ce77029982228c6e1a75604a9bd6cbbe630d21ebe8bd6a11723460b460f973ea01a38c129211daa81d17
+EBUILD milter-regex-1.9.ebuild 1750 SHA256 932904c0293292ecda1c78a7b66fe59ea0c68b947153e04bc69177389a8ad9b0 SHA512 e4408eb161ae03f164c367baa9912c21ab61956fe436dc6909282b0efdd7e05cc19adc9636619ad64a530959f0d06c14867231160d6a172892422dd066266f94 WHIRLPOOL 9613e92c179d4ed3efb4ce431428435c169b899345d7b4c13c0348eb640bcc7f3c9c0c77032d30813ad89d78ae26a4f37a076a4706dbd9c85391891cb3897e0f
+MISC ChangeLog 2653 SHA256 f3c6a86b8aec3b3fafe3d2f0089176b8df9106307e0520a420d24dfd854e6d8b SHA512 4c33e310d2c17625b47cb117bc42e32f8244c0c1b3099b950ad5e7b9b9e889b885c19bb8a6ffb9d6db3f6e210d11d7a9dc55f5881b38f39ace4567300918dfa7 WHIRLPOOL 2521a87212229c49d749aca5436ff9050a4af2d813c8ced853dc6c6aeba136d10dc57ad64fbb08d66f4a037048188e68a0fb624cbaccf85ed3bff757dd97c04b
 MISC metadata.xml 400 SHA256 0d5b1d38e713aa4cf31874a75d2667f4805b0af1641e24b2a323486fd5d89283 SHA512 f0532f2502b2663b8a1a46db7c11d1a022d4c7ef6ce2cd46ac8510dbbd95598326e1c2b4a6fe5b5638d98c4a7d803be20537e1bbdc621c8ae4e9dd4fc4f2d40a WHIRLPOOL be63219458f2ef1bb770c2484dcb59ddce9e2e7b96b0a00b11d655524679f9f550764eec90d883818bfc95b618893a9f0faf0ecd5f58e7bb51284670dffe7a6a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTEuZNAAoJELp701BxlEWfsKkQAJF5Vs7mIXKu3H9ZkyWhzas8
-w3ggwWlkbhhGGvmPGDMzHsfoC6T7ZALx1L7s3v9401vd9W2UJ/ENLuo8eIxviKa5
-EQyuyv+FEtIuqWZwpm+1Hm/QQS7fb4BeEXJaxGcTbajbr62KyKn/6LWNYqB6YOsW
-c3zaNKHEXVS7PNL7HAzx6kXSqccl1Bg9lUsqhbhO22wVacVyY7M6WiwKDNOuVSZf
-yLMnMZi5j0IsjG5jeGEY16Hsfb5Z45Bi5PmPVk+VlN/qFkKMEo3Jw7PkKneIQTyc
-a/WGkE5uYPqmBUBP6P+tfeCiDa/qk8BKHwNDGhDNZ1+e9jg2IJsRSqTTHSeImpSi
-M7OWEdEXgaKN7wWLI2TJnv67fnM3g8q5OYW1wWSi17Uw6vyJ6+4GonBjXV+fbdrU
-SGjtLwLcVzYpf0PFhw3wZrwmDHtR7qBxmAGdHh++aZCU1EjpTzdbps7tuJ9OTO64
-9cwJlMw72+Zy7Ak9ONfVj9LX9jDJfDseukfLGq5jKTWx+pe4wDxEwYJ9DTIFiMqi
-kH50lzH+PpUnyr+FsxJbIuWLrvcEAYoTDNbpzGaL9WCuwHDYPNNGFmzuj8KVxKU+
-YYS/WiPPZe0HLs5cxikKsSH4BiJWpnfEplklGR4se010mxEkyD3HEZD6BtYMLiYD
-/dHd092DCDaqE1W7pVeg
-=vc1K
------END PGP SIGNATURE-----
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"