Fix versioning, new patchset from debian, bug #214426

(Portage version: 2.1.4.4)

3 files changed, 36 insertions, 8 deletions

diff --git a/net-misc/sitecopy/ChangeLog b/net-misc/sitecopy/ChangeLog
index 9ac856046b44..754aafc7839d 100644
--- a/net-misc/sitecopy/ChangeLog
+++ b/net-misc/sitecopy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/sitecopy
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.46 2008/01/26 16:59:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.47 2008/03/25 16:49:25 armin76 Exp $
+
+*sitecopy-0.16.3_p15 (25 Mar 2008)
+
+  25 Mar 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/0.16.3-neon-28.patch, -sitecopy-0.16.3-r1.ebuild,
+  +sitecopy-0.16.3_p15.ebuild:
+  Fix versioning, new patchset from debian, bug #214426
 
 *sitecopy-0.16.3-r1 (26 Jan 2008)
 
diff --git a/net-misc/sitecopy/files/0.16.3-neon-28.patch b/net-misc/sitecopy/files/0.16.3-neon-28.patch
new file mode 100644
index 000000000000..8d4780f0d0fe
--- /dev/null
+++ b/net-misc/sitecopy/files/0.16.3-neon-28.patch
@@ -0,0 +1,13 @@
+--- configure.in
++++ configure.in
+@@ -112,8 +112,8 @@
+    AC_LIBOBJ(lib/fnmatch)
+ fi
+ 
+-# Support neon 0.24, 0.25, 0.26.
+-NE_REQUIRE_VERSIONS([0], [24 25 26 27])
++# Support neon 0.24, 0.25, 0.26, 0.27, 0.28, 0.29.
++NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29])
+ 
+ dnl But we don't use zlib or ACL support
+ NEON_WITHOUT_ZLIB
diff --git a/net-misc/sitecopy/sitecopy-0.16.3-r1.ebuild b/net-misc/sitecopy/sitecopy-0.16.3_p15.ebuild
index 505afd2d69fd..36cbe75231aa 100644
--- a/net-misc/sitecopy/sitecopy-0.16.3-r1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.3_p15.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.3-r1.ebuild,v 1.2 2008/01/26 16:59:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.3_p15.ebuild,v 1.1 2008/03/25 16:49:25 armin76 Exp $
 
 inherit eutils autotools
 
 IUSE="expat nls rsh ssl webdav xml zlib"
 
-DEB_PL="14"
+DEB_PL="${P##*_p}"
+MY_P="${P%%_*}"
+MY_P="${MY_P/-/_}"
 DESCRIPTION="sitecopy is for easily maintaining remote web sites"
-SRC_URI="http://www.lyra.org/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/s/${PN}/${P/-/_}-${DEB_PL}.diff.gz"
-HOMEPAGE="http://www.lyra.org/sitecopy/"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
+HOMEPAGE="http://packages.debian.org/unstable/sitecopy http://www.lyra.org/sitecopy/"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="rsh? ( net-misc/netkit-rsh )
 	>=net-misc/neon-0.24.6"
 
+S="${WORKDIR}"/${MY_P/_/-}
+
 pkg_setup() {
 	if use zlib ; then
 		built_with_use net-misc/neon zlib || die "neon needs zlib support"
@@ -41,11 +46,14 @@ src_unpack() {
 	unpack ${A}
 
 	# Debian patches
-	epatch ${P/-/_}-${DEB_PL}.diff
+	epatch ${MY_P}-${DEB_PL}.diff
 	epatch "${S}"/debian/patches/*.dpatch
 
 	cd "${S}"
 
+	# Make it work with neon .28 and newer
+	epatch "${FILESDIR}"/0.16.3-neon-28.patch
+
 	sed -i -e \
 		"s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
 		Makefile.in || die "Documentation directory patching failed"