version bump; convert to webapp; fixes #208584

Package-Manager: portage-2.1.4

5 files changed, 107 insertions, 9 deletions

diff --git a/net-mail/vqadmin/ChangeLog b/net-mail/vqadmin/ChangeLog
index 6ea10d35b8f3..5e6b417cadc9 100644
--- a/net-mail/vqadmin/ChangeLog
+++ b/net-mail/vqadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/vqadmin
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/ChangeLog,v 1.7 2007/07/29 17:02:17 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/ChangeLog,v 1.8 2008/02/03 10:06:30 hollow Exp $
+
+*vqadmin-2.3.7 (03 Feb 2008)
+
+  03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> +files/postinstall-en.txt,
+  vqadmin-2.3.6.ebuild, +vqadmin-2.3.7.ebuild:
+  version bump; convert to webapp; fixes #208584
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> vqadmin-2.3.6.ebuild:
   Fixing the DEPEND/RDEPEND for the move of net-www/apache to
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index 00b16f816a86..19a9fce072a1 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX postinstall-en.txt 291 RMD160 ecd5b991d87ad9415f2d0d426bb85a4dbbe6dc08 SHA1 72b41bf8a3037295cd587e6a66701a673fb78b5d SHA256 de409a36534723bd8bc8a73c6f386c568c34facc31c0aa36ed7f799b676b576e
 DIST vqadmin-2.3.6.tar.gz 155771 RMD160 31b89d0f6b605a96445d304e084ef6bc7b055376 SHA1 41e6ac1728f1a3b592377abcfa51e2e38d5d4f4c SHA256 e72fde3cf538d1e93a6aaaffbce100aeb417350d07cb73ee49b08c22256076d9
-EBUILD vqadmin-2.3.6.ebuild 3711 RMD160 2f3e1ed606bdfffd5f4d48fdf918dd9b56fc1184 SHA1 1c18631010ebab11ebbeb4d7f4cf7d989740f0d7 SHA256 a816b6b087c2804dd7d0b23a8fe3323d3fe65736c5b77b1b7763715419631c70
-MISC ChangeLog 1045 RMD160 3714ead98ebf544637ee0d10836819ec3fa96054 SHA1 f28af2f9ed1f95ea45bcb33228379b238f92c7b1 SHA256 08db44bb85f137de9ac65825d9f94fcceee7c2d18825f4cdd93bbf7cfbf86921
+DIST vqadmin-2.3.7.tar.gz 153678 RMD160 89657c2c6f1c9848c36e9684b605c4e450442c71 SHA1 c38bcecd301656a95dbf0244b569c67b71445816 SHA256 af68640f454896d6d267b6aee63a79ae0605c0104cff083aa6dc5df0d8c4ee0f
+EBUILD vqadmin-2.3.6.ebuild 3720 RMD160 7b1646818dc579e449de3348ee3833cba6d91e72 SHA1 4cd938830d88455cf0ca3cda614721fb9528efe4 SHA256 df598fe4ad416f9bf15e18c73bc83a895712820cc43c50a65bf00bf9696cbcda
+EBUILD vqadmin-2.3.7.ebuild 1479 RMD160 a1901df474b378bc04612b97a797c5023b9d0ced SHA1 71361a858c7aba068c014dffbc51e8ffe10701da SHA256 4be1093797ba08f8e87f9727376f5679f0a38a71ee99067ba64161e99fcc0cb5
+MISC ChangeLog 1249 RMD160 7e0f404e05e4f2f33db469e91a20d5a4f49e5f70 SHA1 64939c5e1a0e2708ce85e3a187e3857890f31644 SHA256 3f2640bc8740a91004e3aac19b805270e53d3c32c7babd8eccf3bc5457ba764a
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkelkjQACgkQmPFBzbX68WHfQgCgmF6OBMKsDID4aOqau48vGkG8
+kwwAnjBn2Sse2DZ/o90UMe9Cu63tuhD7
+=ZwPi
+-----END PGP SIGNATURE-----
diff --git a/net-mail/vqadmin/files/postinstall-en.txt b/net-mail/vqadmin/files/postinstall-en.txt
new file mode 100644
index 000000000000..3a909a78d9fb
--- /dev/null
+++ b/net-mail/vqadmin/files/postinstall-en.txt
@@ -0,0 +1,12 @@
+You need to setup authentication. For apache do the following:
+
+<Files ${VHOST_CGIBINDIR}/${PN}>
+	AuthType Basic
+	AuthUserFile ${VHOST_CONFDIR}${PN}.passwd
+	AuthName ${PN}
+	Require valid-user
+</Files>
+
+The create the password file like this:
+
+htpasswd -c ${VHOST_CONFDIR}${PN}.passwd <user>
diff --git a/net-mail/vqadmin/vqadmin-2.3.6.ebuild b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
index 489071a9dbba..c718c828ea69 100644
--- a/net-mail/vqadmin/vqadmin-2.3.6.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/vqadmin-2.3.6.ebuild,v 1.9 2007/07/29 17:02:17 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/vqadmin-2.3.6.ebuild,v 1.10 2008/02/03 10:06:30 hollow Exp $
+
+inherit depend.apache
 
 DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -12,8 +14,9 @@ SLOT="0"
 DEPEND=">=net-mail/vpopmail-5.3
 		virtual/qmail"
 RDEPEND="${DEPEND}
-	net-mail/qmailadmin
-	www-servers/apache"
+	net-mail/qmailadmin"
+
+need_apache
 
 src_compile() {
 	local dir_vhost="/var/www/localhost/"
@@ -57,7 +60,7 @@ src_install () {
 	make DESTDIR=${D} install || die
 
 	# Install documentation.
-	dodoc ACL AUTHORS BUGS LICENSE ChangeLog FAQ INSTALL NEWS TODO README
+	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
 }
 
 #pkg_config() {
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
new file mode 100644
index 000000000000..9de030d809a6
--- /dev/null
+++ b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vqadmin/vqadmin-2.3.7.ebuild,v 1.1 2008/02/03 10:06:30 hollow Exp $
+
+inherit webapp eutils autotools
+
+DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains. Works with qmailadmin"
+HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
+SRC_URI="http://www.inter7.com/vqadmin/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3"
+RDEPEND="${DEPEND}
+	net-mail/qmailadmin"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fixes for sane webapp integration
+	sed -i \
+		-e "s|html/|/usr/share/${PN}/|g" \
+		-e "s|/images/vqadmin/|/vqadmin/|g" \
+		-e "s|/cgi-bin/vqadmin/|/cgi-bin/|g" \
+		-e "s|vqadmin\.cgi|vqadmin|g" \
+		*.h *.c html/*.html
+}
+
+src_compile() {
+	econf ${myopts} \
+		--enable-qmaildir=/var/qmail \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-cgibindir="${MY_CGIBINDIR}" \
+	|| die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	webapp_src_preinst
+
+	insinto /usr/share/${PN}
+	doins html/*
+
+	insinto "${MY_HTDOCSDIR}"
+	doins html/*.css
+
+	insinto "${MY_CGIBINDIR}"
+	doins vqadmin.acl
+	insopts -m 755
+	doins vqadmin
+
+	dodoc ACL AUTHORS BUGS ChangeLog FAQ INSTALL NEWS TODO README
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}