gentoo resync : 10.11.2019

6 files changed, 7 insertions, 59 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index d1655add8658..979ae3da309c 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/gnap/Manifest b/dev-embedded/gnap/Manifest
deleted file mode 100644
index a8947d9a9934..000000000000
--- a/dev-embedded/gnap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gnap-core-2.0.tar 12257280 BLAKE2B 709a1a98527d765de9a70e059432ca1a0a53a681d694b989c49809787e2fb0239cf7e52503ce0ae5d91093747519872e71e7f26631b05cec5d95ad9bbde6050d SHA512 3da9ea5a1a64ff9b1dc58b1efca33079bc48823a96c2e47c878d3651276943be7ec03be2d9ad402818263faaf2415dad0b45f479f60b2fd37f8a7d8a4433ffeb
-DIST gnap-tools-2.0.tar.bz2 26874 BLAKE2B 016dccbce6b467d37bce71803c2bde3b3274035b9727ab7f004ef7ed5de97bc9ce0f1d5c666d0dc5c9115f1312864221a5b8316da5cae87fd281dfa7e19d7ed0 SHA512 cd8de371aaeee9b5dac5bebb4961855e78cd173a1de99056671e0071be2376c3fd45fb7d635786ad22f3ff413fbcd6d2b710b7c8ca4e99bdfbb09b31e7bf4b52
-EBUILD gnap-2.0.ebuild 795 BLAKE2B 5821916798eafad74bc9a562fc9b9b3df07c6311ed4e8c3a69540b69f27c54a9d383bdab2d1ada0446b513d9fc4e67d8fba9c3b90eca472065929abb3380b1cb SHA512 c31bf7c03fa693e33719da0d7102a1ac1ad1c96d4d0cb37a824209a59881e5f1173d16a074c09735053515e066734b82f21ebd100622069970ff4c9cec295108
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/gnap/gnap-2.0.ebuild b/dev-embedded/gnap/gnap-2.0.ebuild
deleted file mode 100644
index af43d9a41121..000000000000
--- a/dev-embedded/gnap/gnap-2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${P/gnap/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance building system"
-HOMEPAGE="https://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/${PN}-core-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-RDEPEND="app-cdr/cdrtools
-	sys-fs/dosfstools
-	<sys-boot/syslinux-5"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_install() {
-	dobin gnap_overlay
-	doman gnap_overlay.1
-
-	dodoc README.upgrading
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins "${DISTDIR}"/${PN}-core-${PV}.tar ${PN}-core.tar
-		doins -r mbr
-		doins -r examples
-	fi
-}
diff --git a/dev-embedded/gnap/metadata.xml b/dev-embedded/gnap/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-embedded/gnap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-embedded/pista/Manifest b/dev-embedded/pista/Manifest
index 31df628b27e8..96968a246634 100644
--- a/dev-embedded/pista/Manifest
+++ b/dev-embedded/pista/Manifest
@@ -1,3 +1,3 @@
 DIST pista-0.70.tar.gz 50454 BLAKE2B 515038a133d3c3dcbe5959020c88d6e4bc4e5a8b2bed7c6b0b226064ebde6f5fa91f0af102fe544cb4fba0d0b7e9439bdbecc4516354c6d6daeb5735c2fa72fc SHA512 23125ffff317d7c0de16de76cc572bb4a0aba125dd3b9cd7adb5adb7efe09f7c694c81046fd9ced77e595e25d417044ab3b8a7371a28f7d04c9be794d0436a7c
-EBUILD pista-0.70.ebuild 690 BLAKE2B b4c24789c0430df870d0095630269f34b17aaf60d6874898e92db8608201d1fd2925f1956ba04acd6bd7bc95656e0d92d4c0bfde394604a54bb699ca86bae4ee SHA512 ae43883627c97b42a89d315978668c93bdcdb0650cacee050d80807e14b241f4284e6a91c4675ad33cc41fc10cd1a1c1aa1708c46d8fc46901e26f238755926d
+EBUILD pista-0.70.ebuild 633 BLAKE2B 83836d088bb87e3ac38d3611570a06ca3f0e33d6cf9226e9ab8e9798dbb0f5856db0a1209e0c66441eee6ed9ba755dc1a032d50e1fae38e0a83845cac8b46ad9 SHA512 ef9b446c4e7c10695ac8d8871ab6158e8184a5da7a188315d28c6fd98afd08f80b1adc6dbb2de398cb60c91e709e3f9627227a987a786c08442eb68e264f98b9
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/pista/pista-0.70.ebuild b/dev-embedded/pista/pista-0.70.ebuild
index f9431fbdcf31..5c585c7fc978 100644
--- a/dev-embedded/pista/pista-0.70.ebuild
+++ b/dev-embedded/pista/pista-0.70.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Commandline-driven interface to PICSTART+ PIC programmer"
 HOMEPAGE="http://gatling.ikk.sztaki.hu/~kissg/pd/pista/pista.html"
@@ -15,13 +15,10 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	dev-perl/TermReadKey"
+DEPEND="dev-lang/perl"
 
-src_compile() {
-	perl Makefile.PL PREFIX=/usr || die "Running Makefile.PL failed"
-	emake || die "make failed"
-}
+DOCS=( README Changes Copyright doc/pista.html )
 
-src_install() {
-	emake install DESTDIR=${D} || die
-	dodoc README Changes Copyright doc/pista.html
+src_configure() {
+	perl Makefile.PL PREFIX=/usr || die "Running Makefile.PL failed"
 }