[gentoo-commits] dev/lordvan:master commit in: net-mail/dbmail/

[Thomas Raschbacher]

commit:     c5c06dcc360db2cbf865400be7731b43e6b63383
Author:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 12:04:14 2013 +0000
Commit:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 12:04:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/lordvan.git;a=commit;h=c5c06dcc

dbmail 3.1 live git ebuild

---
 net-mail/dbmail/ChangeLog                          |  8 ++-
 net-mail/dbmail/Manifest                           |  5 +-
 ...{dbmail-3.0.2.ebuild => dbmail-3.1.9999.ebuild} | 60 +++++++---------------
 3 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index 186deeb..54499ac 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-mail/dbmail
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.43 2011/07/15 21:08:51 maekke Exp $
 
+*dbmail-3.1.9999 (30 Sep 2013)
+
+  30 Sep 2013; <lordvan@g.o> -dbmail-3.0.2.ebuild,
+  +dbmail-3.1.9999.ebuild:
+  removed old ebuild added 3.1 branch live git ebuild
+
   13 Aug 2012; <lordvan@g.o> dbmail-3.0.2.ebuild:
   change pid_directory to /var/run/dbmail by default and fix config and init
   files

diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 3e29e1e..5e30fa0 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,4 +1,3 @@
-DIST dbmail-3.0.2.tar.gz 867560 SHA256 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e SHA512 ca1d30a114c1b2b8968227ed678e3857c6d5cb98eb9e7086d45c32b4e957396971bd76cfe2e278fe904fbe8a8ded53199ded76da300d9835b324839e42532834 WHIRLPOOL a79d8b344361bd032446e99bbbb865e798db54e60a730cb7191112e4320ca130d194d8a1ad2d676673b2bb06e50e9cc1ccc78a8a1fc7edcb2a9b3eeeb7841500
-EBUILD dbmail-3.0.2.ebuild 4806 SHA256 b79fbba89f71a53c389d0a6b25dc07463de117ba85be0b86fd503ba22f039bcf SHA512 63f44d36a4abc61e0583428885f6432970cb8987185c2cd69a8fd9adeb0d97bc0dba7608f024e77682d825c1ac01d79ed445c809170abedb86ab4969d5edc593 WHIRLPOOL b75c931956e95f448f32ca73b1340755d572b784eedec96af2e8116a0ef8058da3396d7bf931fb8b3631e44e1a97d6183c443fcd71d562ba1fdb4ad9ecfa110c
-MISC ChangeLog 9081 SHA256 ae664f68c7b9e1c2d51e7d4ca4a6cc49b400c0a16a067ef1cf15b5367bbb2028 SHA512 d198a00702420a5751f46ebacc760b48f2ed3b88a1a893f713b78c51cc916a4f1300c30f1d8937a1572fb99d32a54aa41c723d2cada2f6b21a275c2cf7e7fbea WHIRLPOOL 0eaeda6a5caa3bab81bfdf9c5889944d073a8ff8ee18dae79da03c2db8d9ebeac6eec095c2f507d15f6c15de5825a5fd72a48867ce354582a82e3a87ac6319f2
+EBUILD dbmail-3.1.9999.ebuild 4311 SHA256 62d1f612ad5b8e4885d5108e56bb53105832972d288885c4595bb31483b62f89 SHA512 750fd9da5f9a90ee6eebdac2284798a1b59aa95be7622946fdb668c4aee531c538c26923e9c076632755f2ea00d21da11bbb5e0d11551ea30ae4ea29fad87ad2 WHIRLPOOL 089d25a0e0b70c38bffcf001720eaac7ade3cfa4095defe9ad95d4e4794bcc3f045b0c388eb3e6501afe51081e23f42b32e8989786c3d26e693edb4b7ef751d7
+MISC ChangeLog 9253 SHA256 5dcf45fd350bceacea05e923def94b2a488f8c43a679ef9b2ecec19304b7d353 SHA512 c0f9423affaecca345d214c4e65d3b21cf666df9da2ab8c3b7507b3b3069200358ee3bccf8467b1640fcd1b9048dc90621950280fc4afad1c63cb1bd839505ff WHIRLPOOL 915b29177ef4a7b82a81400b32f4a5dbd5b3f6401e500444326f5d0c571470cd201ed84b77e2399185d73ad3d1e827155583d2c55db03aa0a27ab41e82ae19f7
 MISC metadata.xml 548 SHA256 44a8967070c748d01cf091dc9102c31a4b49c1de45387a244991fa8e1bf09056 SHA512 04e5ffe784421938f9211f9fa1b3b5952f00b1009503d22bf7c4e23e7717305bb6217d7480a31e98bf362f36d76d38effcbd09e08ed4f5292d9e1b1dd0fcb1d0 WHIRLPOOL 969132b4480ce852454416410164b21c5c182b240a47f8007c82c2c76e6dcb9d46d8a9728e5be8e598062e327f5df812dc9325d357a7821b343073948fbb579e

