Fixed bug #76582 and added a nice gcc3.4 patch to go with it.

diff --git a/net-misc/sitecopy/ChangeLog b/net-misc/sitecopy/ChangeLog
index 99995f087fb0b7d4731c697feb140573d76c1eeb..12d9882d2bdb4d228879aef0e18ad95d7b3d5add 100644 (file)
--- a/net-misc/sitecopy/ChangeLog
+++ b/net-misc/sitecopy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2004/10/03 04:55:44 chriswhite Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.25 2005/01/04 20:14:03 chriswhite Exp $
+
+*sitecopy-0.14.3 (05 Jan 2005)
+
+  05 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/sitecopy-gcc3.4.patch, +sitecopy-0.14.3.ebuild:
+  Fixed bug #76582 and added a nice gcc3.4 patch to go with it.
 
 *sitecopy-0.14.2 (03 Oct 2004)
 

diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 91f9bd8fd4662abcfb99fc26215199fddaff7970..68a40134fa1d0a0418c15e3ee3b1cbca5c2038fd 100644 (file)
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -1,17 +1,30 @@
-MD5 efb313c1297bd9aaf1beba7c82586749 ChangeLog 3768
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9b59117fb94bf5781b920623f415f76 ChangeLog 3973
 MD5 f5f1522837a3398846f77d381fda47ec metadata.xml 226
-MD5 8e1c77c6c8e0794425e005715f97b3d2 sitecopy-0.14.1.ebuild 1564
-MD5 587033df0a1cfb59e37e7229cc35b5b3 sitecopy-0.14.2.ebuild 1499
+MD5 3bbc7854d9970468fa600c574754acd0 sitecopy-0.10.12-r1.ebuild 977
+MD5 23d7221e79fb41bc66a1331a25910a50 sitecopy-0.12.1.ebuild 1125
+MD5 c10a3f88d16f4f8362713b2e67da7819 sitecopy-0.13.4-r1.ebuild 1797
+MD5 d3286f6a00ba6935bf983d28040f63d0 sitecopy-0.13.4-r2.ebuild 1951
+MD5 c18e86bcfbcff4453e8fab1e21006828 sitecopy-0.13.4.ebuild 1123
+MD5 2fbf9f996b007377f17c7c9c56347c92 sitecopy-0.14.1.ebuild 1564
+MD5 bbfe5ddadf3db2c87e363c97bceec92b sitecopy-0.14.2.ebuild 1499
+MD5 a720f20b61e73dc8d3212562b8ada8c2 sitecopy-0.14.3.ebuild 1636
 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
 MD5 288fac1555c5aa6689f3e3e4e9e2c5e9 files/digest-sitecopy-0.14.2 67
+MD5 9d2f1b627c2e64ada7b81ea3fa5ee51d files/sitecopy-0.14.1-nls.patch 598
+MD5 d4ee82cb6aac0ea4d36d55c0194229df files/digest-sitecopy-0.14.3 67
+MD5 1dfe28809075352e0eed13c4a713b728 files/sitecopy-gcc3.4.patch 493
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB2vgNFdQwWVoAgN4RAuUNAKCSLtX4vmPaqVC42X70Be+9TUSvkwCaA8V5
+TlSgVgBCN+RmcSErkdTrZSY=
+=94kN
+-----END PGP SIGNATURE-----

diff --git a/net-misc/sitecopy/files/digest-sitecopy-0.14.3 b/net-misc/sitecopy/files/digest-sitecopy-0.14.3
new file mode 100644 (file)
index 0000000..d766285
--- /dev/null
+++ b/net-misc/sitecopy/files/digest-sitecopy-0.14.3
@@ -0,0 +1 @@
+MD5 bf3f69b46021d633c8e52efa65b12c38 sitecopy-0.14.3.tar.gz 922323

diff --git a/net-misc/sitecopy/files/sitecopy-gcc3.4.patch b/net-misc/sitecopy/files/sitecopy-gcc3.4.patch
new file mode 100644 (file)
index 0000000..7b48a06
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-gcc3.4.patch
@@ -0,0 +1,20 @@
+--- gnome/minilist.c.old       2005-01-05 04:25:24.283691792 +0900
++++ gnome/minilist.c   2005-01-05 04:25:36.940767624 +0900
+@@ -191,6 +191,7 @@
+           NE_DEBUG(DEBUG_GNOME, "Removing an item from the ignores list.\n");
+           break;
+       default:
++          ;;
+       }
+       if (the_gui->data)
+           the_gui->data->prev = NULL;
+--- gnome/misc.old     2005-01-05 05:00:55.528693304 +0900
++++ gnome/misc.c       2005-01-05 05:01:07.183921440 +0900
+@@ -310,6 +310,7 @@
+           return;
+           break;
+       default:
++          ;;
+       }
+     }
+ }

