Build from source, unless USE=binary is specified. Install EAPI cheat sheet. Add missing dependency on recode. Remove old.

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 110 insertions, 63 deletions

diff --git a/app-doc/pms/ChangeLog b/app-doc/pms/ChangeLog
index 47b2f8a8d70f..eb234f71204f 100644
--- a/app-doc/pms/ChangeLog
+++ b/app-doc/pms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/pms
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/ChangeLog,v 1.36 2013/02/07 21:34:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/ChangeLog,v 1.37 2013/08/09 21:07:47 ulm Exp $
+
+*pms-5-r1 (09 Aug 2013)
+
+  09 Aug 2013; Ulrich Müller <ulm@gentoo.org> -pms-4_p20110118.ebuild,
+  +pms-5-r1.ebuild, pms-9999.ebuild, metadata.xml:
+  Build from source, unless USE=binary is specified. Install EAPI cheat sheet.
+  Add missing dependency on recode. Remove old.
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> pms-4_p20110118.ebuild,
   pms-5.ebuild, pms-9999.ebuild:
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 777a277a192f..04827cd5c586 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pms-4_p20110118.pdf 348747 SHA256 6ceecaa392939e558b38f7f8ab80bbba3f706416c566d325bc658a90a66009ed SHA512 30a0339ed5bdfba161bbe33bde8fe008087e7bd86b3a79fee0db0331fe17a2a51b005a66274b4caa4fa838f130ba5afcf85902104e781c6fb9908321d248c9ed WHIRLPOOL bf751d1e73ad6b87ba2fdc58ad4d976aa4dbd39b27b7f26cf3b885e4f7fe022520ed4529b911bd5a9ee4ef66e88554da60556f6395b73bb3017860ae247a3a9d
 DIST pms-5.pdf 469297 SHA256 5a169f77da166e80a652385c895a2d646c47b8f39cb4ff3d5881376428293685 SHA512 2da12cc8aec3c34c6b67e6efab53457e98a9259cca12e34229c5dd830d663e57ebf1c4d9b611cee3c2c776b9f05bf6e5dcae01af99f72c1712eb2e5e970bf2fc WHIRLPOOL 2743e5ab89bc786728deeafad840718d99efb4291c91aa0de0427a7461d3da6de56da47956ce4abc012021296861f912730776cec07ddd2dd804b772d0427ae9
-EBUILD pms-4_p20110118.ebuild 877 SHA256 b19a010f674c87e0c975fd4c3457364c44604c45467755be25c6a523c6cfbc38 SHA512 c88697d45d0ad97046fcf99d850edf3b005774506510ae3dc680e352ccd719d12664fd7330ac08e46f8e1c17120f0125cc60ff555c1fc2666dc2f4b6f44a5a1b WHIRLPOOL aa3a7186b48d7978573c8c5cc514fac1b0c1c80c630cae09180d9f255be062cc631287e1dd2921dcc5a54807225ff1780c39cbdd28c70b5fd539a74f4ae7057c
+DIST pms-5.tar.xz 50284 SHA256 a3b7702298adc4481584ed03f2d49e9fa7ea58638d8e8e9bf36fca832b2fbc87 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e WHIRLPOOL 373d333f1c060faacbfbd398ae3be3a0143c0ee618b093867313e4182bce7f15609445d2fc6b109f6f02fe597fe8f6cf687673029569e27fa7ed3411f4932013
+EBUILD pms-5-r1.ebuild 1655 SHA256 1cc3676d0b4aec35a7149c9f0b5bcc5eee573917f19e25f5416637738b6bdfa4 SHA512 a32413e0b8a8db5e027b0607586f792fe920bb20cba88961489bc6df50f3391251528ca74af9822753d7eb24f7f033a6cd357a686b35d2558b70f47f6072fc59 WHIRLPOOL 23bdee1fbfd09bd3599ba355059bed085f5e3d79fd1b76be49fa4ae380dcfd480e312a32d755e29dfa34c3086f39f80976c463a1044dcd9c9a02c6ff612f9141
 EBUILD pms-5.ebuild 868 SHA256 1db254457918609ec1ce176afb7e28321edf41dd4918587c250f6796345f530a SHA512 97ea73652be3d9e5cfae22a2bf1794d4519d228dc91ae75630b551273203999a0c58b5cbe378bb12da3979188771ff34f42172c35da0194653289c9ccef2b369 WHIRLPOOL 0168616d6a46d39c8961147875eccb45d623052dd3800cb39c259bbad42b5fd34c7bbbaccda5284676338e541b5a46547ddfe25c44943512aaf323506a8809fc
