x86 stable for bug #116347. Removed broken sftp support. built_with_use to pkg_setup. Readded self as maintianer.

(all your kde-base are belong to us version: 2.0.51.22-r3)

4 files changed, 35 insertions, 36 deletions

diff --git a/net-misc/sitecopy/ChangeLog b/net-misc/sitecopy/ChangeLog
index 18453751180b..52c41855ff5f 100644
--- a/net-misc/sitecopy/ChangeLog
+++ b/net-misc/sitecopy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/sitecopy
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.29 2005/09/10 07:01:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.30 2005/12/22 05:32:51 chriswhite Exp $
+
+  22 Dec 2005; Chris White <chriswhite@gentoo.org> metadata.xml,
+  sitecopy-0.16.0.ebuild:
+  x86 stable for bug #116347. Removed broken sftp support. built_with_use to
+  pkg_setup. Readded self as maintianer.
 
 *sitecopy-0.16.0 (10 Sep 2005)
 
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 6da51b8eca73..bbf4fe15904e 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6c6d0ce57d673aff0ad1efb92dbf0cc1 ChangeLog 4751
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 161f63f5b3d6bd6d391fd739db3c4084 sitecopy-0.16.0.ebuild 2544
+MD5 ebe90825466ecdac16089ecd43abdcab metadata.xml 251
+MD5 bd857832333c43eaf4f217b65400843b ChangeLog 4960
 MD5 d3286f6a00ba6935bf983d28040f63d0 sitecopy-0.13.4-r2.ebuild 1951
 MD5 a5aaa1005bcb0bec44f71e07c5e26006 sitecopy-0.15.1.ebuild 2793
-MD5 25fbd9090ba5b29d5013a4c918abf0bb sitecopy-0.16.0.ebuild 2769
 MD5 a9f8ec12aecca50ec49648f0a8c2829f files/digest-sitecopy-0.16.0 67
 MD5 2181dd9a02cbcac0257406ff7a30a37b files/digest-sitecopy-0.13.4-r2 67
-MD5 9d2f1b627c2e64ada7b81ea3fa5ee51d files/sitecopy-0.14.1-nls.patch 598
 MD5 1dfe28809075352e0eed13c4a713b728 files/sitecopy-gcc3.4.patch 493
 MD5 fdd1c7334ee674439936fa8eed17cfcc files/digest-sitecopy-0.15.1 67
+MD5 9d2f1b627c2e64ada7b81ea3fa5ee51d files/sitecopy-0.14.1-nls.patch 598
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIoT2mdTrptrqvGERAjtJAKCN5j/VzblMr1zKXwNkcfTZ2EEK0QCeOjDr
-T9VQKZ/94jbah1OjaC8p8Qs=
-=IR8C
+iD8DBQFDqjqrFdQwWVoAgN4RAnUaAKDklxHdiPhJ4OhYt4HXoch74H4nYwCgnD23
+dQY+EP6JuSZN8wM5xdu1py0=
+=cbi7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index 20ce219711a2..82b1797d9454 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+	<email>chriswhite@gentoo.org</email>
+	<name>Chris White</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/sitecopy/sitecopy-0.16.0.ebuild b/net-misc/sitecopy/sitecopy-0.16.0.ebuild
index f20019474b44..af582a7de43c 100644
--- a/net-misc/sitecopy/sitecopy-0.16.0.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.0.ebuild,v 1.1 2005/09/10 07:01:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.0.ebuild,v 1.2 2005/12/22 05:32:51 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
-IUSE="expat gssapi nls rsh sftp ssl webdav xml2 zlib"
+IUSE="expat gssapi nls rsh ssl webdav xml2 zlib"
 
 DESCRIPTION="sitecopy is for easily maintaining remote web sites"
 SRC_URI="http://www.lyra.org/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.lyra.org/sitecopy/"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 # gnome support is disabled at this point
@@ -27,21 +27,6 @@ pkg_setup() {
 	ewarn "gnome support has been disabled"
 	ewarn "until some major bugs can"
 	ewarn "be fixed regarding it!"
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e \
-		"s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
-		${S}/Makefile.in || die "Documentation directory patching failed"
-}
-
-src_compile() {
-
-	einfo "Sitecopy uses neon unconditionally for a security bug."
-	einfo "The sitecopy system also checks for zlib, ssl, and xml"
-	einfo "support through neon instead of the actual system libraries"
-	einfo "therefore support must be built into neon."
 
 	if use zlib ; then
 		built_with_use net-misc/neon zlib || die "neon needs zlib support"
@@ -60,6 +45,21 @@ src_compile() {
 		built_with_use net-misc/neon expat && die "neon needs expat support disabled for
 		xml2 support to be enabled"
 	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e \
+		"s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
+		${S}/Makefile.in || die "Documentation directory patching failed"
+}
+
+src_compile() {
+
+	einfo "Sitecopy uses neon unconditionally for a security bug."
+	einfo "The sitecopy system also checks for zlib, ssl, and xml"
+	einfo "support through neon instead of the actual system libraries"
+	einfo "therefore support must be built into neon."
 
 	# Bug 51585, GLSA 200406-03
 	einfo "Forcing the use of the system-wide neon library (BR #51585)."
@@ -70,7 +70,6 @@ src_compile() {
 			$(use_with gssapi) \
 			$(use_enable nls) \
 			$(use_enable rsh) \
-			$(use_enable sftp) \
 			$(use_with expat) \
 			$(use_with xml2 libxml2 ) \
 			|| die "configuration failed"
@@ -91,12 +90,3 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "install failed"
 }
-
-pkg_postinst() {
-	if use sftp
-	then
-		einfo "Please note that in order to use sftp"
-		einfo "You must have 'protocol sftp instead of ftp"
-		einfo "This is not documented in the man page"
-	fi
-}