gentoo resync : 18.08.2019

7 files changed, 51 insertions, 72 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index a191bd431d7d..0b5ce6a72364 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/netboot/Manifest b/sys-boot/netboot/Manifest
index 55bdaee07853..8f15fd8dbacb 100644
--- a/sys-boot/netboot/Manifest
+++ b/sys-boot/netboot/Manifest
@@ -1,5 +1,4 @@
 AUX netboot-0.10.2-ldflags.patch 1208 BLAKE2B e9b6bbfafbb05341d807bde22c0b54a99e17b8f8370065bd8ba8bb20ebfb3cf3495205fd70397303c8e1abdb485b336710f1d1d7ab8aeef4feb6befba91bfcfe SHA512 ab96af0ddd9956c293cf1088597b543e312bb10f535b26e379692dd94b14a34f56d9ee71c1c82e6946702d69f1665a92acff42afe4d0036d56f28c533f8f1bd3
 DIST netboot-0.10.2.tar.gz 1457791 BLAKE2B bd7fbaa1c87990ebac3dfb22f947146b19c199ceb579d32ded9a58bed6bcae34b02a1bf9cf5c079ba389ba24ca6f89fb6b4faf0b3ed028f9fe56b8dc083d8507 SHA512 422e78833c36e9975a77226523e14ebf8b5af5c02e98628ee030459ebf9f26d020551265899e84ea27bf6ab43c4d9bf8edc6722f942f49103bac897c7cc4fa3e
 EBUILD netboot-0.10.2-r1.ebuild 1650 BLAKE2B 47566aef05d0679ab869aefec982c9f1e1f60c8f61170561ed0d9dc2a946869e01ea855aa79fc88a72a94df776b07296a2550ebd49bae92233f058fc34c72c34 SHA512 e0ec5ff39d7ad2fde3216657e2f10a5c178570c1f1b899ab1cac8dea0db5560b4bc96a2d95f23fd196c776d9eddf599b3523d2cd64a793ea4d020bc17009af77
-EBUILD netboot-0.10.2.ebuild 1116 BLAKE2B 585efcea4dd20dfb07605e41b1dfeb44f81edc8ab2952198258156d18d87a1849c6cf7b6f511eb19353625c6f549d779e72b425ed302535301b0c14c711524d7 SHA512 13c6c05c03f5878a7f883bd5140182495b154bcc66b3125d769f751e90ecba83e56cb851f364c0c06b6e2d7618057b3a8fcbb499af108b20deb5ecddece312b2
 MISC metadata.xml 960 BLAKE2B f2262581782a9583c19256558cef60be3524fcdf054ccb0a80497bb5c284b7101071ebf258b4ae4f8c26e2085c47fff2b59701a3f25b4b2dbb6a13c545bb1ae3 SHA512 a7df07a46e8bd89d1a32f4def00f91956c63c0452f46b5482b5f26e579f0509f0f4ca736127c9c88bc83c34c9d849bbd3be7992ef57faa766251f63139e7aa22
