Version bump (bug #285258).

(Portage version: 14615-svn/cvs/Linux x86_64)

5 files changed, 64 insertions, 134 deletions

diff --git a/net-fs/davfs2/ChangeLog b/net-fs/davfs2/ChangeLog
index 5b057b62eeaf..a40f9745202c 100644
--- a/net-fs/davfs2/ChangeLog
+++ b/net-fs/davfs2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/davfs2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.42 2009/10/17 02:23:13 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/ChangeLog,v 1.43 2009/10/17 04:27:54 arfrever Exp $
+
+*davfs2-1.4.1 (17 Oct 2009)
+
+  17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/davfs2-nobody.diff, -davfs2-1.1.4.ebuild, -davfs2-1.2.2.ebuild,
+  +davfs2-1.4.1.ebuild:
+  Version bump (bug #285258).
 
   17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   davfs2-1.3.3.ebuild:
diff --git a/net-fs/davfs2/davfs2-1.1.4.ebuild b/net-fs/davfs2/davfs2-1.1.4.ebuild
deleted file mode 100644
index 44dfb74f878c..000000000000
--- a/net-fs/davfs2/davfs2-1.1.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.1.4.ebuild,v 1.4 2007/07/12 05:38:40 mr_bones_ Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses Coda for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
-IUSE="ssl debug socks5"
-RESTRICT="test"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		socks5? ( >=net-proxy/dante-1.1.13 )
-		dev-libs/libxml2
-		net-misc/neon
-		sys-libs/zlib"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-nobody.diff
-}
-
-src_compile() {
-	local myconf
-
-	if use debug; then
-		myconf="--with-debug"
-	fi
-	if kernel_is 2 4; then
-		myconf="${myconf} --with-kernel-src=${KV_DIR}"
-	else
-		myconf="${myconf} --without-kernel-src"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with socks5 socks) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	cd doc
-	dodoc BUGS ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO BUGS
-
-	#fix einstalled files in wrong places
-	cd ${D}/usr/share/davfs2
-	rm COPYING ChangeLog davfs2.conf.template FAQ NEWS README secrets.template THANKS TODO BUGS GPL
-	rmdir ${D}/usr/share/davfs2
-
-	dodir /var/run/mount.davfs
-	keepdir /var/run/mount.davfs
-	fowners root:users /var/run/mount.davfs
-	fperms 1774 /var/run/mount.davfs
-
-	dodir /etc/modules.d
-	cat >${D}/etc/modules.d/davfs2 <<EOF
-alias char-major-67	coda
-alias /dev/davfs*	coda
-EOF
-}
diff --git a/net-fs/davfs2/davfs2-1.2.2.ebuild b/net-fs/davfs2/davfs2-1.2.2.ebuild
deleted file mode 100644
index d4f2a7b4eb6c..000000000000
--- a/net-fs/davfs2/davfs2-1.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.2.2.ebuild,v 1.1 2007/08/08 23:14:45 genstef Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses fuse (or coda) for kernel driver and neon for WebDAV interface"
-SRC_URI="mirror://sourceforge/dav/${P}.tar.gz"
-HOMEPAGE="http://dav.sourceforge.net"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl debug socks5"
-RESTRICT="test"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-		socks5? ( >=net-proxy/dante-1.1.13 )
-		dev-libs/libxml2
-		net-misc/neon
-		sys-libs/zlib"
-SLOT="0"
-
-src_compile() {
-	local myconf
-
-	if use debug; then
-		myconf="--with-debug"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with socks5 socks) \
-		--enable-largefile \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL.davfs2 NEWS README \
-		README.translators THANKS TODO
-
-	# remove wrong locations created by install
-	rm -r "${D}/usr/share/doc/davfs2"
-	rm -r "${D}/usr/share/davfs2"
-
-	dodir /var/run/mount.davfs
-	keepdir /var/run/mount.davfs
-	fowners root:users /var/run/mount.davfs
-	fperms 1774 /var/run/mount.davfs
-}
diff --git a/net-fs/davfs2/davfs2-1.4.1.ebuild b/net-fs/davfs2/davfs2-1.4.1.ebuild
new file mode 100644
index 000000000000..b0b978a7cbea
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/davfs2/davfs2-1.4.1.ebuild,v 1.1 2009/10/17 04:27:54 arfrever Exp $
+
+EAPI="2"
+
+inherit autotools linux-mod
+
+DESCRIPTION="a Linux file system driver that allows you to mount a WebDAV server as a local disk drive. Davfs2 uses fuse (or coda) for kernel driver and neon for WebDAV interface"
+HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
+SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-libs/libxml2
+		net-misc/neon
+		sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s/^NE_REQUIRE_VERSIONS.*28/& 29 30/" -i configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-largefile
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README README.translators THANKS TODO
+
+	# Remove wrong locations created by install.
+	rm -fr "${D}/usr/share/doc/davfs2"
+	rm -fr "${D}/usr/share/davfs2"
+
+	dodir /var/run/mount.davfs
+	keepdir /var/run/mount.davfs
+	fowners root:users /var/run/mount.davfs
+	fperms 1774 /var/run/mount.davfs
+
+	# Ignore nobody's home
+	cat>>"${D}/etc/davfs2/davfs2.conf"<<EOF
+
+# nobody is a system account in Gentoo
+ignore_home nobody
+EOF
+}
diff --git a/net-fs/davfs2/files/davfs2-nobody.diff b/net-fs/davfs2/files/davfs2-nobody.diff
deleted file mode 100644
index cb4602594d0e..000000000000
--- a/net-fs/davfs2/files/davfs2-nobody.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/mount_davfs.c	2006-11-07 19:44:22.000000000 +0100
-+++ src/mount_davfs.c.new	2006-11-29 11:55:18.000000000 +0100
-@@ -572,9 +572,12 @@
-             setpwent();
-             pw = getpwent();
-             while (pw != NULL) {
-+                // On gentoo the home directory of nobody is '/', so we
-+                // ignore the user 'nobody'
-                 if (pw->pw_dir != NULL && pw->pw_uid != args->uid
-                         && strlen(pw->pw_dir) > 0
--                        && strstr(mpoint, pw->pw_dir) == mpoint)
-+                        && strstr(mpoint, pw->pw_dir) == mpoint
-+                        && strcmp(pw->pw_name, "nobody") != 0)
-                     error(EXIT_FAILURE, 0,
-                           "You can't mount into another users home directory.\n"
-                           "  \"%s\" is the home directory of user %s.",