proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

10 files changed, 654 insertions, 0 deletions

diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
new file mode 100644
index 000000000000..86ec63b9f713
--- /dev/null
+++ b/net-mail/qmailadmin/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch
new file mode 100644
index 000000000000..b4c5aa90248a
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.12-quota-overflow.patch
@@ -0,0 +1,118 @@
+diff -Nurp qmailadmin-1.2.12/util.c qmailadmin-1.2.12.new/util.c
+--- qmailadmin-1.2.12/util.c	2007-09-21 19:27:40.000000000 -0400
++++ qmailadmin-1.2.12.new/util.c	2009-07-11 01:54:02.000000000 -0400
+@@ -19,10 +19,11 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stddef.h>
++#include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
+ #include <pwd.h>
+ #include <dirent.h>
+ #include <ctype.h>
+@@ -352,41 +353,70 @@ char *get_quota_used(char *dir) {
+                    back to bytes for vpasswd file
+    return value: 0 for success, 1 for failure
+ */
+-int quota_to_bytes(char returnval[], char *quota) {
++int quota_to_bytes(char returnval[], const char *quota) {
+     double tmp;
++    int err = 0;
+ 
+     if (quota == NULL) { return 1; }
+-    if ((tmp = atof(quota))) {
+-        tmp *= 1048576;
+-        sprintf(returnval, "%.0lf", tmp);
+-        return 0;
++
++    /* first set errno to 0 to determine if an error occurs */
++    errno = 0;
++    tmp = strtod(quota, NULL);
++    err = errno;
++    if (err != 0) {
++        perror("quota_to_bytes");
++        return 1;
+     } else {
+-	strcpy (returnval, "");
+-	return 1;
++        tmp *= (1024*1024);
++        err = sprintf(returnval, "%.0lf", tmp);
++        if (err > 0) {
++            return 0;
++        } else {
++            returnval[0] = '\0';
++            return 1;
++        }
+     }
+ }
+ /* quota_to_megabytes: used to convert vpasswd representation of quota
+                        to number of megabytes.
+    return value: 0 for success, 1 for failure
+ */
+-int quota_to_megabytes(char *returnval, char *quota) {
++int quota_to_megabytes(char *returnval, const char *quota) {
+     double tmp;
+-    int i;
++    int err = 0;
++    size_t i;
+ 
+     if (quota == NULL) { return 1; }
+     i = strlen(quota);
++
++    errno = 0;
++    tmp = strtod(quota, NULL);
++    err = errno;
++    if (err != 0) {
++        perror("quota_to_megabytes");
++        return 1;
++    }
++
+     if ((quota[i-1] == 'M') || (quota[i-1] == 'm')) {
+-        tmp = atol(quota);  /* already in megabytes */
++        /* already in megabytes */
+     } else if ((quota[i-1] == 'K') || (quota[i-1] == 'k')) {
+-	tmp = atol(quota) * 1024;  /* convert kilobytes to megabytes */
+-    } else if ((tmp = atol(quota))) {
+-        tmp /= 1048576.0;
++        /* convert kilobytes to megabytes */
++        tmp *= 1024;
++    } else if (tmp != 0) {
++        /* convert bytes to megabytes */
++        tmp /= (1024*1024);
+     } else {
+-	strcpy (returnval, "");
+-	return 1;
++        returnval[0] = '\0';
++        return 1;
++    }
++
++    err = sprintf(returnval, "%.2lf", tmp);
++    if (err > 0) {
++        return 0;
++    } else {
++        returnval[0] = '\0';
++        return 1;
+     }
+-    sprintf(returnval, "%.2lf", tmp);
+-    return 0;
+ }
+ 
+ void print_user_index (char *action, int colspan, char *user, char *dom, time_t mytime)
+diff -Nurp qmailadmin-1.2.12/util.h qmailadmin-1.2.12.new/util.h
+--- qmailadmin-1.2.12/util.h	2007-09-21 19:27:40.000000000 -0400
++++ qmailadmin-1.2.12.new/util.h	2009-07-11 02:02:45.000000000 -0400
+@@ -25,8 +25,8 @@ void str_replace (char *, char, char);
+ 
+ void qmail_button(char *modu, char *command, char *user, char *dom, time_t mytime, char *png);
+ 
+-int quota_to_bytes(char[], char*);     //jhopper prototype
+-int quota_to_megabytes(char[], char*); //jhopper prototype
++int quota_to_bytes(char[], const char*);     //jhopper prototype
++int quota_to_megabytes(char[], const char*); //jhopper prototype
+ 
+ void print_user_index (char *action, int colspan, char *user, char *dom, time_t mytime);
+ char *cgiurl (char *action);
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch
new file mode 100644
index 000000000000..bf8ca4785dfd
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.15-quota-security.patch
@@ -0,0 +1,41 @@
+Previous patch did not fix the 32-bit overflow properly.
+This goes with the vpopmail 5.4.33 matching quota fix (in upstream).
+
+X-Gentoo-Bug: 269129
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar qmailadmin-1.2.15.orig/qmailadmin.h qmailadmin-1.2.15/qmailadmin.h
+--- qmailadmin-1.2.15.orig/qmailadmin.h	2013-05-30 23:42:27.689759997 +0000
++++ qmailadmin-1.2.15/qmailadmin.h	2013-05-30 23:44:33.870866242 +0000
+@@ -63,4 +63,4 @@
+ /* copied from maildirquota.c in vpopmail
+  * it really needs to get into vpopmail.h somehow
+  */
+-int readuserquota(const char* dir, long *sizep, int *cntp);
++//int readuserquota(const char* dir, storage_t *sizep, storage_t *cntp);
+diff -Nuar qmailadmin-1.2.15.orig/template.c qmailadmin-1.2.15/template.c
+--- qmailadmin-1.2.15.orig/template.c	2009-02-06 05:30:05.000000000 +0000
++++ qmailadmin-1.2.15/template.c	2013-05-30 23:45:47.319571080 +0000
+@@ -426,7 +426,7 @@
+           case 'Q':
+             vpw = vauth_getpw(ActionUser, Domain);
+             if (strncmp(vpw->pw_shell, "NOQUOTA", 2) != 0) {
+-              long diskquota = 0;
+-              int maxmsg = 0;
++              uint64_t diskquota = 0;
++              uint64_t maxmsg = 0;
+               char path[256];
+ 
+diff -Nuar qmailadmin-1.2.15.orig/user.c qmailadmin-1.2.15/user.c
+--- qmailadmin-1.2.15.orig/user.c	2009-05-02 19:13:29.000000000 +0000
++++ qmailadmin-1.2.15/user.c	2013-05-30 23:45:26.039946212 +0000
+@@ -170,7 +170,7 @@
+               (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) {
+         if (AdminType==DOMAIN_ADMIN || 
+             (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)) {
+-          long diskquota = 0;
+-          int maxmsg = 0;
++          uint64_t diskquota = 0;
++          uint64_t maxmsg = 0;
+ 
+           /* display account name and user name */
diff --git a/net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch b/net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch
new file mode 100644
index 000000000000..e2a8f49a5c1b
--- /dev/null
+++ b/net-mail/qmailadmin/files/qmailadmin-1.2.9-maildir.patch
@@ -0,0 +1,11 @@
+--- qmailadmin-1.2.9/qmailadmin.h
++++ qmailadmin-1.2.9/qmailadmin.h
+@@ -24,7 +24,7 @@
+  * it below.
+  */
+ #ifndef MAILDIR
+-#define MAILDIR "Maildir"
++#define MAILDIR ".maildir"
+ #endif
+ 
+ /* max # of forwards a user can set on the Modify User screen */
diff --git a/net-mail/qmailadmin/metadata.xml b/net-mail/qmailadmin/metadata.xml
new file mode 100644
index 000000000000..13ee9dc934c2
--- /dev/null
+++ b/net-mail/qmailadmin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qmail</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="maildrop">Filter spam using maildrop</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">qmailadmin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
new file mode 100644
index 000000000000..c0b428c0fb84
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+# TODO: convert this ebuild to use web-app.
+
+# the RESTRICT is because the vpopmail lib directory is locked down
+# and non-root can't access them.
+RESTRICT='userpriv'
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+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"
+KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
+IUSE="maildrop"
+
+DEPEND="virtual/qmail
+	>=net-mail/vpopmail-5.3
+	net-mail/autorespond
+	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
+RDEPEND="${DEPEND}"
+# apache and lighttpd both work, but there's no virtual yet
+#	www-servers/apache"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
+}
+
+src_compile() {
+	local dir_vpopmail="/var/vpopmail"
+	local dir_vhost="/var/www/localhost"
+	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
+	local dir_htdocs_images="${dir_htdocs}/images"
+	local url_htdocs_images="/${PN}/images"
+	local dir_cgibin="${dir_vhost}/cgi-bin"
+	local url_cgibin="/cgi-bin/${PN}"
+	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
+	local dir_qmail="/var/qmail"
+	local dir_true="/bin"
+	local dir_ezmlm="/usr/bin"
+	local dir_autorespond="/var/qmail/bin"
+
+	# 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=${dir_vpopmail} \
+		--enable-htmldir=${dir_htdocs} \
+		--enable-imageurl=${url_htdocs_images} \
+		--enable-imagedir=${dir_htdocs_images} \
+		--enable-htmllibdir=${dir_htdocs_htmlib} \
+		--enable-qmaildir=${dir_qmail} \
+		--enable-true-path=${dir_true} \
+		--enable-ezmlmdir=${dir_ezmlm} \
+		--enable-cgibindir=${dir_cgibin} \
+		--enable-cgipath=${url_cgibin} \
+		--enable-autoresponder-path=${dir_autorespond} \
+		--enable-domain-autofill \
+		--enable-modify-quota \
+		--enable-no-cache \
+		--enable-maxusersperpage=50 \
+		--enable-maxaliasesperpage=50 \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		"$@" \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS NEWS FAQ README contrib/*
+}
+
+pkg_postinst() {
+	elog "If you would like support for ezmlm mailing lists inside qmailadmin,"
+	elog "please emerge some variant of ezmlm-idx."
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
new file mode 100644
index 000000000000..2e1d8ca177f5
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit qmail eutils webapp
+
+# 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.3
+	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
+}
+
+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-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
+}
+
+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
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..878472e1c503
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ia64 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
+	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
+	epatch "${FILESDIR}"/${PN}-1.2.15-quota-security.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
+}
+
+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
+}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
new file mode 100644
index 000000000000..d139c04c4a97
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3
+	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
+	epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.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
+	# 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 \
+		--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 \
+		LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		"$@" \
+		|| 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
+}
+
+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
+}
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..c67c5dbf27f6
--- /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
+# $Id$
+
+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}"
+}