sys-kernel/gentoo-sources-kernelimage: use mount-boot eclass, fix bashrc

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

4 files changed, 22 insertions, 29 deletions

diff --git a/sys-kernel/gentoo-sources-kernelimage/ChangeLog b/sys-kernel/gentoo-sources-kernelimage/ChangeLog
index b821f1e..f9ae063 100644
--- a/sys-kernel/gentoo-sources-kernelimage/ChangeLog
+++ b/sys-kernel/gentoo-sources-kernelimage/ChangeLog
@@ -1,3 +1,7 @@
+  19 Nov 2019; Agostino Sarubbo <ago@gentoo.org> files/bashrc,
+  gentoo-sources-kernelimage-4.19.79.ebuild:
+  sys-kernel/gentoo-sources-kernelimage: use mount-boot eclass, fix bashrc
+
 *gentoo-sources-kernelimage-4.19.79 (21 Oct 2019)
 
   21 Oct 2019; Agostino Sarubbo <ago@gentoo.org>
diff --git a/sys-kernel/gentoo-sources-kernelimage/Manifest b/sys-kernel/gentoo-sources-kernelimage/Manifest
index 881a780..48daf40 100644
--- a/sys-kernel/gentoo-sources-kernelimage/Manifest
+++ b/sys-kernel/gentoo-sources-kernelimage/Manifest
@@ -1,5 +1,5 @@
-AUX bashrc 635 SHA256 a123aaa2fd47326f33dfe9c8bac06adfcbbcc8d30afd75046ddf7e56bd55f9cd SHA512 9f415083ce36a6cdc318fff343b05281974b2d416c2921eb014447dc587ddd65e3263fa761a89f2341b991cc782b7d37593d6c4bc50e2d18a61db245af3340d3 WHIRLPOOL d4d197662e506519f4b964c596964b720e43c8b230dc28575c677e9c66a215700128908ad18b0af3a68b0d0b2b1fbbd35b30af416935f35b276c6dae226ce465
+AUX bashrc 416 SHA256 265fe4f8ce8362ce905c174c4030498763e9d3de1448ec5b5c301d7082ed51be SHA512 8a32847265a91deabc9e132c0650f57901de5bf5de7cc6f66eb52fc16b9c3c5b72a3307328b5199110b4aa54de1e3f1936b7ff3563dcaaa6e3d4d470d15c3e50 WHIRLPOOL a73d42a23571f4ee11fe748ff17ffda93959d94520041fca8d82802255d6d4d1eafdf743aa8f7c5b1474b3efba9f5b20373b793390e5e7c926f41d91a0c8b910
 DIST gentoo-sources-kernelimage-4.19.79.tar.xz 55641164 SHA256 42b9be5df13f683a5b76d34ca9a276e64eb67365eaf2c811877bd33715b2a288 SHA512 e015b52c7e699b50c7d1fb6fd21155ccd25534b393347f4732a7494c566911b0c0cf2648fe708bf8d78d8f3184390ee5e1c8ef122b3d431bf8395e886f7eb8da WHIRLPOOL 7980cd82f05661063bcb78c12937f885f26ed6a35abfed620278581a31bb0f55ed29dd1245f3b0a43bd10e87bda37e5ed1963a334bb02c5da192a27d6941a31b
-EBUILD gentoo-sources-kernelimage-4.19.79.ebuild 996 SHA256 376c4c1582fdd9bf4062b2f6beb52210eb0ed48ef04df6d178f3e6f35173173d SHA512 90ec350d4511c36885f9e0e37b81f16bf33aa626cab4bf89f0b284ee9e6ff6cdbe47d4e4a2ad028a832f64ae87a5838103dd92f22f5ebad594b2454a9fedf6db WHIRLPOOL 62b2e54d43a3d1eec6effacc23964372e4c35dc98037d41300fa96b41fcf054c957296f95086ede2ae74d2b54844a846fdd0decc6fc2884f29a78a7df09a9963
-MISC ChangeLog 1593 SHA256 b1138df48994a49e77a5e5a74c52585a6afafc3f162b93fbc640a4743ed54e00 SHA512 0b4210504820cba9dc597b1fd89d851807f62c8ff5a6d0b0c3a7766167f1b649e289b183b8373dc10620afd5d8288fa6c8aac8a6511b6c539b023a8653123d39 WHIRLPOOL 221014256a53c3266e0f4a58f406ca30f87ab62c093cc82ef18ba30f71ebb5cdd3b590210d41af32e6a9d53cefe5974523268cb155b28ac4ca7a457edc4cf1a7
+EBUILD gentoo-sources-kernelimage-4.19.79.ebuild 853 SHA256 e7a8b14f2c91f327d1adbcc56d4936a68a3863feb0dbe3cb9b67d46294871581 SHA512 0725794f09fe230f0a4697efcc418dae137d276df5d3a72ad48e2e057b6534885ad1093cc36a0746e16e56102e981ce5cadfb82bf21deadc7ad304bae68201ee WHIRLPOOL 4469b67eeae72f8603ca61f6715902ed3a0231a4d32fe95855380df7afd0b3a41f25a60b3eacb30728f230a3e6ab0bc5d3675779db448def73afd3bea1399720
+MISC ChangeLog 1777 SHA256 83ced41a52ab512bbacff79df8e31457e1e00954f684d89f428c97c6fcf50139 SHA512 edaf9921c7458742a323cb3dd647a46b7892ee3991309200af5cb160126a84ccf5842d30933d255f5c7cc539fd178cb1f083b78db204ad09a7ec7cf6df6ef322 WHIRLPOOL 21af799e7feb11355f75ccd8bb74056492f7358cf0c0f8033667cef00a0341e1a8431a129225dc9f7ba1acc256fd7874f673b5ce654a419113e6ce250cbf53fd
 MISC metadata.xml 252 SHA256 0df10ba8b53ce829ea0fdf3b8f808ae371f24235ab02a7f94967fe0c2d7845bf SHA512 1f9486ce3b84ae866622da9d6e26a3e873467fe1607826fca6b0cc2f6091b0c8f94c4cff6717c57419867ac74bd371c0ef8f035ffb1ffcb1c4cbfae86f544ab5 WHIRLPOOL f993df191d6ce02786a5a2234510fbae80c9e1e1661c2a89cfe71be92cf5668fda737e28faedb21765de32526df074b3ef4eef6f5110020aa8232b1cb85aa7dc
