Version bump per bug #401249. Also bug #353073: drop flags for hppa compile.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 107 insertions, 7 deletions

diff --git a/net-mail/qmailadmin/ChangeLog b/net-mail/qmailadmin/ChangeLog
index ccaf803ab2b0..8fdb0e5246cd 100644
--- a/net-mail/qmailadmin/ChangeLog
+++ b/net-mail/qmailadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/qmailadmin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/ChangeLog,v 1.30 2013/05/30 23:59:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/ChangeLog,v 1.31 2013/05/31 00:47:07 robbat2 Exp $
+
+*qmailadmin-1.2.16 (31 May 2013)
+
+  31 May 2013; Robin H. Johnson <robbat2@gentoo.org> +qmailadmin-1.2.16.ebuild,
+  qmailadmin-1.2.15-r1.ebuild:
+  Version bump per bug #401249. Also bug #353073: drop flags for hppa compile.
 
 *qmailadmin-1.2.15-r1 (30 May 2013)
 
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index 9d1889d2d92b..9f1688b9500c 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild,v 1.1 2013/05/30 23:59:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild,v 1.2 2013/05/31 00:47:07 robbat2 Exp $
 
 inherit qmail eutils webapp autotools
 
@@ -44,9 +44,6 @@ src_compile() {
 	else
 		set --
 	fi
-	# If vpopmail is built with mysql, we need to pick that up.
-	CFLAGS="${CFLAGS} $(</var/vpopmail/etc/inc_deps)"
-	LDFLAGS="${LDFLAGS} $(</var/vpopmail/etc/lib_deps)"
 
 	econf \
 		--enable-valias \
@@ -70,8 +67,6 @@ src_compile() {
 		--enable-maxaliasesperpage=50 \
 		--enable-vpopuser=vpopmail \
 		--enable-vpopgroup=vpopmail \
-		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
 		"$@" \
 		|| die "econf failed"
 
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
new file mode 100644
index 000000000000..1f871041909c
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild,v 1.1 2013/05/31 00:47:07 robbat2 Exp $
+
+inherit qmail eutils webapp autotools
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT="userpriv"
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains"
+HOMEPAGE="http://www.inter7.com/qmailadmin.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.4.33
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+	eautoreconf
+}
+
+src_compile() {
+	# Pass spam stuff through $@ so we get the quoting right
+	if use maildrop ; then
+		set -- --enable-modify-spam \
+			--enable-spam-command='|preline maildrop /etc/maildroprc'
+	else
+		set --
+	fi
+
+	econf \
+		--enable-valias \
+		--enable-vpopmaildir=/var/vpopmail \
+		--enable-htmldir="${MY_HTDOCSDIR}" \
+		--enable-imagedir="${MY_HTDOCSDIR}"/images \
+		--enable-imageurl=/${PN}/images \
+		--enable-htmllibdir=/usr/share/${PN}/htmllib \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+		--enable-cgipath=/cgi-bin/${PN} \
+		--enable-qmaildir="${QMAIL_HOME}" \
+		--enable-autoresponder-path="${QMAIL_HOME}"/bin \
+		--enable-true-path=/bin \
+		--enable-ezmlmdir=/usr/bin \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-trivial-password \
+		--enable-catchall \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
+		TRANSLATORS NEWS FAQ README contrib/*
+
+	webapp_src_install
+
+	# CGI needs to be able to read /etc/vpopmail.conf
+	# Which is 0640 root:vpopmail, as it contains passwords
+	cgi=/usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/qmailadmin
+	fowners root:vpopmail $cgi
+	fperms g+s $cgi
+}
+
+pkg_postinst() {
+	einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	einfo "please emerge some variant of ezmlm-idx."
+	webapp_pkg_postinst
+	einfo "For complete webapp-config support:"
+	einfo "1. Add this for the Apache cgi-bin dir: Options +ExecCGI -MultiViews +FollowSymLinks"
+	einfo "2. Run: webapp-config -I -h localhost -d qmailadmin $PN $PV"
+	einfo "3. Symlink: ln -s {/usr/share/webapps/${PN}/${PV}/hostroot,/var/www/localhost}/cgi-bin/${PN}"
+}