-EBUILD pms-9999.ebuild 919 SHA256 265dc78d14228098496ffe9943018c24f0effc3ce1ea96e1caa088a324ff8866 SHA512 5683bb96339093a08b84492c077a95d5b5389ddfb091e4e5df753db1cc478d49dcd5b27be6cd4bcf973ee8d511bea51ef89a33a44e21ef7fcdf3acdc8dd74320 WHIRLPOOL d6385f31d00090442373b2399b0696055383eac19e81b10be980ea2a3b8d20d01c14b0742b50d18881565686e81a7c057df1a3e0d909911bf03fc8c712bcebd7
-MISC ChangeLog 5180 SHA256 3f1c4d0dfe7213845b5fbc632131f380a6b2b1dbfd36e21435f64b597dee8fca SHA512 ba8478257983bcfcb10e929340bbbfd4e9ca5556bc10474e82f3fd049b1575e850a9acb36cf7ae08703a0798c636af4daf47285dd3123f3f3af95d093c7b4c7d WHIRLPOOL e72636ae3c4400905caa69bc357400baa3da60a801ae1015b41bc0a6f05b51d7b0f306021447dff3076955d0b49cbe91802b5b5838eef46377468cc4d9b9499c
-MISC metadata.xml 401 SHA256 0f55736ed91407bfb10a1d6187c9b296b29d78c15d38bf7a9a85fb1d444a5379 SHA512 c073b2bacc9d46ab9f0be0ef1853c1a60b768844c4249005608487781a5bb5e19a16320ade9a48fcd67ff244366414550cf63af6bf978fbd505134a62a44624b WHIRLPOOL 3ae6ab9ae2141e4bc1761332385863249acf3a28f7362365c2ba9f24858e4b0482b5b9bb9324101251f617d9fd807a53c1c367d7f2eeaba688292d9959de0121
+EBUILD pms-9999.ebuild 1009 SHA256 5b4da699f5d62d5bbd45a6a9ab7e241177ecad9db685537096f483f887e7c729 SHA512 5b13e8d731219b49012b350f887a04cc330ec7da5ba98fcf51431c73b9c96a8141876157329f9a15300f3249b5741d869bb026f6df380d2995046c7318fafe1c WHIRLPOOL a4d8da87dc4b61c1110619648dbe3a13a3af7589eac26c0c6f39404fda5d505970dafdbccc7f58cdbb44c1519ee21ebb896a034c47920391b35bdf4a50e36e5c
+MISC ChangeLog 5456 SHA256 3d1ade87ca4e163df1d03827e97a2b244524143a4556dbc96c122d64109cb9bf SHA512 8c75a461301690dcb3010ca56a5a67741f91d153ecbbefaec391a9a2af16c3887c05c38d62fd5e2c97f4d9ab246c0c52eee29dff1476b4bf9684421f74111091 WHIRLPOOL 9f7b5a6970e0bee1418cd5bce481eb36f5e93a0e2b26d55581920cb7d4212052bd02d24cfc36ee93088b06d4e1481f129e3069ce9727801329c689a098744897
+MISC metadata.xml 487 SHA256 c90092c79fdde5d664b9ecc1ee8f8ee2a0892d945f60ab46daad974087f15e62 SHA512 8af71b4ddc8c6f68287d106214b3fe1920feabfde55f47036c8a40fbfa2a66876aec8177ec0227b52ffc929f1192d2b2a765f60ca7a790bb0c0e5f2d69624777 WHIRLPOOL f39767b375bd5b00d3a588776bbe973b55457b3d01b702ae1d3e80c4f12df70e895d46ac1f3fad11fe094392e21b0b87620b067f6c41d35067ed34f32172fef3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFB7AAAoJEDxpGckxwJCBShYQAINWQPJScZONjhY++vqF3GSh
-zuSCBxvqr/qVxarhGSdQri0xnpc717kVp7unr1HK/ICTozc8HdxIToiRKV8AT6ZY
-gG9nA7MHeh97XaRmrmJJjr5eQrEKJzNuhLaFpraoxKxJIaMgMb2n43sAAEMxRdXO
-mHdmC696EDM9BDLSorczW7opyWAWXP9CkXNOysYfyi5U34/SvC2YOSOo5iIlAvA7
-snNApJK5jhCwxDnnJZQhm8EKiSoOO/wBCc0Vd2LFCfJ+n9bKruwM8Eg7HWHU5hpA
-gu0d+ooGz5jw5Qk8jB4xjR1zpJNA2QjSUVIkdKDHgQcQNHtThm5BsJ6R139/hoCV
-2tVS6QNubgh0Sao+hAkxgCeAqdpsCnnEj8VJpeSNg53MCj+2BvyrmCzZuxBuCbDB
-tmnDk6CmSnm9xv2Yrc5qL+esBttVS0UiBfSWH2OsKkiQsAasHjwiYAndjTUoF0Zy
-GoABSqVzsWka2axf97HoM8stqPrFEzwTBuLEkLoovVhG7Wfty/PfDUwuRBWRKcih
-D0Ugxqz+d6ZensOw3g5G+r5+HhAqC6BV44SsJCFkfyjliBjt+zMVGUC2coqTM35F
-0THiCmrJ2KQjc86XVsB6BD5HyBSKLCgzob/KddIXzpLNKex3J1mvg5f/ruYrtwiO
-vk4YEMDd1TIbcwVaFTOe
-=yw7B
+iQGcBAEBCAAGBQJSBVqhAAoJEJQzkH1pP7W4SSIL/3a/UOpTgb8takpo1NXiUjLf
+B2EyFH0N2nP580kPEN7P0p8Whfne3TX1o/puRqTteY28cSX8YrhMVvpTA31P0hW6
+Aeot/W7VrdpT0VPtJKqXKSl3KQbG2mDTxuRjaNMUiqLCwdW72X8S9ZizVzIhLrI3
+H0ade4/HetU/negYmMABFCvfmBoYBAFs6eYuvk7knbS57a6fjHWOsUu4bx8ahZ01
+Wt2rHhUlEv7fso2BVkxE9R6803P/RG2aYa65l8YIB8hLFWoj7BO7QE184QwWhRQ7
+LpJYUTa25ZTlcRQIE5Vx2QzMqhSShfp70Wmn5Bq+FDTtYNhvrMfsicBAazM73VWG
+zUpHng6cuA1x9Nf4WXseytY+urJNh/T+OPZLGt/JlLj9i5TwHiM+AC4w45uzcQN9
+H+QT54v0HCRUEFgeq0Rtg3MJVExnClIXHROcZ3B26qIuPHQrv7bHVuRU8DOjCJE4
+XqM0EAeKLme43i7Yf8T0EWcqw/U0HAfrsHvW3xdy6A==
+=eXkb
 -----END PGP SIGNATURE-----
