Remove old.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 5 insertions, 103 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index ced488c67043..7bdba59ab549 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.155 2012/02/15 16:40:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.156 2012/02/17 08:58:04 radhermit Exp $
+
+  17 Feb 2012; Tim Harder <radhermit@gentoo.org> -fuse-2.8.5.ebuild,
+  -files/fuse-2.8.5-double-version.patch:
+  Remove old.
 
   15 Feb 2012; Brent Baude <ranger@gentoo.org> fuse-2.8.6.ebuild:
   Marking fuse-2.8.6 ppc for bug 392949
diff --git a/sys-fs/fuse/files/fuse-2.8.5-double-version.patch b/sys-fs/fuse/files/fuse-2.8.5-double-version.patch
deleted file mode 100644
index 60f5c98f3840..000000000000
--- a/sys-fs/fuse/files/fuse-2.8.5-double-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 824b4ce6acd676e13cfa216dfbb5dbf4380781a0
-Author: Miklos Szeredi <mszeredi@suse.cz>
-Date:   Tue Sep 28 20:04:02 2010 +0200
-
-    Fix ambiguous symbol version for fuse_chan_new
-    
-    fuse_versionscript included fuse_chan_new in both FUSE_2.4 and
-    FUSE_2.6.  Remove the FUSE_2.4, which is invalid.
-    
-    Reported by Raymes Khoury, who discovered this with the gold linker
-
-diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
-index bd0186d..860c403 100644
---- a/lib/fuse_versionscript
-+++ b/lib/fuse_versionscript
-@@ -27,7 +27,6 @@ FUSE_2.4 {
- 		fuse_chan_data;
- 		fuse_chan_destroy;
- 		fuse_chan_fd;
--		fuse_chan_new;
- 		fuse_chan_receive;
- 		fuse_chan_send;
- 		fuse_chan_session;
diff --git a/sys-fs/fuse/fuse-2.8.5.ebuild b/sys-fs/fuse/fuse-2.8.5.ebuild
deleted file mode 100644
index ef0023c6a7c4..000000000000
--- a/sys-fs/fuse/fuse-2.8.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.8.5.ebuild,v 1.13 2011/08/15 04:32:15 vapier Exp $
-
-EAPI=3
-inherit eutils libtool linux-info
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux"
-IUSE="kernel_linux kernel_FreeBSD"
-S=${WORKDIR}/${MY_P}
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use user-mode utils"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-double-version.patch"
-	# fix building with glibc-2.14 #370411
-	sed -i '1i#define _GNU_SOURCE' util/fusermount.c || die
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		INIT_D_PATH="${EPREFIX}/etc/init.d" \
-		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
-		UDEV_RULES_PATH="${EPREFIX}/lib/udev/rules.d" \
-		--disable-example
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README \
-		README.NFS NEWS doc/how-fuse-works \
-		doc/kernel.txt FAQ
-	docinto example
-	dodoc example/*
-
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
-	fi
-
-	rm -rf "${D}/dev"
-
-	dodir /etc
-	cat >"${ED}"/etc/fuse.conf <<-EOF
-		# Set the maximum number of FUSE mounts allowed to non-root users.
-		# The default is 1000.
-		#
-		#mount_max = 1000
-
-		# Allow non-root users to specify the 'allow_other' or 'allow_root'
-		# mount options.
-		#
-		#user_allow_other
-	EOF
-}