gentoo resync : 23.06.2018

4 files changed, 10 insertions, 55 deletions

diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index e1196e0fa869..ed5836a4f008 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -7,6 +7,5 @@ DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0c
 EBUILD pms-5_p20120920.ebuild 1420 BLAKE2B 7e6bb11748ef75c54b4f00758033aa9a4d601927d2930ea2bc910cecce920e20c37b6700f2017179a2ad0d16ef0693faf5e85c358d47fb37b6b99b57e374dff9 SHA512 cee19f88ac744d246ccc2b5d02412e3815bf5e3895d37466b22619f1a610093617cfe97c0e21127d33f6efc4925beb7a1825167172ceb7694069e13277e0b55d
 EBUILD pms-6_p20170429.ebuild 1551 BLAKE2B 13c478dbced5e0d27132d1ef6775157eb3f228d89686a3299392d1932d6b4abc6398913d3c233555189b7e43464ab9a3d37f52d592c51ac0ff11e63f9e4cff26 SHA512 88d1a04e8c2983c36b5808fe9cf39bc3435e1a070d1a8ffaad284dac3eabfae672832816ac022de7f525c86fb9279fa5ba6e7d569c92320fba292c6e8da780cf
 EBUILD pms-7_p20180430-r1.ebuild 1676 BLAKE2B 302b66c7b7ebce8300007999978e680088bda1c7bc8ba94a42f38d4e9ad0d41b95a10bc6dc18f8ac0fe9a514983a3cf3e77cb54e6c6756f5c096f23debc24d7c SHA512 86571cd44535f00128a03a5d56d6fcccf594a3d3e7b3853c43ce8ed4ab9189180712027db0bffe0a73ba3153818aa38652cdb4f8189f9fc60fb99b1187d2b27a
-EBUILD pms-7_p20180430.ebuild 1560 BLAKE2B af4924e76035d862d64677fcc7f2c2a65ca345a8b5973e0be66d5fb7c0cdb2d3f138cc496ab33ce049b583e5f819c9befe37b08dd8a2e39ac551d5b3f0c17557 SHA512 0c269c259661214516e6525f70c12dfa8f218dd2a82b621dd2a86258216bc8e59874084ca9e28af113a609d1174022594b79400948f294dd399204140d69cb52
-EBUILD pms-9999.ebuild 1023 BLAKE2B e60de705ee7cb6e134228c9bf067f18eeb12de3bda234748ec3e891cfcc5109089dd69f6a81e530e639bf2d19366c1c1d582a93075ba5aa3fc6543ee5ecfd530 SHA512 7116be5727443e09438de942e45a49a37e00ab39001a80935808a56ca18137eea7dca1938ed5e60f72a19713442eae3a52d966deb3ff744e2efb3dc2f276f4bd
-MISC metadata.xml 495 BLAKE2B 5792a9b2db15b671aba18a6ceb77cda04e4e83ceb5ef3ac130a8180803ebad25d99c3d3bdef32bfa1f0ba9186a3b27f5110e6dc172800f75aaa177b017c738c1 SHA512 11e0668a058130a9d62d28cdd70998b1bdc21722a600d87cc76b34882eae2c82d066955fd30fed77471a7078dc2a9181483ab832549d9be4d9060f63c18820ce
+EBUILD pms-9999.ebuild 1234 BLAKE2B 46f77394bb3e6c94600e3c37a45f95838cd7dd088eff9c4ded2918a742338d2f221a073f22142488612b53d6ce64de12b903ff4e39f7d8c340801fd5b4d348b3 SHA512 b832a1f3fbbcea3116fa8670fc5e932033bcfa30c7b2c0f7fd209cfb4d519becc79ee3cbf9ea9c6ea6677c13224a9bcb7d67c225bcc24f8b24311695d2c35e60
+MISC metadata.xml 518 BLAKE2B 370ddfa79e44e10c0234d0aafb89624181bf64ae7e90b89b678a8dcb518214f310bc9afc261d5069a8f07299b2194c3a831e1d2a9bcba8d97dd6ef0dc1369346 SHA512 e1079583ec59594d9c89dbbf68199aff7edb35112375e96a2f6ca28627f679ee46570f649a0723c296bd41d003dd91226e6b2805bc780baded00dc1ae72d24a2
diff --git a/app-doc/pms/metadata.xml b/app-doc/pms/metadata.xml
index 53e7110fe549..3e38fe6abb63 100644
--- a/app-doc/pms/metadata.xml
+++ b/app-doc/pms/metadata.xml
@@ -5,6 +5,7 @@
   <email>pms@gentoo.org</email>
   <name>Package Manager Specification</name>
 </maintainer>
+<stabilize-allarches/>
 <use>
   <flag name="binary">Download pre-built files instead of building
     from sources</flag>
diff --git a/app-doc/pms/pms-7_p20180430.ebuild b/app-doc/pms/pms-7_p20180430.ebuild
deleted file mode 100644
index 71f1413395e3..000000000000
--- a/app-doc/pms/pms-7_p20180430.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Gentoo Package Manager Specification"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
-SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
-	binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}-prebuilt.tar.xz )"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="binary html"
-
-# texlive-bibtexextra: plainurl.bst
-# texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
-# texlive-mathscience: algorithm, algorithmic
-# leaflet used by eapi-cheatsheet
-DEPEND="!binary? (
-		dev-tex/leaflet
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-mathscience
-		html? (
-			app-text/recode
-			>=dev-tex/tex4ht-20090611_p1038-r5
-		)
-	)"
-
-src_compile() {
-	if ! use binary; then
-		# just in case; we shouldn't be generating any fonts
-		export VARTEXFONTS="${T}/fonts"
-		emake
-		use html && emake html
-	fi
-}
-
-src_install() {
-	dodoc pms.pdf eapi-cheatsheet.pdf
-	if use html; then
-		docinto html
-		dodoc *.html pms.css
-		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
-	fi
-}
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 186f98518988..c3c195c85e60 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+EGIT_BRANCH="master"
 DESCRIPTION="Gentoo Package Manager Specification (draft)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
 
@@ -13,7 +14,11 @@ LICENSE="CC-BY-SA-3.0"
 SLOT="live"
 IUSE="html twoside"
 
-DEPEND="dev-tex/leaflet
+# texlive-bibtexextra: plainurl.bst
+# texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
+# texlive-mathscience: algorithm, algorithmic
+# leaflet used by eapi-cheatsheet
+BDEPEND="dev-tex/leaflet
 	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-fontsrecommended
 	dev-texlive/texlive-latex