[gentoo-commits] repo/gentoo:master commit in: app-doc/pms/

[Ulrich Müller]

commit:     44bebabd8e053a900b9a89557ccf66f2ddcfadec
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 10:44:59 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 10:48:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bebabd

app-doc/pms: Drop "binary" USE flag.

The prebuilt version of PMS is now in its own package app-doc/pms-bin.
No revbump, because removal of the flag will affect neither installed
files nor runtime dependencies.

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-doc/pms/Manifest                  |  2 --
 app-doc/pms/metadata.xml              |  4 +---
 app-doc/pms/pms-5_p20120920.ebuild    | 42 ++++++++++++++++-------------------
 app-doc/pms/pms-7_p20180430-r1.ebuild | 40 ++++++++++++++-------------------
 app-doc/pms/pms-9999.ebuild           |  1 +
 5 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 8e5a9211662..5fcabc96127 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,4 +1,2 @@
-DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a16df8b9c3c80328c9436d886b1888484b0cd636f3d5ce492578e8a3e7c1a42be5cf7f8072c71fa401f817125d33 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
-DIST pms-7_p20180430-prebuilt.tar.xz 593500 BLAKE2B e59882b215492424b351242f31b90cc3aa457f7e4630c5b15fe8bc18fd8722764371868f3a44bd7226f4d00c5a8d9c12829d934cda715e575b4c949631c4ad02 SHA512 e27527e4ea1fa16f7c069267bec136521e7be621bd49701920d11e79e4a5645ca8da06aa41c4adaa1813c0f4abce8248e4274d7ec0ae04f6a8479107b0578c4f
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47

diff --git a/app-doc/pms/metadata.xml b/app-doc/pms/metadata.xml
index 3e38fe6abb6..cdd2d5fbcfe 100644
--- a/app-doc/pms/metadata.xml
+++ b/app-doc/pms/metadata.xml
@@ -7,9 +7,7 @@
 </maintainer>
 <stabilize-allarches/>
 <use>
-  <flag name="binary">Download pre-built files instead of building
-    from sources</flag>
-  <flag name="html">Generate PMS as .html as well</flag>
+  <flag name="html">Generate and install PMS as .html as well</flag>
   <flag name="twoside">Enable two-sided layout suitable for printing</flag>
 </use>
 </pkgmetadata>

diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index ec756a31611..8c738245eee 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -1,42 +1,38 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${PN}-${PV%%_*}"
 DESCRIPTION="Gentoo Package Manager Specification"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
-SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz )
-	binary? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P}-prebuilt.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="${PV#*_p}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="binary html"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="html"
 
-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-20090115_p0029
-		)
+BDEPEND="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-20090115_p0029
 	)"
+RDEPEND="!app-doc/pms-bin"
 
 S="${WORKDIR}/${MY_P}"
 
 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
+	# just in case; we shouldn't be generating any fonts
+	export VARTEXFONTS="${T}/fonts"
+	emake
+	use html && emake html
 }
 
 src_install() {

diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index fbf88543718..bd1d7b478c8 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -5,41 +5,35 @@ EAPI=7
 
 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 )"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="binary html twoside"
+IUSE="html twoside"
 
 # texlive-bibtexextra: plainurl.bst
 # texlive-latexextra: chngcntr, isodate, marginnote, paralist, tocbibind
 # texlive-mathscience: algorithm, algorithmic
 # leaflet used by eapi-cheatsheet
-BDEPEND="!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
-		)
+BDEPEND="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
 	)"
+RDEPEND="!app-doc/pms-bin"
 
 src_compile() {
-	if ! use binary; then
-		# just in case; we shouldn't be generating any fonts
-		export VARTEXFONTS="${T}/fonts"
-		emake $(usex twoside TWOSIDE=yes "")
-		use html && emake html
-	else
-		use twoside && ewarn "USE=twoside is not supported with USE=binary"
-	fi
+	# just in case; we shouldn't be generating any fonts
+	export VARTEXFONTS="${T}/fonts"
+	emake $(usex twoside TWOSIDE=yes "")
+	use html && emake html
 }
 
 src_install() {

diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 4de9727baee..001aee4fd9f 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -26,6 +26,7 @@ BDEPEND="dev-tex/leaflet
 	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathscience
 	html? ( >=dev-tex/tex4ht-20090611_p1038-r5 )"
+RDEPEND="!app-doc/pms-bin"
 
 src_compile() {
 	# just in case; we shouldn't be generating any fonts