Ebuild cleanup.

(Portage version: 2.1.2.3)

6 files changed, 111 insertions, 114 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 4660a7b8a25a..8704eb15dfe0 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.186 2007/03/12 18:14:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.187 2007/04/07 13:03:55 chtekk Exp $
+
+  07 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  files/saslauthd-2.1.21.conf, files/saslauthd2.rc6, files/pwcheck.rc6,
+  metadata.xml, cyrus-sasl-2.1.22-r2.ebuild:
+  General ebuild cleanup (comments/style). Fix issue in comment #3 of bug
+  #134437.
 
   12 Mar 2007; Jeroen Roovers <jer@gentoo.org> cyrus-sasl-2.1.22-r2.ebuild:
   Stable for HPPA (bug #169512).
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
index 19b1a81febe3..abea6f088554 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
@@ -1,56 +1,50 @@
 # Copyright 1999-2007 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.22-r2.ebuild,v 1.9 2007/03/17 21:15:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild,v 1.10 2007/04/07 13:03:55 chtekk Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
 
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2
 
-ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
-SASLAUTHD_CONF_VER=2.1.21
+ntlm_patch="${P}-ntlm_impl-spnego.patch.gz"
+SASLAUTHD_CONF_VER="2.1.21"
 
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
 HOMEPAGE="http://asg.web.cmu.edu/sasl/"
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
+		ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
 LICENSE="as-is"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-# Removed 'static' USE flag because it is broken upstream, Bug #94137
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl pam authdaemond sample urandom srp ntlm_unsupported_patch"
-
-RDEPEND="berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	pam? ( virtual/pam )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( >=virtual/jre-1.4 )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
+IUSE="authdaemond berkdb crypt gdbm kerberos ldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
+
+RDEPEND="authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) )
+		berkdb? ( >=sys-libs/db-3.2 )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		java? ( >=virtual/jre-1.4 )
+		kerberos? ( virtual/krb5 )
+		ldap? ( >=net-nds/openldap-2.0.25 )
+		mysql? ( virtual/mysql )
+		ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )
+		pam? ( virtual/pam )
+		postgres? ( >=dev-db/postgresql-7.2 )
+		ssl? ( >=dev-libs/openssl-0.9.6d )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	java? ( >=virtual/jdk-1.4 )"
+		>=sys-apps/sed-4
+		java? ( >=virtual/jdk-1.4 )"
 
 pkg_setup() {
-	if use gdbm && use berkdb; then
+	if use gdbm && use berkdb ; then
 		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
+		ewarn "You have both the 'gdbm' and 'berkdb' USE flags enabled."
 		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
+		ewarn "If you want to build with BerkeleyDB support, hit Control-C now,"
+		ewarn "change your USE flags -gdbm and emerge again."
 		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
+		ewarn "Waiting 10 seconds before starting ..."
+		ewarn "(Control-C to abort) ..."
 		epause 10
 	fi
 	java-pkg-opt-2_pkg_setup
@@ -67,38 +61,39 @@ src_unpack() {
 	# Fix include path for newer PostgreSQL versions.
 	epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch"
 
-	# UNSUPPORTED ntlm patch. Bug #81342
+	# UNSUPPORTED ntlm patch (bug #81342).
 	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
 
-	# --as-needed.
+	# --as-needed fix.
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 
-	# Support for crypted passwords. Bug #45181
-	use crypt && epatch "${FILESDIR}/cyrus-sasl-2.1.19-checkpw.c.patch"
+	# Support for crypted passwords (bug #45181).
+	use crypt && epatch "${FILESDIR}/${PN}-2.1.19-checkpw.c.patch"
 
 	# Upstream doesn't even honor their own configure options... grumble
-	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' "${S}"/plugins/Makefile.{am,in}
+	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
 
-	# Fixes for bug #152544
+	# Fixes for bug #152544.
 	epatch "${FILESDIR}/${P}-crypt.patch"
 
+	# Fix QA issues.
 	epatch "${FILESDIR}/${P}-qa.patch"
 
 	# Recreate configure.
-	rm "${S}/config/libtool.m4"
+	rm -f "${S}/config/libtool.m4" || die "rm libtool.m4 failed"
 	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
 }
 
 src_compile() {
-	# QA issues
+	# Fix QA issues.
 	append-flags -fno-strict-aliasing
 	append-flags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
 
-	# Java
+	# Java support.
 	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
 
 	local myconf="--enable-login --enable-ntlm --enable-auth-sasldb --disable-krb4 --disable-otp"
-#	myconf="${myconf} `use_enable static`" -- doesn't work upstream Bug #94137
 	myconf="${myconf} `use_with ssl openssl`"
 	myconf="${myconf} `use_with pam`"
 	myconf="${myconf} `use_with ldap`"
@@ -109,14 +104,17 @@ src_compile() {
 	myconf="${myconf} `use_enable postgres`"
 	use postgres &&	myconf="${myconf} `use_with postgres pgsql $(pg_config --libdir)`"
 
-	# Add use srp. Bug #81970.
+	# Add srp USE (bug #81970).
 	myconf="${myconf} `use_enable srp`"
+	# Java support.
 	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
+	# Add authdaemond support (bug #56523).
+	if use authdaemond ; then
+		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+	fi
 
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
+	# Fix for bug #59634.
+	if ! use ssl ; then
 		myconf="${myconf} --without-des"
 	fi
 
@@ -126,19 +124,19 @@ src_compile() {
 		myconf="${myconf} --disable-sql"
 	fi
 
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
 		myconf="${myconf} --with-dblib=gdbm"
 	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
 		myconf="${myconf} --with-dblib=berkeley"
 	else
-		einfo "build without SASLdb support"
+		einfo "Building without SASLdb support"
 		myconf="${myconf} --with-dblib=none"
 	fi
 
-	# Use /dev/urandom instead of /dev/random. Bug #46038
+	# Use /dev/urandom instead of /dev/random (bug #46038).
 	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
 
 	econf \
@@ -149,32 +147,28 @@ src_compile() {
 		--with-dbpath=/etc/sasl2/sasldb2 \
 		${myconf} || die "econf failed"
 
-	# Upstream doesn't even honor their own configure options... grumble
-	# We sed'd Makefile.in already. Remove this block after testing period.
-	# sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${S}/plugins/Makefile
-
-	# we force -j1 for bug #110066
-	emake -j1 || die "compile problem"
+	# We force -j1 for bug #110066.
+	emake -j1 || die "emake failed"
 
-	# Bug #60769. Default location for java classes breaks OpenOffice.
+	# Default location for java classes breaks OpenOffice (bug #60769).
 	# Thanks to axxo@gentoo.org for the solution.
 	cd "${S}"
-	if use java; then
+	if use java ; then
 		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
 	fi
 
-	# Bug #58768. Add testsaslauthd.
+	# Add testsaslauthd (bug #58768).
 	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
+	emake testsaslauthd || die "emake testsaslauthd failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "failed to install."
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 	keepdir /var/lib/sasl2 /etc/sasl2
 
-	# Install everything necessary so user can build sample client/server
-	# (bug #64733)
-	if use sample; then
+	# Install everything necessary so users can build sample
+	# client/server (bug #64733).
+	if use sample ; then
 		insinto /usr/share/${PN}-2/examples
 		doins aclocal.m4 config.h config.status configure.in
 		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
@@ -190,18 +184,17 @@ src_install() {
 		dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
 	fi
 
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	if use java ; then
 		java-pkg_dojar ${PN}.jar
 		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		#hackish, don't wanna dig though makefile
-		rm -rf "${D}/usr/$(get_libdir)/java"
-		docinto java
+		# hackish, don't wanna dig through makefile
+		rm -Rf "${D}/usr/$(get_libdir)/java"
+		docinto "java"
 		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
 		dodir "/usr/share/doc/${PF}/java/Test"
 		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
+		doins "${S}"/java/Test/*.java || die "Failed to copy java files to /usr/share/doc/${PF}/java/Test"
 	fi
 
 	docinto ""
@@ -209,46 +202,44 @@ src_install() {
 	newdoc pwcheck/README README.pwcheck
 	dohtml doc/*.html
 
-	docinto saslauthd
+	docinto "saslauthd"
 	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
 
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
-		die "failed to install pwcheck to /etc/init.d"
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-		die "failed to install saslauthd to /etc/init.d"
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd || \
-		die "failed to install /etc/conf.d/saslauthd"
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd || die "Failed to install saslauthd to /etc/pam.d"
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || die "Failed to install pwcheck to /etc/init.d"
+
+	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || die "Failed to install saslauthd to /etc/init.d"
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd || die "Failed to install saslauthd to /etc/conf.d"
 
 	exeinto /usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
+	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || die "Failed to install testsaslauthd"
 }
 
 pkg_postinst () {
 	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]]; then
-		einfo "Generate an empty sasldb2 with correct permissions."
+	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
 		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "failed to generate sasldb2"
+			|| die "Failed to generate sasldb2"
 		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "failed to delete temp user"
+			|| die "Failed to delete temp user"
 		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "failed to chown ${ROOT}/etc/sasl2/sasldb2"
+			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
 		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
 	fi
 
-	if use sample; then
-		elog "You have chosen to install sources for example client and server."
+	if use sample ; then
+		elog "You have chosen to install sources for the example client and server."
 		elog "To build these, please type:"
 		elog "\tcd /usr/share/${PN}-2/examples/sample && make"
 	fi
 
-	if use authdaemond; then
-		ewarn "You need to add a user running a service using Courier's"
-		ewarn "authdaemon to the 'mail' group. For example, do:"
-		ewarn "	gpasswd -a postfix mail"
-		ewarn "to add postfix to 'mail' group."
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
 	fi
 }
diff --git a/dev-libs/cyrus-sasl/files/pwcheck.rc6 b/dev-libs/cyrus-sasl/files/pwcheck.rc6
index b0603aad404a..a24b80d3d3c9 100644
--- a/dev-libs/cyrus-sasl/files/pwcheck.rc6
+++ b/dev-libs/cyrus-sasl/files/pwcheck.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/pwcheck.rc6,v 1.4 2004/07/14 22:02:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/pwcheck.rc6,v 1.5 2007/04/07 13:03:55 chtekk Exp $
 
 depend() {
 	need localmount
diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf
index f70b7ac8bfb5..3f2653c55293 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf
+++ b/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf,v 1.1 2005/05/27 00:22:28 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf,v 1.2 2007/04/07 13:03:55 chtekk Exp $
 
 # Config file for /etc/init.d/saslauthd
 
@@ -6,20 +6,20 @@
 SASLAUTHD_OPTS=""
 
 # Specify the authentications mechanism.
-# *NOTE* For list see: saslauthd -v
-# From 2.1.19, add "-r" to options for old behavior
+# **NOTE** For a list see: saslauthd -v
+# Since 2.1.19, add "-r" to options for old behavior,
 # ie. reassemble user and realm to user@realm form.
-# SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam -r"
-SASLAUTHD_OPTS="${SASLAUTH_MECH} -a pam"
+#SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r"
+SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam"
 
 # Specify the hostname for remote IMAP server.
-# *NOTE* Only needed if rimap auth mech is used.
+# **NOTE** Only needed if rimap auth mechanism is used.
 #SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -O localhost"
 
 # Specify the number of worker processes to create.
 #SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -n 5"
 
-# Enable credential cache, cache size, and timeout.
-# *NOTE* Size is measured in kilobytes 
-#        Timeout is measured in seconds
+# Enable credential cache, set cache size and timeout.
+# **NOTE** Size is measured in kilobytes. 
+#          Timeout is measured in seconds.
 #SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -c -s 128 -t 30"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
index a804f6cb67c1..a5e9a4406161 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd2.rc6
+++ b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc6,v 1.6 2004/07/14 22:02:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd2.rc6,v 1.7 2007/04/07 13:03:55 chtekk Exp $
 
 depend() {
 	need net
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index 51f94e3fbe0e..940fde8f70ce 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>net-mail</herd>
 </pkgmetadata>