Do not inherit autotools-utils.eclass (bug #392117).

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64

diff --git a/net-misc/gsasl/ChangeLog b/net-misc/gsasl/ChangeLog
index 897c3b43b436d64ba77d4968a36bdd095ca63858..46c158aa375472306ca5cbeddded466e4f0ca83f 100644 (file)
--- a/net-misc/gsasl/ChangeLog
+++ b/net-misc/gsasl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/gsasl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.47 2011/11/27 04:33:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.48 2011/11/27 22:55:54 jer Exp $
+
+  27 Nov 2011; Jeroen Roovers <jer@gentoo.org> gsasl-1.6.1.ebuild:
+  Do not inherit autotools-utils.eclass (bug #392117).
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> gsasl-1.6.1.ebuild:
   Build in the source tree.

diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index adc3b5ed3e30fc80858bb9e8748cf05ccc279531..42dde0c28b060baca7a0ec8463c0aca8692e61ba 100644 (file)
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX gsasl-gss-extra.patch 951 RMD160 b8475cd6d626ba9a1d7ec34c03574e44824b0906 SHA1 3f428ec77f7fa9ffd9cdb9cf41ad883319ab1cc3 SHA256 68223ba6c2367bd48afa18ed0470efd808b9a563c579920136507b202926dde8
 DIST gsasl-1.6.1.tar.gz 4623634 RMD160 510661e88a41300ad3b32dd4a6bd6236aab28c78 SHA1 5439fd32ac975c36015263fafdc79ededdd57c72 SHA256 e68b7df563939b107a6e9bddae6ae587a3632405f856122e0233e239b4cab509
-EBUILD gsasl-1.6.1.ebuild 1561 RMD160 534778cfbbb93027555a98527429b19b09dbe361 SHA1 3940ef844b26fe9c05c3b5daa33d823930e5bc52 SHA256 857a38b501c9d216800d412af2fa3d02a2d4eaf8a968cf550591f76e34df27d6
-MISC ChangeLog 6441 RMD160 0196c3da2dd592f0a0fa42597ee3b456536244f1 SHA1 488e2dcceabff4eb62f9148c70890a685a33cd3c SHA256 2f6e29e50f44f0f94948c59dfd4dfb0974c8c62d9a616345d6518d505bd1d278
+EBUILD gsasl-1.6.1.ebuild 1550 RMD160 0c595378da6aea4a940ed4c253cf452c96229c83 SHA1 b7f5c74a8c7d1765758514e83f2039af6a335d10 SHA256 ed9f03dbbbf4bac4147dcb70c7c13decfc4d546688964bf14643206dbc9f9fda
+MISC ChangeLog 6558 RMD160 82f076be511d794c42c066668a03380a49ef3490 SHA1 59d39f79b41852ffc42f32ee47ee0d65aeba8700 SHA256 1fd2fda60da121ac965d58243bc29d3fdcf1ed57f50885a16892622bceef4a1f
 MISC metadata.xml 365 RMD160 a9616de37d5f2718e4e95825189c64a4f4398acd SHA1 c3333e09a308799c49f9bf48b7351e158aae9595 SHA256 69909f3d81df55423fb7cb4b87a8968972ddb092e117f317d79fcda8e3b4256b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0b2JAAoJEEqz6FtPBkyjFUcH/2QvdUIYwONCdMFDwEeziUEW
-+CfQz9YT8mLTOmq+6XwX1hTUOo2TzsuQg7+QKrpyhZYa5P/1dzyB0gYdkRqUEeF9
-TCxOfaMjBGa1rW1U/0+cIBVEXxFYPW/0CW3gkPAwnc0uQlltgln2PJLKgvhDGWeU
-yMOtH8TK9dxU0cG/1ou2Iu1ZOvzTkQOglfMITCb4MNdrbQDwfiKUsJoeSH2ogDp+
-EIhPtFYjeblwEu6MLSQQxgs7nqRQEsBB7YoV97iRWbTG9pb+wn94LgwzZdwbczpD
-vUcTdNOKEeFe9udOdfajX8ey1BPefnE8WrPNPuoBFWTkHyLPBnwynYoHswMa81A=
-=qdaa
+iEYEARECAAYFAk7SwAAACgkQVWmRsqeSphNSFACeKpYwgfwmMs5m2bVBr+XvcFJN
+EI4Anif8D0eFuMJlCJzjKX/8aGFctGAQ
+=Yf0V
 -----END PGP SIGNATURE-----

diff --git a/net-misc/gsasl/gsasl-1.6.1.ebuild b/net-misc/gsasl/gsasl-1.6.1.ebuild
index 375da00953367588e17f0c9fe2e8da7f0364f2d0..e72c2571966a89b37aaa245d27835e624419f75c 100644 (file)
--- a/net-misc/gsasl/gsasl-1.6.1.ebuild
+++ b/net-misc/gsasl/gsasl-1.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.1.ebuild,v 1.7 2011/11/27 04:33:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.1.ebuild,v 1.8 2011/11/27 22:55:54 jer Exp $
 
 EAPI="2"
 
-inherit autotools-utils
+inherit autotools eutils
 
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -23,8 +23,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 src_prepare() {
        epatch "${FILESDIR}/${PN}-gss-extra.patch"
        eautoreconf
@@ -51,7 +49,9 @@ src_configure() {
 
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
-       use static-libs || remove_libtool_files
+       if ! use static-libs; then
+               rm -f "${D}"/usr/lib*/lib*.la
+       fi
        dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
        doman doc/gsasl.1 doc/man/*.3