gentoo resync : 24.12.2018

9 files changed, 135 insertions, 21 deletions

diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 08503b9d63c3..1d6d35e83f67 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,13 +1,15 @@
 DIST spl-0.6.5.11.tar.gz 531710 BLAKE2B e89cb5a023d3f4b3949a385100b56e01c5fd0ff4448bc175f8463a84b74d1d8f1fcf669c2e4b73f2ec3326653594106ebfa3e66987e49a9cd029355bbb317990 SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722
 DIST spl-0.7.11.tar.gz 551795 BLAKE2B c7002e0281ad6c1e97e2e5ef1365500ed2dce8d06339679b1a5e6405bea61c918cde280b8b840ab023a8fb73198faf985043e3e5eddae2494b331bea7637ad44 SHA512 c7d5d2f504f98f581554d3cf96fe5ae128dae6a27b0aa802e0f95f6b7d89f8a9783c71696e095a6a25a319c28087d933b5ebaa015111f96711d2fb54195c197c
+DIST spl-0.7.12.tar.gz 551880 BLAKE2B 751909a5dba7060b6eb88acdf2e9a64010a802eef98f967d61bb4463b5e80d86c325d027d8092beab4f72b1bac90b1c5fa20a2d1448bd331e0bf214b4b5acbb6 SHA512 4dcada8ccde3fc0320eafbd8b3592baf3f5970babbb2c0b8d2c2c5f254bd940e52565fa86c176f455f819da2a192077df8183640fb7c6279410d628e446335f9
 DIST spl-0.7.8.tar.gz 559558 BLAKE2B 5aa68a8150cb0c922c1ad0df9d1260136cedd95c13df45cc4490d937746a2a0e76e964978128a6f4e553f7bad4adc72a0408ef89969a15ba3f43af26e412b61c SHA512 dcd38dd0971042603baa474460486ed2e7cb59468de7613fa713eb4bdd081026794af7780b5d8970dd17645b04b6dde1e2f43e89a782437a50afc679a8850001
 DIST spl-0.7.9-r1-patches.tar.xz 2428 BLAKE2B 5a8550be587c511975d579bdba889538ed574d51b75ff579d02da190a2f8f0c2ba79a5ab4247603f17d26d0ec4d3552dd066c276b99e152d3d95a420db62038c SHA512 829d16e9ab98d568174558fe850e6cb75a70c05de485054f1801f3896dc1fb56a1aaa7f4ba6c7e107558eef591456098291917ca071774c12f4191b0004b9b93
 DIST spl-0.7.9.tar.gz 551115 BLAKE2B 0ebb801ff60e5f8691c0b3386b5b1c326ea9d40decc20fb455ddb103d108923f28cd870e1c1dc465af5e24e8627973f2b60e7b9b88b3fdbd3ac45f3bd167def2 SHA512 89a42a65b3c09a654ffc3bcef84a0735eefe080c2d790400a3691cccf01e9f0a95cd40a4eed37542cfa7f4a94f20e06aae44886325473713407833d247751ec3
-EBUILD spl-0.6.5.11.ebuild 2707 BLAKE2B 056ca8888de322833390969112d45cccc4cd7d59e93891355ca81f95098eb4e381bf638c105b5150a4b5a55c94bf8a772fa9bd2968d3d2f7e3e32779bf52e5c5 SHA512 96a12346f728c144a78cfa701f5b451ad2bdacaaa544a753a9db5abd8047113acc2340fe1d49f915efe3f5e7c3d79f6459a22291b0e62d6e9b42c28417812a2c
-EBUILD spl-0.7.11.ebuild 2687 BLAKE2B e037757c0e2bb3c0db56b0a4237f88df4340cc46c0c8d1d5acf2017ec23405958c6b86460211fa29e4f5e67c1d931356eaa43cdbc5579be6a011de5992fea78b SHA512 cfb66d943f3bc543134a00b0c8f8d38206bf6a911883653828a93ff407fb75148cbdf22667e3dc24347fbda23751e8ba1a74683cc5214888c2425e01eb23dda4
-EBUILD spl-0.7.8.ebuild 2686 BLAKE2B 25ada9a1556c66cda953dfe47a09781e0c7d6cf12b41631f465f7c2fa9f1b0d13be8e5539bba41e5251b620fc75dbedd319dc9fd064870f2be1a6af62d771724 SHA512 b6ad416f3f5af65572371e326d94ef5dd7321b50f176fdd85579a384a7f4aea142ef0858d4c9bea0a98d0252339b5ff6c76419736a60cb1a3bd9f5083414f2e5
-EBUILD spl-0.7.9-r1.ebuild 2883 BLAKE2B 5274d0e99083733b170a2a898061ce6bd9ebc954a7953f191878ba87250f355818dccd53b21d78b80a6bfacaa137bd58e516f558f2ee663c560a4d9cadd1559d SHA512 b8a5dd24d90804ddc4b50b5786340d5847e25518a490e0a26398741651115bb173bc0dd8aacffe07006c5d95219ae1dc542f1c7522175e851b02cc67567ec1ec
-EBUILD spl-0.7.9.ebuild 2686 BLAKE2B 4a8f48a1c0c6527cfb3ff726c71449401ea105802729ad81d0912e57f0563b76d0690c5975b496c239eb0584f20ed845c6b33d39879d73a5e52ba85601f33720 SHA512 e2763f99ac5f51895c9032a8c0ff7a441c9922ff5a3cc6971acb3399017cff5b04a6d1541fbf5251df514cee9502dac6d228d7e169e2d2f6e7f0ab66c6b2b8c1
-EBUILD spl-0.7.9999.ebuild 2778 BLAKE2B cdb8f8d535748223fdf0044a82cc54ec18993570909e73da54c08f60531dad798d190fe937b03addd00f3370415a3d8088650ba6a26d9cb9aa56e8b8a7a90b92 SHA512 c1dfe69fa5b7b04e69e48c47a1edd38c852dc7a8b8a589fce72ffd357476ca7ab013f414bf7ea849cc04ccb3aaec0171709837453c00febf87e124b223702439
-EBUILD spl-9999.ebuild 2744 BLAKE2B e1e8a7fe8e229768ab8cbed29a8d9b5a7d755ae7b4e5074d56701d381508b5e8b984b468f348dedba478724c041e99f723c4338813ac44bf515b44e59e7e5750 SHA512 877677fa40a0e1c1076b1a0c3d143f5161d93f1b89833958cc6e8c0563c732aef32b7e070ac8839b06283c3bffaf3f61619d84bbbbf22348041b602e4b8dc7b1
+EBUILD spl-0.6.5.11.ebuild 2705 BLAKE2B 4961a28af850b8d94691a307cf3b045cf21269d0901155fe1ef14d575ae08b5eb5fc8d6ac2aa53a5f6efd31f1953479127e0ffe43fcf66fc7a7f4558bd5eb39b SHA512 22bc59c1967cd85d74117a76aa85ebc3b30bd444979193b7bf479481dcca55c75a31cb16873ee3b93fcad2e5c86141e8274e71cc025042fb9a997eb9cd77435d
+EBUILD spl-0.7.11.ebuild 2685 BLAKE2B 1050f8204c574867b9c0041893717796820dc3951b3ede273b0d53ace2c36361728fc647ff368ebfb525145b176d7af43eaba7c5bac8c394d43cb818d276b3a3 SHA512 097d3d0aa14617c86bb3106faa039cfc74688376effdec5ca5f11ee5de54beee70274ede52bdb7846c711c31f243e65775dc4cf0991d77b4f987e1412ab04d59
+EBUILD spl-0.7.12.ebuild 2706 BLAKE2B 7152aaec08023c166b894d843749e9aeabbec5db3bc79d66e665687f2837b5718b13be491cfefeced51c22cda9b37b3f60d9e03e9e4044deeaeb67f6263efe35 SHA512 a298b643d9e4a2efbfe552b76e04c5078b34a7dfe997a3cee2a91b01e24775448023bbe943dcb36cb7db4547a1e24367644a41b0aac90446cb23de3585524250
+EBUILD spl-0.7.8.ebuild 2684 BLAKE2B ef7ca0d1783aa6c5afcbe382cbd771f5212680e7f395af5336a0feaf983031f1ea21cdbfa5c271f35dcbc9f348219dd7996beac937ff13754df07082265519b1 SHA512 0a9c349fdc90066ac0f1e21fee71d9d89aad17f125f82cd0aeafbf7fd7256738823eef63c40456308e693b7e13e027c120e78c29f4052039fa1f6cc5ce3eb8cf
+EBUILD spl-0.7.9-r1.ebuild 2881 BLAKE2B b5ec81b194584dc6e5cb88507873b7be4b0e7ec92c39a7734cd663249d33558fde3342764f72d235cf098aa1c120070c2b6bb45b290a1583a81d5d6b42de31b0 SHA512 64d03d5c0136d593b1b2a1c72de71eaa3f9652d40d1440a9983aa2e534292f7d3c72fd4293f3c5e9f0e9e1a0e021fc1d1d5216ff837254caedfb858a2b09c8b7
+EBUILD spl-0.7.9.ebuild 2684 BLAKE2B c78ad353e91308e4f7d345e307157aef63b31c9afb07b38b0976fa550472ff8ee53e06f3527cbb10abb3930b65256e0b13f929177dc23027a69a50c57bf32245 SHA512 9f2bcae29139765ea6e46e8c6828a69f13bf86b164b71076fac535f95cd038f61f81e23abe0c585540a9ab6c0e0b12d92ff3f44723f7c258d369f6bd23aa39d7
+EBUILD spl-0.7.9999.ebuild 2776 BLAKE2B 82d83ab1c4ffa933e178e7607d1193a4ef9a715d5a823b0f82c1f37ca1c907625515c1c689cd27dd19f5d7d582b53676960185c6cc2c8eacac4d8c310305175a SHA512 76bd9c1ed4562a03448b6413c973c3bb80cf2b876b1d8a41a95d462d8f959fb309ccb40386243a4dfaff98241a637a594677e0f5ccdf9b72a50aa1cd23faf6fb
+EBUILD spl-9999.ebuild 2742 BLAKE2B be3eb43205e604b86c49b960f9db73d5f5456bcbb06995a50accbb0e2003429f97612bd26682e4f1ae980b219c72effc19c5fcb15ba14599ea1bc86c314381cc SHA512 97fa2aa734c5bdc83b83759cc9e0e31755e658e5569f5f2b7f248425d265c8da3d0e4d46913e793253adebc734d1eae7a9687278193f7feac55c2b98c70291a4
 MISC metadata.xml 433 BLAKE2B d911e255347ea6ddf13c56903332d32a5acaa1fd6c66302aab9f70431ffbd681a37fb1829335ff6892ca8dc2c08fd653e5119ccf46516a23e8ce5c8bc8840fcc SHA512 7b31d40c8c2a87c9aab15c67503540d0e6ce6b149c7d69f1f6f92402ab5f9ff5795aea77f20e63af593e53b9e43a370cbc764d8586b5bf1f47647e413461dc6e
diff --git a/sys-kernel/spl/spl-0.6.5.11.ebuild b/sys-kernel/spl/spl-0.6.5.11.ebuild
index d527d2919fd0..74b4625dd73f 100644
--- a/sys-kernel/spl/spl-0.6.5.11.ebuild
+++ b/sys-kernel/spl/spl-0.6.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/spl/spl-0.7.11.ebuild b/sys-kernel/spl/spl-0.7.11.ebuild
index 59fcff47c01a..510c66830304 100644
--- a/sys-kernel/spl/spl-0.7.11.ebuild
+++ b/sys-kernel/spl/spl-0.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/spl/spl-0.7.12.ebuild b/sys-kernel/spl/spl-0.7.12.ebuild
new file mode 100644
index 000000000000..d6e0509a0a15
--- /dev/null
+++ b/sys-kernel/spl/spl-0.7.12.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
+HOMEPAGE="https://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug"
+RESTRICT="debug? ( strip ) test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS DISCLAIMER )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		MODULES
+		KALLSYMS
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!PAX_SIZE_OVERFLOW
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 19 || die "Linux 4.19 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=all
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+}
diff --git a/sys-kernel/spl/spl-0.7.8.ebuild b/sys-kernel/spl/spl-0.7.8.ebuild
index 871dba52938f..6aea5d09bc31 100644
--- a/sys-kernel/spl/spl-0.7.8.ebuild
+++ b/sys-kernel/spl/spl-0.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/spl/spl-0.7.9-r1.ebuild b/sys-kernel/spl/spl-0.7.9-r1.ebuild
index 8d4bead61154..1cbb3fc1e4ee 100644
--- a/sys-kernel/spl/spl-0.7.9-r1.ebuild
+++ b/sys-kernel/spl/spl-0.7.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/spl/spl-0.7.9.ebuild b/sys-kernel/spl/spl-0.7.9.ebuild
index 5295e9d967fb..b14f1c060c5b 100644
--- a/sys-kernel/spl/spl-0.7.9.ebuild
+++ b/sys-kernel/spl/spl-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/spl/spl-0.7.9999.ebuild b/sys-kernel/spl/spl-0.7.9999.ebuild
index 69d32ece0724..2a659b0f0f06 100644
--- a/sys-kernel/spl/spl-0.7.9999.ebuild
+++ b/sys-kernel/spl/spl-0.7.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index b39cb38557a5..3a5480a6f98a 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ fi
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
 DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
+HOMEPAGE="https://zfsonlinux.org/"
 
 LICENSE="GPL-2"
 SLOT="0"