new version + cleanup old versions

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

5 files changed, 11 insertions, 390 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 97647198aac4..7a27472aa089 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.66 2014/08/10 20:44:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.67 2014/11/02 12:50:17 lordvan Exp $
+
+*dbmail-3.2.0 (02 Nov 2014)
+
+  02 Nov 2014; Thomas Raschbacher <lordvan@gentoo.org> -dbmail-3.1.9.ebuild,
+  -dbmail-3.1.10.ebuild, -dbmail-3.1.11.ebuild, -dbmail-3.1.12.ebuild,
+  +dbmail-3.2.0.ebuild:
+  removed old versions + added 3.2.0 
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> dbmail-3.1.10.ebuild,
   dbmail-3.1.11.ebuild, dbmail-3.1.12.ebuild, dbmail-3.1.13.ebuild,
diff --git a/net-mail/dbmail/dbmail-3.1.10.ebuild b/net-mail/dbmail/dbmail-3.1.10.ebuild
deleted file mode 100644
index 9826d32c4d81..000000000000
--- a/net-mail/dbmail/dbmail-3.1.10.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.10.ebuild,v 1.2 2014/08/10 20:44:28 slyfox Exp $
-
-EAPI="4"
-inherit eutils multilib versionator user
-
-DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap sieve +sqlite ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	>=dev-libs/gmime-2.4.6:2.4
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
-#asciidoc and xmlto needed?
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	local myconf=""
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
-
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
-	newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-	#doman man/*.{1,5,8}
-
-	# ldap schema
-	if use ldap; then
-	   insinto /etc/openldap/schema
-	   doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	keepdir /var/run/dbmail
-	fowners dbmail:dbmail /var/run/dbmail
-}
-
-pkg_postinst() {
-	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /var/run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.1.11.ebuild b/net-mail/dbmail/dbmail-3.1.11.ebuild
deleted file mode 100644
index 7f8509412924..000000000000
--- a/net-mail/dbmail/dbmail-3.1.11.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.11.ebuild,v 1.2 2014/08/10 20:44:28 slyfox Exp $
-
-EAPI="4"
-inherit eutils multilib versionator user
-
-DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap sieve +sqlite ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	>=dev-libs/gmime-2.4.6:2.4
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
-#asciidoc and xmlto needed?
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	local myconf=""
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
-
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
-	newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-	#doman man/*.{1,5,8}
-
-	# ldap schema
-	if use ldap; then
-	   insinto /etc/openldap/schema
-	   doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	keepdir /var/run/dbmail
-	fowners dbmail:dbmail /var/run/dbmail
-}
-
-pkg_postinst() {
-	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /var/run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.1.9.ebuild b/net-mail/dbmail/dbmail-3.1.9.ebuild
deleted file mode 100644
index 6a047aa40c96..000000000000
--- a/net-mail/dbmail/dbmail-3.1.9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.9.ebuild,v 1.4 2014/08/10 20:44:28 slyfox Exp $
-
-EAPI="4"
-inherit eutils multilib versionator user
-
-DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database"
-HOMEPAGE="http://www.dbmail.org/"
-SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap sieve +sqlite ssl static"
-
-DEPEND="dev-db/libzdb
-	sieve? ( >=mail-filter/libsieve-2.2.1 )
-	ldap? ( >=net-nds/openldap-2.3.33 )
-	app-text/asciidoc
-	app-text/xmlto
-	app-crypt/mhash
-	sys-libs/zlib
-	>=dev-libs/gmime-2.4.6:2.4
-	>=dev-libs/glib-2.16
-	dev-libs/libevent
-	ssl? ( dev-libs/openssl )"
-#asciidoc and xmlto needed?
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dbmail
-	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
-}
-
-src_configure() {
-	local myconf=""
-	use ldap && myconf=${myconf}" --with-auth-ldap"
-
-	econf \
-		--sysconfdir=/etc/dbmail \
-		$(use_enable static) \
-		$(use_with sieve) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
-
-	dodoc -r sql
-	dodoc -r test-scripts
-	dodoc -r contrib
-	## TODO: install other contrib stuff
-
-	sed -i -e "s:nobody:dbmail:" dbmail.conf
-	sed -i -e "s:nogroup:dbmail:" dbmail.conf
-	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
-	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
-
-	insinto /etc/dbmail
-	newins dbmail.conf dbmail.conf.dist
-
-	# change config path to our default and use the conf.d and init.d files from the contrib dir
-	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
-	sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
-	newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
-	newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
-
-	dobin contrib/mailbox2dbmail/mailbox2dbmail
-	doman contrib/mailbox2dbmail/mailbox2dbmail.1
-	#doman man/*.{1,5,8}
-
-	# ldap schema
-	if use ldap; then
-	   insinto /etc/openldap/schema
-	   doins "${S}/dbmail.schema"
-	fi
-
-	keepdir /var/lib/dbmail
-	fperms 750 /var/lib/dbmail
-	fowners dbmail:dbmail /var/lib/dbmail
-	keepdir /var/run/dbmail
-	fowners dbmail:dbmail /var/run/dbmail
-}
-
-pkg_postinst() {
-	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
-	elog "for remaining instructions on setting up dbmail users and "
-	elog "for finishing configuration to connect to your MTA and "
-	elog "to connect to your db."
-	echo
-	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
-	elog "Database schemes can be found in /usr/share/doc/${PF}/"
-	elog "You will also want to follow the installation instructions"
-	elog "on setting up the maintenance program to delete old messages."
-	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
-	echo
-	elog "For regular maintenance, add this to crontab:"
-	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
-	echo
-	elog "Please make sure to run etc-update."
-	elog "If you get an error message about plugins not found"
-	elog "please add the library_directory configuration switch to"
-	elog "dbmail.conf and set it to the correct path"
-	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
-	elog "A sample can be found in dbmail.conf.dist after etc-update."
-	echo
-	elog "We are now using the init script from upstream."
-	elog "Please edit /etc/conf.d/dbmail to set which services to start"
-	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
-	elog "forget to rc-update del dbmail-* first)"
-	echo
-	elog "Changed pid directory to /var/run/dbmail (see"
-	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
-	echo
-	ewarn "The database config has changed to support libzdb db URI"
-	ewarn "Please check the documentation (or Bug #479664)"
-	echo
-	ewarn "The database schema has changed since 3.0.x make sure"
-	ewarn "to run the migration script"
-	echo
-}
diff --git a/net-mail/dbmail/dbmail-3.1.12.ebuild b/net-mail/dbmail/dbmail-3.2.0.ebuild
index ba19860ea02c..8f33026a3224 100644
--- a/net-mail/dbmail/dbmail-3.1.12.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.12.ebuild,v 1.2 2014/08/10 20:44:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.2.0.ebuild,v 1.1 2014/11/02 12:50:17 lordvan Exp $
 
 EAPI="4"
 inherit eutils multilib versionator user
@@ -21,7 +21,7 @@ DEPEND="dev-db/libzdb
 	app-text/xmlto
 	app-crypt/mhash
 	sys-libs/zlib
-	>=dev-libs/gmime-2.4.6:2.4
+	|| ( dev-libs/gmime:2.6 dev-libs/gmime:2.4 )
 	>=dev-libs/glib-2.16
 	dev-libs/libevent
 	ssl? ( dev-libs/openssl )"
@@ -53,6 +53,7 @@ src_install() {
 
 	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
 
+	docompress -x /usr/share/doc/${PF}/sql
 	dodoc -r sql
 	dodoc -r test-scripts
 	dodoc -r contrib