diff --git a/sys-boot/netboot/netboot-0.10.2.ebuild b/sys-boot/netboot/netboot-0.10.2.ebuild
deleted file mode 100644
index 861a4089eb28..000000000000
--- a/sys-boot/netboot/netboot-0.10.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="netbooting utility"
-HOMEPAGE="http://netboot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=dev-libs/lzo-2
-		>=sys-libs/db-4"
-RDEPEND="${DEPEND}
-		!net-misc/mknbi"
-
-src_prepare() {
-	cp -av make.config.in{,.org}
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	find "${S}" -name \*.lo -exec rm {} \;
-}
-
-src_configure() {
-	econf --enable-bootrom --with-gnu-cc86="$(tc-getCC)" \
-		--with-gnu-as86="$(tc-getAS)" --with-gnu-ld86="$(tc-getCC)"|| die 'cannot configure'
-	# --enable-config-file
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README doc/*
-	docinto FlashCard
-	dodoc FlashCard/README FlashCard/*.ps
-	mv "${D}"/usr/share/misc "${D}"/usr/share/${PN}
-	rm -rf "${D}"/usr/lib/netboot/utils
-
-	dodoc "${S}"/mknbi-dos/utils/mntnbi.pl
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins "${S}"/mknbi-mgl/misc/mgl.vim
-}
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 8fcb35268437..265127c34a70 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,8 +1,9 @@
 AUX 99palo 19 BLAKE2B 6c0aef7b3b54456a283f112c2046ae8d4d99633c8a7ac943d1a8f826275d6521ed1d4ca2c3fa166a50cb4fbdbf06c9f948907b967012d8d886a123752ffc7c71 SHA512 1ca106eff8f34386b5fa6bd9f0bfb656567040a2d3bc18de8f6913c3b533369f7c267932904556517f599674226feec8a09df6965bc8f844cb7ca873f5f5d174
 AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470e65bf39f9d33f19f42961f928f6a6e3ec69665750a0d1d90c66a4ab8479beb0d653a9e6a930d03b2bfadb8d65b SHA512 1c92b555f1456623e8657b33067693e4e13bbbbbebd55b13f2f6c86615133a39789cf323601993ffbcfac6c7f9e322ea4a1422f5663083d0b07f7efcdab34ab4
-AUX palo-9999-toolchain.patch 397 BLAKE2B 7de7df2ca1d2d76f2c3cf72f78682686b6a9b8959287ae91dbd8c8cd804c75d3271ff33ac348abbf06b6c1e554d88d6f2bf2c714517df0d48fada24b71721a32 SHA512 96dc88d06a40b4cf6c36ca50aa5518e7c7f68c52f4cb9174e2b97a186fed1939f80082bcb4a8c50fef1902cbfc0103c41f7f7268785996d65c2878ffd0541b2f
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.00.tar.gz 124484 BLAKE2B b46b616acf51534382f6a775b456cdcbd4771d6bc9d7a8339ad788a5c5a4a333e98a6e4815c40a6750408b1e8168a19800da11ddf7125621f77d478a651d9c75 SHA512 b6dab81e6c2641a64a40561a65b5412ee702136ac79dab94619e0094faf011e158c67e681f45d5aa51423f5f162da7c1fd07b391b58e8a2100e1306eb7148056
+DIST palo-2.11.tar.gz 129144 BLAKE2B 25ea9462e7a87da333ace52be624aab65cc1fa4d20848bdec4ba1cea468b3ecd850dd7ceb936e9f2bd5761add766df65d054dc1b5d3f9cee991e9b3e4ddf864a SHA512 26e989ce0c652d6fafdc98d3ab3564d4adc5c943e3d44b0275beb8c385ad52cad0a29ad360e4992fb35c0f2036e29d3eee9b8f6594a53eaea9c3b973a60d9029
 EBUILD palo-2.00.ebuild 882 BLAKE2B 1dd41909eccd63f451b5e244d5cb6aef7ea70b51a2a59c70f2fda1e260ce103d43326c551efc703efccebd2fd7507d913ecbed06a18a0924fb4a9db003f7a449 SHA512 d58a792304194d3d8a5ff652292f3a4d990ea058c9f1b9b50063620fe1b686e8abc23a4e30c378f6db87622ed4b31e7c04b21837a562c68d3f832ccd9b7edd93
-EBUILD palo-9999.ebuild 960 BLAKE2B f532e29106d43de89eada1db3e601b668aca0b74c5ec53a50b5b38bc3f9c76fbef52473f2245da02a3cd13b21ace7f278cba4b4dfd4632996cf27e06ea640b0d SHA512 10a18e601b961741ca4f28c9597b13c825f15375869e85858508c1d213c23908c38670a23d3366144c49719a5b0d7d6a708609a80b9652212d40b9372eccd6bf
+EBUILD palo-2.11.ebuild 860 BLAKE2B e3f78d1c29436f352f5b82ee77ab8df66e62090e737a4aac8448529de724788b316877028c032c8dfb5cab0a844a6759c28f7042889891a296fbaefbf77f9975 SHA512 9b9b7d6a95b32375387f199cc4b92bed2ffc5a01053a06d33b2d2dd774795c325a634a4fd3ef9fffe008f5e8269a639d2b31be41a335e572588b8089a40cd0b4
+EBUILD palo-9999.ebuild 947 BLAKE2B 16b35ad0d3a63090cafe43747ccdefb093dade8a9c645bd7d8b1da7c3e9a211694983cc98692926ec08db7abd1cc1f851f87d58445b82baeddbd4458ae91bfc5 SHA512 640752c59c52830fe9b7ec464cc07fbcd7642eeb21aeb923f93d16df241ff0aa9ffc5d6de5719ca0c21ef263dc927036bfc728cd72832fe5900ba99a0350c88c
 MISC metadata.xml 318 BLAKE2B 0d17e33c45886d0c0e03044b5b2513d44c1bb4a28d758a8575929536e866419328c68971ba3f324a5677ff68bf37b38a22645e4b02810a118b5f18026d0476c4 SHA512 7ff12a5eb42ac39840f8c9eb78b24aeecd9cbfe780d11eccd75fd6f02b11f4abafd514bc32f47f727047b069e446e9252914dcaf5c33d6f1054981a3c175fdef
diff --git a/sys-boot/palo/files/palo-9999-toolchain.patch b/sys-boot/palo/files/palo-9999-toolchain.patch
deleted file mode 100644
index 4869f7e6a4e4..000000000000
--- a/sys-boot/palo/files/palo-9999-toolchain.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/palo/Makefile
-+++ b/palo/Makefile
-@@ -10,9 +10,9 @@
- OS := $(shell uname -s)
- CC?=cc
- ifeq ($(strip ${OS}),HP-UX)
--CFLAGS=-g -O -I../include -I../lib -I$(PA)/include
-+CFLAGS=-O -I../include -I../lib -I$(PA)/include
- else
--CFLAGS=-g -O -I../include -I../lib -D_FILE_OFFSET_BITS=64
-+CFLAGS=-O -I../include -I../lib -D_FILE_OFFSET_BITS=64
- endif
- 
- ifneq ("$(wildcard /etc/debian_version)","")
diff --git a/sys-boot/palo/palo-2.11.ebuild b/sys-boot/palo/palo-2.11.ebuild
new file mode 100644
index 000000000000..cf05c9a92a79
--- /dev/null
+++ b/sys-boot/palo/palo-2.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="PALO : PArisc Linux Loader"
+HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~hppa"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.00-toolchain.patch
+)
+
+src_compile() {
+	local target
+	for target in '-C palo' '-C ipl' 'iplboot'; do
+		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
+	done
+}
+
+src_install() {
+	into /
+	dosbin palo/palo
+
+	insinto /usr/share/palo
+	doins iplboot
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf
+
+	insinto /etc/kernel/postinst.d
+	insopts -m 0744
+	doins "${FILESDIR}"/99palo
+
+	doman palo.8
+
+	dodoc TODO debian/changelog README.html
+}
diff --git a/sys-boot/palo/palo-9999.ebuild b/sys-boot/palo/palo-9999.ebuild
index 7800f7b0c900..c7ae9c107e1b 100644
--- a/sys-boot/palo/palo-9999.ebuild
+++ b/sys-boot/palo/palo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="PALO : PArisc Linux Loader"
 HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS=""
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-toolchain.patch
+	"${FILESDIR}"/${PN}-2.00-toolchain.patch
 )
 
 src_prepare() {
@@ -32,6 +32,9 @@ src_install() {
 	into /
 	dosbin palo/palo
 
+	insinto /usr/share/palo
+	doins iplboot
+
 	insinto /etc
 	doins "${FILESDIR}"/palo.conf
 
@@ -42,7 +45,4 @@ src_install() {
 	doman palo.8
 
 	dodoc TODO debian/changelog README.html
-
-	insinto /usr/share/palo
-	doins iplboot
 }