diff --git a/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild b/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild
index 5509415935a1d0aa06ca1798e1b68b52c0617715..72cfbd0ac04e9659d1ef985217961bbe39b95bd1 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.10.12-r1.ebuild,v 1.17 2004/07/01 21:52:36 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild,v 1.18 2005/01/04 20:14:03 chriswhite Exp $
 
 DESCRIPTION="sitecopy is for easily maintaining remote web sites"
 SRC_URI="http://www.lyra.org/sitecopy/${P}.tar.gz"

diff --git a/net-misc/sitecopy/sitecopy-0.12.1.ebuild b/net-misc/sitecopy/sitecopy-0.12.1.ebuild
index 57abd389328a0e03e9864e924c5e6493e45c8445..1f3e3162876e0ba90fe31d3fefba1a5818f2e8a7 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.12.1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.12.1.ebuild,v 1.9 2004/07/15 03:35:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.12.1.ebuild,v 1.10 2005/01/04 20:14:03 chriswhite Exp $
 
 IUSE="ssl xml xml2"
 

diff --git a/net-misc/sitecopy/sitecopy-0.13.4-r1.ebuild b/net-misc/sitecopy/sitecopy-0.13.4-r1.ebuild
index afb01e27637f3a30368d7441428b7e38bddea5ba..5951807e16fe81e195256ead735c96de6ce617f9 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.13.4-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.13.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.13.4-r1.ebuild,v 1.11 2004/08/12 19:58:05 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.13.4-r1.ebuild,v 1.12 2005/01/04 20:14:03 chriswhite Exp $
 
 IUSE="ssl xml xml2 gnome nls"
 

diff --git a/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild b/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild
index d9f858b9688241f5b454e6f6669374fbb379a5b7..26c347169d0cc5e4cb0eaf73223143d92d1fcfd2 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.13.4-r2.ebuild,v 1.4 2004/08/14 05:21:58 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild,v 1.5 2005/01/04 20:14:03 chriswhite Exp $
 
 IUSE="ssl xml xml2 gnome nls"
 

diff --git a/net-misc/sitecopy/sitecopy-0.13.4.ebuild b/net-misc/sitecopy/sitecopy-0.13.4.ebuild
index d7a78e9c4e117e516c2f49babacafc77ec4affc2..5867bc57cac54a51466f6bf5406066bbea842920 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.13.4.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.13.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.13.4.ebuild,v 1.9 2004/07/15 03:35:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.13.4.ebuild,v 1.10 2005/01/04 20:14:03 chriswhite Exp $
 
 IUSE="ssl xml xml2"
 

diff --git a/net-misc/sitecopy/sitecopy-0.14.1.ebuild b/net-misc/sitecopy/sitecopy-0.14.1.ebuild
index dff7587366802207c7ed5a0c81d5082db0232da1..0b55459e9ee3f65039965928c178a2cb2bdd38e9 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.14.1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.14.1.ebuild,v 1.1 2004/09/16 22:17:26 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.14.1.ebuild,v 1.2 2005/01/04 20:14:03 chriswhite Exp $
 
 inherit eutils
 

diff --git a/net-misc/sitecopy/sitecopy-0.14.2.ebuild b/net-misc/sitecopy/sitecopy-0.14.2.ebuild
index 3177cc3e77d511dcf10bb8a46e3a439126c94b94..3e849bb57a6a08d126464ab5ddc1d3f5d1606921 100644 (file)
--- a/net-misc/sitecopy/sitecopy-0.14.2.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.14.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.14.2.ebuild,v 1.1 2004/10/03 04:55:44 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.14.2.ebuild,v 1.2 2005/01/04 20:14:03 chriswhite Exp $
 
 inherit eutils
 

diff --git a/net-misc/sitecopy/sitecopy-0.14.3.ebuild b/net-misc/sitecopy/sitecopy-0.14.3.ebuild
new file mode 100644 (file)
index 0000000..fd10fb9
--- /dev/null
+++ b/net-misc/sitecopy/sitecopy-0.14.3.ebuild
@@ -0,0 +1,68 @@
+# 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.14.3.ebuild,v 1.1 2005/01/04 20:14:03 chriswhite Exp $
+
+inherit eutils toolchain-funcs
+
+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_unpack() {
+       unpack ${A}
+       cd ${S}
+       if [ $(gcc-version) = "3.4" ]
+       then
+               epatch ${FILESDIR}/${PN}-gcc3.4.patch
+       fi
+}
+
+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
+
+       emake || die "Make failed"
+}
+
+src_install() {
+       make DESTDIR=${D} install || die "install failed"
+}