gentoo resync : 10.11.2019

4 files changed, 37 insertions, 32 deletions

diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index 0d781085e487..c031b44f9313 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,8 +1,8 @@
 AUX lufs-0.9.7-enable-gnome-2.patch 2893 BLAKE2B c267ab97740e7f3dc31a0bad28e67f349eac9889cc99b0881942ed666277eb30c64b047d4cf7d910b79845f1b24878a427f390f5155db9d68ca2cac98318e8ec SHA512 59ee306dc0f3ec0c080738850bd8ea3fbd582ac573d74f2e3b920ddb96af69164c24437dcf545b0a33881e2f2bd609809411f89f46ea451387ce699a4f62f856
-AUX lufs-0.9.7-fPIC.patch 714 BLAKE2B 90d117159d4736cfd5fc964507e46b8d127bc5d849f881c9b1a3a9d7fa2ac00a92397f2a2b1f0651b2da96b400b74dbe65928383bd5bb2ee8b82290dc875c2a2 SHA512 8677e14d0323ce588f5679b4037a190fc686f4458b8cde65903e736f5ccbe4f7af8b643e72598d1d8acf21d41e358cb424b3ecad0d1737278ad572aad7acbeca
-AUX lufs-0.9.7-gcc43.patch 877 BLAKE2B 9cd53781407225cc84b29726412bcfdd9246252607901485d50fe77e0689d416bc9cf8ff63eb60f0ae71c11c8318653b3df5da182b3ca8bdf287b29e97083617 SHA512 4eda5f796d857d5d89b28cf2bde2dce92a1526a5824f9f15fc0418ad41e0cae315202ad5facf398efdb32c1cc9dcd8b910deaa1d7b6d134c7c7b49b5e1fcfb75
+AUX lufs-0.9.7-fPIC.patch 646 BLAKE2B 7ecf96f85169678fb4367a9aa2831c84c3905e15041a31e0f6f02a41678b7d3c56668f5adf40e47eda8bd9c86bc4459ed4203b9265b44047a8a63264cd2001e8 SHA512 e36c4e14c51f74485a46e209875d023d6900f2f362d2d0e77103edf7b2597cad1622b1ef6861c614b284ce0127d1c6baec75d3775308208275de8c9398988da0
+AUX lufs-0.9.7-gcc43.patch 658 BLAKE2B 6bdbae5d71d9f011f0c35058a5041c672eb0d504b46e6e06b9765b7d1dbddbb731cdcf8dc51e6cb565ff3b107048c60c27831f95e27a3807fa478be64ce71ebc SHA512 ee531efdad653a71df540c4b3c7158ac02551ac92173b550ef25c38156a6b3a250dd5bd77ec9a7190c1075754816893a55668df9c4edc1a58f944ab8bfea6c15
 AUX lufs-automount-port.diff 754 BLAKE2B 83b54abf4afcee61639530d781f18da370420d5dc5f9c52aa07900ee071bb7870b521f52ed42d08a5cd19c4a3dc79236e35b6909d3f171f217f9ba63ab1f9f9c SHA512 006149b123cf052e3b3e16cf301b05ae7604d3415a40c069a536afe5f0c8ab503dcc6e518f6323a0bd25a5597300f16535ce5d9caf3fb781071331271c4cef3f
 AUX lufs-no-kernel.patch 3347 BLAKE2B 3519852a28b8d4d5f38f8e90056272d2f43f896c8118161c5ee7166ea63a42e8b3d2787d2f9baaba3b4ef5446ed824c2eadfe9e334c26a78911dc7fcaec48fd0 SHA512 690e12928f206856859f94bb2ed4a9ca0d6e34fea2a9cb84c17293e54ee0230e2d01bca11cbd3ac5298f442483b3be3fb557129a044905738139b997bcf20743
 DIST lufs-0.9.7.tar.gz 537772 BLAKE2B cc0a22a1711c9d6fabb310e760455fe50d427a323ced7c5289ff00392983a14cf4ab9921fbe33c2889cea4478c16ba448db6877b585d33c5a3795838568edb74 SHA512 c7c70de89bd3f31e4fbae3e4a4acb04a6c29d0dac2b52e18a99dd2563db57ca9b3ff5e3fef53b45b9eea4b689122a30fef887973a9eb6e13b12c38fc957bfb91
-EBUILD lufs-0.9.7-r3.ebuild 1696 BLAKE2B 6b21cb2c6fcc121fc268252ccffdf913b50f22f778b2c27a9148c235a25ef9c6e0b1c56132f3713a59fd7b6382618554e6aa327ec8b9d324c8661e21f8099f99 SHA512 b381ded239d682e3cf712d221dfb28e62de27093a28e26ae8fa7c155696f12aa2d0253344616cb5740a990c0d3c97841a15c63573293726ad1645d0f3678af3a
+EBUILD lufs-0.9.7-r4.ebuild 1715 BLAKE2B 4e0dffa20d8b1cc7ba455d2a920573b53674c5f434313eb42e5c55f8a0c72c6c6649bfd6bccccf3a82a27dfce0668bef619efa74976e4c00bd09e86a9c300e70 SHA512 75d6e08fe9db87915ca09204f31059ec353e46829b02eff284d42ef9d73b2c98dd2c01162fe33b40de2fd5ef0c79836b8925de50febe85b73c8f06c9acb4baee
 MISC metadata.xml 324 BLAKE2B 839b0c3da99be949242c9193de8ae875e6780673053ef5201df7ddeec61df8a921272b9056b5acc63331efab6b02db6d94e441354a7ea68e54188724e2f95375 SHA512 0f93937ea367a04e67b3d03a4a000b4e020a3ac4ca432eaa9dccfd82211a3db52afbeb4f3fd800e2164fa22dfa6f70ffbec6ecea44aad8aac8dc675920f9ac19
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 <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
index 617a1bfed0e8..eb06257760e0 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
 }