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

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64

4 files changed, 111 insertions, 9 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/Manifest b/net-mail/qmailadmin/Manifest
index 5d7975d1412c..c8beaf79b8b6 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -4,9 +4,11 @@ AUX qmailadmin-1.2.9-maildir.patch 253 SHA256 038e72a7770883e6418a10dfacd80d414f
 DIST qmailadmin-1.2.10.tar.gz 390150 SHA256 24f27697c268a0031145d1fe3b597f0e3e55af41a09f5c6d499b6c2409ce771b SHA512 43dcd55b9b3458896398eada9a7d0b513cce5bde6edecb8ae54b6519509361dfab18c7600a3f94ff141b4a3b824e93b4a88a5db3e5a8980ddabf2e6dda8cfb47 WHIRLPOOL 7ab4afacb84b210507916b19ea35ab3280a5ea8289b10dcf8a3ba9e2c23467f2bc1f14cd5d5cda7d1ebf5d9fcceebd12a85877961580743d650826801221ada6
 DIST qmailadmin-1.2.12.tar.gz 400144 SHA256 926c6dd91540aed9b011e0c3623ed108acdb5ecc3d6cff8f08731c2f2bba42c4 SHA512 9fea49c3cab31606b37b9b827cd21ee852267e8c5555d96c48d52fc8388d7a3a862384cf18211c89c34525b84f866fa371a70a88386309e32dde1d7d8bb5b3ed WHIRLPOOL f681e817bc9eb96a25e2c73af3535ece35308472870d1a2348eec1c3c4c3b4a2462c791bb443319f10aad8795014c90eae291854cb9affac8cd9ebc8576db901
 DIST qmailadmin-1.2.15.tar.gz 385529 SHA256 3b8bb55a5e567497434c7cf9cbaf8cd73f85b8fa5c56b4bebdf7aef8b2c70db7 SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347 WHIRLPOOL 4555e2ee3581f89a1fbcb2777546461cbbbd47ace7577579d5a5c6cb41cb20265e7a31c89d571ed5258e503937f9d5a8f56f34de2adfe59962f33c3ddf23fc5f
+DIST qmailadmin-1.2.16.tar.gz 388689 SHA256 89b72184e31bf2c88a169950a0804dc32389106735f0ab09800996c7be06260f SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91 WHIRLPOOL 397bf6a1158fa015bfe3348fafa063693e0558f8037c24ed93083b8a34cc3fc1425c34c7227ab8e193d5df05763ce19007b9490bfb8bca1ff80b218a11eec3a0
 EBUILD qmailadmin-1.2.10.ebuild 2738 SHA256 7e94f997d2fe66bcf0cd0b4fa50d062f0d4a54f7e46cf5b85a4aed29fdffcdda SHA512 3c954be558c50c2fc67714aba7cdf9b796a1bbfd58f506685dc303f67735a9f2dd94ba2c5147eb7e24e71a5d16a24729bbd8282b4dc254557bf48cf49173c2e7 WHIRLPOOL 95783a9fef70b08e08b03f05b17a2293381b7b16cbac6ba5601e2ce09c5f85fad0796fe7801724fa8489da5ff2c79e32f1cdcb0b1e860c94974e7cb69a3ebe34
 EBUILD qmailadmin-1.2.12.ebuild 2264 SHA256 ae9a7c38fe06eacdcde1c66c8574f04689180c3d258da8014c594020dc8dbc00 SHA512 cbbae785ac0b66d96d1c2a8091c9876f26a768b587c1deb50288a056257febabd1b507c34b0e43ba7aa55a2d98fe6c5446aa07e753a4d2ba1d3dcf4f11d32345 WHIRLPOOL 76a2f5153dceddb5cee3a3bff3e5aba6a31820df1c96cfc62bda58b4ff708e80ce2b02f631eb502e0be51449645f4ce4990b12d3ea486d2995b18169b35cd25d