diff --git a/sys-kernel/gentoo-sources-kernelimage/files/bashrc b/sys-kernel/gentoo-sources-kernelimage/files/bashrc
index 68d7ddf..f16aa53 100644
--- a/sys-kernel/gentoo-sources-kernelimage/files/bashrc
+++ b/sys-kernel/gentoo-sources-kernelimage/files/bashrc
@@ -1,29 +1,15 @@
-function post_pkg_postinst() {
-	if [ "${CATEGORY}"/"${PN}" = "sys-kernel/gentoo-sources-kernelimage" ]
+# FOR THE FIRST MERGE
+function pre_pkg_postinst() {
+	if [ "${CATEGORY}"/"${PN}" = "sys-kernel/gentoo-sources-kernelimage" ] && [ -z "${REPLACING_VERSIONS}" ]
 	then
 		grub2-mkconfig -o /boot/grub/grub.cfg || die
-		umount /boot || die
-	fi
-}
-
-function pre_pkg_preinst() {
-	if [ "${CATEGORY}"/"${PN}" = "sys-kernel/gentoo-sources-kernelimage" ]
-	then
-		mount /boot || die
-	fi
-}
-
-function pre_pkg_prerm() {
-	if [ "${CATEGORY}"/"${PN}" = "sys-kernel/gentoo-sources-kernelimage" ]
-	then
-		mount /boot || die
 	fi
 }
 
-function post_pkg_postrm() {
+# FOR THE SUCCESSIVE MERGES OR UNMERGE
+function pre_pkg_postrm() {
 	if [ "${CATEGORY}"/"${PN}" = "sys-kernel/gentoo-sources-kernelimage" ]
 	then
 		grub2-mkconfig -o /boot/grub/grub.cfg || die
-		umount /boot || die
 	fi
 }
diff --git a/sys-kernel/gentoo-sources-kernelimage/gentoo-sources-kernelimage-4.19.79.ebuild b/sys-kernel/gentoo-sources-kernelimage/gentoo-sources-kernelimage-4.19.79.ebuild
index e721210..7012198 100644
--- a/sys-kernel/gentoo-sources-kernelimage/gentoo-sources-kernelimage-4.19.79.ebuild
+++ b/sys-kernel/gentoo-sources-kernelimage/gentoo-sources-kernelimage-4.19.79.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit mount-boot
+
 DESCRIPTION="A 'genkernel all' kernel image compiled on gentoo-sources"
 HOMEPAGE="https://www.gentoo.org"
 SRC_URI="https://dev.gentoo.org/~ago/distfiles/${PN}/${P}.tar.xz"
@@ -11,16 +13,14 @@ LICENSE="GPL-2"
 SLOT="${PVR}"
 KEYWORDS="-* ~amd64"
 RDEPEND="sys-kernel/linux-firmware"
-RESTRICT="strip"
+RESTRICT="binchecks strip"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]
 	then
 		ewarn
 		ewarn
-		ewarn "If you have a separate BOOT partition, is highly recommended to configure a portage HOOK."
-		ewarn "This is needed because the boot partition needs to be mounted and umounted."
-		ewarn "You may also, want to configure your bootloader."
+		ewarn "You may want to configure your bootloader by setting a portage HOOK (/etc/portage/bashrc)."
 		ewarn "A valid example is available into /usr/share/doc/${PF}/bashrc.bz2"
 		ewarn
 		ewarn
@@ -28,9 +28,12 @@ pkg_setup() {
 }
 
 src_install() {
-	dodir /boot /lib/modules
-	cp *genkernel* "${D}"/boot/ || die
-	cp -r "${PV}"-"${PN}" "${D}"/lib/modules/ || die
+	insinto /boot
+	doins *genkernel*
+
+	insinto /lib/modules
+	doins -r "${PV}"-gentoo
+
 	insinto /usr/share/doc/${PF}
 	doins "${FILESDIR}"/bashrc
 }