gentoo resync : 25.09.2021

3 files changed, 73 insertions, 2 deletions

diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 8b435039adce..624c133314e7 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -5,8 +5,10 @@ AUX aboot-pt_note.patch 8966 BLAKE2B 63918ae7d2e7c1f40dc152a4766b48e35727c81ff91
 AUX aboot-respect-AR.patch 302 BLAKE2B d4c13c57c9f5a508f02048b88423e80d5013b4e9e37aad2bb95eeced7b712c39524d5cd755d27140491bb23a0b338896f0a5c41a23976fa03f7c76d36f2361fc SHA512 0c5288302b11c850abd673aea0c6edf8482d40d8c0189c9291f015cf088a3d39a70b0f562c1eaa27005b8119d095de3b3c052db21c5d6b3406e6a787f389e103
 AUX aboot.conf 295 BLAKE2B 0038c41f8f2e9cc7cedc0e1d0f70ee7b99425ae5bed44e4701abe2bd7c32bc5fcbd521de03ccd6a040748c9f843042317d8c545b4b74268577519dc95e20ec9b SHA512 2dc56371223f6dfa19d13feaa9e33655997f571309ba9158e265051b5b9fe3e2f79ccf66385bde8433cf8b5cd0cb95b3036de43f93392c31a95638039f658e30
 DIST aboot-1.0_pre20040408.tar.bz2 115062 BLAKE2B 49f1b45abcd4726fd036e24709d10bbfea42cee03293e31b2deb3aec383c1c438602aa97d3909516ec9864986dfcf82612fe7644b47e3e2760bdf377313446a0 SHA512 b1fff7ce806336f89efe8239108a8547053f22727cba93cea742995432c4f35133f8dc619588390ba6e0d114e2fd62b80b730443e6c18900aa2a8832ddd4ebfc
+DIST aboot-2.0_pre20210801.tar.gz 173477 BLAKE2B 54c38a98b9e3e956f08b4fcca6a4f3351364d7774a915916aae8af67237982635a2686c1df0628fc28dcc2443da8ad57be822c8530e1580261c60dde73f00519 SHA512 57181897147bba65e8b216af262bf2d2e57cb76bd809d8207439dbfbe84ff550cf9a43c0f10f9925e54ca21660cfe9441c7607743ff3f7613c1e22e219708081
 DIST aboot_gentoo.diff.bz2 9527 BLAKE2B 2492b456f7411630b6ecfb19db775969b69a35c0ef31b2146fd353aac78cf4d3c9ef2162cf54ab4ac025c65607219b3a33a74d2105be196e6dda54dd2509c1f8 SHA512 868a73fee56e9bf6d986175a6a4dc321ed12fb78d74dfb8f1a3e35274577ddc9ea0820768b44836403587b3976ad8dacdcf6562a9ce5c45981c752670901155f
 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 BLAKE2B a264d7999ed7735e42ea21f8cf96b60ca1bdbfcb76dbdfcba14a849043e1f6a9109cd72bf5b91b9ab877dc3025ce6a9270ea914cf277b8f77cecff703646a7ec SHA512 99849928eede0c4b101ddc9179c0974cac6b4f18803dc98b72dcbe80cea88d3062f709beaa1b890edbed9c147be0dd516065d4cee945164b5d9f19f7a3cf249d
 EBUILD aboot-1.0_pre20040408-r3.ebuild 2643 BLAKE2B 42cc709c24a16cc6a1edde9833894159a8f16b3ccd0328148b03dba0fe04e3f42ea66616c999e974fd82c13a0df587ff8fbad8e0ad5d0460e67abd20f7742b90 SHA512 4a86c1b908e70c83ef306c756bab15fe7a36cfb2677b178334deaea6f46cc391b5a743a5b2ab4d5cddaf7675ca7a75645a50ab5f11e4cf3327776848e4df5d89
