Fix building with mysql - bug #438602. EAPI bump and cleanup

Package-Manager: portage-2.2.0_alpha139/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 204 insertions, 15 deletions

diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index 92d54b8e523a..780aa4998669 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.122 2012/10/16 09:31:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.123 2012/10/17 12:41:17 eras Exp $
+
+*courier-authlib-0.65.0-r1 (17 Oct 2012)
+
+  17 Oct 2012; Eray Aslan <eras@gentoo.org> +courier-authlib-0.65.0-r1.ebuild,
+  +files/courier-authlib-0.65.0-sqlite.patch:
+  Fix building with mysql - bug #438602. EAPI bump and cleanup
 
 *courier-authlib-0.65.0 (16 Oct 2012)
 
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 097cea63710c..1d5c96ebdf38 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 0.59.2-configure-db4.patch 2618 SHA256 a60e2f5d26673be2ae107d9fcec024f41c522663d28f4741000fb1885ce067bc SHA512 3eb8fcf593071c79863ef18b6b2ff119f359cac48cca8c858e8da060798521eb6a47461375c22f9ca520cda1dd3f6c18cf8d7fb7a3b924a0bf1c67cefc35c700 WHIRLPOOL e664d3363a722358ab6346d21bcf81dfc96b93c923345bd0f72139e37dcb1fd099c4848e1b8a03a1d2a4293904c40f17b51826ce9eb4ec7a4e5af894f0495dc7
 AUX 0.59.2-remove-obsolete-macro.patch 254 SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f SHA512 3c852f0255ea2c33e24d2d8aeee00bd46680d83a2f06fae2b5289ad959c283918c2e367812720a0742ad0eb707e6198767d7818dc14af97d3b60ea736b7702d8 WHIRLPOOL d6198294c0362cb3209c7f67806a0e7f6f492ed655fd1dd0447c3838cd6717d0e380c8a6dce2e11182a0bc89cbcb29fad6a9fb72fa2c05fae3d61b98ef14345b
 AUX courier-authlib 1112 SHA256 c946e42e5ed31a210da99af4d83cb739e2008ad2ea524955cdb141f4c7289dc9 SHA512 b7773959e23d0cf693fc91fb83c1c57970958accc1e7ae033c175f6c83d5813a6ab5e0bba41e4951a38cc8320f3d86acf53c7ac2753901f8471af87374033efc WHIRLPOOL 7b95c1454c2ae9346a93cc3d3202fe029165e99f5e05fafe2d1b31b61cf003349582242935dfd1e5724928ce77657ce004e3db87f105218dd7af877ad5dc3201
+AUX courier-authlib-0.65.0-sqlite.patch 260 SHA256 40692d6a5492f2702fe7ec1cff2b2a343e084747c4b2e0a0fd8d66b530a94285 SHA512 672ca134aba8a210882a2004fb0ca78d89911aef5bec377e159377c7eb30390edb466f43589e6c58c7c7b81cb7244e05ccfc89b01c1fb48990a3c363213fa0c8 WHIRLPOOL ef6fcbfd2b32008e2b105e8e19cd477b9401a8af75e386adb699f15b115d234418b8b7f092dcd97d7a37df6dafe3212c5e9646457322673ff089cbb30abfda33
 AUX courier-authlib-r1 1107 SHA256 c7d9e1efbbc4a805a08d085cbe1edeaf491e455b0ba265c3a60fda2c3f3c8fbd SHA512 e1bf12da0720af55227953c4cbf48323ad07dfa7fe35df7efd383116c905345b6fcd0d33d83317467397007ce01d48b9a372b93276b25b5ef84ea9a49756bfbe WHIRLPOOL e40e524d3e0a4bdab18cccd7450cfa6c95b35f79fe97c64e8f4615aebe88d87c1d49e59289cfa9f58d07160f90612a873dd828f727fe58d6689a333c442b2e1a
 DIST courier-authlib-0.62.2.tar.bz2 2233216 SHA256 8ce756df57c7f4c09219fe9c70b4f7e6002a2e0fbf9de73f304c22b316387c50
 DIST courier-authlib-0.62.4.tar.bz2 2175238 SHA256 ab033565dbec9fd65e1f7618a311a614214cf72f4a3052adb9e0b9a6cecaf081
