Updated to version 0.14.1. This closes bug #63855. More details in ChangeLog.

5 files changed, 90 insertions, 2 deletions

diff --git a/net-misc/sitecopy/ChangeLog b/net-misc/sitecopy/ChangeLog
index ba9796b19961..a4f4ccf774b3 100644
--- a/net-misc/sitecopy/ChangeLog
+++ b/net-misc/sitecopy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/sitecopy
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.22 2004/08/14 05:21:58 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.23 2004/09/16 22:17:26 chriswhite Exp $
+
+*sitecopy-0.14.1 (16 Sep 2004)
+
+  16 Sep 2004; Chris White <chriswhite@gentoo.org>
+  +files/sitecopy-0.14.1-nls.patch, +sitecopy-0.14.1.ebuild:
+  Updated to version 0.14.1 as per bug #63855. Cleaned the ebuild logic up some
+  (use_with and use_enable). Removed some of the gnome fixes that are no longer
+  required. Crunched down the xsitecopy and sitecopy build decision to one or
+  the other. Fixed an nls issue while I was at it.
 
   14 Aug 2004; Chris White <chriswhite@gentoo.org> sitecopy-0.13.4-r2.ebuild:
   Marked stable on x86.  Closes stable marking for bug #51585.
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 1c6852625ffa..4dc5ab5969a8 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -1,12 +1,15 @@
-MD5 f27d57c57da5b5007ab6a320e10ed1c3 ChangeLog 3105
+MD5 acddc5bc79c33aea083adbff6771f272 ChangeLog 3539
 MD5 e717add6ac28bce8b34bc08b47893e84 sitecopy-0.10.12-r1.ebuild 976
 MD5 bc03f4c35012bc7b210e9161ba2553c7 sitecopy-0.12.1.ebuild 1122
 MD5 18212cba2a3c3280f21532017a23bcd6 sitecopy-0.13.4-r1.ebuild 1795
 MD5 7d059885e7150cd63f1e4093b815d109 sitecopy-0.13.4.ebuild 1120
 MD5 0bd5f252f1b21dd14d526d06e86b4065 sitecopy-0.13.4-r2.ebuild 1951
 MD5 f5f1522837a3398846f77d381fda47ec metadata.xml 226
+MD5 8e1c77c6c8e0794425e005715f97b3d2 sitecopy-0.14.1.ebuild 1564
 MD5 09b3e7444248285b787fa3635d41aedc files/digest-sitecopy-0.10.12-r1 68
 MD5 3ee0433186f6f3224dff93ab6818a119 files/digest-sitecopy-0.12.1 67
 MD5 2181dd9a02cbcac0257406ff7a30a37b files/digest-sitecopy-0.13.4 67
 MD5 2181dd9a02cbcac0257406ff7a30a37b files/digest-sitecopy-0.13.4-r1 67
 MD5 2181dd9a02cbcac0257406ff7a30a37b files/digest-sitecopy-0.13.4-r2 67
+MD5 4d13e53c5bae73ede477e5e63cfc3aa1 files/digest-sitecopy-0.14.1 67
+MD5 9d2f1b627c2e64ada7b81ea3fa5ee51d files/sitecopy-0.14.1-nls.patch 598
diff --git a/net-misc/sitecopy/files/digest-sitecopy-0.14.1 b/net-misc/sitecopy/files/digest-sitecopy-0.14.1
new file mode 100644
index 000000000000..ab253a65adb6
--- /dev/null
+++ b/net-misc/sitecopy/files/digest-sitecopy-0.14.1
@@ -0,0 +1 @@
+MD5 36b587e68b33652d8fe2d52ad9c080a9 sitecopy-0.14.1.tar.gz 856387
diff --git a/net-misc/sitecopy/files/sitecopy-0.14.1-nls.patch b/net-misc/sitecopy/files/sitecopy-0.14.1-nls.patch
new file mode 100644
index 000000000000..1714ebecad92
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.14.1-nls.patch
@@ -0,0 +1,13 @@
+--- po/Makefile.old	2004-09-16 21:24:45.929163920 +0900
++++ po/Makefile	2004-09-16 21:32:01.790902864 +0900
+@@ -26,8 +26,8 @@
+ 
+ INSTALL = /bin/install -c
+ INSTALL_DATA = ${INSTALL} -m 644
+-MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++MKINSTALLDIRS = $(top_builddir)/mkinstalldirs
++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(MKINSTALLDIRS)" ;; esac`
+ 
+ GMSGFMT = /usr/bin/msgfmt
+ MSGFMT = /usr/bin/msgfmt
diff --git a/net-misc/sitecopy/sitecopy-0.14.1.ebuild b/net-misc/sitecopy/sitecopy-0.14.1.ebuild
new file mode 100644
index 000000000000..dff758736680
--- /dev/null
+++ b/net-misc/sitecopy/sitecopy-0.14.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.14.1.ebuild,v 1.1 2004/09/16 22:17:26 chriswhite Exp $
+
+inherit eutils
+
+IUSE="ssl xml xml2 gnome nls"
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libc
+	>=sys-libs/zlib-1.1.3
+	xml? ( dev-libs/libxml )
+	dev-libs/libxml2
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	gnome? (
+		gnome-base/gnome-libs
+		=x11-libs/gtk+-1*
+	)
+	>=net-misc/neon-0.24.6"
+
+src_compile() {
+
+	local myconf=""
+	use xml && myconf="${myconf} $(use_with xml libxml1)"
+	if use xml && use xml2 ; then
+		myconf="${myconf} --with-libxml2 --without-libxml1"
+	else
+		myconf="${myconf} $(use_with xml2 libxml2)"
+	fi
+
+	# Bug 51585, GLSA 200406-03
+	einfo "Forcing the use of the system-wide neon library (BR #51585)."
+	myconf="${myconf} --with-neon"
+
+	econf ${myconf} \
+			$(use_with ssl) \
+			$(use_enable nls) \
+			$(use_enable gnome gnomefe) \
+			|| die "configuration failed"
+
+	# fixes some gnome compile issues
+	if use gnome
+	then
+		echo "int fe_accept_cert(const ne_ssl_certificate *cert, int failures) { return 0; }" >> gnome/gcommon.c
+		sed -i -e "s:-lglib:-lglib -lgthread:" Makefile
+	fi
+
+	# fix NLS compilation issue
+	epatch ${FILESDIR}/${P}-nls.patch
+
+	emake || die "Make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+}