Revert to autotools eclass (fixes bug #392163).

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

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 622cc4c1fa0aeed3fea418c27f2835082d5402ad..2ed81b35d9630d06ed3820a9676ef545fed93d39 100644 (file)
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.322 2011/11/26 01:18:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.323 2011/11/28 02:48:38 radhermit Exp $
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> gnutls-2.12.14.ebuild,
+  gnutls-3.0.8.ebuild:
+  Revert to autotools eclass (fixes bug #392163).
 
   26 Nov 2011; Tim Harder <radhermit@gentoo.org> gnutls-2.12.14.ebuild,
   -gnutls-3.0.7.ebuild, gnutls-3.0.8.ebuild:

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 4cf8c941ab4bca1de5ee418efa3f860ff671fd78..8f209b1c334331b6648f920ae55d7e8dd8500a1b 100644 (file)
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -5,18 +5,18 @@ DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b370473
 DIST gnutls-2.12.14.tar.bz2 7166618 RMD160 855c89c46898e7b934a8f6b7466d3089031c9f9a SHA1 e5680f78ee51ff9ebb9749b39504d3e981a19242 SHA256 5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3
 DIST gnutls-3.0.8.tar.xz 4257072 RMD160 b8ae537d21701954cbdd9baf76c14b465766b48d SHA1 b62457ff7422034b6f2974633e78c81fca5a8213 SHA256 ba4e194be89035b468e5db18e0582de42c9876f6cf91d56699de0986aa3c9761
 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e
-EBUILD gnutls-2.12.14.ebuild 3164 RMD160 6c586f32b308d4ceac829eff9e79b5195dcce518 SHA1 dfa7add330abfffabe4f698e5b7ff265de635429 SHA256 e6674262ba9226245fa6271ecb4d2ca6947cb6122dd0193aba487a1c62abc97c
-EBUILD gnutls-3.0.8.ebuild 2715 RMD160 0039ae8d05e4f79bc9a22a26744e880e426578bd SHA1 6e046c9638ff3fdc1a58dd887f6167d3d42e0a57 SHA256 ca1729ea11ad6ab22f2e23b4d5e1c7f01aa56836b1775ea2a8bb05b9d80219de
-MISC ChangeLog 48517 RMD160 153fb73f40c908220d5d75f398ab10d12cfb584f SHA1 8f003f315b8ac7cfd24286877fc715d2c76e99cf SHA256 2aa9d77c0915aa56113aa19b590b81a20b5d50749f7f18e782774c8faef21323
+EBUILD gnutls-2.12.14.ebuild 3147 RMD160 ca932875c90bbc73517e45d221556836276c81b4 SHA1 47fd1084b43c938de807d959d13c7ebfbe262bc9 SHA256 ec5b797c283518bd5a537584fc0712b2dd8adb8dcd5610f8dd61fab05c144b01
+EBUILD gnutls-3.0.8.ebuild 2698 RMD160 98bfe7f6dc2d7fee43179d62082a61669887fb28 SHA1 c5cabcb2484916495b17334c8af5ed80e575a14a SHA256 ceb18c581ef8a950ab8a325cad91d70e201f1c06e1a5d6c56c16908c9e801a6d
+MISC ChangeLog 48663 RMD160 7c55edf5bee1f00a3e046fc934bf4562d5756a48 SHA1 d6d4029615a83f143290c67421be0dfc56f12a7f SHA256 f48ecf67a2a7bac3fb0fde119d0a63e7cbe74e8ccdd5041cb395b54186b00e8c
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0D5tAAoJEEqz6FtPBkyjCCoH+gOaKTB66MVuojU6ARCdcLji
-3Z2sdEVx6VakikqbAb5rw6hmbl6hZKN8tbpTWBpJUIPbXHHEMtwgI5A3fAaMbTDd
-ibdIPCbFeaaR5zXvZRi1s0qfIcNKWTWAt7fEd74Vw0EMCu+JdSbDnlwbTpFI/asg
-Y9G+wa8pKHjZAGv8S3Xg+hGaqMjv/rwbkjnJ/5MojXJ+ZOZ0eCH8M9i1pmll0DJ1
-iOWVV2L6Mui3Gptogkuh8edMkgHiMhr70ABLGr+oDRWMGvffSV5aJHd6Yn90o92E
-Z0EuUxb4YTRcrHHbA2oUcplRDCzgiOldO74B90IU/1RHE6AsdTfvP/mMAyWvF0k=
-=XtZV
+iQEcBAEBCgAGBQJO0vaMAAoJEEqz6FtPBkyjvMcIAKOQBv8u9Ts247u8SYNC0sJh
+wHvB2RZtDNz2mOi5rVrpPtqr7yHZC7Gi12XOJ4bF6E9uGLgFnjokz+N2KBneUJyR
+K68meu2zI78ncf1mIk6p0dXJgQvqrSh9pH5ZO2H6pwG1djVV14hEGT6PfwgRA6s4
+f5XWfjk2sXSB0xAIAgtbkW/oqJiCJ4rFni0tN90VF36wYzTZjXenMvsrSvJSnJxT
+j1RKoMMdaGcBy6SUCBsV+V54FDrMFGGrCWidVHPmNP2Rhl1NpVAka//Pw2WN86QX
+Za6Db6OWc2+zK9IuOqBz3moL8JprW339a+zoh8RnhlQiVrpLNclkkJ5Xm3j6a9o=
+=2Htt
 -----END PGP SIGNATURE-----

diff --git a/net-libs/gnutls/gnutls-2.12.14.ebuild b/net-libs/gnutls/gnutls-2.12.14.ebuild
index 158eadef80b70349c47bdc0ac6614c36cc47051c..89c0d0f43d3a01390352f824ffe0a1854a9680a2 100644 (file)
--- a/net-libs/gnutls/gnutls-2.12.14.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.14.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-libs/gnutls/gnutls-2.12.14.ebuild,v 1.2 2011/11/26 01:18:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.14.ebuild,v 1.3 2011/11/28 02:48:38 radhermit Exp $
 
 EAPI=4
 
-inherit autotools-utils libtool
+inherit autotools libtool
 
 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -45,8 +45,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P%_pre*}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 pkg_setup() {
@@ -110,7 +108,7 @@ src_test() {
 src_install() {
        default
 
-       remove_libtool_files all
+       find "${ED}" -name '*.la' -exec rm -f {} +
 
        if use doc; then
                dodoc doc/gnutls.{pdf,ps}

diff --git a/net-libs/gnutls/gnutls-3.0.8.ebuild b/net-libs/gnutls/gnutls-3.0.8.ebuild
index 66ef52ffd7b44774f6b0302fa6bff7f1bccbee7b..74cabc2bf97e4584d004522d5e160b7e9d757eee 100644 (file)
--- a/net-libs/gnutls/gnutls-3.0.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.0.8.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-libs/gnutls/gnutls-3.0.8.ebuild,v 1.2 2011/11/26 01:18:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.8.ebuild,v 1.3 2011/11/28 02:48:38 radhermit Exp $
 
 EAPI=4
 
-inherit autotools-utils libtool
+inherit autotools libtool
 
 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -43,8 +43,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P%_pre*}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 src_prepare() {
@@ -99,7 +97,7 @@ src_test() {
 src_install() {
        default
 
-       remove_libtool_files all
+       find "${ED}" -name '*.la' -exec rm -f {} +
 
        if use doc; then
                dodoc doc/gnutls.{pdf,ps}