@@ -15,23 +16,24 @@ EBUILD courier-authlib-0.62.4.ebuild 5149 SHA256 8d76affd050417bbea114c155b1708d
 EBUILD courier-authlib-0.63.0-r1.ebuild 5106 SHA256 bef7f8736d92ab7f217bec8ff1b68b80efcd96889c13b41d75d2e8ccfbb1980b SHA512 e5346e70b89ccc913934961b5d9a514b35f7fa7b380c197b5204a43868b7d2045e46afa7668a44ade5090937cd4af6482378f9b926b0eb0c617ab8364cdd05c2 WHIRLPOOL e15effff4e412ccfd0a89ebf7181104a26d18decd8f665df06ec82cb988f0a0aa6eb5b0509620f4a8a8b19754915c8eab2c183cc68675b8d96fc2691779075f4
 EBUILD courier-authlib-0.63.0.ebuild 5085 SHA256 b976ce03fc5efe7810e8ef6263705766c621ec0d435ffad1a9ca68deccac05bc SHA512 8562c33811dac221efdb7737685ca6192dcec8b800d29758e4c17b3c0ec313fb4f7d760e1a483885372bafa54d5e1e821be726b34b229331f2ff855a144497e7 WHIRLPOOL a3fba1d1dff9c743e0feceb511577a584fd9d50130fd0d0f1199efdcaaadea6e4c64b25e206e816a30ad6201860f0b28f12b30ea82246ce8665553ace33f2ffd
 EBUILD courier-authlib-0.64.0.ebuild 5111 SHA256 c0ee7e1c980e3d13b59259af8364084824428442734ed5b15f18c8d1e4b12ce3 SHA512 987a6fc4ab41bc59ca0911e5fc2d5508a38339c66a63bf27c83986a8292fb4755f9d5ed922fbcfdb83ea58af0b4b539a73b157129791c81a5dc6e91ed185ee4b WHIRLPOOL d526e22861c8643d4cf75559ddadc18c2cb9e9bce9118279c8105555ff63222ad5d1176d6e25d5341de73805a3382e2938bff4a77901d9b39c886484d6b3ad63
+EBUILD courier-authlib-0.65.0-r1.ebuild 5312 SHA256 61ec51619cff7e88d3e8ef89fceae6fdcc15072ca23a773b1c4298b4c5ffefec SHA512 80c4022340d6e9c4859f7ae48117411aa187c2803fe339e50c09fcf1844c05bf281e6488fb81b810407d7b637718f29e47b262a16da5a9dc003a7302e96e44f2 WHIRLPOOL 763004ca8f54e73cd84463bd5a443c99845c90a0c2a0e07d24edfc43329c5e9d9ee430039a506a1c2523ddb4a08d4ef275f97524ca0419b55fd0a6ae71443619
 EBUILD courier-authlib-0.65.0.ebuild 5124 SHA256 95cb8f47018ea8485ef030c123e6dabf1a5d927e7ec1009a3d148e77fbc0ce11 SHA512 bf5ceb84169638d38a54399dc46ef5ee70f8872e535ed3eb73804669c0da064c6a10b8031f33783a8465bb44c1576dfbcfb6434fc1c205655d3d00397d179e28 WHIRLPOOL 8ae82e8ec291aec86b2523c41f3a3157848fdd6c962ec84887755c3ff7fcc6672af70c0fc27478757147cab8d7eca63d683b4a387fbec507c62c2b8fa81c3e81
