Version bump and fix Q&A issues

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 55758000)

3 files changed, 23 insertions, 10 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/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)
 }