[sys-fs/zfs] Fix gentoo detection

(Portage version: 2.2.0_alpha32/git/Linux x86_64, signed Manifest commit with key F82F92E6)

3 files changed, 57 insertions, 14 deletions

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index aaa71209d..58cef1cfd 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-gentoo-Fix-detection-of-gentoo.patch 1162 RMD160 a815b8db1038b2a6e6bc8fa467fcdeb0866bd345 SHA1 6c594a55e17182a56c3816505c77f92154619208 SHA256 04e35be42591e374129b4c5893fd363ee3b129a1a85b702ea4b4a428c90287d6
 AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d
 AUX zfs.initd 2052 RMD160 3636ead94d4b7200cc221b9e9646b85a5c3acc1a SHA1 d59d5b475c3dc335bf70a24a7af80ef7a38df347 SHA256 ad5e5aa282f2942b23364b5dcb43b4edea5c3923559d18d624ca9bcb51218476
 DIST zfs-0.6.0-rc4.tar.gz 1870362 RMD160 190677dddcf54835ab933f2ec891f189dc1cb39e SHA1 c01bb9458586c5b50ee4d3dfb8b6059689da1e12 SHA256 947f3bd84998c6e9047cf68a37d3f029b850c9470d3a65f99edb246f73fa7c7d
 EBUILD zfs-0.6.0_rc4.ebuild 1604 RMD160 b738938a641822d3cde856227d193e4bf9a178a3 SHA1 18a8b8688e917160b573c830980b7ba8d51f2314 SHA256 db2e724bc7248418859b038d40430d2cf8b363a913225498f94b1ac87955666c
