Version bump and fix Q&A issues

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

4 files changed, 47 insertions, 14 deletions

diff --git a/mail-filter/opensmtpd-extras/ChangeLog b/mail-filter/opensmtpd-extras/ChangeLog
index 430ab1c665df..1e155bb8ab69 100644
--- a/mail-filter/opensmtpd-extras/ChangeLog
+++ b/mail-filter/opensmtpd-extras/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/opensmtpd-extras
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opensmtpd-extras/ChangeLog,v 1.2 2015/05/29 02:31:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opensmtpd-extras/ChangeLog,v 1.3 2015/05/29 13:54:36 zx2c4 Exp $
+
+*opensmtpd-extras-5.4.5.201505291521 (29 May 2015)
+
+  29 May 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +opensmtpd-extras-5.4.5.201505291521.ebuild,
+  -opensmtpd-extras-5.4.5.201505281056.ebuild, metadata.xml:
+  Version bump and fix Q&A issues
 
   29 May 2015; Patrick Lauer <patrick@gentoo.org>
   opensmtpd-extras-5.4.5.201505281056.ebuild:
diff --git a/mail-filter/opensmtpd-extras/Manifest b/mail-filter/opensmtpd-extras/Manifest
index 99f5a4cf3d3a..527e1cbcc74a 100644
--- a/mail-filter/opensmtpd-extras/Manifest
+++ b/mail-filter/opensmtpd-extras/Manifest
@@ -1,4 +1,24 @@
-DIST opensmtpd-extras-201505281056.tar.gz 158740 SHA256 47fe0c63b78e9f29f0432accf88a4fd551c20bc9e14fcf15917430a401512b15 SHA512 842a0cafd50d23f29d84440bbd95cc6600caddc4aef78961aedab840ffc1980f8b5a98ab7f01dcde56b9134f4a55c21e45df23dbd894d9137ee978bf78f74175 WHIRLPOOL 44172be9eab0efdb98250ed08c1428fc47e3dfbcb25df5d84c0add34783684af3ee3c2cf1706f5949ec6952810002ac6a90935aaeebbae9d1bb50f08c47fec7d
-EBUILD opensmtpd-extras-5.4.5.201505281056.ebuild 2140 SHA256 d44eeab80327afa99e51c5ec13250522aec4776c22f1d0b7b69463a10abe9369 SHA512 8824b538e1dfe560454200ae716f6dc13b1220103440f3ae89caf3121908ecf9c6c7d6b0a45d8455dbb21f030565e7b5619faf45f0af050a10d4aa39f912077e WHIRLPOOL 7e7251d5eb2fa5bf4be1ac6be86053812f6add4b7a2f8c90ce31dfe250b527193a87159b257c55914b40de37684579db0fd371453957ba35edb7df48f558d2a2
-MISC ChangeLog 516 SHA256 57604c3971046a5bcbf40834ab4bba9523c98d46869ee1996ab5c07eb8ee0f18 SHA512 1fb94ed5b9afcd37568d66d42e785ff44a049e91c71052cf2bc33ab10205d5559b30fa09f98e715cae34b1e888d51d8425cda60371c590ae420f299f1ff1ccb4 WHIRLPOOL 242774671717f07ff2ff2d02c9670f833af162ee4014412866d07d9c74e61b273eab2af207d2cd87a2db1147db6cc75396afbb36cf75c362fb5bfda972948a06
-MISC metadata.xml 2278 SHA256 fe28c762684498468286562dbb9fd4ffd61d4bffc254cc14ec6133950b34a605 SHA512 9b5f7f36567dba63d8f11c1b81cff4e97b4ee9c9c54ee96e9fcc35df69721ae66b859a05341965134fbd239651891ef2aa1fd8a51c2fd9f24467ad18952c2395 WHIRLPOOL bc694bee27d228d15b0b29a4067d2b02e9873d31dcab3e47b05e0370731fd2a3ce23816884f99e01bc80bf81731e247224aaec04f099fa35405d569d7908925a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST opensmtpd-extras-201505291521.tar.gz 163979 SHA256 522ac5976d662e2bac55c10e8ef702ccc1a930d317c94e3f1ab0d1520d102640 SHA512 c127b67995de659298088f6fde86a0cac45e0971532f76ac10ca0d63d2ca439a1ffe17f25d30b29d84d8832ee0936c839c24479da23b162eeeda2a5796537016 WHIRLPOOL f57da2130c669d1ebdf53325f9ced5dc6f338f0113c171b488bef247bd7dae80f22b05a874f3e7a05622dd21249199b5462e3f82c9e10bf2f785bf60175ac291
+EBUILD opensmtpd-extras-5.4.5.201505291521.ebuild 2387 SHA256 755d7a3a010412209d9c32b6ac657eaa5e428e3280c96d1ef932ed6ae2408988 SHA512 f4a4f75949776648df1a33bdd70cd84bcdecb91797cc52dfadb38d8eb0c8b4932b8a3e81abb06239e1faf6674ed2bf1a40426397a45f0d03720f7acde1889d9c WHIRLPOOL ad86ba1dfa40d9f0ef851630f6ad7062de6cb4cf97b93dc9863a72e8d3b0ec8c14e16f630f85ecd6f893dfee40eaa239927d68402b37ef81aff46d71a61f4fff
+MISC ChangeLog 762 SHA256 642cecbde428f7000e381473060d9aa7e943b71e4c9df5ba20ac7695aeea1cdf SHA512 91e4fc827df66875401a7427a04f2fc487214b264685b47f95b58a4d907ebdb9d69d933b3f297d4079b2da55bd68773749d921d11876a9332e6194427190c438 WHIRLPOOL 7afa71c2544f88833b0d88b2df4976e1d9692a7e4145fcba262cbce45838146de00d95727a543f6cf2482719b5ee7dd4feb24cf73250e2b0f816b038cdf89519
+MISC metadata.xml 2365 SHA256 d533766f3e9a1fd3bdc94b36c83d547b62002ff16a156f7941690ea777b0f80b SHA512 ef6e392263c2207c7f206d4148ca83f46afc45394798c6f2a19b0fb14efd6ec6f6a92a7e7776ab66421ceb54e249fa5fbe0975f794abaaab3b42761f7ca4e558 WHIRLPOOL 92c01c7588ccb36e0fbd8b74dde58ee4d3c137905546b8cf30961823a01755e0318f331a91315f4c7af4066f42b7bec7736abfe6e2b43cdf3a34316f41b884f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVaG+uAAoJEA9GG/3yO0PNK6UP/2I0oKwurWgsKl46RUeFXIk7
+/pO5KV64xkqZ2iapj689y0wXiN1dQ6JfiWKJSfJdQHqEk2MLOI9jFgNriAW8mzWz
+YSwKWNAJH4asHOUUQv9+hGOOxez2PR0L4k6o/rBs/Wx2XCXk+vLl9/iO3qgVxjE9
+IzbdT2QeI+EatsaTxCXLUViQCekuRFU0rgHuPL2FUqmfwGsVIaejnv3cOHXNTE8s
+6ykaoeOS+sY9C3WSnPR0CZSCstg4NfOLpU6y9lHA9X4SzujGQA5rZQveg9Q6yQ1B
+Xvun8hNCXZVInYkVsHn8piWql9EN+MjTvJO04fz/HgfXjt/ObKh5WVUBP4hkDWw4
+gzM205yJyraCX/nmEc4F2bjBwD1Nw0H0YHQ0rguGtU6P9d3yPADO0f41iO1AT7+W
+sgfiTcfXKQDJ/6oAV5I0VxsbKOc2N5PZ/fcTV8gQXvgp3iJJxpmRsphIOLo2/32a
+p+Bm/FjoOwt+zcehT2aQekq3ukF8TlgAz4/bOgSCH5Ge75LMTiU0YhJsXGD3AoYq
+g9Kxpe0B/eVxbZECqup5XU/U3JhpOU/bogmUV4L332PQUNW7N9e6z2sGGlRdLCVS
+3x7sNB+vFZ+Thm9Vo8IYO2Rizsn6IL43+55DZrhtodkBy2RR1zMcYrylE9SK9d2A
+prpGdtU7siyoGKwuL29a
+=95Xe
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/opensmtpd-extras/metadata.xml b/mail-filter/opensmtpd-extras/metadata.xml
index 73470fbc6dbd..d329432a28b9 100644
--- a/mail-filter/opensmtpd-extras/metadata.xml
+++ b/mail-filter/opensmtpd-extras/metadata.xml
@@ -38,6 +38,7 @@ Extras filters, tables, and other extensions for mail-mta/opensmtpd.
 <flag name='scheduler-ram'>ram scheduler</flag>
 <flag name='scheduler-stub'>stub scheduler</flag>
 <flag name='scheduler-python'>schedulre for interfacing with python</flag>
