gentoo auto-resync : 24:02:2024 - 23:40:37

11 files changed, 29 insertions, 101 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 439af590264b..c92780db90f0 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index f75e8f60287d..f4757a338204 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -61,13 +61,13 @@ DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c2610
 DIST zlib-1.2.13.tar.gz 1497445 BLAKE2B 73cd65f287d662a988287205b74e93d516d6a74e18555d0f1a2777557e73e81249b45341c687fe97e65406a7210f77b8914ed146bac517d3fcc4c9fcb16546d3 SHA512 99f0e843f52290e6950cc328820c0f322a4d934a504f66c7caa76bd0cc17ece4bf0546424fc95135de85a2656fed5115abb835fd8d8a390d60ffaf946c8887ad
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 DIST zstd-1.5.5.tar.gz 2368543 BLAKE2B 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 SHA512 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
-EBUILD genkernel-4.3.10.ebuild 11866 BLAKE2B 8fd79f0d5c4b0248ac4824b43dbc0b9069a4613ba140af10bc4c8d169e62f7122e62ca546b97a95b1f6714ac12a0aab0a3f9c4776bf75ad2da67d3acb758ce0a SHA512 e78fd0f1e8d8b5c7504b7574640b77799c7d0d30a0ae0b800bdb2bda54515fe23c1e0fe10d68ad183850a0cd204e130bc4bfab69695b7c0a56e75c5ea7490249
-EBUILD genkernel-4.3.2-r1.ebuild 11814 BLAKE2B c1df24ccd2c4f4b86089be357abbb707636b8b4044c4a4bb01f174fafb34b9a2ca9010f95eab4652032276929856f8780eedd2ebdf3c597b083236897ee35358 SHA512 c641f5f79d28fad0a83b69127f61990b6866d3eec122c682cc9b0ec9a7095260b5d85604679ef999501713d0e5fdf5bdc9feb5de25979c4e766248dfbe8e9047
-EBUILD genkernel-4.3.3.ebuild 11776 BLAKE2B 48ccc69eb2bdfcf78acd6a464f5bcdcd2a323d81a283d30529e3b673015284e4741f8d2f5da6009358bf2a7d81fb80c500f0149c2eae1331d93dcfdb842693f4 SHA512 d495a829b1ae85dca0429e3351d78d7c62245cbbc3b608ecdb94da9d199e1dd12a5acf4731ea0cda43ea10a9c360f0496d23527955b78b8694fc5b377469719e
-EBUILD genkernel-4.3.5-r1.ebuild 11841 BLAKE2B a09cf59d383f7ea193e28f0eba9f74d0571919a8547fae13de5d651148bb2b9bb07b78d4500a3aaf162b302710251cd71414854779ac040cfe08a7059a0a4e2f SHA512 731ec3991f5d19201517bc0fe1835643daf53fe71619be0d32e205cf2791cca8cef663e1f265c1dc3b03fe3c619d402fa2b65994b6d8a678b22476e95676fb98
-EBUILD genkernel-4.3.5.ebuild 11781 BLAKE2B b5e1b518e6a51c5a300966372a5c97b79505752b195b2f41805b2b4fbea992d12b33220b0603035e79e39d0c9af96b1e3ccd006ec6b28ba91567722261dc4650 SHA512 57eca5ccb930b6369da6741489aeb118fa57d9a9b1836420cbcf51889eaed9aed08bfe02fe75f07f766dd86be5877203575de4a73fe946b56b7dfe7fe1b99201
-EBUILD genkernel-4.3.6.ebuild 11885 BLAKE2B dd59ac587f12d1d10b03c09c5d9dd2ed667ef3373ad6b17069dd0c18bd0ed576e6d85acbc41e1b23e8495af83182f96ec6d982149ad94669747854a9d51cf4f1 SHA512 f2d03b9d97ebb0b7bc2bbe8d6848597ec5cbb9363b75938f24c205c51f9ef9abfc7738eca0a33a47a9e0db8e4da25286b39faab2b476b7844b656b1d7112a9a3
-EBUILD genkernel-4.3.7.ebuild 11893 BLAKE2B 853da970e01023f21dea1b1a9c048b08445904905cd3228eddd296e1200e563be06127d1fb1e06eb56110502bd0f16eda18b06dd682ca49356d58502cc1744b5 SHA512 f6c50321c2fb15ca76e8636a41486f84567fbc740df19219a8a996d5441e10ebdc49269202b050487959775d4c3d899fe1139fdeb0fa2d584bb414d085c4a317
-EBUILD genkernel-4.3.8.ebuild 11893 BLAKE2B 853da970e01023f21dea1b1a9c048b08445904905cd3228eddd296e1200e563be06127d1fb1e06eb56110502bd0f16eda18b06dd682ca49356d58502cc1744b5 SHA512 f6c50321c2fb15ca76e8636a41486f84567fbc740df19219a8a996d5441e10ebdc49269202b050487959775d4c3d899fe1139fdeb0fa2d584bb414d085c4a317
-EBUILD genkernel-9999.ebuild 11893 BLAKE2B 853da970e01023f21dea1b1a9c048b08445904905cd3228eddd296e1200e563be06127d1fb1e06eb56110502bd0f16eda18b06dd682ca49356d58502cc1744b5 SHA512 f6c50321c2fb15ca76e8636a41486f84567fbc740df19219a8a996d5441e10ebdc49269202b050487959775d4c3d899fe1139fdeb0fa2d584bb414d085c4a317
+EBUILD genkernel-4.3.10.ebuild 11844 BLAKE2B 95d0a01a83d247e5625cd7bf33b27bdd1e1454574b0a17fad9f261cabfb8f994a1971d913df16c24be70e7d627c8f377b8ad2a048d9f02a7b933b0be433cc23f SHA512 677b2dd5d9cd89d3d38242f1db148a4e97001dfcd2cdf3d9e7b24b89c2baef086dd3a5229d45b82e7f7446197bf6ec32568d61309a3bc3758acbd7c4a9ea299f
+EBUILD genkernel-4.3.2-r1.ebuild 11792 BLAKE2B 4518af2db85db3e10217dd6d2b9f550064928bcfc741e42b22f659c301a25dac32389da077d942c6af983e8918b60c1cfe365c761d2e9e7cd6b4efbd1db7cc15 SHA512 e423c64f3314ea307ff24b6ee5bf7a2147802e9595bc1108840543327574538ab8095ceb43e2212da73001c81fad04566919ba54d1b1244f723099a95de898b9
+EBUILD genkernel-4.3.3.ebuild 11754 BLAKE2B f60e4f3f33b2b913f9f86db258262f27e3d56ad86fe9dbc7836ae18eb9500809cbc47f3246d6cafcff839f98f8f89a1b28d8dfa1c0f1b705e895187ca529c481 SHA512 c61d8f31e5022134977dadeba99117023087c6e8e8e7781938eec3e7cef67021279d4cf5f5952f23f13b5aea594ffb0849e2c7832fdbf527c6280fca172cb25f
+EBUILD genkernel-4.3.5-r1.ebuild 11819 BLAKE2B 70fce946850cd361633f4f385ef31c571f02056647d7d28808ca5ae7f5a71e4d66c638c87dede01fe84a6a460ef4594ba96a65d83cf617f563108481dd7160d6 SHA512 f9c4ed9422e0972a3d4b763e7da89686b0d4c4c3e0fd23b0377ce9af91e1c8e0cdd8187bd97d2fb61f5e8e7eb0ee42836d9664d36d8e91a22a3c6f693a6584f3
+EBUILD genkernel-4.3.5.ebuild 11759 BLAKE2B bc95540a140e01d5ad69081f88234fbba640e436cb01b0c3f9d19a138da8a24242b857f7f82c5af3a7a1a1a56feca42717ef97e413aa284aa78c83144b0bde21 SHA512 ab825594fa519300145e75134b32ffca7f248045a6b9d9eb40b4ceeb97758f7013ea6d800b7d48eb9f611e87b2b917a693227b1ae4808b206270d8c5aa6a6b63
+EBUILD genkernel-4.3.6.ebuild 11863 BLAKE2B a12560c20892765892a9fabb328f832bf3932b96bb91c2debca4af4802fb26cbead71ab0e3cd46d711b9721c51719b7837404b803371f674333502b161d37dce SHA512 9ddbf256c6b1978d6d3e9f2e37496c65a50b1f106248bb0be84dd916de15ab4498ba99264bf3e3ae122bef1d24b776f8220c2a0917a12c48eb114b2999e26b18
+EBUILD genkernel-4.3.7.ebuild 11871 BLAKE2B 2852bf0efa01c5e161f03b8d713f7f5c37c6ce5f87cca61bc623660d5f743686827def08582c4c38708d62e41c7359fc5756d2415e55b966f85dd40c562f7af9 SHA512 0f5b4f4eb5403b8b8c8a3e5807e3da96d72d67e0273f7661f023e2eac8e514a47d4ec91fb7c757dabc8bb96674184543ff9f89d28a2700f58480bff9b8295cbd
+EBUILD genkernel-4.3.8.ebuild 11871 BLAKE2B 2852bf0efa01c5e161f03b8d713f7f5c37c6ce5f87cca61bc623660d5f743686827def08582c4c38708d62e41c7359fc5756d2415e55b966f85dd40c562f7af9 SHA512 0f5b4f4eb5403b8b8c8a3e5807e3da96d72d67e0273f7661f023e2eac8e514a47d4ec91fb7c757dabc8bb96674184543ff9f89d28a2700f58480bff9b8295cbd
+EBUILD genkernel-9999.ebuild 9813 BLAKE2B 5c805ec7c9a306ac33ce2db8682f2b44ced8b5a6e6e4e2a3d970d64e71d7b10aa6dd4aa9d76816109f57d496e55379d3fc0aeaa1487b91674177c9d7942c28e8 SHA512 e4cb714f64f4d536f8ff6e7f3d5e63d953cece84071a486a106aae7bb0e9f67b037339992826b6e6f3d4e018849443a429f6f9e2cc12da7528358938de70c34b
 MISC metadata.xml 480 BLAKE2B 8b1b1655cb13d866985a92755b0696bef00841a7626cb6cd10f39d7a7ad196c1ec2f5895f86e23fc3ee1345c48d7c659346d2bc7bb2a2bdaa9c997511f002fd8 SHA512 5030d4505b077faec4e2eb9cb2dcc47195a1864057bcb5f110314bab97b90b1bdcd3f293f76116a23dd0e694c7c8ee66ed46d39c9b7b0c506b22fe23e86febc4
diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
index 505fe3f356e7..231d78668417 100644
--- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -111,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
index 571e5a35cd86..e1b47412c7c8 100644
--- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -109,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
index 5cc642be67ca..7b750e86b11a 100644
--- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -109,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
index 49d4b62d53d8..2801dccffcc4 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -109,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
index 860214201405..d37e61489cda 100644
--- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -109,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
index 8b6f12a6146d..07190a27fbea 100644
--- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -111,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
index 6de5f5963238..03810b3f08bc 100644
--- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -111,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuild b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
index 6de5f5963238..03810b3f08bc 100644
--- a/sys-kernel/genkernel/genkernel-4.3.8.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -111,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 6de5f5963238..46254b9348ab 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/
 
 LICENSE="GPL-2"
 SLOT="0"
-RESTRICT=""
 IUSE="ibm +firmware"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -111,7 +110,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # because genkernel will usually build things like LVM2, cryptsetup,
 # mdadm... during initramfs generation which will require these
 # things.
-DEPEND=""
+DEPEND="
+	app-text/asciidoc
+"
 RDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	>=app-misc/pax-utils-1.2.2
@@ -128,11 +129,8 @@ RDEPEND="${PYTHON_DEPS}
 	dev-build/libtool
 	virtual/pkgconfig
 	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
+	firmware? ( sys-kernel/linux-firmware )
+"
 
 PATCHES=(
 )
@@ -163,73 +161,19 @@ src_prepare() {
 		popd >/dev/null || die
 	fi
 
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
+	# Export all the versions that may be used by genkernel build.
+	for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do
+	export ${v}
+	done
 }
 
 src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
+	emake PREFIX=/usr
 }
 
 src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
+	emake DESTDIR="${D}" PREFIX=/usr install
 	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
 
 	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py