improved ebuild (init script, python, ldap, contrib stuff)

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.24-gentoo-r3 x86_64

3 files changed, 166 insertions, 2 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index da0baa8034da..6b4b768af7d5 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.32 2008/12/01 12:38:03 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.33 2008/12/18 11:38:42 lordvan Exp $
+
+*dbmail-2.2.11_rc3-r1 (18 Dec 2008)
+
+  18 Dec 2008; Thomas Raschbacher <lordvan@gentoo.org>
+  +dbmail-2.2.11_rc3-r1.ebuild:
+  added 2.2.11_rc3-r1 which used upstream gentoo init scripts and conf.d
+  file. also now installing ldap schema if USE="ldap", contrib stuff into
+  doc dir and also installing python modules if USE="python"
 
 *dbmail-2.3.4 (01 Dec 2008)
 
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index bb5c88c1b7d0..30870f53d624 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -7,8 +7,9 @@ DIST dbmail-2.2.11-rc3.tar.gz 900334 RMD160 9b80bd24974fa70c451c569836880e2682f0
 DIST dbmail-2.2.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
 DIST dbmail-2.3.4.tar.gz 894841 RMD160 5846ee396916f9f46165e79ff0926e105d357091 SHA1 191c147be930ba9c81689aa7c6e138d180fcbe34 SHA256 86523cfb2511d5e004a8f5a3f6581aa41752ff178507c4dac206e4c8414b51ce
 EBUILD dbmail-2.2.10.ebuild 3564 RMD160 40b53b456c03e9a70672cc64ada03b5c33641c97 SHA1 a9502150f6f6a402cd39f94e2740bdedeb1f8982 SHA256 46c740834bfbb5b2e36eedebe16a5fd66847e11a9f4cba4fcba38d1233dc512e
+EBUILD dbmail-2.2.11_rc3-r1.ebuild 5025 RMD160 3a2d87c1501012331f1a3b42f3c994dade1332f4 SHA1 71b4b64ed730e2ba0d73a4bf039c4fa8bb5c1505 SHA256 842544477e458eff44b6cbd1c54afd0930571b5fe2aca3d6b209128d0e90d929
 EBUILD dbmail-2.2.11_rc3.ebuild 3608 RMD160 997844ab949027d8ff97ace63f1bb343cd8b1c4e SHA1 260c5e0abc17647030cf84b83ad01075bb6f773f SHA256 43af8362b3f4e04fb433ffdd4bbab747c032034ea06823d364a1ef2363817873
 EBUILD dbmail-2.2.9.ebuild 3561 RMD160 a4358b41534f1f3544f09b415ae4769a60255302 SHA1 3f503f4cac7fe697b194ca40600142af1bf10196 SHA256 88f5dbd1e016c480b3c4da853f22d032faaf7b360f8e6fcd594e1cc627f0bae1
 EBUILD dbmail-2.3.4.ebuild 3649 RMD160 2288b129a2cd2836e2dfdaac221e901981e893c3 SHA1 b410bff97b9248199445c04348370067b0c8b3c0 SHA256 a7b2fba3cd016a2549359eacc5dd59017797a9bb139b554814b62e181b1e6d18
-MISC ChangeLog 6574 RMD160 37ccc31b613752259f0320523bdb73efd9a5ca8d SHA1 3c5d996d62f0bf3d61420a662f2f1c459667b075 SHA256 5ca28b4a9cc2ddc4f22ad3749554cd7bf2fec832949c050935f8ec269b3a9046
+MISC ChangeLog 6907 RMD160 70441286954dd1b51e0b85b4eda3be548518017e SHA1 6c3dcd142f52da1973cf509a1e7b5662d899d223 SHA256 d957d0beac6fb7d4c1e5f031781395137fd1ce056bae34887617140ee90bcfcf
 MISC metadata.xml 580 RMD160 e824692f7f60c50f5afffb04e3ef2eb47c44efaf SHA1 96720e52cc8f2387b57f3db2e55e87a660aa1815 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14
diff --git a/net-mail/dbmail/dbmail-2.2.11_rc3-r1.ebuild b/net-mail/dbmail/dbmail-2.2.11_rc3-r1.ebuild
new file mode 100644
index 000000000000..d45c3a2ab5de
--- /dev/null
+++ b/net-mail/dbmail/dbmail-2.2.11_rc3-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.11_rc3-r1.ebuild,v 1.1 2008/12/18 11:38:42 lordvan Exp $
+
+inherit eutils multilib python
+
+MY_P="${P/_/-}" # for rcX was without the - for versions < 2.2.6
+#MY_P="${P}" # releases
+DESCRIPTION="A mail storage and retrieval daemon that uses MySQL or PostgreSQL as its data store"
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="http://www.dbmail.org/download/2.2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap mysql postgres sieve sqlite3 ssl static python"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	postgres? ( >=virtual/postgresql-server-7.4 )
+	mysql? ( >=virtual/mysql-4.1 )
+	sqlite3? ( >=dev-db/sqlite-3.0 )
+	!mysql? ( !postgres? ( !sqlite3? ( >=dev-db/sqlite-3.0 ) ) )
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	python? ( net-zope/zopeinterface )
+	app-text/asciidoc
+	app-text/xmlto
+	sys-libs/zlib
+	=dev-libs/gmime-2.2*
+	>=dev-libs/glib-2.8"
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+}
+
+src_compile() {
+	use sqlite3 && myconf="--with-sqlite"
+	if ! use postgres && !use mysql && !use sqlite3; then myconf="${myconf} --with-sqlite" ; fi
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		${myconf} \
+		$(use_enable static) \
+		$(use_with sieve) \
+		$(use_with ssl) \
+		$(use_with postgres pgsql) \
+		$(use_with mysql) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING VERSION
+
+	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
+	docinto contrib
+	dodoc contrib/quota_warn.pl
+
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup: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
+	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
+
+	# ldap schema
+	if use ldap; then
+	   insinto /etc/openldap/schema
+	   doins "${S}/dbmail.schema"
+	fi
+
+	if use python; then
+	   python_version
+	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail
+	   doins python/*.py
+	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/app
+	   doins python/app/*.py
+	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/bin
+	   doins python/bin/*.py
+	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/lib
+	   doins python/lib/*.py
+	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/tests
+	   doins python/tests/*.py
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+
+}
+
+pkg_postinst() {
+	if use python; then
+	   python_version
+	   python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail
+	fi
+	elog "Please read /usr/share/doc/${PF}/INSTALL.gz"
+	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 SQLite3, PostgreSQL or MySQL."
+	elog "If none of the use-flags are specified SQLite3 is"
+	elog "used as default. To use another database please"
+	elog "specify the appropriate use-flag and re-emerge dbmail."
+	echo
+	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)"
+}
+
+pkg_postrm() {
+	     python_mod_cleanup
+}
\ No newline at end of file