diff --git a/app-doc/pms/metadata.xml b/app-doc/pms/metadata.xml
index 0bd61deb8537..4c9cc22eae8c 100644
--- a/app-doc/pms/metadata.xml
+++ b/app-doc/pms/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>ulm@gentoo.org</email>
-		<name>Ulrich Müller</name>
-	</maintainer>
-	<maintainer>
-		<email>fauli@gentoo.org</email>
-		<name>Christian Faulhammer</name>
-	</maintainer>
-	<use>
-		<flag name="html">Generate PMS as .html as well</flag>
-	</use>
+<maintainer>
+  <email>ulm@gentoo.org</email>
+  <name>Ulrich Müller</name>
+</maintainer>
+<maintainer>
+  <email>fauli@gentoo.org</email>
+  <name>Christian Faulhammer</name>
+</maintainer>
+<use>
+  <flag name="binary">Install pre-made PDF file instead of building
+    from sources</flag>
+  <flag name="html">Generate PMS as .html as well</flag>
+</use>
 </pkgmetadata>
diff --git a/app-doc/pms/pms-4_p20110118.ebuild b/app-doc/pms/pms-4_p20110118.ebuild
deleted file mode 100644
index b810af65518e..000000000000
--- a/app-doc/pms/pms-4_p20110118.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-4_p20110118.ebuild,v 1.5 2013/02/07 21:34:12 ulm Exp $
-
-EAPI=2
-
-DESCRIPTION="Gentoo Package Manager Specification"
-HOMEPAGE="http://www.gentoo.org/proj/en/qa/pms.xml"
-SRC_URI="mirror://gentoo/${P}.pdf"
-
-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~x86-netbsd ~ppc-openbsd ~x64-openbsd ~x86-openbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newdoc "${DISTDIR}"/${P}.pdf pms.pdf || die
-}
diff --git a/app-doc/pms/pms-5-r1.ebuild b/app-doc/pms/pms-5-r1.ebuild
new file mode 100644
index 000000000000..542e2320a870
--- /dev/null
+++ b/app-doc/pms/pms-5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-5-r1.ebuild,v 1.1 2013/08/09 21:07:47 ulm Exp $
+
+EAPI=5
+
+DESCRIPTION="Gentoo Package Manager Specification"
+HOMEPAGE="http://www.gentoo.org/proj/en/qa/pms.xml"
+SRC_URI="!binary? ( mirror://gentoo/${P}.tar.xz )
+	binary? ( mirror://gentoo/${P}.pdf )"
+
+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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~x86-netbsd ~ppc-openbsd ~x64-openbsd ~x86-openbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="binary html"
+
+DEPEND="!binary? (
+		dev-tex/leaflet
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-science
+		html? (
+			app-text/recode
+			>=dev-tex/tex4ht-20090115_p0029
+		)
+	)"
+RDEPEND=""
+
+src_unpack() {
+	if use !binary; then
+		unpack ${A}
+	else
+		S="${WORKDIR}"
+		cp "${DISTDIR}"/${P}.pdf pms.pdf || die
+	fi
+}
+
+src_compile() {
+	if use !binary; then
+		emake
+		use html && emake html
+	fi
+}
+
+src_install() {
+	dodoc pms.pdf
+	if use !binary; then
+		dodoc eapi-cheatsheet.pdf
+		if use html; then
+			dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+			dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+		fi
+	else
+		use html && ewarn "USE=\"html\" has no effect with USE=\"binary\"."
+	fi
+}
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index e7926887b362..86e39500de1f 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-9999.ebuild,v 1.3 2013/02/07 21:34:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-9999.ebuild,v 1.4 2013/08/09 21:07:47 ulm Exp $
+
+EAPI=5
 
-EAPI=4
 inherit git-2
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
@@ -10,20 +11,21 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
 
 DESCRIPTION="Gentoo Package Manager Specification (draft)"
 HOMEPAGE="http://www.gentoo.org/proj/en/qa/pms.xml"
-SRC_URI=""
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="live"
-KEYWORDS=""
 IUSE="html"
 
-DEPEND="html? ( >=dev-tex/tex4ht-20090115_p0029 )
-	dev-tex/leaflet
+DEPEND="dev-tex/leaflet
 	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-science"
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-science
+	html? (
+		app-text/recode
+		>=dev-tex/tex4ht-20090115_p0029
+	)"
 RDEPEND=""
 
 src_compile() {
@@ -32,6 +34,9 @@ src_compile() {
 }
 
 src_install() {
-	dodoc pms.pdf
-	use html && dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+	dodoc pms.pdf eapi-cheatsheet.pdf
+	if use html; then
+		dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+		dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
+	fi
 }