diff --git a/net-mail/dbmail/dbmail-3.0.2.ebuild b/net-mail/dbmail/dbmail-3.1.9999.ebuild
similarity index 74%
rename from net-mail/dbmail/dbmail-3.0.2.ebuild
rename to net-mail/dbmail/dbmail-3.1.9999.ebuild
index eecc1af..dafacb2 100644
--- a/net-mail/dbmail/dbmail-3.0.2.ebuild
+++ b/net-mail/dbmail/dbmail-3.1.9999.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.17.ebuild,v 1.3 2011/07/15 21:08:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.7.ebuild,v 1.1 2013/09/25 17:53:43 lordvan Exp $
 
 EAPI="4"
-inherit eutils multilib python versionator
+inherit eutils multilib versionator git-2
 
 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"
+#SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+EGIT_REPO_URI="http://git.dbmail.eu/paul/dbmail"
+EGIT_BRANCH="dbmail_3_1"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap sieve +sqlite ssl static python"
+KEYWORDS=""
+IUSE="ldap sieve +sqlite ssl static"
 
 DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33 )
-	python? ( net-zope/zope-interface )
 	app-text/asciidoc
 	app-text/xmlto
 	app-crypt/mhash
@@ -30,7 +32,6 @@ DEPEND="dev-db/libzdb
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	python_pkg_setup
 	enewgroup dbmail
 	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
 }
@@ -55,20 +56,6 @@ src_install() {
 
 	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
 
-#	docinto sql/mysql
-#	dodoc sql/mysql/*
-#	docinto sql/postgresql
-#	dodoc sql/postgresql/*
-#	docinto sql/sqlite
-#	dodoc sql/sqlite/*
-#	docinto test-scripts
-#	dodoc test-scripts/*
-#	docinto contrib/sql2sql
-#	dodoc contrib/sql2sql/*
-#	docinto contrib/mailbox2dbmail
-#	dodoc contrib/mailbox2dbmail/README
-#	docinto contrib
-#	dodoc contrib/dbmailclient.php
 	dodoc -r sql
 	dodoc -r test-scripts
 	dodoc -r contrib
@@ -99,27 +86,14 @@ src_install() {
 	   doins "${S}/dbmail.schema"
 	fi
 
-	if use python; then
-	   insinto $(python_get_sitedir)/dbmail
-	   doins python/*.py
-	   insinto $(python_get_sitedir)/dbmail/app
-	   doins python/app/*.py
-	   insinto $(python_get_sitedir)/dbmail/bin
-	   doins python/bin/*.py
-	   insinto $(python_get_sitedir)/dbmail/lib
-	   doins python/lib/*.py
-	   insinto $(python_get_sitedir)/dbmail/tests
-	   doins python/tests/*.py
-	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() {
-	if use python; then
-	   python_mod_optimize dbmail
-	fi
 	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 "
@@ -149,8 +123,10 @@ pkg_postinst() {
 	elog "Changed pid directory to /var/run/dbmail (see"
 	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
 	echo
-}
-
-pkg_postrm() {
-	     python_mod_cleanup dbmail
+	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
 }