re-keywords, touchup ready to remove hardmask.

3 files changed, 72 insertions, 48 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 5b229b02c27d..0ddeca907246 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.87 2004/07/21 01:55:48 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.88 2004/07/21 23:56:52 langthang Exp $
+
+  21 Jul 2004; Tuan Van <langthang@gentoo.org> cyrus-sasl-2.1.19.ebuild:
+  re-keywords, touchup ready to remove hardmask.
 
   21 Jul 2004; Daniel Ostrow <dostrow@gentoo.org> cyrus-sasl-2.1.18-r2.ebuild:
   Stable on ppc.
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index aeb11e27c505..92cc6f377017 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,44 +1,44 @@
-MD5 fde67c074f5cc1d54568402c94cec872 ChangeLog 16332
-MD5 fca787b36b2303a6d2e8b93aa4dfe018 cyrus-sasl-1.5.27-r5.ebuild 2672
 MD5 0c36a223623cafbd54654c586cc4792e cyrus-sasl-1.5.27-r6.ebuild 2745
-MD5 7249a88df4e8bf01818b639cd5eddf5e cyrus-sasl-2.1.14.ebuild 3899
+MD5 7345d1758bbad4ac5ffb130c606f964f cyrus-sasl-2.1.18-r2.ebuild 5330
+MD5 b61513de5e687711b55cba7fb5f33b7b cyrus-sasl-2.1.18.ebuild 4222
 MD5 9bec5bcd49985c0721eec238b54ccc3d cyrus-sasl-2.1.15.ebuild 3747
+MD5 fca787b36b2303a6d2e8b93aa4dfe018 cyrus-sasl-1.5.27-r5.ebuild 2672
 MD5 118563c3516cf8075300c454145fe383 cyrus-sasl-2.1.17.ebuild 4234
-MD5 b61513de5e687711b55cba7fb5f33b7b cyrus-sasl-2.1.18.ebuild 4222
+MD5 3062635295e3fc738ef24d195c0e0ede cyrus-sasl-2.1.19.ebuild 5533
+MD5 7249a88df4e8bf01818b639cd5eddf5e cyrus-sasl-2.1.14.ebuild 3899
+MD5 86771a1a98a1fd1062f1aa0868a69c1a ChangeLog 16457
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 7345d1758bbad4ac5ffb130c606f964f cyrus-sasl-2.1.18-r2.ebuild 5330
-MD5 3076eb4fa8de1bb5f137f9d5bebb4f9e cyrus-sasl-2.1.19.ebuild 4686
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
-MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
+MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
+MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
+MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
+MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
 MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
-MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
+MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
+MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
+MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
+MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
 MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
+MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
+MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
+MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
+MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
+MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
 MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
 MD5 6109117a3ea3c1141364d60d212f48d9 files/digest-cyrus-sasl-2.1.15 70
 MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
 MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18 70
-MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
-MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
-MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
-MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
-MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
-MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
-MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
-MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
-MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
-MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
-MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
 MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19 70
-MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild
index 6be8a9d3fa79..7d4c45268a2c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild,v 1.1 2004/07/16 23:53:38 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild,v 1.2 2004/07/21 23:56:52 langthang Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -10,8 +10,8 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="2"
-KEYWORDS="x86 ~ppc sparc ~mips alpha ~arm ~hppa amd64 ia64 ~s390 ~ppc64"
-IUSE="gdbm ldap mysql postgres kerberos static ssl java pam"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+IUSE="berkdb gdbm ldap mysql postgres kerberos static ssl java pam"
 
 RDEPEND="virtual/libc
 	>=sys-libs/db-3.2
@@ -29,6 +29,35 @@ DEPEND="${RDEPEND}
 	sys-devel/automake
 	sys-devel/libtool"
 
+pkg_setup() {
+	if use gdbm && use berkdb; then
+		echo
+		eerror "You have both \"gdbm\" and \"berkdb\" in your USE flags."
+		eerror "please choose only one for your SASLdb database backend."
+		echo
+
+		has_version ">=sys-apps/portage-2.0.50" && (
+		einfo "It would be best practice to add the set of USE flags that you use for this"
+		einfo "package to the file: /etc/portage/package.use. Example:"
+		einfo "\`echo \"dev-libs/cyrus-sasl gdbm -berkdb\" >> /etc/portage/package.use\`"
+		einfo "to build cyrus-sasl with GNU database as your SASLdb backend."
+		)
+
+		exit 1
+	fi
+	echo
+	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
+	einfo "realm and username into a username of "user@realm" form."
+	echo
+	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
+	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
+	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
+	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
+	echo
+	einfo "Pause 30 seconds before continuing."
+	sleep 30
+}
+
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
@@ -81,9 +110,14 @@ src_compile() {
 		myconf="${myconf} --disable-sql"
 	fi
 	if use gdbm ; then
+		einfo "build with GNU DB as database backend for your SASLdb."
 		myconf="${myconf} --with-dblib=gdbm"
-	else
+	elif use berkdb ; then
+		einfo "build with Berkeley DB as database backend for your SASLdb."
 		myconf="${myconf} --with-dblib=berkeley"
+	else
+		einfo "build without SASLdb support"
+		myconf="${myconf} --with-dblib=none"
 	fi
 
 	# Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
@@ -138,16 +172,3 @@ src_install () {
 	insinto /etc/conf.d
 	newins "${FILESDIR}/saslauthd-${PV}.conf" saslauthd
 }
-
-pkg_postinst() {
-	echo
-	einfo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	einfo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\$\{SASLAUTH_MECH\} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	einfo
-}