summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/sipcalc/Manifest4
-rw-r--r--net-misc/sitecopy/ChangeLog9
-rw-r--r--net-misc/sitecopy/files/0.16.3-neon-28.patch13
-rw-r--r--net-misc/sitecopy/sitecopy-0.16.3_p15.ebuild (renamed from net-misc/sitecopy/sitecopy-0.16.3-r1.ebuild)22
4 files changed, 38 insertions, 10 deletions
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 077efe9e4b6f..f4f9c333a22f 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,6 +1,6 @@
DIST sipcalc-1.1.2.tar.gz 74268 RMD160 37a610ee3bcb5ed7265c5cbebf3991e27af46843 SHA1 2e0e0f7fc38134d4b8561135a2e5021605880ff4 SHA256 4a9ddb2fa3563cf9386329abfa83571e0c21221c2895c19d50f0991de2c612b3
DIST sipcalc-1.1.4.tar.gz 108508 RMD160 811211a1f5ea48bef7adceff6085795e0c18c387 SHA1 99d0d75b489fc6882fd660fcf093363c238097d1 SHA256 205dc438799d27eb2585a82d64a28abbb30dfe8e10032ee78edd8e01c5bfdafd
EBUILD sipcalc-1.1.2.ebuild 623 RMD160 f5edbf23352989b7a664ef3733fe72608d47c42d SHA1 dc7b0caf61d8e082a275f303bfa20d783a3b190d SHA256 502eb397b3d06668ddec54544ae9e4b80ed6ffb5145c0fe9b97f1156c145d90b
-EBUILD sipcalc-1.1.4.ebuild 625 RMD160 d4674f14775ed00772ef3d32ef6c64254b816bfa SHA1 63ec94a7d71bfdfb079994857fefa8bef3840323 SHA256 4919f97922800a876c488dffb66425855c12ae9d7a49d6e0b456f5f7898a74ba
-MISC ChangeLog 1306 RMD160 92fb170c40833c52477592945954e99415e7dd79 SHA1 22ff3f5a553abe2cf6e8413de84f0f599b7a5ad1 SHA256 daf82837e9e3a86b7c547b3ef13a6758edad96f6ebc3bd821c414a9e24628e75
+EBUILD sipcalc-1.1.4.ebuild 622 RMD160 14d31635124388be0d5be352804c46c9737a7a75 SHA1 dbc4b08c14322bbb6dbc18615e4b016f60565ee8 SHA256 21e658abfb10423d19705bfd9a208daf7f5a0c99e9946c40af871282e50870bf
+MISC ChangeLog 1409 RMD160 d61888f9f30c67cf9b70b8f781f0d84c8bd49655 SHA1 ce3e2ba658eec50f1ad213294158585c4d7743e6 SHA256 dae5a921880a85cbf0ccd712f4b5d5b521d209810ab20ee2517f86424651c4eb
MISC metadata.xml 348 RMD160 3186283cf8559c97658ba30ccae10318c228f29f SHA1 a8adce1fc76a7dcd92959659856ef0af2708bfd1 SHA256 5f7150cf1406611309e956ca52e024750f14baee92bee2f0649ae152e162b1f0
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"