Fix USE=static in other ebuilds too.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

4 files changed, 26 insertions, 16 deletions

diff --git a/net-misc/gsasl/ChangeLog b/net-misc/gsasl/ChangeLog
index 3d06d30d2f90..b09737a4a0a7 100644
--- a/net-misc/gsasl/ChangeLog
+++ b/net-misc/gsasl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.39 2011/05/02 05:46:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.40 2011/05/02 06:03:40 jer Exp $
+
+  02 May 2011; Jeroen Roovers <jer@gentoo.org> gsasl-1.6.0.ebuild,
+  gsasl-1.6.0-r1.ebuild:
+  Fix USE=static in other ebuilds too.
 
 *gsasl-1.6.1 (02 May 2011)
 
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 7b67a868b7ac..47499288f276 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -11,15 +11,15 @@ EBUILD gsasl-0.2.29.ebuild 1237 RMD160 c7920e1eb3a70919b77f8a5e6733ed951b1f0dc3
 EBUILD gsasl-0.2.4.ebuild 1116 RMD160 3685978f42e055ac5c51f326e7d2a65c77c1e53a SHA1 1a7cfd8f6fc0dded17dde1f4c3251000a2b8a99c SHA256 b1793209e29cd014dc18cffa4dd890317ddb0a3204831f46cd13b6ebf9856c84
 EBUILD gsasl-1.1.ebuild 1132 RMD160 35e136598fe76ad616ba20c001d5fe1e1b701bb7 SHA1 b220b1e9affe25d2f6589dc7e500da72cb95a6b1 SHA256 34a48e663e658a0bdc9f5c53f36d3ee5d8558fbe50580b1059c4a01ee6529661
 EBUILD gsasl-1.4.1.ebuild 1150 RMD160 998350936d4e3e0864a18327c589c012558d6273 SHA1 31cde2c60620e9b5b26858bfd83b5d74ae04da11 SHA256 f4b44d4159c771c491e1b96e9b0625ad2e1731b9abe240cbd04adad2a114159d
-EBUILD gsasl-1.6.0-r1.ebuild 1378 RMD160 90a68bbe1b3c6fbe4c21345cb6521859ca389484 SHA1 cc9538eead2dc8068f49e74e79c333b88048f59d SHA256 c1f94adf4ef726889046ead3784e02b92c6d096d1e116e1b317ec49ac505220e
-EBUILD gsasl-1.6.0.ebuild 1286 RMD160 49e3af87fe77617577450fa3ce23c8935713d5c0 SHA1 e5e43d663f241dcf29f4ff35900d63747929c773 SHA256 845be23f74dc663d7da270f7684ded1a3f18a05efa5f39e2e2080aab47cbe247
+EBUILD gsasl-1.6.0-r1.ebuild 1460 RMD160 2b1aea3575ca784122dd1e096aed7066c79dd760 SHA1 974f479d5b7906b31864d277c898f8a04d42e447 SHA256 beab99ffaebb5a6c3b871fe3744b2c16def976434334ee6d535306cfcb8f462e
+EBUILD gsasl-1.6.0.ebuild 1327 RMD160 1fdad2d431ae5ed298ea627a44dd04fd9b7a354c SHA1 d45a5f07e6c59f84ef37c519c87e9dccf4825621 SHA256 14479c0542bb933e1f447eacd3e01df9778df62589522077f6ccd0a5bf7f32b4
 EBUILD gsasl-1.6.1.ebuild 1466 RMD160 d7528c324f18589484530f21a04bdcac0a0a2199 SHA1 59520ae23372daa5d4d77e1e9da79d4932f4279a SHA256 2a1a689f93df5b3ecf5cc603611306e74bc615dafe142f95c241822a56059efe
-MISC ChangeLog 5309 RMD160 ad53cde8e5c50ec96498044c1fe4c364b092bd1d SHA1 f000cfacbabe76eec8cc34e17b773227f52a5ae9 SHA256 4207ce0127dea5a6aee4747d919154f7c6a657d52c44444f64665e9b07a3ac05
+MISC ChangeLog 5441 RMD160 ecbe913f9f8642336a1bf9bf55b7ca47867b9304 SHA1 4bad7d2c927d30163d1711ced2bdbc648c98e356 SHA256 79f5459119993d710041262545261de206504d36dd0d622ca8fde4be646c422e
 MISC metadata.xml 365 RMD160 a9616de37d5f2718e4e95825189c64a4f4398acd SHA1 c3333e09a308799c49f9bf48b7351e158aae9595 SHA256 69909f3d81df55423fb7cb4b87a8968972ddb092e117f317d79fcda8e3b4256b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2+RSQACgkQVWmRsqeSphPJSQCfSJXuMi6mZrHDrAthRcE1tHOP
-46AAn13pvRN/SzNGuKTFSrwNWzVRzT85
-=YpMx
+iEYEARECAAYFAk2+SUIACgkQVWmRsqeSphPJ9QCeNGvMN+kO9PLsgeuNXp0K9LSh
+wK4An3uFWDpZEe9x93KNN4dpe16FXXcu
+=sgty
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gsasl/gsasl-1.6.0-r1.ebuild b/net-misc/gsasl/gsasl-1.6.0-r1.ebuild
index 73e26515a15e..979eab7b2723 100644
--- a/net-misc/gsasl/gsasl-1.6.0-r1.ebuild
+++ b/net-misc/gsasl/gsasl-1.6.0-r1.ebuild
@@ -1,16 +1,18 @@
 # 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.0-r1.ebuild,v 1.1 2011/04/25 15:13:59 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild,v 1.2 2011/05/02 06:03:40 jer Exp $
 
 EAPI="2"
 
+inherit autotools-utils
+
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc gcrypt idn kerberos nls ntlm static"
+IUSE="doc gcrypt idn kerberos nls ntlm static-libs"
 
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt )
@@ -37,11 +39,12 @@ src_configure() {
 		$(use_with idn stringprep) \
 		$(use_enable ntlm) \
 		$(use_with ntlm libntlm) \
-		$(use_enable static)
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	use static-libs || remove_libtool_files
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
 	doman doc/gsasl.1 doc/man/*.3
 
diff --git a/net-misc/gsasl/gsasl-1.6.0.ebuild b/net-misc/gsasl/gsasl-1.6.0.ebuild
index f8384128ccda..40c753eb1bb1 100644
--- a/net-misc/gsasl/gsasl-1.6.0.ebuild
+++ b/net-misc/gsasl/gsasl-1.6.0.ebuild
@@ -1,6 +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.0.ebuild,v 1.2 2011/03/15 19:25:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild,v 1.3 2011/05/02 06:03:40 jer Exp $
+
+EAPI="2"
+
+inherit autotools-utils
 
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -8,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc gcrypt idn kerberos nls static"
+IUSE="doc gcrypt idn kerberos nls static-libs"
 
 # TODO: check http://www.gnu.org/software/gsasl/#dependencies for more
 # 	optional external libraries.
@@ -20,7 +24,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_compile() {
+src_configure() {
 	econf \
 		--enable-client \
 		--enable-server \
@@ -29,13 +33,12 @@ src_compile() {
 		$(use_with gcrypt libgcrypt) \
 		$(use_enable nls) \
 		$(use_with idn stringprep) \
-		$(use_enable static) \
-	|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "einstall failed"
+	use static-libs || remove_libtool_files
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	doman doc/gsasl.1