Ebuild cleanup.
authorLuca Longinotti <chtekk@gentoo.org>
Sat, 7 Apr 2007 13:03:55 +0000 (13:03 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Sat, 7 Apr 2007 13:03:55 +0000 (13:03 +0000)
Package-Manager: portage-2.1.2.3

dev-libs/cyrus-sasl/ChangeLog
dev-libs/cyrus-sasl/Manifest
dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild
dev-libs/cyrus-sasl/files/pwcheck.rc6
dev-libs/cyrus-sasl/files/saslauthd-2.1.21.conf
dev-libs/cyrus-sasl/files/saslauthd2.rc6
dev-libs/cyrus-sasl/metadata.xml

index 4660a7b8a25aaeec346c04aea0488fd9da47ede5..8704eb15dfe088499a450a0ee840cd9c14e49db9 100644 (file)
@@ -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).
index 2cc085a6606ad80165dfd559c3266f1cbde674ea..f7eeb3fe193f3f2aa8145f804f46f0fd941d2d3b 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cyrus-sasl-2.1.17-pgsql-include.patch 617 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c SHA1 a7a22f113044d8bda07e8345781913c317941f53 SHA256 394b196e7d5d7abb3d340de69ddea718bf80936de1eb667580ebae40b9cca228
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
 RMD160 b6a01c3447b49c8cc33ae0c7ca63294cad8e672c files/cyrus-sasl-2.1.17-pgsql-include.patch 617
@@ -25,44 +22,44 @@ AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1
 MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b files/java.README.gentoo 934
 SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe files/java.README.gentoo 934
-AUX pwcheck.rc6 540 RMD160 d675a5e80564dde8978d117c50bc49f209d81718 SHA1 00227312e2ae12e5ce59345cb4fe87709012a089 SHA256 e534c0a2f1a88db2024b3e67b77446eeddafaf4346794b72a833720c826090ca
-MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
-RMD160 d675a5e80564dde8978d117c50bc49f209d81718 files/pwcheck.rc6 540
-SHA256 e534c0a2f1a88db2024b3e67b77446eeddafaf4346794b72a833720c826090ca files/pwcheck.rc6 540
-AUX saslauthd-2.1.21.conf 906 RMD160 51ca03cf8df80a282edb0720b52e644f95c3d76d SHA1 2b9babfd9d47787bfdb3b1cd5ddb919dd6366d2b SHA256 5164b4b0179f45f6ee3148d02ddd882f52ed2c56671671e5ae9b9c7088c79330
-MD5 4717e635830a067d9abb83da6b2700cb files/saslauthd-2.1.21.conf 906
-RMD160 51ca03cf8df80a282edb0720b52e644f95c3d76d files/saslauthd-2.1.21.conf 906
-SHA256 5164b4b0179f45f6ee3148d02ddd882f52ed2c56671671e5ae9b9c7088c79330 files/saslauthd-2.1.21.conf 906
+AUX pwcheck.rc6 538 RMD160 acd0c14abc01390b6bf0944c2b35691e00f4c27f SHA1 ef9ebcf058536a0429211d8ed0d35aacb84a35cf SHA256 9e0d9ab2f0d0f7bccbcc194f6cbfe8ed67e94958465a18f3985f3819f5ed04e1
+MD5 c14374b47f308d6754e87ab6e0fa2939 files/pwcheck.rc6 538
+RMD160 acd0c14abc01390b6bf0944c2b35691e00f4c27f files/pwcheck.rc6 538
+SHA256 9e0d9ab2f0d0f7bccbcc194f6cbfe8ed67e94958465a18f3985f3819f5ed04e1 files/pwcheck.rc6 538
+AUX saslauthd-2.1.21.conf 926 RMD160 fab448738564cb27562a08363a9de84b1141bcc0 SHA1 3220aa01bc5aa3ed4163f3120790f581682fe2e3 SHA256 31e1676f845540dafa9c09799b110234a6362bcd056feaa1ae096e277c9d216e
+MD5 d8f08903e22cae1bdb41cf723cb73241 files/saslauthd-2.1.21.conf 926
+RMD160 fab448738564cb27562a08363a9de84b1141bcc0 files/saslauthd-2.1.21.conf 926
+SHA256 31e1676f845540dafa9c09799b110234a6362bcd056feaa1ae096e277c9d216e files/saslauthd-2.1.21.conf 926
 AUX saslauthd.pam-include 160 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 SHA1 4202ff7752fd39614211dfc099faace5509c632f SHA256 97166de49d227cf5ff305168ea75ca584feda9ab87d1eb1437638861986e70ba
 MD5 a1b5b72d1285487654685fc497aa81b5 files/saslauthd.pam-include 160
 RMD160 643057c1c0e6fc859114b152dab1bf0e89c13c70 files/saslauthd.pam-include 160
 SHA256 97166de49d227cf5ff305168ea75ca584feda9ab87d1eb1437638861986e70ba files/saslauthd.pam-include 160
