Fix autotools-utils usage (bug #392167).

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

diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
index 4db3497c9502b492303bd56f55855dddddb79854..bb20dfaf601a2ad895ce4b5019c19092bfb17647 100644 (file)
--- a/net-libs/libecap/Manifest
+++ b/net-libs/libecap/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libecap-limits.patch 480 RMD160 660d746cf22d8cc74196f82f0f6c7ccbefed9f26 SHA1 d77d2b42ccd587bffb0ec19e71451d2b6ea99f8f SHA256 0d40b7d66815984e500644daacfedbc3d16d2e22ecddbd669abd19eecaaa22e0
 DIST libecap-0.0.2.tar.gz 298074 RMD160 3dbef51d3e20f21e1a7fdd9bb9fd7d80ab64316f SHA1 3ba560387d1f1d2a3f6a70935e70a314ce371301 SHA256 ec3a7acc848eeb3e93d9bae6bebae5d7f6eb32023b5e814b45daeea45b0731d6
 DIST libecap-0.0.3.tar.gz 333181 RMD160 abfd20968f88ef9c7d912ee9b03dba1fa6788ed4 SHA1 c29f096ae40b714dec46ae495528ff3ec9b8def6 SHA256 1d1f854c57dd72acfc2f5d293baa65e0cb08ea3a40ae3a64104cdbf11e93454e
 DIST libecap-0.2.0.tar.gz 337696 RMD160 54ef4df4320b4a6d6b695a377fde90246e7a2d8e SHA1 aa32d084e062668376194f2caae88ed3ce271967 SHA256 19e195d60cf67ec3b49fe4d109823d753546b5da115230499ad1a9cb65ca92d2
 EBUILD libecap-0.0.2.ebuild 726 RMD160 b2fce426ce038352a385af0440429f09f29f98b0 SHA1 8e09a5b5e40a5b5190f32054a44c2b4cf802d779 SHA256 c2e94f195d3c2365e136148b07f1aa27623ebe4319c98440255cb9a19e5a99ed
-EBUILD libecap-0.0.3.ebuild 711 RMD160 bfaa62110f180842b1aa480ca0d5c3c558d57cd5 SHA1 ac9e62395be0c542ddca2cd0cee01239c61aac9b SHA256 f703237f3968ca2de95eed42735ac5f523bac43d7aede1500caab13024698729
-EBUILD libecap-0.2.0.ebuild 711 RMD160 178cdd25cb850c9622c577073a9538d00e81ed01 SHA1 8c9b36cfa2f8f4698d3719c8e9342b3e01df1a9d SHA256 565d0d52aad1d307db904cfd43610242659f944c1bce5347f60c2fe0678f5630
-MISC ChangeLog 1880 RMD160 b233a542fa23bfc95c81de931deab6d9cb12c50c SHA1 0809eae505318cb765ee3c4d7784e63d3cbd99a4 SHA256 adb48f2a597a2efdd2c84255e02f7dada68ff5cdc611e067ba4e55d5a3441094
+EBUILD libecap-0.0.3.ebuild 590 RMD160 24963f4291337bf0016479aa3c0750291cfe9b34 SHA1 562fe72ff65bc1e281c6049fac8c21f037eab90f SHA256 ec2bb6ca7ca62bd2e50c674d9fd9ccda0f5fc456bc51382ff0941d017d40792b
+EBUILD libecap-0.2.0.ebuild 590 RMD160 72a774d13563e9239ee41b0ad46e32d89334137d SHA1 b0267eb46e0a70798bb33503ef1ef105a18ee7be SHA256 7046730e2e68af90ad19717ef40da2f4f202e03434b7caa13d8d46bfd38dc93a
+MISC ChangeLog 2025 RMD160 abfd7198a57ec36861a730d626c6ff075b2894a7 SHA1 af3abd8e8f1c461a20d33afb419469b1a926e72c SHA256 8e803519c017d49778e4bd50618405d6411e9f7084a73b8b109e437926d5d82e
 MISC metadata.xml 368 RMD160 dfdc3ccfb677debeb330cec04bc8d27a7bc26455 SHA1 7e89074792e20c8f9ef15295d1cc9fd788a062b3 SHA256 4df11142e6f1bb0380d77dc68a6720bc2d2fa6783f51083af1554667d513ed68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5K/koACgkQVWmRsqeSphNnzgCfbvI0djnhU4O0GpGUNANs21j7
-nvEAn1H/JJO1EiYwipaXDVYZt09xHOaD
-=k8yn
+iQEcBAEBCgAGBQJO0vQ+AAoJEEqz6FtPBkyjBAMH/2PMkU3qCDVMDlCRwfBijGqH
+38Hiwu7NUZOUVvNWdEi40D/yuc0Mrbyg6bL+Ok17LB0q0guXBa5q+EJ3oQrU4YdV
+99vFE4/KsySiM+Ql9ZWp2FwLh5qDKKPdUPs0nK3d0Mxw/SShRRMpb4MkG6cBnfDS
+lydWuFt+ZC3vd4/w5VO6UemU7Qo7BTh4LfcZNBCJCVB7yozeYWWD7UlMTi9Lohol
+jpSbk1FpH7C9oGdAe1b93gH0d4CQ/T0Y4xMD2ubLPEKg+TyfXnTL+hFN6YVpr6bT
+/EzuoMz0qR6/pbA9umzeMZE7DWD1BVv5odtNFf34U/FYkdUbbHtlwCR9XwAs9QU=
+=3Jrs
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index d875b51b7763f1d1a5e205514b8ce030afb3fc6b..0ce17d537d7d149bd916ae2bab6876f48b92e0f0 100644 (file)
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.45 2011/11/27 04:27:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.46 2011/11/28 02:35:04 radhermit Exp $
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> libssh2-1.3.0.ebuild:
+  Fix autotools-utils usage (bug #392167).
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> libssh2-1.3.0.ebuild:
   Build in the source tree.

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 740d38a2f1ede5d3cf2647e18de2b0ae6ef435bd..1254b31a1f2d039011313d8c5a66e5c4a3251e4e 100644 (file)
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,17 +4,17 @@ Hash: SHA512
 DIST libssh2-1.2.2.tar.gz 535430 RMD160 21e90f957019c11d0447352c5ac19c9dc3f8dd5c SHA1 d1a52cd4949efc7befcd61052de7fce4ae3e7415 SHA256 1e2a133b111a367c579b89d72d5da9e65a73b8e57202b91d540a51141aca69aa
 DIST libssh2-1.3.0.tar.gz 639262 RMD160 5c8f0cfde6fb4378eb0985f6ecc090061329a133 SHA1 d342e06abe38a29b1bbb9c58d50dd093eab0bee9 SHA256 9de377854202f033bfb57ce4f95194a2b1283d45fb243b5e7dca30e058f40f9c
 EBUILD libssh2-1.2.2.ebuild 1091 RMD160 0487e598c61c5b577ec20d3f3908e445923f815a SHA1 2599cb3ee32197dcfd4a665ea5c7b95cc0ece34e SHA256 fa0974fd9a9f7cc951d0bcfe3b8f025569a2cf4f5a58dc2031b5f2d948145e2c
-EBUILD libssh2-1.3.0.ebuild 1105 RMD160 1ba7744d99ec01a1c97640d77238eb95bb1ac67d SHA1 34fc5746b1eac1760d5b2c60417482733a5279dc SHA256 78e54d19db08ccb767131ff04bc63e39fa6670e4a31e6f5dc1934a7b802b612b
-MISC ChangeLog 6053 RMD160 6c50a38026344857bdd805e16f553fe2d040f57d SHA1 679bcc7f07af76cf376f4b9f5c80ea9e5d30c1fb SHA256 0adc07b2b60a358901c45a8e96cd4567afdfb78a74ea973483b4a04c832054ca
+EBUILD libssh2-1.3.0.ebuild 1019 RMD160 43b32325e0e1979fc0c0fa89d8bc02f56fa18add SHA1 c1a9f1e68e65b945cd996823d340bdb44018b6a4 SHA256 6b851c40b585ec5d431f2573e02f037338f50b4432ce38f4e51ecf9714298e15
+MISC ChangeLog 6168 RMD160 7fa6c6ac86200ad56472ae1b1bf8e10ec5a5da6d SHA1 68bfe95e492fd9fb8bba18ba151dc66783872a35 SHA256 1a679fe6e56263d244e8f12d2d2c861f46ee84d86a9860865edbd672a5df51e2
 MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0bxSAAoJEEqz6FtPBkyjvBsIALgLtv8BrCdF4A5/E8dWEPUA
-azhB+EwCqtjmQ7ZrTG56gxLNrTvOZeCUp1cl2nnwrtD3qzeRp2msHKNQQIaE/NX1
-RUzVEuwb0lCkItXGZKIsWMi4lP0Jue+xq+u8H1d+Otzk2MBjE6vqyw19TFYFkjnK
-PpTNWrLXcFgXYG0d3yT3AdFIvCsWtgSAT27f0RXItMlCr5kEyB5RyduD6KtzOWgP
-kduEx6ZfLz02q85sdZU42YGdvDS/5fKfmObDIYIN/a0g19iHaptveaG5Da0ez0iN
-qJnb0klKtcYF4n54GDNN3I6dmryIjyfIbgZ9NYEaRxcvCyU49vutm0JhSBOdbOE=
-=/fpE
+iQEcBAEBCgAGBQJO0vNhAAoJEEqz6FtPBkyj+UgH/3yKUtPeueet6ZPEDWqsZ3NI
+oPZK/x8udzLYlcNzZPkH4EoyjJeNif1baax+8PZia6j/OGEvEBjnieapjpQ0ksDm
+dDSM0d6cOC5D/hRctBsJse+bD4/Ie5NGPjCXgJ/D7TiRbedDPEVpchjDuV0e6Ro3
+hPMgkjwSeWs9HRKhOfrgO5l+s806evmq9GfQtrQfoLjUuxvyOr3KA0lNsU7xu7dd
+gevSKr8vLisel4XMefGDVyAjajqUBhhnM90h1T2N2g2hLkYGoEEd9zs3gx4zOgnX
+d4onLSRHuaEmEYy8e9k4ABbHB67mZ9VtBWi926yCsB0G1s3T2YXLobGYSBD7G2k=
+=gLlS
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libssh2/libssh2-1.3.0.ebuild b/net-libs/libssh2/libssh2-1.3.0.ebuild
index a99b44fb103420ce2129b02a5973074920ecbdf6..5fae7d7485def062b6701fc877949d3e191a67ef 100644 (file)
--- a/net-libs/libssh2/libssh2-1.3.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.3.0.ebuild,v 1.6 2011/11/27 04:27:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.3.0.ebuild,v 1.7 2011/11/28 02:35:04 radhermit Exp $
 
 EAPI="4"
 
@@ -20,28 +20,22 @@ DEPEND="!gcrypt? ( dev-libs/openssl )
        zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( README )
 
 src_configure() {
-       local myconf
+       local myeconfargs
 
        if use gcrypt; then
-               myconf="--with-libgcrypt"
+               myeconfargs+=" --with-libgcrypt"
        else
-               myconf="--with-openssl"
+               myeconfargs+=" --with-openssl"
        fi
 
        # Disable tests that require extra permissions (bug #333319)
        use test && export ac_cv_path_SSHD=
 
-       econf \
-               $(use_with zlib libz) \
-               $(use_enable static-libs static) \
-               ${myconf}
-}
-
-src_install() {
-       default
-       dodoc README
-       use static-libs || remove_libtool_files
+       myeconfargs+=(
+               $(use_with zlib libz)
+       )
+       autotools-utils_src_configure
 }