-EBUILD aboot-9999.ebuild 1918 BLAKE2B 32d15635932447d804c78f47d8f8795cad5a96a6fb3088ffb479a07c90a4b27da48d7a187b09d9b90e668e0b9479d781cd9eddf59d05861b66815efa5a281e16 SHA512 ae87fa7a82b75160bdcbed66aa7d4a751fc261277063d1f6cf24174d62a5960587d7cb4be986b57a3d2ed1ce5a9c8c6b5ab811ed81064ab1ab79a7573608a0f2
+EBUILD aboot-2.0_pre20210801.ebuild 2016 BLAKE2B 6b5bc455c34c8775982dd397f03d6d02684938f7db12464b2db6f3e092bf9f1973f2f8210d5e48bb7241446f4af8dee672f130e9f2473b7bf71a08b7456807d8 SHA512 6a3b7ceb8ec510c55ca49607c136e339439dc81d1bd9133722abf2b42c3e77a3e2b8b2905d5fec93f5896757d6a053204ad3fe901c7fa98902e389a3d91fcef7
+EBUILD aboot-9999.ebuild 1920 BLAKE2B 6eb855d8fc7a8c533017f0a10809cbbd435962a250d562620765eeb988a00fe1a6de7c72143cbaa1a309f3d53fdf431400754a1b2150b144539ad70cb0a55a7e SHA512 86084d7852f4269ebf98abe446e53127f1221aee4f6f53a89af519ea0e9bd50bb8ebce259ec69bfee2780b733fd2c136b18b15fd4036fa67b240a2dc9cae3d00
 MISC metadata.xml 339 BLAKE2B 35e599ad19c953888aa30d498be33e8d5788e8d34da3133d7170d42b5b815127c325dffc40ea38bb383b6d0d6894866b05c2386c97b9a1b248addf8a7be03259 SHA512 d33e65b6f82d8f46c3b9be8b554d3ea5ee1043e3057a3cafc6cf44f2e1b01adf10ce5b34f726d704bf152ee642b68053bce89dad2dcc0bf5434f9b54a037650a
diff --git a/sys-boot/aboot/aboot-2.0_pre20210801.ebuild b/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
new file mode 100644
index 000000000000..925430679b65
--- /dev/null
+++ b/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mattst88/${PN}.git"
+	inherit git-r3
+else
+	COMMIT_ID="dde7f7b85f7631668f1da7c0b0ecf7ddbbde004e"
+	SRC_URI="https://github.com/mattst88/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+	KEYWORDS="-* ~alpha"
+fi
+
+DESCRIPTION="Alpha Linux boot loader for SRM"
+HOMEPAGE="https://github.com/mattst88/aboot https://sourceforge.net/projects/aboot/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="app-text/docbook-sgml-utils"
+
+src_compile() {
+	emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) \
+		all netabootwrap
+
+	einfo "Building man pages"
+	emake -C doc/man
+}
+
+src_install() {
+	dodir /boot /sbin /usr/share/man/man{1,5,8}
+	emake root="${D}" install
+
+	insinto /boot
+	doins net_aboot.nh
+	dobin netabootwrap
+	dodoc ChangeLog INSTALL README TODO aboot.conf
+
+	insinto /etc
+	newins "${FILESDIR}"/aboot.conf aboot.conf.example
+
+}
+
+pkg_postinst() {
+	einfo "To make aboot install a new bootloader on your harddisk follow"
+	einfo "these steps:"
+	einfo ""
+	einfo " - edit the file /etc/aboot.conf"
+	einfo " - cd /boot"
+	einfo " - swriteboot -c2 /dev/sda bootlx"
+	einfo " This will install a new bootsector on /dev/sda and aboot will"
+	einfo " use the second partition on this device to lookup kernel and "
+	einfo " initrd (as described in the aboot.conf file)"
+	einfo ""
+	einfo "IMPORTANT :"
+	einfo ""
+	einfo "The partition table of your boot device has to contain "
+	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
+	einfo "must not be part of a partition as aboot will write its bootloader"
+	einfo "in there and not as with most x86 bootloaders into the "
+	einfo "master boot sector. If your partition table does not reflect this"
+	einfo "you are going to destroy your installation !"
+	einfo "Also note that aboot currently only supports ext2/3 partitions"
+	einfo "to boot from."
+}
diff --git a/sys-boot/aboot/aboot-9999.ebuild b/sys-boot/aboot/aboot-9999.ebuild
index d3e6321ec031..2e29e829936e 100644
--- a/sys-boot/aboot/aboot-9999.ebuild
+++ b/sys-boot/aboot/aboot-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mattst88/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mattst88/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="-* ~alpha"
 fi