-AUX saslauthd2.rc6 527 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 SHA1 eeea12a2bbf0fda12e118d16d1f7aa0437b414ed SHA256 55e59c02dcfeab84b777b9a4f1d1bb79645aab43538e1ba593c61dcb82a9e1f7
-MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
-RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 files/saslauthd2.rc6 527
-SHA256 55e59c02dcfeab84b777b9a4f1d1bb79645aab43538e1ba593c61dcb82a9e1f7 files/saslauthd2.rc6 527
+AUX saslauthd2.rc6 525 RMD160 b21261a0c3670d66314269775ec8ff06e9437d88 SHA1 1dfb2736a8a12181a1948870b1063577f6863b2d SHA256 329fb67382e307ab6d37aa789667b04a91ba3f69e9c1023b0902adafed065ee9
+MD5 9045c1b9c79a6ae0727b31e602d098ad files/saslauthd2.rc6 525
+RMD160 b21261a0c3670d66314269775ec8ff06e9437d88 files/saslauthd2.rc6 525
+SHA256 329fb67382e307ab6d37aa789667b04a91ba3f69e9c1023b0902adafed065ee9 files/saslauthd2.rc6 525
 DIST cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466 RMD160 70e498d2ca27289bd729563793dcdabe650ffac4 SHA1 2f944004dbd828ca9bbd53bc7619d79c8b8714ab SHA256 a696dddc27d46ab1950b546fcf49efc1a03a8380ecc4537d085d8daacb88ccf0
 DIST cyrus-sasl-2.1.22.tar.gz 1609278 RMD160 086e20d01588cb86decad001244b72a37223354c SHA1 d23454ab12054714ab97d229c86cb934ce63fbb1 SHA256 c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962
 EBUILD cyrus-sasl-2.1.22-r1.ebuild 8420 RMD160 39e045f62e248fa82a3f37130ebcee80b61690b1 SHA1 390838bca89f536978115c4ecc84a8df559dd50d SHA256 8217f29dd672b54df523fbae97bc0bcd145a82faa3ffa25657b42f9249b093fc
 MD5 5e9af1453ceb9b006a4c609a3c7ff235 cyrus-sasl-2.1.22-r1.ebuild 8420
 RMD160 39e045f62e248fa82a3f37130ebcee80b61690b1 cyrus-sasl-2.1.22-r1.ebuild 8420
 SHA256 8217f29dd672b54df523fbae97bc0bcd145a82faa3ffa25657b42f9249b093fc cyrus-sasl-2.1.22-r1.ebuild 8420
