Remove old.

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

5 files changed, 14 insertions, 185 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index ad0a61b61a52..96441ac36214 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libssh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.56 2011/09/17 23:24:03 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.57 2012/02/24 05:12:29 radhermit Exp $
+
+  24 Feb 2012; Tim Harder <radhermit@gentoo.org> -libssh-0.4.91.ebuild,
+  -libssh-0.5.0.ebuild, -files/libssh-0.5.0-no-server.patch:
+  Remove old.
 
 *libssh-0.5.2 (17 Sep 2011)
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 04d9fc1380b7..7b8a725df574 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -2,29 +2,24 @@
 Hash: SHA512
 
 AUX libssh-0.5.0-no-pdf-doc.patch 1195 RMD160 496f4c7a2ba7826cbf79822266d2456cd40be297 SHA1 b71b64be55b5c32838dcde5cbb8d04dbc4911bde SHA256 116f436073bb6eed8ec776828efcba399852019483a10da2691b3d350570c793
-AUX libssh-0.5.0-no-server.patch 959 RMD160 0208a42fa8eee053359e31c3be8e0ab90f8806d0 SHA1 3c6090dbee1da072e42c6d5d17bf42d0e892c185 SHA256 1f684d8d173235832d1571a6326bfa643baa6d4bd2d2c1377b06778928f2296f
 AUX libssh-0.5.0-tests.patch 473 RMD160 b0d2af4276ae19f316c2e2ec5bd372509aa2e825 SHA1 48f40afcc4ce97c8b004a714913f8b73219060f1 SHA256 aa57848a7e67fe4e62bad6ade2dbeb45c616b03f9d38594ac90deba893c649c1
 DIST libssh-0.4.8.tar.gz 277614 RMD160 1f2b31e7ff87fda102050d97ba5d10ea96b95b8d SHA1 97750c95389e425e10c9b1a8f8ce49667e7fbfe0 SHA256 15c239a426c7fbdddf97127ffddee6c4a5bcafac37f94987cf4f28cf218aa815
-DIST libssh-0.4.91.tar.gz 312078 RMD160 e9a58a31b49dc0310ce6e10a26336da975baa9d3 SHA1 61aff7b7e6c7d4a36ef68a58f47f216f7e5a019d SHA256 52d6a7202308de8df4c6bee2df56a5994eac2c64c4835407b64660632029d6e2
-DIST libssh-0.5.0.tar.gz 314429 RMD160 22af6792cfa6cca8c5371fc60a1607f7489cee28 SHA1 ec72a2e23f97d412c465f8ba97d688679550ac18 SHA256 4bfd09676d1cb6667cfc778a2729c85fc8e3bdb6ad85d6661ab976419f4f993c
 DIST libssh-0.5.1.tar.gz 315848 RMD160 e56faaa015439d8976349d94c542474fcad86b78 SHA1 ed48e13890186d86214f165477aae6c052a07635 SHA256 55ead7b7858abecbe9295d8699d6821514d41adfa76a6e47cb3f859ffa630a87
 DIST libssh-0.5.2.tar.gz 317336 RMD160 7e1352329dc0b212495122d5737ca821d40f30fe SHA1 4bf36d4052bd0c948e05bbf3b0cd0da8684ac00e SHA256 41e8b9c1af077544625e8b398582f101dacc3b8457fee1811a724ca4245ab227
 EBUILD libssh-0.4.8.ebuild 1470 RMD160 1019596fcf9d2a56e0d407b0a041edc14f2094a5 SHA1 1b4f040d827f2c7cc1b88f555e37964f644f28aa SHA256 3faeacbb2cd3aca4b6b10ebcd2607843f318156112015cdf1423f60c518e8c9e
-EBUILD libssh-0.4.91.ebuild 1548 RMD160 d484b3afcd4d2c4cb7461a2041ad7fb80808b98c SHA1 d8b16c754a4ca0fc16bc9011e5a982da1f3e97c8 SHA256 89c1cd9009b183d180acdbd90fa094a8d6c550cd59a5402aac269f341e3f5835
-EBUILD libssh-0.5.0.ebuild 1857 RMD160 8014868e1af43242c48ec687716b979366a9934b SHA1 000c2e15b722db0db68a1e511b443846c586241d SHA256 84bf7ee650bd89e9338d94926a6b24b509d45a06cfdf862b7e1a524d5dabdc01
 EBUILD libssh-0.5.1.ebuild 1903 RMD160 74eee095eb9b9ef479419a03b619e41e8d2ffd9c SHA1 024407360b06cc6b14903937d3d6d176642228ba SHA256 f103fb76bdb16581a9c7219c5cec19bd14c95cac0a37f09cbbea43d358cfb37d
 EBUILD libssh-0.5.2.ebuild 1916 RMD160 85beb9ac600906c68377eeddd7a202c5278206ba SHA1 7ae6d08ed4673447e94d22088d8234340e4b5e3d SHA256 e9c24df3d55b94f0655b6d6548f8aa4a3995e9f38fe77cf512ee1d331d4f6567
 EBUILD libssh-9999.ebuild 1476 RMD160 621b94791a2be1585871e68685ba59fae4bfe987 SHA1 add26fc157d81f50aff2d33f8f01a308da9e490b SHA256 f7de35a5de94e8fbf7df009e4a03d361bc8f748cdde9accae8ecad73018943f3