-MISC ChangeLog 19777 SHA256 53e589782845966a578fb18408ad1e5da15695c69f091533fa028687246eda55 SHA512 139094711677a2c5ab2ecad7fc3f7958fbe9016baaa770d2f76f5927283797f7196813cc363979e201015fc38d1f03c2b9e6e5d5310ff1e6f3d2bf67912af6a9 WHIRLPOOL 36cc3d02d874da0be9b19af5102154e8c45100e1ea1442e7b7d6f7650dec5fd6d9913310b2bd9a44575480c3ad3e48160b5c034851898ca3d785912879d4e44c
+MISC ChangeLog 20008 SHA256 b131193b0bcdba3e2eb7702b9e09015d725d58b6b2b95bbfb670767a6362e546 SHA512 9a1faee6b93c70037bab14a90bc8668b6c39bdc2664716025b13cf5843c02f259a82e834bbda43059feb50946ec01fbeb459559422897f08eb3dcb07445d31b9 WHIRLPOOL 7469b48083a5019b2a98f2724bbd9df2de1174ac0b55ee2041cc084a8c42ed967804dd2a28e467cecd3d8651c5ee0ddbe43a9ef54e0136d938fb801d05b008e8
 MISC metadata.xml 237 SHA256 a8a93d896577309c559cb95967fe0ebab7ee7201a1c7204eeae6e95ce9375305 SHA512 7dbe4ef965827cf9f1d2f12ba05d24870c98e377687e50174427ab6299896a9e29a35870b049057c075248603d6b5bc5d55aa4202033426fe89c5f71e5363aa2 WHIRLPOOL 751a7e9f576a448c109dcc1bfce1c203a5f3ec518df929863de4ebc87830b952d4789e8d8d583cf211a29fb900769499b3f3f85921d2f0ce71929e53f9bc1f74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQfSl8AAoJEHfx8XVYajsfAKkP/jZ11waAkVtucJFjzgvULWJ7
-592v/dZzyrgqVDiLgnP0ASWPhn9kqxeuUA8kv2X0opHgXn/9DYXzq/rcxtzJnyIF
-10RiEu30OC9HmoP8scjxHPARqX9XQGMTFqAuXttb8kTqNNBd4FG89RieUi1blzvd
-fy/F+FAkP3RGEU2JX0yOOW3J7wutod9aLt6s0nI5c9KXoMXqDVvpI06HNhRcGnef
-oIDnC45WTSB0k4Ouzb7GBg8cUA0Ntanz3KQQY+l8hNfcEMhn/ZzOSiuoiNiO7OCQ
-Sa1xfXeG5y1U7aaPGGCizcJAn1LUsNo6/GaUWCGnvDddQvw2b0DjxccfHj4cDzOk
-QF3YyH3sKMeCNFk1wArknKzCJ5oLsmjtAogWuckVB9OQWrAnUIxywdM3e0MK+4XS
-/jzK8LeQHfKhYqzsZjtQZY3V+qmOfn1GCbzJ/0lyuiS1XbKkoetqoB39OrIj/rjE
-pCtwhf04rP/9k14Fx215dc+wPbj6s0KpF/3OI+1xmaxdz+Y9r6XBrkbmuHtQ+tV6
-6qyCDdtq++0UggFIhrvhZ5wnzJnnV61zfSUomwhvH29CMk7tIxsU9K6khi9CPA4e
-7HvPHvfmIJXFCTXtA8QJkn+YcgBQa8ufnEMSaur+fLVBGX8kRUIkZGiE3OhvE48A
-t66JtEc5RvIeZQtus6l6
-=FjAA
+iQIcBAEBCAAGBQJQfqd7AAoJEHfx8XVYajsfa2MP/iYkTFxD7M3jllC/6c0ArV9a
+3FhfLQWBl2AedG/uqe+PO5h0bb3m2r0AdYujnp2RqhOjBc9YrW2wnshg/p/uFvJt
+iNtYTgxI/KqYUhf9wo4L7HkzRRwc7HVMmCFqAkBzhV1qyaDWJRybj+EkKZhun961
+ShjVAirfYDXqFE2dJfVLu731uOe15dQovB6A5zuHom8PUfgipaLxsciSjkaPOzRQ
+dRq32kk1MZOkWU8z034O8V/vSJoaMnaeCmJnSc1qqKpatZIP0brg3Y1CIMdn1qdL
+QDyLBRx0DzaZOa6hihwGKmRtsNaVJhLT/OQNUSDyGDyID+Hd38vsumHI0sleGL91
+mMytbLAp7RoMMe91JXyVAxdU6lzfkii6c0Yfs83GpjwmiE6lXFrR3ZEheRxKby2k
+yOQKBQ7bTdhIZm0MeQQgMFwa2gd7Eh6WLLEUS9s+/Ttcfqd/kgXwpoD3WwocbYx8
+0/U1y2R4eOVunFGH4Wt8F+XW/pNirqHwTdSWuV1IM+k467h/AgX5QIqj4P525LCZ
+np2Em4pA0l0ewQnSRfZs1dO7uuE9fyELijQK+DepYvbKoeWp4gXWYHPoIkRkAkCS
+U5gx9FcohhaSkGaZ9Go6Qw8sU/lu3xp8iKAfbDNSqi//Kz79vPxU6fGEauTENg9D
+lnjkHr+ckdL10zxhv0FR
+=K1yT
 -----END PGP SIGNATURE-----
diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r1.ebuild
new file mode 100644
index 000000000000..1e9d4fccf81d
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.65.0-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.65.0-r1.ebuild,v 1.1 2012/10/17 12:41:17 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib user autotools
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library."
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
+
+RESTRICT="userpriv
+	!berkdb? ( test )"
+
+RDEPEND="gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db )"
+
+DEPEND="${RDEPEND}
+		>=dev-libs/openssl-0.9.6
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( >=dev-db/postgresql-base-8.4 )
+		sqlite? ( dev-db/sqlite:3 )"
+
+# vpopmail support removed upstream
+REQUIRED_USE="( !vpopmail )
+	sqlite? ( mysql )"
+
+pkg_setup() {
+	enewuser mail -1 -1 /var/spool/mail
+
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sqlite.patch
+
+	# move local macro to m4 and run eautoreconf
+	mkdir "${S}/m4"
+	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+		m4/sysconftool.m4 || die
+	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--libexecdir=/usr/$(get_libdir)/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}"
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -f "${dir}/userdb" "${D}/etc/courier/authlib/"
+			chmod go-rwx "${D}/etc/courier/authlib/userdb"
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/*
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+	dodoc AUTHORS ChangeLog* INSTALL NEWS README
+	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+	if use mysql ; then
+		dodoc README.authmysql.myownquery
+		dohtml README.authmysql.html
+	fi
+	if use postgres ; then
+		dohtml README.authpostgres.html README.authmysql.html
+	fi
+	if use ldap ; then
+		dodoc README.ldap
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/"
+	fi
+	if use sqlite ; then
+		dohtml README.authsqlite.html README.authmysql.html
+	fi
+	newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+
+	use static-libs || find "${D}" -name "*.*a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb
+		makeuserdb
+	fi
+
+	# Suggest cleaning out the following old files
+	list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
+	if [[ ! -z "${list}" ]] ; then
+		ewarn "Courier authentication files are now in /etc/courier/authlib/"
+		elog "The following files are no longer needed and can likely be removed:"
+		elog " rm $(echo \"${list}\")"
+	fi
+}
diff --git a/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch b/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
new file mode 100644
index 000000000000..60a0d53ed165
--- /dev/null
+++ b/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
@@ -0,0 +1,11 @@
+--- configure.in	2012-10-17 08:50:00.387963153 +0000
++++ configure.in	2012-10-17 08:50:21.121706830 +0000
+@@ -635,7 +635,7 @@
+ 	LIBS="$saveLIBS"
+ fi
+ 
+-if test "$doauthmysql" != "yes"
++if test "$doauthsqlite" != "yes"
+ then
+ 	SQLITE_LIBS=""
+ 	SQLITE_CFLAGS=""