-EBUILD zfs-9999.ebuild 1507 RMD160 348d2ff51ad8a3aed6cdd319784e503d4abc2ebb SHA1 be5a7374fa4b22c8f6a8b137960b2242bda99298 SHA256 c42c5cc57c32e698682eaf5cb9502011d770f34611d2933aab75fc7983da3998
+EBUILD zfs-9999.ebuild 1570 RMD160 76475701ad690dbc59864ebabf05705192b64e41 SHA1 5f95560c79ccbb8444df2a2a4840952d1ec285fb SHA256 fd5173b7f749f7838640c7ddcf4879401d7c94e7abd002acac8ec11af393873e
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNzojcAAoJEOf+E+/4L5LmKj8P/1Ahh+mX9Nz7qskvZlJfPa0/
-qXkEAHxHaNPEVfs71Q+Qk6r3yJD8DJbgxKAK9LoNaG0CxIYidTNd1xMYCCkcI1s7
-DaCWwB4Ivcy/bESXjUb/7hR4LjkCK/LjPRiu3EDoZQvSehG7kwoUuklAwL994uew
-Eu/mWVqplnMcz+v0SAGW3zAtFQZNEwqJ3sx8bWP0O8Iq9lztuODxO15yGo6Ifqe5
-lhpis5qFUgJUOXY09a8TxTd1AGEJ6ZJ77WlK2IWq+m6aTlzmJYX2rl1Y5vlZPj5w
-fd2fJ64wrSrsZ1q9MLUIlOrdDWXd3sd2CxHANC5mcyDUoDgO+BZuCLJ/55Nd/4CJ
-sgFvBYNd2gULmBAli4eoyHe8cgAAKT17KWaOwNnQB0ZeT2LgySuSwdH6OSpmfFs1
-OZmlUym2ya3E/b1jpsfb3JAhfqRM548OyV0BWnZy96s98bRZMccqWM96cMBkDx+L
-u440kC9LTwIMrqe2qcbErnmKnKFRbQQrXvrmVAQeR3vmlE8HLVmVKKZdrRhva6xx
-GXmf2xEewG/ln1HFI8PxaMYV7kKtS/2+IUBPFz/1308y9iESx7bZBdAkDPtG4Zy8
-3KVnft2BMNIvFQD+dvrL5gDCEgA9PBlJfGOKdAZF+wvzK0nzM7lEvBQvvRgEA24i
-S91UiyNaqOAhVDTPwAQd
-=pBY9
+iQIcBAEBCAAGBQJNzpHuAAoJEOf+E+/4L5LmEkAP/1UlDZwk5gPyz67vqVDwDikm
+YLZlvsW6eeIOydGk5xQKHGu3BdjZNlbv5DgelnGxcQIDaONwSz1WYQ1pnBPJfiKt
+2mI3yTtuEgRawGEYkwmEeMNfWAUxZvCUpyQMFv3ZasLGzcD/XlX3LVNmCaV3cu9y
+CZ24QOzJ3o6LwS6Ks8j+Tv6WKiCGlAr7iKVh0DuQgiyQE0nDLW18W7KikfQ2sWfz
+kTP5GvS1GBA7mTImc1elD5cWuugxqBlz8ucCr1/bsBQBfHr8lCqOc9WX9TcSDEef
+SoovEe2uH5lDoizYjyq2NXRMGdJIe9IUH953YG1sYWwTAFJ8wnufRRchny5HjdhK
+pOG+Y1aikr8VrYFVSBQ1Z8dlbQ34zhSAm+4laBI/JzEsVEzAWNek5G8PCWz1PnjI
+r0f2Yv8DQNEbMZuE515nl2gj5mukSQyFnHHBnE4ZiCxgvEoEdEq7B2iMvTl3+jS/
+GiOwi1MBHmccAFjRypV+CMAc5T7WxjV25FK65a97iemC72piZgaSG/PVLF60x/Un
+NuvSFjzbhe6yNkaSvpScWoDplQjjIyBNyQGlf9roHeW4j+DQX1vX7kZst6a2awn5
+jMJTR7jaZt99n2r5LH5pXzsDJII6oyZDybMnNklDQEY3uI08XGEJVduyPiASJi5L
+6kTRRqz6/SNBC9Y8/u3u
+=mMkZ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch b/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch
new file mode 100644
index 000000000..aa8e68430
--- /dev/null
+++ b/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch
@@ -0,0 +1,41 @@
+From aa31bffa2022a73c3a5c57914462025ebdbd4407 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Sat, 14 May 2011 18:25:37 +0400
+Subject: [PATCH] [gentoo] Fix detection of gentoo
+
+Also this may fix other distros because some of them also provides
+/etc/lsb-release not only ubuntu.
+---
+ configure |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index fee3c74..f504950 100755
+--- a/configure
++++ b/configure
+@@ -11785,18 +11785,18 @@ $as_echo_n "checking linux distribution... " >&6; }
+ 		VENDOR=redhat ;
+ 	elif test -f /etc/fedora-release ; then
+ 		VENDOR=fedora ;
+-	elif test -f /etc/lsb-release ; then
+-		VENDOR=ubuntu ;
++	elif test -f /etc/gentoo-release ; then
++		VENDOR=gentoo ;
+ 	elif test -f /etc/debian_version ; then
+ 		VENDOR=debian ;
+ 	elif test -f /etc/SuSE-release ; then
+ 		VENDOR=sles ;
+ 	elif test -f /etc/slackware-version ; then
+ 		VENDOR=slackware ;
+-	elif test -f /etc/gentoo-release ; then
+-		VENDOR=gentoo ;
+ 	elif test -f /etc/lunar.release ; then
+ 		VENDOR=lunar ;
++	elif test -f /etc/lsb-release ; then
++		VENDOR=ubuntu ;
+ 	else
+ 		VENDOR= ;
+ 	fi
+-- 
+1.7.5.rc3
+
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index efb5f7cd0..db6fe7c80 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -41,6 +41,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
+	epatch "{FILESDIR}"/0001-gentoo-Fix-detection-of-gentoo.patch
 	eautoreconf
 }