-MISC ChangeLog 8004 RMD160 a7254195065cfdf662d5c6b48863945fdf3c40a4 SHA1 2abdd4142114ab687534792fa27c41ad90eda288 SHA256 e04475c045eff2786d2b99604700412fd0b55eaf9b296d93ed5de37bd9042fdc
+MISC ChangeLog 8152 RMD160 1b8655a291dc59790bcc55d46fa82230bfeb771b SHA1 a659beaf8a3e4c2ec8d17d6613d8b8b4489ed876 SHA256 79f51548d322843232dc609e5929de78227e82ef9b804381ada23959e0c287a5
 MISC metadata.xml 617 RMD160 62c9a2d4ef7d2d96b7d92d991955fabd7e852938 SHA1 3a3043b5b0684bb959008f0107957841cee6b4cb SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOdSwdAAoJEEqz6FtPBkyjl/wIAKh+IKS65N9efQg2a+fC5wMg
-cOX9DDgyk5pRnifoZFFMGDixZ1a5PvnxZLucC6N6aVqcXHfmwnlzlcJoia+sQmrx
-wGI9h0wEEWdgWC78UJik9RlycAOg8xvEBPL4mcSF9oa26k8zAGR9a9zBkKVmQ/cP
-8VKzG7ZPcK+yU8xlfsPY+EmuRpaPy69UZQIkZ5toeyZ7LYKL06eeT2bKThxQMkp1
-oXyXoZJa77V+LTkg6PO3Q7kBsKoP/CAEwJjoxnVUGXj1MbJ1/TUJKrqvtQ2G50JU
-ppouzT+XNSGOoM6jwdNZNMJw6yFaAw4Akbl1+zO+1YEIPZA1yObP7qFAP5xZWgw=
-=jTL+
+iQEcBAEBCgAGBQJPRxxDAAoJEEqz6FtPBkyj78gIAKh/kJTwNu/aGO1HVrHlNO99
+vEz/bmxrHmsti3PzLoWWoj/pgZ8wswr/2GLr7ujsFLMC8EXfPUSild3MrIKbKOU1
+Oe/BTBiOSm7B/2kPgNTSuzStjQzHntShiBvotymc4h7t5pJAdd/Y5unUN8ddSZK6
+SEcq0drEIGaJXH/ugbdTnu2GPGv9jHeD1C1MpyloWLWKEBg3wGVx3e/3oVqYz3le
+XG4Av6QBIqB+mzTx6hLnU3chco4FcWmBdjfdFAnPbffbufP8zw+6qlN0Zu5pSKdU
+awU5OPrPjTpRohS9wM+FSO43H8DxW1EHZNWikATmiMdfXEGytXcVqN8mlWneT5A=
+=oLfy
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/files/libssh-0.5.0-no-server.patch b/net-libs/libssh/files/libssh-0.5.0-no-server.patch
deleted file mode 100644
index fe3d5373ea6c..000000000000
--- a/net-libs/libssh/files/libssh-0.5.0-no-server.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- libssh-0.5.0/src/messages.c.orig
-+++ libssh-0.5.0/src/messages.c
-@@ -41,7 +41,7 @@
- #include "libssh/keys.h"
- #include "libssh/dh.h"
- #include "libssh/messages.h"
--#if WITH_SERVER
-+#ifdef WITH_SERVER
- #include "libssh/server.h"
- #endif
- 
-@@ -69,6 +69,26 @@
-   return msg;
- }
- 
-+#ifndef WITH_SERVER
-+
-+/* Reduced version of the reply default that only reply with
-+ * SSH_MSG_UNIMPLEMENTED
-+ */
-+static int ssh_message_reply_default(ssh_message msg) {
-+  ssh_log(msg->session, SSH_LOG_FUNCTIONS, "Reporting unknown packet");
-+
-+  if (buffer_add_u8(msg->session->out_buffer, SSH2_MSG_UNIMPLEMENTED) < 0)
-+    goto error;
-+  if (buffer_add_u32(msg->session->out_buffer,
-+      htonl(msg->session->recv_seq-1)) < 0)
-+    goto error;
-+  return packet_send(msg->session);
-+  error:
-+  return SSH_ERROR;
-+}
-+
-+#endif
-+
- static int ssh_execute_message_callback(ssh_session session, ssh_message msg) {
-     int ret;
-     if(session->ssh_message_callback != NULL) {
diff --git a/net-libs/libssh/libssh-0.4.91.ebuild b/net-libs/libssh/libssh-0.4.91.ebuild
deleted file mode 100644
index ebd4c0ab07be..000000000000
--- a/net-libs/libssh/libssh-0.4.91.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.91.ebuild,v 1.1 2011/03/28 11:14:42 scarabeus Exp $
-
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="http://www.${PN}.org/files/rc/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug examples gcrypt pcap +sftp ssh1 server static-libs zlib"
-
-DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with zlib LIBZ)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.5.0.ebuild b/net-libs/libssh/libssh-0.5.0.ebuild
deleted file mode 100644
index 591e3be29bfa..000000000000
--- a/net-libs/libssh/libssh-0.5.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.0.ebuild,v 1.5 2011/08/07 14:21:52 armin76 Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="http://www.${PN}.org/files/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmockery )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	epatch "${FILESDIR}"/${P}-no-server.patch \
-		"${FILESDIR}"/${P}-no-pdf-doc.patch \
-		"${FILESDIR}"/${P}-tests.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with test TESTING)
-		$(cmake-utils_use_with zlib LIBZ)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}