-EBUILD cyrus-sasl-2.1.22-r2.ebuild 8657 RMD160 6b279f2a99dad85ecdb9ec583342a7b95563d070 SHA1 2ed3767644c7180d2df766d01ba152b11ecbc66b SHA256 0e38e9f297bd66479e5ae075f83f2845222a6b3fa4f1e7a31d5b839368ff4cb8
-MD5 45bda6044da9e582a3027d4f2d3e1304 cyrus-sasl-2.1.22-r2.ebuild 8657
-RMD160 6b279f2a99dad85ecdb9ec583342a7b95563d070 cyrus-sasl-2.1.22-r2.ebuild 8657
-SHA256 0e38e9f297bd66479e5ae075f83f2845222a6b3fa4f1e7a31d5b839368ff4cb8 cyrus-sasl-2.1.22-r2.ebuild 8657
+EBUILD cyrus-sasl-2.1.22-r2.ebuild 8554 RMD160 5bda1a69c645beeab73d52224e0951156154b4cb SHA1 9c516b0e4ce71b3170c928c786dbeb9225f785b3 SHA256 d584b372dedb6b5cf8fcb975aa3633ebf790a1599cecf5b2f32a14740b07e644
+MD5 32d447f44bc9f06ab47e495ca2d429f8 cyrus-sasl-2.1.22-r2.ebuild 8554
+RMD160 5bda1a69c645beeab73d52224e0951156154b4cb cyrus-sasl-2.1.22-r2.ebuild 8554
+SHA256 d584b372dedb6b5cf8fcb975aa3633ebf790a1599cecf5b2f32a14740b07e644 cyrus-sasl-2.1.22-r2.ebuild 8554
 EBUILD cyrus-sasl-2.1.22.ebuild 8395 RMD160 81e42cc4660494024d4f26b36e026b746adb7a20 SHA1 ab4f81c0c2b6d0d362918b044aa3c5d8739247a9 SHA256 26fef8c5871406d0ffd8a8ec539e2bab0b3a382005ebb27aa19674f15d3023e1
 MD5 97c07c7009e89a5b70958ced5b5c9ba3 cyrus-sasl-2.1.22.ebuild 8395
 RMD160 81e42cc4660494024d4f26b36e026b746adb7a20 cyrus-sasl-2.1.22.ebuild 8395
 SHA256 26fef8c5871406d0ffd8a8ec539e2bab0b3a382005ebb27aa19674f15d3023e1 cyrus-sasl-2.1.22.ebuild 8395
-MISC ChangeLog 31655 RMD160 f720ab29246ad5bbf0e7d35b3b407f71294c5ce0 SHA1 e6b0a2f80b2152b5d1bf3ad630b045cf4ab2eaa4 SHA256 3dbd3a0596151cd93a431adf9397b08249d1d1bea23cfb803ae0294b8ac708c5
-MD5 e45cde92cb7b9ffc334925cd7ef869b5 ChangeLog 31655
-RMD160 f720ab29246ad5bbf0e7d35b3b407f71294c5ce0 ChangeLog 31655
-SHA256 3dbd3a0596151cd93a431adf9397b08249d1d1bea23cfb803ae0294b8ac708c5 ChangeLog 31655
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
-SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+MISC ChangeLog 31912 RMD160 6e3ce55474eed8b814394ee1c648b5783c6782d2 SHA1 f12c340979581bcf07d493ff49c9c4e106ef25df SHA256 31f94ac3a32f0baac18bd442f89eb711a5e884c71573ef6fce15459c8622348e
+MD5 3e087e260f674742eef64424be3b5d89 ChangeLog 31912
+RMD160 6e3ce55474eed8b814394ee1c648b5783c6782d2 ChangeLog 31912
+SHA256 31f94ac3a32f0baac18bd442f89eb711a5e884c71573ef6fce15459c8622348e ChangeLog 31912
+MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
+MD5 2169405288c432c981b23bc7965d15c9 metadata.xml 162
+RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 metadata.xml 162
+SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b metadata.xml 162
 MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22 560
 RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22 560
 SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22 560
@@ -72,10 +69,3 @@ SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/di
 MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22-r2 560
 RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22-r2 560
 SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22-r2 560
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/Fp48bi6rjpTunYRAunrAJ98D1RPgXvUKnltmkLXnZS8L9LAbgCfQkB+
-6X1qLJbhgWJHqc2ebfJJrUQ=
-=Hudg
------END PGP SIGNATURE-----
index 19b1a81febe38bcf7997eb5a32b97641188a9b78..abea6f0885549231aa0681ea15fb52b85420663a 100644 (file)
@@ -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
 }
index b0603aad404a2c9029485f4647c67c21f4d22928..a24b80d3d3c9bcb95295d34123516b72cd457bc2 100644 (file)
@@ -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
index f70b7ac8bfb5161d733789bfbf29126dd12dbabc..3f2653c552937ffa6e529bbee63c1825e816897e 100644 (file)
@@ -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"
index a804f6cb67c129064a53f2acf5f315de3a3b00b3..a5e9a44061616ff590e0c629072af208c93b734b 100644 (file)
@@ -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
index 51f94e3fbe0ef068ce643a5eb106c15fe0ac77c6..940fde8f70ce1dd4483b949aa8cb539f72963222 100644 (file)
@@ -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>