-EBUILD qmailadmin-1.2.15-r1.ebuild 2671 SHA256 0c9fe6ed0496c8c9aa29f222e45a0ea828913601b9e921953954a8cd789e3acf SHA512 58dbb62a899b5dc62267b5d0d40e7f8328ab38add8ad7c546cd3b68f36d9e21439b240bedcfea5a5799cc87f03cad87ac9895f4506574d122dd01c7ae5c53279 WHIRLPOOL d190cd8e6429bf0df1ac2c63673f9b7894b378b46957667030dd48f8efb5ad98189f9acad0c2741bc3c252ee72287ab17c14c983017a2b389d79250fcae047d9
+EBUILD qmailadmin-1.2.15-r1.ebuild 2458 SHA256 f46e8bf2fdd11e3c411f85e0e172d417fa6e2eed3b96b4ce8e9716882e3fc636 SHA512 6fc1108bfd4cf742d23c8a5050ca1b273ffbf503f575ec3f525c277894794d955e5ae37d727fd895d717af29338e0a3244fe22ab955f9a7068ce5e4bb70c6470 WHIRLPOOL ad29487e1678c7303a1b7b8ade4182f831261df744354cd44aade97a678b6f562dceec9a0ed16f6ae487a61911c4956120e9412a765cc3ff289f001af5bb2440
 EBUILD qmailadmin-1.2.15.ebuild 2602 SHA256 8cb1a448669fb4950ea4f6d84e795dd90b72b4f1cfa69c04e12876696e555ebe SHA512 f9032c52d87395c7beea4cd4e6499fc4053418f486d929d8fe932566f8b9060f329e0a6ff8c45895a1b430bb3ae6a9d4283d76ce6ef10a09bab87da6c954f992 WHIRLPOOL 96f849d40718cd8030ba94921169e4b14b349d8d55d7d5c44479fed6b7c9e844b53c00c91db6eda7a1e784e39aebb7b590cdce0ed14bfbf19d97b3e9278eaf43
-MISC ChangeLog 4815 SHA256 1168ae0a8db21020975117b9593962ef5f310b89a38c4ec0efc54c832107259a SHA512 d4be1f8a20f3eb5597c898a68730d60a5ea2e4e730f0d64dfd941f48d2bbe4eadafafd350e20ceb809cace9b9a6eaa4360e42a642c8c211c5acbcdcd4f6cbdd5 WHIRLPOOL e613a60840cd254b3286ccb631de3963b7c0bb72a535122c24063f5750f08c99b487d3b8c2bcce104cc384668a3882c2234b10a021ce6c9fc8ccb214555a118a
+EBUILD qmailadmin-1.2.16.ebuild 2871 SHA256 0119dc430380498c678ddfa904cae4112b0c3bd21c752438418b343f455cc874 SHA512 12c2c129257905c1f47f71b2e54cfff43cb129419d7fcbccc46af085e0b8b4f51c83209f25f7136ac3c18999b9c327a8b304c5cd835d879415900396e8137cea WHIRLPOOL c766e6a01c73316531835f4d0aba35b49bbbc74e76a14287d5651996231b9de7d71d0f8b2d22a1ce021d4900f7eb472ceb79820bec96af1cb423b9cfefa1b3cd
+MISC ChangeLog 5040 SHA256 485f3784e30f6549c7dc1356d78d8a332a9759ea8645e6d5c864a0b33609e044 SHA512 cd7b3d2fa74e1a0349f24faec86e6dc757a9fee1b7cb6ffcaf6318f7dcb6ff0111c78e6c882b573e20b7f8fea380aeddf071180fe2c974eba00f0e3a24113d1f WHIRLPOOL 18783676066efe30cf6d1e978ffa095a51bb517c8e827c54843f64750b1650286c899edc9825ea602478148a5bc10013e6354c4d85ae0e6b6766af695d2893e7
 MISC metadata.xml 306 SHA256 6e23cbfe8a4fc080cd916a2bee406af0d799862c23e1a912a348aac61046af24 SHA512 05f5af69f0ae16939cf2faa0d15bdcb5c9bd625c57a0ebff8dc017ca0d959255d561d3a906a90e423950a93e3ae02f91bf189dea423b25597b603926bd290e33 WHIRLPOOL 91ac29b3412462bab939045496f703ea8ee38fbc9880eff377eb9741718d6e9e068c5981947a4be3754be8af4f97b2fea20e96407ae3681adcdf1afc45f59991
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}"
+}