Stable on x86; bug #116526

(Portage version: 2.1_pre2)

5 files changed, 8 insertions, 52 deletions

diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index f1b7ea8bc69b..619b2cda7bb7 100644
--- a/net-misc/scponly/ChangeLog
+++ b/net-misc/scponly/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/scponly
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.21 2005/12/28 15:50:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.22 2005/12/28 21:59:14 halcy0n Exp $
+
+  28 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -scponly-4.2.ebuild,
+  scponly-4.3.ebuild:
+  Stable on x86; bug #116526
 
   28 Dec 2005; Simon Stelling <blubb@gentoo.org> scponly-4.3.ebuild:
   stable on amd64 wrt bug 116526
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 81dd64dc9d2f..8627a9aae486 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -10,4 +10,4 @@ MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
 MD5 48f3604e22751295c07e471844ade2bb scponly-4.0.ebuild 3067
 MD5 dadf22d4d802d59445e6a28a7f7fc934 scponly-4.1.ebuild 1124
 MD5 0e85e30c913d79adb0036280672542dd scponly-4.2.ebuild 1147
-MD5 2c62b10ef4175a495c6762a9edb229dd scponly-4.3.ebuild 1146
+MD5 0874435b875cb268f6177fb992ce4c4f scponly-4.3.ebuild 1145
diff --git a/net-misc/scponly/files/digest-scponly-4.2 b/net-misc/scponly/files/digest-scponly-4.2
deleted file mode 100644
index 544d4173cb4a..000000000000
--- a/net-misc/scponly/files/digest-scponly-4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 270dedc527d6fbc68b152b8bb3c8a864 scponly-4.2.tgz 96736
diff --git a/net-misc/scponly/scponly-4.2.ebuild b/net-misc/scponly/scponly-4.2.ebuild
deleted file mode 100644
index 01b13cb4232e..000000000000
--- a/net-misc/scponly/scponly-4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.2.ebuild,v 1.3 2005/12/27 02:26:12 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
-HOMEPAGE="http://www.sublimation.org/scponly/"
-SRC_URI="http://www.sublimation.org/scponly/${P}.tgz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/openssh"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-getopt.patch
-}
-
-src_compile() {
-	PATH="${PATH}:/usr/$(get_libdir)/misc" \
-	econf \
-		--enable-scp-compat \
-		--enable-rsync-compat \
-		--enable-chrooted-binary \
-		|| die "./configure failed"
-#		--enable-svn-compat\ # subversion SCS cli compatibility
-#		--enable-svnserv-compat\ # subversion SCS svnserve compatibility
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README TODO
-	dodoc setup_chroot.sh
-}
-
-pkg_postinst() {
-	einfo "Setting up chroot in pkg_postinst was removed. Please setup manually."
-}
diff --git a/net-misc/scponly/scponly-4.3.ebuild b/net-misc/scponly/scponly-4.3.ebuild
index 47f521239cc5..bf738e557436 100644
--- a/net-misc/scponly/scponly-4.3.ebuild
+++ b/net-misc/scponly/scponly-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.3.ebuild,v 1.3 2005/12/28 15:50:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.3.ebuild,v 1.4 2005/12/28 21:59:14 halcy0n Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.sublimation.org/scponly/${P}.tgz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc