gentoo resync : 25.08.2020

4 files changed, 128 insertions, 43 deletions

diff --git a/sys-kernel/bliss-initramfs/Manifest b/sys-kernel/bliss-initramfs/Manifest
index 3ed75ada86af..1b9938e8a14f 100644
--- a/sys-kernel/bliss-initramfs/Manifest
+++ b/sys-kernel/bliss-initramfs/Manifest
@@ -1,3 +1,5 @@
-DIST bliss-initramfs-8.0.0.tar.gz 28234 BLAKE2B fc1295d9d203e32b5339e42b7c5565f669212e8c17b570b3f8a304dae32ec242c62b74f6dbccacd710b0cc2c4418c3b4a7af64dddc36a52f23881c74457cab7d SHA512 94bf5261cd1ddbf902e026f5e20344aa7def76115009fd18fe67efe65e24b376622ee852236b540452f0f2b2c847debf145602c73dee0113ea0215c7abcbe0df
-EBUILD bliss-initramfs-8.0.0.ebuild 999 BLAKE2B 2fd222dfd84d67b536fab3b5be5541cae81b91ff1143abc472c31ec2e011528ff4c2637c0edd7fb344a0aff7dfd2a3fd88ce4bb61011b0d49a8ed74e9e8c97ec SHA512 117191fcbc23be46ba5a9608a3ae0f5751d7ab6a1cd95c520062b90838e11b85791ede9655781f89639e206d411eb0eb6a72c6ee7a3d6f9233b2a1d9e283d03c
+DIST bliss-initramfs-8.1.0.tar.gz 34464 BLAKE2B 5cc4c547fa9fadc91b21f9e752242dd1f3fa81a589457297c2d058fa811ea08deb3aacdcc5f2448856fd1d1c627037c47796f69b39b9691a60d8b0bcfc499cff SHA512 bee5e206ddd388a06ef876d99e36d0e1587d9148d890761e4d56b27e12c83c9a51794a3c9e99cac70de9729297e27051d6c323986f13cf8b3666a6ec66b85090
+DIST bliss-initramfs-9.1.0.tar.gz 27708 BLAKE2B 920e33e5c63d0c8eec2f17ceca42c6b83c3850714b63fd8d80855fafaea7f5799a22d213fb05e6ee03c9321d2eaffac434cec2822326d18cb5f8bcea5d361eaa SHA512 2ce98a6dd837062accfdcb145f1eba9e93c6f21f41fc6fdeb38f939749a1a86c6971aa9e438f99a06a7fec7013ff19e8cd3dd346cc9aa80b0048c6402c93865a
+EBUILD bliss-initramfs-8.1.0-r1.ebuild 1944 BLAKE2B a96243fc47808618ee4c61dfb2eeb4a2384f3404363613c4212875cfca1d3c627b73950f81815e67fbd9930708561e4d9dd9e2d2fae293631364d81903ba727a SHA512 ea5772e9b2b4fd82937dc7957b91b892d89f2a64ae9c206b60001d8ade937db76031fd153d1f8d71091789dffd78e3a79ba22232ca87e785f3f5bbc6812553e2
+EBUILD bliss-initramfs-9.1.0.ebuild 2073 BLAKE2B 80bf05461d6890294669e309ff91a6d2ecea9b8f6efe7aabfda0ad01ca0ef737f0880cf362afc417c222895001da5bd98bb509f9c48a10ca9a1c1407c567781f SHA512 34c3187ce7330e34eabddbc4d6bb467633a7c21d293d43fd2305a5a3bbc4a71e3f00053651222f81c72ad2e821f5bad54cc02952941aa2a6f6b266267336394d
 MISC metadata.xml 376 BLAKE2B fea14093aca69fbbb74bc94aaeebbf32cd609e7cf3ac4e9fc68151c8a4a60ed6d1979c39a33109978867f72a1b7bb2f09f43bdd978f87c876dfa37207524c91a SHA512 f940dbaec346e821e3d95c58bbb3977103277cc4a969a6ddd8e68b5068b9fe5745bd2c89a7c00236e18833e95c2dbbac0fd2b4ce05ad63f7486195e39c386d55
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-8.0.0.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-8.0.0.ebuild
deleted file mode 100644
index a307b28d0903..000000000000
--- a/sys-kernel/bliss-initramfs/bliss-initramfs-8.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit python-single-r1
-
-DESCRIPTION="Boot your system's rootfs from OpenZFS/LUKS"
-HOMEPAGE="https://github.com/fearedbliss/bliss-initramfs"
-SRC_URI="https://github.com/fearedbliss/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="strip"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/cpio
-	virtual/udev"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_install() {
-	# Copy the main executable
-	local executable="mkinitrd.py"
-	exeinto "/opt/${PN}"
-	doexe "${executable}"
-
-	# Copy the libraries required by this executable
-	cp -r "${S}/files" "${D}/opt/${PN}" || die
-	cp -r "${S}/pkg" "${D}/opt/${PN}" || die
-
-	# Copy documentation files
-	dodoc README.md README-MORE USAGE
-
-	# Make a relative symbolic link: /sbin/bliss-initramfs
-	dosym "../opt/${PN}/${executable}" "/sbin/${PN}"
-}
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
new file mode 100644
index 000000000000..5223e32f61f1
--- /dev/null
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit python-single-r1
+
+DESCRIPTION="Boot your system's rootfs from OpenZFS/LUKS"
+HOMEPAGE="https://github.com/fearedbliss/bliss-initramfs"
+SRC_URI="https://github.com/fearedbliss/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="strip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* amd64"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/cpio
+	virtual/udev"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+CONFIG_FILE="/etc/bliss-initramfs/settings.json"
+
+src_install() {
+	# Copy the main executable
+	local executable="mkinitrd.py"
+	exeinto "/opt/${PN}"
+	doexe "${executable}"
+
+	# Copy the libraries required by this executable
+	cp -r "${S}/files" "${D}/opt/${PN}" || die
+	cp -r "${S}/pkg" "${D}/opt/${PN}" || die
+
+	# Copy documentation files
+	dodoc README.md README-MORE USAGE_AND_OPTIONS
+
+	# Copy the configuration file for the user
+	dodir "/etc/${PN}"
+	cp "${S}/files/default-settings.json" "${D}${CONFIG_FILE}"
+
+	# Make a relative symbolic link: /sbin/bliss-initramfs
+	dosym "../opt/${PN}/${executable}" "/sbin/${PN}"
+}
+
+pkg_postinst() {
+	elog "As of version 8.1.0, ${PN} has a new centralized configuration architecture."
+	elog "Any customizations you want to provide to ${PN} should be done by modifying"
+	elog "${CONFIG_FILE}. You can use the \"-c/--config\" option to provide"
+	elog "an alternate configuration path.\n"
+	elog "For a full list of changes, please read the release info located here:"
+	elog "https://github.com/fearedbliss/bliss-initramfs/releases/tag/8.1.0"
+	elog ""
+	elog "Also, 8.1.0 is the last version to include support for LUKS! Starting with"
+	elog "version 9.0.0, bliss-initramfs only contains support for ZFS' Native Encryption."
+	elog "If you are a LUKS/OpenZFS user, please stay on 8.1.0 until you migrate over to"
+	elog "the native encryption."
+}
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-9.1.0.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-9.1.0.ebuild
new file mode 100644
index 000000000000..042e7d7cf5d5
--- /dev/null
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-9.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit python-single-r1
+
+DESCRIPTION="Boot your system's rootfs from Encrypted/OpenZFS."
+HOMEPAGE="https://github.com/fearedbliss/bliss-initramfs"
+SRC_URI="https://github.com/fearedbliss/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="strip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/cpio
+	virtual/udev"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+CONFIG_FILE="/etc/bliss-initramfs/settings.json"
+
+src_install() {
+	# Copy the main executable
+	local executable="mkinitrd.py"
+	exeinto "/opt/${PN}"
+	doexe "${executable}"
+
+	# Copy the libraries required by this executable
+	cp -r "${S}/files" "${D}/opt/${PN}" || die
+	cp -r "${S}/pkg" "${D}/opt/${PN}" || die
+
+	# Copy documentation files
+	dodoc README.md README-MORE.md USAGE.md
+
+	# Copy the configuration file for the user
+	dodir "/etc/${PN}"
+	cp "${S}/files/default-settings.json" "${D}${CONFIG_FILE}"
+
+	# Make a relative symbolic link: /sbin/bliss-initramfs
+	dosym "../opt/${PN}/${executable}" "/sbin/${PN}"
+}
+
+pkg_postinst() {
+	elog "Version >=9.0.0 is a BREAKING CHANGE! bliss-initramfs now has native"
+	elog "zfs encryption support, and LUKS has been completely removed. If you"
+	elog "are using LUKS, please stay on version 8.1.0 since that is the last"
+	elog "version to support LUKS!\n"
+	elog "For a full list of changes, please read the release info located here:"
+	elog "https://github.com/fearedbliss/bliss-initramfs/releases/tag/9.0.0"
+	elog ""
+	elog "As of version 8.1.0, ${PN} has a new centralized configuration architecture."
+	elog "Any customizations you want to provide to ${PN} should be done by modifying"
+	elog "${CONFIG_FILE}. You can use the \"-c/--config\" option to provide"
+	elog "an alternate configuration path.\n"
+	elog "For a full list of changes, please read the release info located here:"
+	elog "https://github.com/fearedbliss/bliss-initramfs/releases/tag/8.1.0"
+}