+<flag name='luajit'>Use JIT for Lua via dev-lang/luajit instead of dev-lang/lua</flag>
 </use>
 </pkgmetadata>
 
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201505291521.ebuild
index 66b9e62e9753..620b8eaf0a2a 100644
--- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild
+++ b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201505291521.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201505281056.ebuild,v 1.2 2015/05/29 02:31:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201505291521.ebuild,v 1.1 2015/05/29 13:54:36 zx2c4 Exp $
 
 EAPI=5
 
-inherit versionator eutils flag-o-matic
+inherit versionator eutils flag-o-matic autotools
 
 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"
+#SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
+SRC_URI="https://dev.gentoo.org/~zx2c4/${PN}-$(get_version_component_range 4-).tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="
+MY_COMPONENTS="
 	filter-clamav
 	filter-dkim-signer
 	filter-dnsbl
@@ -47,6 +48,7 @@ IUSE="
 	scheduler-stub
 	scheduler-python
 "
+IUSE="${MY_COMPONENTS} luajit"
 
 # Deps:
 # mysql needs -lmysqlclient
@@ -58,12 +60,12 @@ IUSE="
 # clamav uses internal library and requires no deps
 # dnsbl needs -lasr
 # python requires python, currently pegged at 2.7
-# lua requires -llua5.2
+# lua requires any lua version
 
 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-lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) )
 	filter-dnsbl? ( net-libs/libasr )
 	table-sqlite? ( dev-db/sqlite:3 )
 	table-mysql? ( virtual/mysql )
@@ -77,11 +79,14 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 4-)
 
+src_prepare() {
+	eautoreconf
+}
 src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
+	econf \
 		--with-privsep-user=smtpd \
 		--with-privsep-path=/var/empty \
 		--sysconfdir=/etc/opensmtpd \
-		$(for use in $IUSE; do use_with $use; done)
+		--with-lua-type=$(use luajit && echo luajit || echo lua) \
+		$(for use in $MY_COMPONENTS; do use_with $use; done)
 }