From 83b68531b24064760bcd9a6e01fac4d71294a5d1 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 7 Nov 2019 15:39:31 +0100 Subject: sys-fs/lufs: EAPI-7 revbump Closes: https://bugs.gentoo.org/697168 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler --- sys-fs/lufs/files/lufs-0.9.7-fPIC.patch | 4 +- sys-fs/lufs/files/lufs-0.9.7-gcc43.patch | 12 ++--- sys-fs/lufs/lufs-0.9.7-r3.ebuild | 72 ----------------------------- sys-fs/lufs/lufs-0.9.7-r4.ebuild | 77 ++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 80 deletions(-) delete mode 100644 sys-fs/lufs/lufs-0.9.7-r3.ebuild create mode 100644 sys-fs/lufs/lufs-0.9.7-r4.ebuild (limited to 'sys-fs/lufs') diff --git a/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch b/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch index 05bb1d2f5d25..2f19ab0b8bd9 100644 --- a/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch +++ b/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch @@ -1,5 +1,5 @@ ---- filesystems/gnetfs/Makefile.in 2004-03-18 15:59:28.391299639 +0000 -+++ filesystems/gnetfs/Makefile.in 2004-03-18 15:59:45.316142704 +0000 +--- a/filesystems/gnetfs/Makefile.in ++++ b/filesystems/gnetfs/Makefile.in @@ -197,7 +197,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/vtree.Plo ./$(DEPDIR)/xfer.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff --git a/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch b/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch index 3736ba62b017..a3da3f82cf6d 100644 --- a/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch +++ b/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch @@ -1,5 +1,5 @@ ---- filesystems/ftpfs/ftplib.cpp.orig 2008-06-08 20:01:35.000000000 +0200 -+++ filesystems/ftpfs/ftplib.cpp 2008-06-08 20:01:53.000000000 +0200 +--- a/filesystems/ftpfs/ftplib.cpp ++++ b/filesystems/ftpfs/ftplib.cpp @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -8,8 +8,8 @@ #include #include #include ---- filesystems/ftpfs/ftpfs.h.orig 2008-06-08 20:04:33.000000000 +0200 -+++ filesystems/ftpfs/ftpfs.h 2008-06-08 20:05:07.000000000 +0200 +--- a/filesystems/ftpfs/ftpfs.h ++++ b/filesystems/ftpfs/ftpfs.h @@ -23,6 +23,8 @@ #ifndef _FTPFS_H_ #define _FTPFS_H_ @@ -19,8 +19,8 @@ using namespace std; struct directory; ---- filesystems/sshfs/sftplib.h.orig 2008-06-08 20:08:55.000000000 +0200 -+++ filesystems/sshfs/sftplib.h 2008-06-08 20:09:43.000000000 +0200 +--- a/filesystems/sshfs/sftplib.h ++++ b/filesystems/sshfs/sftplib.h @@ -28,6 +28,9 @@ #include diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r3.ebuild deleted file mode 100644 index 617a1bfed0e8..000000000000 --- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils autotools - -DESCRIPTION="User-mode filesystem implementation" -HOMEPAGE="https://sourceforge.net/projects/lufs/" -SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="debug" - -RDEPEND="sys-fs/lufis" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-fPIC.patch - epatch "${FILESDIR}"/lufs-automount-port.diff - epatch "${FILESDIR}"/${P}-enable-gnome-2.patch - epatch "${FILESDIR}"/lufs-no-kernel.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - - filesystems="ftpfs localfs" - use amd64 || filesystems+=" sshfs" - - eautoreconf -} - -src_compile() { - einfo "Compiling for ${filesystems}" - unset ARCH - econf $(use_enable debug) || die - - cd filesystems - local i - for i in ${filesystems} ; do - cd ${i} - emake || die "emake ${i} failed" - cd .. - done -} - -src_install() { - cd filesystems - local i - for i in ${filesystems} ; do - cd ${i} - emake DESTDIR="${D}" install || die "emake install ${i} failed" - cd .. - done -} - -pkg_postinst() { - ewarn "Lufs Kernel support and lufsd,lufsmnt have been disabled in favour" - ewarn "of lufis, please use lufis to mount lufs-filesystems, eg:" - if use amd64; then - elog "# lufis fs=ftpfs,host=ftp.kernel.org /mnt/lufis/ -s" - else - elog "# lufis fs=sshfs,host=dev.gentoo.org,username=genstef /mnt/lufis/ -s" - fi - ewarn "If something does not work for you with this setup please" - ewarn "complain to bugs.gentoo.org" - einfo "Note: There is also the native sshfs implementation now" - use amd64 && ewarn "lufs-sshfs does not work on amd64 and is disabled there." -} diff --git a/sys-fs/lufs/lufs-0.9.7-r4.ebuild b/sys-fs/lufs/lufs-0.9.7-r4.ebuild new file mode 100644 index 000000000000..eb06257760e0 --- /dev/null +++ b/sys-fs/lufs/lufs-0.9.7-r4.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="User-mode filesystem implementation" +HOMEPAGE="https://sourceforge.net/projects/lufs/" +SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ppc x86" +IUSE="debug" + +RDEPEND="sys-fs/lufis" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-fPIC.patch + "${FILESDIR}"/${PN}-automount-port.diff + "${FILESDIR}"/${P}-enable-gnome-2.patch + "${FILESDIR}"/${PN}-no-kernel.patch + "${FILESDIR}"/${P}-gcc43.patch +) + +pkg_setup() { + filesystems="ftpfs localfs" + use amd64 || filesystems+=" sshfs" +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + unset ARCH + econf $(use_enable debug) +} + +src_compile() { + einfo "Compiling for ${filesystems}" + + cd filesystems || die + local i + for i in ${filesystems} ; do + pushd ${i} &>/dev/null || die + emake + popd &>/dev/null || die + done +} + +src_install() { + cd filesystems || die + local i + for i in ${filesystems} ; do + pushd ${i} &>/dev/null || die + emake DESTDIR="${D}" install + popd &>/dev/null || die + done +} + +pkg_postinst() { + ewarn "Lufs Kernel support and lufsd,lufsmnt have been disabled in favour" + ewarn "of lufis, please use lufis to mount lufs-filesystems, eg:" + if use amd64; then + elog "# lufis fs=ftpfs,host=ftp.kernel.org /mnt/lufis/ -s" + else + elog "# lufis fs=sshfs,host=dev.gentoo.org,username=genstef /mnt/lufis/ -s" + fi + ewarn "If something does not work for you with this setup please" + ewarn "complain to bugs.gentoo.org" + einfo "Note: There is also the native sshfs implementation now" + use amd64 && ewarn "lufs-sshfs does not work on amd64 and is disabled there." +} -- cgit v1.2.3-65-gdbad