make this ebuild suck less and stabilize for arm/ia64/s390/sh

Package-Manager: portage-2.1.2_rc1-r2

2 files changed, 16 insertions, 22 deletions

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 43333911a864..2e52b67283c8 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -69,10 +69,10 @@ EBUILD cyrus-sasl-2.1.21-r3.ebuild 9333 RMD160 8f018802d70906c6c2bb67edc8a649852
 MD5 0d80749c507d562fc146be655c0d3186 cyrus-sasl-2.1.21-r3.ebuild 9333
 RMD160 8f018802d70906c6c2bb67edc8a6498528fbb97e cyrus-sasl-2.1.21-r3.ebuild 9333
 SHA256 16da48132a712ad356c13f53bf91296eaff3ea7b601d7b08d17627e444619a68 cyrus-sasl-2.1.21-r3.ebuild 9333
-EBUILD cyrus-sasl-2.1.22-r1.ebuild 9207 RMD160 5fb151e3d2000f9cf650a60462555d4f8d382e42 SHA1 6c21c672dd0471378af0cf16673b48aebfefc253 SHA256 db6ec12af8e06fc42442aa4364e7f8d04fb3763559e8c9c530a04456cb6d1c2c
-MD5 0f86c1fd60824d7d84b22b0c89f902aa cyrus-sasl-2.1.22-r1.ebuild 9207
-RMD160 5fb151e3d2000f9cf650a60462555d4f8d382e42 cyrus-sasl-2.1.22-r1.ebuild 9207
-SHA256 db6ec12af8e06fc42442aa4364e7f8d04fb3763559e8c9c530a04456cb6d1c2c cyrus-sasl-2.1.22-r1.ebuild 9207
+EBUILD cyrus-sasl-2.1.22-r1.ebuild 9098 RMD160 d6a5a4ddfdc687ba8a6c0afdae7d6326ed75d6e3 SHA1 eeb6e58e3e0ea1b955f9fa50ba04da473e171ea6 SHA256 59c86128d440d3252ba64b3dab8a74022dc69dad897c55d0fd75a2ca3eea84c2
+MD5 98ed9df58bf3135b014f04bb95c34db7 cyrus-sasl-2.1.22-r1.ebuild 9098
+RMD160 d6a5a4ddfdc687ba8a6c0afdae7d6326ed75d6e3 cyrus-sasl-2.1.22-r1.ebuild 9098
+SHA256 59c86128d440d3252ba64b3dab8a74022dc69dad897c55d0fd75a2ca3eea84c2 cyrus-sasl-2.1.22-r1.ebuild 9098
 EBUILD cyrus-sasl-2.1.22.ebuild 9128 RMD160 d2832ac68a05152153ff1e97f97eddabe3e0b200 SHA1 547a3f63bc5e64af28f0f30330433dd9d0ac1882 SHA256 551b11b900559c8d7579098bd5ad9bccfa630fee65cf598e880dd0a6f06357d0
 MD5 9d691dcaed63c56a35015f26467b08dd cyrus-sasl-2.1.22.ebuild 9128
 RMD160 d2832ac68a05152153ff1e97f97eddabe3e0b200 cyrus-sasl-2.1.22.ebuild 9128
@@ -100,7 +100,7 @@ SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFR5H5FdQwWVoAgN4RAhHlAJ4t2NbqlwGYvsr/rkOU70QP0xHTDgCfZEqe
-IE+APKyI5cmBIY4YBKUgOFk=
-=9nBX
+iD8DBQFFTG6SamhnQswr0vIRAuWhAKCZdElXb3v8MaoOGs6bsMQQ7fBu5wCfRLAM
+ENW44DvLyJgP+t0ulpoyZk8=
+=92/W
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild
index ad240f9ea535..7f0b34d3ebb2 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 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-r1.ebuild,v 1.6 2006/10/31 18:11:59 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild,v 1.7 2006/11/04 10:42:00 vapier Exp $
 
 WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.7.9"
+WANT_AUTOMAKE="1.7"
 
-inherit eutils gnuconfig flag-o-matic java-pkg multilib autotools
+inherit eutils flag-o-matic java-pkg multilib autotools
 
 ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
 SASLAUTHD_CONF_VER=2.1.21
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+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 java pam authdaemond sample urandom srp ntlm_unsupported_patch"
 
@@ -41,7 +41,6 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 pkg_setup() {
-
 	use java && java-pkg_pkg_setup
 
 	if use gdbm && use berkdb; then
@@ -67,7 +66,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-
 	# Fix default port name for rimap auth mechanism.
 	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
 		-i saslauthd/auth_rimap.c || die "sed failed"
@@ -150,9 +148,6 @@ src_compile() {
 	# Use /dev/urandom instead of /dev/random. Bug #46038
 	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
 
-	# Detect mips systems properly.
-	gnuconfig_update
-
 	econf \
 		--with-saslauthd=/var/lib/sasl2 \
 		--with-pwcheck=/var/lib/sasl2 \
@@ -180,9 +175,8 @@ src_compile() {
 	emake testsaslauthd || die "failed to make"
 }
 
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
+src_install() {
+	make DESTDIR="${D}" install || die "failed to install."
 	keepdir /var/lib/sasl2 /etc/sasl2
 
 	# Install everything necessary so user can build sample client/server
@@ -217,12 +211,12 @@ src_install () {
 	fi
 
 	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
 	newdoc pwcheck/README README.pwcheck
 	dohtml doc/*.html
 
 	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
 
 	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
 	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || \
@@ -232,7 +226,7 @@ src_install () {
 	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd || \
 		die "failed to install /etc/conf.d/saslauthd"
 
-	exeinto "${ROOT}/usr/sbin"
+	exeinto /usr/sbin
 	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
 		die "failed to install testsaslauthd."
 }