commit: 83b68531b24064760bcd9a6e01fac4d71294a5d1 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Nov 7 14:39:31 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Nov 7 17:05:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83b68531
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 <polynomial-c <AT> gentoo.org> sys-fs/lufs/files/lufs-0.9.7-fPIC.patch | 4 +- sys-fs/lufs/files/lufs-0.9.7-gcc43.patch | 12 +++--- .../{lufs-0.9.7-r3.ebuild => lufs-0.9.7-r4.ebuild} | 47 ++++++++++++---------- 3 files changed, 34 insertions(+), 29 deletions(-) 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 05bb1d2f5d2..2f19ab0b8bd 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 3736ba62b01..a3da3f82cf6 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 <unistd.h> #include <netdb.h> #include <stdio.h> ---- 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 <string> diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r4.ebuild similarity index 70% rename from sys-fs/lufs/lufs-0.9.7-r3.ebuild rename to sys-fs/lufs/lufs-0.9.7-r4.ebuild index 617a1bfed0e..eb06257760e 100644 --- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild +++ b/sys-fs/lufs/lufs-0.9.7-r4.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit eutils autotools +inherit autotools DESCRIPTION="User-mode filesystem implementation" HOMEPAGE="https://sourceforge.net/projects/lufs/"; @@ -17,43 +17,48 @@ 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 +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}" - unset ARCH - econf $(use_enable debug) || die - cd filesystems + cd filesystems || die local i for i in ${filesystems} ; do - cd ${i} - emake || die "emake ${i} failed" - cd .. + pushd ${i} &>/dev/null || die + emake + popd &>/dev/null || die done } src_install() { - cd filesystems + cd filesystems || die local i for i in ${filesystems} ; do - cd ${i} - emake DESTDIR="${D}" install || die "emake install ${i} failed" - cd .. + pushd ${i} &>/dev/null || die + emake DESTDIR="${D}" install + popd &>/dev/null || die done }
