Remove old.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

4 files changed, 6 insertions, 172 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/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
-}