Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x55758000

6 files changed, 142 insertions, 131 deletions

diff --git a/mail-mta/opensmtpd-extras/ChangeLog b/mail-mta/opensmtpd-extras/ChangeLog
index 83a33510c114..41f117851b30 100644
--- a/mail-mta/opensmtpd-extras/ChangeLog
+++ b/mail-mta/opensmtpd-extras/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/opensmtpd-extras
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd-extras/ChangeLog,v 1.1 2015/05/27 13:15:25 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd-extras/ChangeLog,v 1.2 2015/05/28 10:32:18 zx2c4 Exp $
+
+*opensmtpd-extras-5.4.5.201505281056 (28 May 2015)
+
+  28 May 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +opensmtpd-extras-5.4.5.201505281056.ebuild,
+  -files/opensmtpd-extras-libevent-version-macro.patch,
+  -opensmtpd-extras-5.4.5.201505202252.ebuild, metadata.xml:
+  Version bump
 
 *opensmtpd-extras-5.4.5.201505202252 (27 May 2015)
 
diff --git a/mail-mta/opensmtpd-extras/Manifest b/mail-mta/opensmtpd-extras/Manifest
index ec6e573b4fa7..76da73efbf1b 100644
--- a/mail-mta/opensmtpd-extras/Manifest
+++ b/mail-mta/opensmtpd-extras/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX opensmtpd-extras-libevent-version-macro.patch 1247 SHA256 1a779a436e23c35253086f8e1277f089f11ede433c6f22b3e90f5fdbb107dd45 SHA512 6b906c484ec9ae8821ab8fc1e67bef19e09308cf46baf9c79bb717dc6ff871d467e328bd0e7b6dd9920f2ce44c8e70e4ed3f98c5d5cde7cf7b138d6bb03ee8bd WHIRLPOOL 5502a7d3c062dbfddd718d566e85d7bfd28be7b6f6c0aafa003923a194104b0a220ad7f6a4a22f9bf771c96c6bec1ecfccf6c8a92c28f87d1879d0c1975992d0
-DIST opensmtpd-extras-201505202252.tar.gz 626350 SHA256 0f979b81651a2b0539b0233da127b12d907441055b5811bc45ffad22ed472053 SHA512 20262e1e8879c0f268f324ce379cecea2196568707c744f083b73a9a0d0b2bbd966c24e8c729ca087dcc03e901680d523faa9fa9a8f39a7cdc9cbcdb4292b7a9 WHIRLPOOL b9999ae1c8a31aebe7cb954a0eb894eedd5875f2882b10a0ca3314ce48258026cdb4d9b3d8eabb424464bc8288eb1dc9282e0e7b3fd81588fbbc91b06e3767cd
-EBUILD opensmtpd-extras-5.4.5.201505202252.ebuild 2365 SHA256 ab5c96676a104fe86d049cdc05331ee4aae085cb61e8cb9c3b26fae086d32fe9 SHA512 0eef6f3865527c2657eb57433f651d8a185bfbf057213610a277b24a738ac0d75533569b61cf95a6eb97673cd6a986a26a59cbf3b4cdeaaa135cbc2813bad0ff WHIRLPOOL ebe64816c1ea40a50a2363d58cea2bf0b5a9f12e28a5d8d7500e14b66ba344da7f71b15ed2ea70cc2b03cee79adec81c1ed35bcab0862abbb2de9c5edf2dc42b
-MISC ChangeLog 462 SHA256 f8bd529b90cf63308792ea56867258e2c5e3b0e965c6b3ba23f9420afcbafd4c SHA512 3fb9f8619ae04bef5662d223d2690b63f9071c85b7d2dfe3020cd1188e4a3042bfe32105e34bacc6b566c5891f4d6784f3e629a709b23fe5a69bab5fa70a74a2 WHIRLPOOL 93d45f703d06f79d788761dccebeacae3bd2e77b841fe4737751028cd7b9e4936510dba487360e5c7f6f909123a251b2787532af1f47f4aef9bdacc3ddb85c0f
-MISC metadata.xml 351 SHA256 496fcab83afe6636a172a8a4101f65824df41453dd7706313666b8edb1fed58b SHA512 ee49ef692038a8009baccd784d6d261dbb63294348be5c8b3add85fe071b8cbff4f4d1856d74ec0ecb640d6d1d37fcc62ddf823ecf7801dd0e53905a147af4ac WHIRLPOOL bd28a46487608852d72c60911a27abb6f41630522ac4d85a855fd9015ee3ccb6acbec8f5d7eb514493b856d784a73a648a036dda42adf8ae95f2dff29c6db5dd
+DIST opensmtpd-extras-201505281056.tar.gz 158740 SHA256 47fe0c63b78e9f29f0432accf88a4fd551c20bc9e14fcf15917430a401512b15 SHA512 842a0cafd50d23f29d84440bbd95cc6600caddc4aef78961aedab840ffc1980f8b5a98ab7f01dcde56b9134f4a55c21e45df23dbd894d9137ee978bf78f74175 WHIRLPOOL 44172be9eab0efdb98250ed08c1428fc47e3dfbcb25df5d84c0add34783684af3ee3c2cf1706f5949ec6952810002ac6a90935aaeebbae9d1bb50f08c47fec7d
+EBUILD opensmtpd-extras-5.4.5.201505281056.ebuild 2138 SHA256 22c505fde2efab0de73ac6e7d9ba9583c40338363ff4600cc41cbab6440b7c9f SHA512 e68dbc52e32ba999b47eddc6edab80c957a71a623b47b1c723e92b564ad64d14887830edb2b504b997b167827444ac94642dc6cc7aba30765db737c364ab98ac WHIRLPOOL 4f42998646967295686331e4ff63097d1c905ce7581c6b3cd42736127c826a4b4e0c019a7b5ade7eb9111d50b8b52ee728a23717ceb2f5aeb1942e4fe3173e6c
+MISC ChangeLog 747 SHA256 ccc67b6603f58a099c3f814f557c370d0b2214c19871f7318516a88a793cb91b SHA512 7b236a30507c3654d34bef4022023c9bb2a607b41c3f13699685532667efd5265be84f2e06d17ca06597b675ba2926b9d13ec0665e0ec68b7d4c82846a3ba918 WHIRLPOOL 10c11913df51e6a35343979400e7f133e0c3ece5ef7edbbf9afa9a428e84f4a08f80c7cf0c324771fa17a23a3818ee5b492c743b38fe3e9f53ad4d76a3616ab3
+MISC metadata.xml 2269 SHA256 b55c7c293603ac545208d248962d6cdae3473cdf7007ee6a52f32fa86393f2e4 SHA512 53faa8687247ea572cc3ccc7194f1bdd0b7f0e8ca94d3b860e9716ef729f42a580a0576e472cbf0a1514a7b85540066fae0f6795de9eed13ecd4b5ed2fc187a8 WHIRLPOOL f637712641f26b485d85bb9005b4a370a8cdcbb73f8ece25197e652cf4197e80bb27cfe6196c4adf92e860daeeab11e710c9541eb46d3058dd34fb71dc3677f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZcN/AAoJEA9GG/3yO0PNprsQALVP7gQRb7ZjTJCNCo63sd1R
-bFvgllK5l+2ysl9cxHy0FyUJK2pH7WwNaQOTO9mWYcKS1YGMe4q1V3KQtTS6EvKF
-gugdQ9wLfGztNjt4nk/MmlcAIiFJmAgHiOccR8vZIhbyg56DfrjrFTfm4lrqiVMC
-AM6+QPrJ6M7Qt/ljhMl8JAZvlmVP/amo7UJFzw5E6HtFrMHT+lMAjCMS0cIdEIej
-7mZMmQKt2+ORCX6hyIWJhDL07R9GYIAS7ouESpr0A8kqv7n+zahJyA1k7fiGFQAC
-csIZSgt/aFHgb+w0AH8Ndm8BOVBSrXV4Y/VvM8ckQQTK24+LsPE26JrJwVcfs0Qg
-8IlGyfyrcGb9d80NBAhumDwaUymkynyAa+9AChfD2s+m3M5a5ximENGNny2LPBHz
-Os3bXYj3cJ3CgwOHS/2DkLl8yJVglFm4QC43stEirNNvSpBR1EweAJGNS8u3rrOq
-/OJzqpVwgnKtqC1k5uS30k+hewXDKf/PhZuY+chJxDXw65hnR8owFsFY/Ft8gWOi
-+MA6LHfI0G9de4+GeCX1dZBN4sWHV+JUpWwWctMvsidyWnVI/7QccAUMjvH79BiW
-t2EQnJ0nhHMb+OV2ChSDYQYCGOHpo4ju6tGiay3a/7PMgUYLn3Us3kiu4mDRARpD
-OmiRv/hYJq4ZLooVPYqS
-=a0G+
+iQIcBAEBCAAGBQJVZu7EAAoJEA9GG/3yO0PNnTgP/ifykfNYzE4NAzuAWiRVixvp
+ABHfjHy62kVDBgPvnRTUbzjVbLQSazKO5oU1bnTxruHlDSF8/+6scKJNJdMtVPI0
+U7aLfSTb3V6Q8HcENDcy1H7Z6n/wcioYT28aiolv4Ng+ZNx9W/StjHZQLPrhm1hI
+rq/Er6ghxGANA5ZsgxgywjrUFETkfj+MsH9/ppX7Hb0SncS/HZTCKMiXGzMrWxM7
+L+YfAGjHnr5FiVdpareuPGdvOeB78tQDix4UZwqqLTtC+V6wx6jh186UaN/um+wQ
+x7vdpZzKvbwssoHwnpnJgKYcCirAlDMOGpCKo6m6KyDCltrOuJVmUzlreecAEZmP
+T0un1kkKYHIR/FHcC7KWDZRBK5TEfX4JzzUlz7SczIkic7+QC1ENqmZhXZCDdUCO
+cZFiOFG5BOGIIdzSZVF3/2QOkRbf/EuOPFxQv+Zge3WaOADMdVeem5odTdHqZBDR
+J97DEDlgOfnCpsdYyHW4mTF4zpVMp24wS4h0AHtS7GRt0dNwghv5t1J0jxyD0Qy8
+X0BQ1i6fIeYiZO1+6qDZJfpoMhKL99O8H7fhXcQ6huoOII4Qf8enNged6aizcGuv
+vGguCs5E+/DQ1jzrTgbKT4bEi3yUQTKdtDad4Ri6yv8GYqywCCwjt0YAelt0p3kh
+Ck8PHPin32b3l5KUel55
+=hpdT
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/opensmtpd-extras/files/opensmtpd-extras-libevent-version-macro.patch b/mail-mta/opensmtpd-extras/files/opensmtpd-extras-libevent-version-macro.patch
deleted file mode 100644
index ebd3ab4a77d3..000000000000
--- a/mail-mta/opensmtpd-extras/files/opensmtpd-extras-libevent-version-macro.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru opensmtpd-5.4.5p2/configure opensmtpd-5.4.5p2-fixed/configure
---- opensmtpd-5.4.5p2/configure	2015-04-29 22:53:03.000000000 +0200
-+++ opensmtpd-5.4.5p2-fixed/configure	2015-05-27 14:20:48.977763792 +0200
-@@ -19667,7 +19667,7 @@
- 	if(fd == NULL)
- 		exit(1);
- 
--	if ((rc = fprintf(fd ,"%s\n", _EVENT_VERSION)) <0)
-+	if ((rc = fprintf(fd ,"%s\n", LIBEVENT_VERSION)) <0)
- 		exit(1);
- 
- 	exit(0);
-@@ -19794,7 +19794,7 @@
- main ()
- {
- 
--	exit(strcmp(event_get_version(), _EVENT_VERSION) == 0 ? 0 : 1);
-+	exit(strcmp(event_get_version(), LIBEVENT_VERSION) == 0 ? 0 : 1);
- 
-   ;
-   return 0;
-diff -ru opensmtpd-5.4.5p2/configure.ac opensmtpd-5.4.5p2-fixed/configure.ac
---- opensmtpd-5.4.5p2/configure.ac	2015-04-29 22:52:18.000000000 +0200
-+++ opensmtpd-5.4.5p2-fixed/configure.ac	2015-05-27 14:21:00.868764207 +0200
-@@ -2697,7 +2697,7 @@
- 	if(fd == NULL)
- 		exit(1);
- 
--	if ((rc = fprintf(fd ,"%s\n", _EVENT_VERSION)) <0)
-+	if ((rc = fprintf(fd ,"%s\n", LIBEVENT_VERSION)) <0)
- 		exit(1);
- 
- 	exit(0);
-@@ -2773,7 +2773,7 @@
- #include <stdlib.h>
- #include <string.h>
- 	]], [[
--	exit(strcmp(event_get_version(), _EVENT_VERSION) == 0 ? 0 : 1);
-+	exit(strcmp(event_get_version(), LIBEVENT_VERSION) == 0 ? 0 : 1);
- 	]])],
- 	[
- 		AC_MSG_RESULT([yes])
diff --git a/mail-mta/opensmtpd-extras/metadata.xml b/mail-mta/opensmtpd-extras/metadata.xml
index 559d61dfffe8..a86950d2a80d 100644
--- a/mail-mta/opensmtpd-extras/metadata.xml
+++ b/mail-mta/opensmtpd-extras/metadata.xml
@@ -9,6 +9,35 @@ Extras filters, tables, and other extensions for OpenSMTPD.
 <name>Jason A. Donenfeld</name>
 </maintainer>
 <use>
+<flag name='filter-clamav'>filter for scanning with app-antivirus/clamav</flag>
+<flag name='filter-dkim-signer'>filter for adding DKIM signatures to outgoing messages</flag>
+<flag name='filter-dnsbl'>filter for checking hosts against the DNS black lists</flag>
+<flag name='filter-lua'>filter for interfacing with dev-lang/lua</flag>
+<flag name='filter-monkey'>filter for arbitrarily rejecting random emails</flag>
+<flag name='filter-pause'>filter to pause on new connections</flag>
+<flag name='filter-perl'>filter for interfacing with dev-lang/perl</flag>
+<flag name='filter-python'>filter for interfacing with dev-lang/python</flag>
+<flag name='filter-regex'>filter for regular expression matching</flag>
+<flag name='filter-spamassassin'>filter for scanning with mail-filter/spamassassin</flag>
+<flag name='filter-stub'>stub filter</flag>
+<flag name='filter-trace'>trace filter</flag>
+<flag name='filter-void'>void filter</flag>
+<flag name='queue-null'>null queue</flag>
+<flag name='queue-python'>queue for interfacing with dev-lang/python</flag>
+<flag name='queue-ram'>ram queue</flag>
+<flag name='queue-stub'>stub queue</flag>
+<flag name='table-ldap'>table for lookups with net-nds/openldap</flag>
+<flag name='table-mysql'>table for lookups with virtual/mysql</flag>
+<flag name='table-postgres'>table for lookups with dev-db/postgresql</flag>
+<flag name='table-redis'>table for lookups with dev-db/redis</flag>
+<flag name='table-socketmap'>table for lookups using a socket map</flag>
+<flag name='table-passwd'>table for lookups using /etc/passwd</flag>
+<flag name='table-python'>table for interfacing with dev-lang/python</flag>
+<flag name='table-sqlite'>table for lookups with dev-db/sqlite3</flag>
+<flag name='table-stub'>stub table</flag>
+<flag name='scheduler-ram'>ram scheduler</flag>
+<flag name='scheduler-stub'>stub scheduler</flag>
+<flag name='scheduler-python'>schedulre for interfacing with python</flag>
 </use>
 </pkgmetadata>
 
diff --git a/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505202252.ebuild b/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505202252.ebuild
deleted file mode 100644
index 61cac789c7d3..000000000000
--- a/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505202252.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505202252.ebuild,v 1.1 2015/05/27 13:15:25 zx2c4 Exp $
-
-EAPI=5
-
-inherit versionator eutils flag-o-matic
-
-DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD"
-HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras"
-SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86" 
-IUSE="filter-dnsbl filter-monkey filter-perl filter-python filter-stub filter-trace filter-void queue-null queue-python queue-ram queue-stub table-ldap table-mysql table-postgres table-redis table-socketmap table-passwd table-python table-sqlite scheduler-ram scheduler-stub scheduler-python"
-
-DEPEND="mail-mta/opensmtpd
-	filter-python? ( dev-lang/python:2.7 )
-	filter-perl? ( dev-lang/perl )
-	table-sqlite? ( dev-db/sqlite:3 )
-	table-mysql? ( virtual/mysql )
-	table-postgres? ( dev-db/postgresql )
-	table-redis? ( dev-libs/hiredis )
-	table-python? ( dev-lang/python:2.7 )
-	scheduler-python? ( dev-lang/python:2.7 )
-	queue-python? ( dev-lang/python:2.7 )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 4-)
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-libevent-version-macro.patch"
-}
-
-src_configure() {
-	if use filter-python || use queue-python || use table-python || use scheduler-python; then
-		# FIXME: clean this up
-		append-cppflags "-I/usr/include/python2.7"
-	fi
-
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-privsep-user=smtpd \
-		--with-privsep-path=/var/empty \
-		--sysconfdir=/etc/opensmtpd \
-		$(use_with filter-dnsbl) \
-		$(use_with filter-monkey) \
-		$(use_with filter-perl) \
-		$(use_with filter-python) \
-		$(use_with filter-stub) \
-		$(use_with filter-trace) \
-		$(use_with filter-void) \
-		$(use_with queue-null) \
-		$(use_with queue-python) \
-		$(use_with queue-ram) \
-		$(use_with queue-stub) \
-		$(use_with table-ldap) \
-		$(use_with table-mysql) \
-		$(use_with table-postgres) \
-		$(use_with table-redis) \
-		$(use_with table-socketmap) \
-		$(use_with table-passwd) \
-		$(use_with table-python) \
-		$(use_with table-sqlite) \
-		$(use_with scheduler-ram) \
-		$(use_with scheduler-stub) \
-		$(use_with scheduler-python)
-}
diff --git a/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild b/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild
new file mode 100644
index 000000000000..03dc10e0ebc2
--- /dev/null
+++ b/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild,v 1.1 2015/05/28 10:32:18 zx2c4 Exp $
+
+EAPI=5
+
+inherit versionator eutils flag-o-matic
+
+DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD"
+HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras"
+SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	filter-clamav
+	filter-dkim-signer
+	filter-dnsbl
+	filter-lua
+	filter-monkey
+	filter-pause
+	filter-perl
+	filter-python
+	filter-regex
+	filter-spamassassin
+	filter-stub
+	filter-trace
+	filter-void
+	
+	queue-null
+	queue-python
+	queue-ram
+	queue-stub
+	
+	table-ldap
+	table-mysql
+	table-postgres
+	table-redis
+	table-socketmap
+	table-passwd
+	table-python
+	table-sqlite
+	table-stub
+	
+	scheduler-ram
+	scheduler-stub
+	scheduler-python
+"
+
+# Deps:
+# mysql needs -lmysqlclient
+# sqlite needs -lsqlite3
+# redis needs -lhiredis
+# postgres requires -lpq
+# ldap uses internal library and requires no deps
+# spamassassin uses internal library and requires no deps
+# clamav uses internal library and requires no deps
+# dnsbl needs -lasr
+# python requires python, currently pegged at 2.7
+# lua requires -llua5.2
+
+DEPEND="mail-mta/opensmtpd dev-libs/libevent dev-libs/openssl
+	filter-python? ( dev-lang/python:2.7 )
+	filter-perl? ( dev-lang/perl )
+	filter-lua? ( dev-lang/lua:5.2 )
+	filter-dnsbl? ( net-libs/libasr )
+	table-sqlite? ( dev-db/sqlite:3 )
+	table-mysql? ( virtual/mysql )
+	table-postgres? ( dev-db/postgresql )
+	table-redis? ( dev-libs/hiredis )
+	table-python? ( dev-lang/python:2.7 )
+	scheduler-python? ( dev-lang/python:2.7 )
+	queue-python? ( dev-lang/python:2.7 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 4-)
+
+src_configure() {
+	tc-export AR
+	AR="$(which "$AR")" econf \
+		--with-privsep-user=smtpd \
+		--with-privsep-path=/var/empty \
+		--sysconfdir=/etc/opensmtpd \
+		$(for use in $IUSE; do use_with $use; done)
+}