Install the same set of files with and without USE=binary. Remove old.

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

4 files changed, 29 insertions, 36 deletions

diff --git a/app-doc/pms/ChangeLog b/app-doc/pms/ChangeLog
index eb234f71204f..ae9b11902f3a 100644
--- a/app-doc/pms/ChangeLog
+++ b/app-doc/pms/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2013/08/09 21:07:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/ChangeLog,v 1.38 2013/08/10 06:55:52 ulm Exp $
+
+*pms-5-r2 (10 Aug 2013)
+
+  10 Aug 2013; Ulrich Müller <ulm@gentoo.org> -pms-5-r1.ebuild,
+  +pms-5-r2.ebuild:
+  Install the same set of files with and without USE=binary. Remove old.
 
 *pms-5-r1 (09 Aug 2013)
 
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 04827cd5c586..9310c13b833b 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST pms-5-prebuilt.tar.xz 540244 SHA256 c93ce6902db323ab7ec613ad90a6dca2beda2dd2cebcc3e8ace83c1faeb6a1c7 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451 WHIRLPOOL 9369c7604fdf0aadb7666f1fc08f041b064896d6359dd76779dc3af842fef14d81aed07301ec52eac11462664d16faed0e3fd50a0b96702822c59538917f5f78
 DIST pms-5.pdf 469297 SHA256 5a169f77da166e80a652385c895a2d646c47b8f39cb4ff3d5881376428293685 SHA512 2da12cc8aec3c34c6b67e6efab53457e98a9259cca12e34229c5dd830d663e57ebf1c4d9b611cee3c2c776b9f05bf6e5dcae01af99f72c1712eb2e5e970bf2fc WHIRLPOOL 2743e5ab89bc786728deeafad840718d99efb4291c91aa0de0427a7461d3da6de56da47956ce4abc012021296861f912730776cec07ddd2dd804b772d0427ae9
 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-r2.ebuild 1431 SHA256 b4b1f043c65b6bddbeb456d0a5c1f511c589ea6b261051a9f60aecdfa996e835 SHA512 6ff7d1f1ba6b8eef89477efecc1313c30734f751ba09107b5026cb5b2a5619c316309ebc4049c28926c37868aa9ce0444919b289992d55ab05ed78618efb2327 WHIRLPOOL 9638610743ee8a72abd8f0553fcca80f649d129d6eb504d5e200548e883054e2c573886e8bd8f1d7e89769d30188c3720b97f4b9ba5bfc61deea73901ac5b5f8
 EBUILD pms-5.ebuild 868 SHA256 1db254457918609ec1ce176afb7e28321edf41dd4918587c250f6796345f530a SHA512 97ea73652be3d9e5cfae22a2bf1794d4519d228dc91ae75630b551273203999a0c58b5cbe378bb12da3979188771ff34f42172c35da0194653289c9ccef2b369 WHIRLPOOL 0168616d6a46d39c8961147875eccb45d623052dd3800cb39c259bbad42b5fd34c7bbbaccda5284676338e541b5a46547ddfe25c44943512aaf323506a8809fc
 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
+MISC ChangeLog 5640 SHA256 038ca6b5407ff490b8bd5501d6a4d6f82456e20e5722823728b2d4082eaa412e SHA512 323d23dc674f1684b8f621cdc0afd274a5b4878c76956b52125a44e58438b7391851a003edec4d3589f344e609771ad73ff2d71d18f0ddd46ec46bde40ce44c3 WHIRLPOOL fd785d9dd80fa49be0c88a03943a9e93b7d79dbc65426432907ee587b00a7893b41f1329b17e8bcec8954fc8f293b6adad015ba30fca4843b5a280f29e5c84e5
+MISC metadata.xml 486 SHA256 fcc19b82567bd0808813d94e15c54e5690b2b0dbd94eab9a67db7797457ff498 SHA512 6263bd0ae143af3577ced79782fbe0ab401dc6efb74e840d961619f1ada160bd4cbe43e19bd5db2b484bffd9dc49c678cd82a7ef171127fd882a98ec8fc6a686 WHIRLPOOL eb345c9bbf2cd22303243c0d5f4c0393321267319acd7ae86cc96191e380f3a30ffb362f86c3bf179c9fbb2daac501b0c752cb570506f8a9b8b6aa7dc7cbd61d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-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
+iQGcBAEBCAAGBQJSBeSGAAoJEJQzkH1pP7W4KuMMAIcKpJ7kuNoyEyueNwjAN9bC
+pFTHUoMEBp/C1dRsqCQfzDW3uupJFm7F7vRl4tXPt4pzMCBmr6VK7K+whi88xqcs
+tcd/T7fe1ltIdiDv4nIlFzL+hIMSuUVthZ9whhxgR92V9cn1oAupQARdk6rJA/Gf
+zANfOPQyChuFjtSGk+tNgInFFkMOxohsv0jj4v2Q8rljCGFuzenRal+CZQdH/sdb
+Isd6k/3EPqdj1tp+ZlTqJS8K+J1F2k1AKV/tyHgAx+J47RDG830DoQ9DnsQF4I8x
+8Bkl5+5i28PxJlq85Zav1bo5Iz0ocQNlo0ZlgI38utSbCgwKoL0HhvNhP8SDjzaQ
+N+TI5JXjKllocrqeb6P3MfjtPaa2VAt3x/LhaZ7GzFk0d57htiftae9kVdxPE1Lg
+0yWlg6Hozv0rtJ/dBjx5Jtchq3LymckiLSl9GqOaUNtL/FIlFO9UuXzPpiEXGYQF
+1/vfDbxuLq7mpdCpWjO1/R4h6pQZv0muHkPMCLQ6Tw==
+=QKqC
 -----END PGP SIGNATURE-----
diff --git a/app-doc/pms/metadata.xml b/app-doc/pms/metadata.xml
index 4c9cc22eae8c..f33e051d9e75 100644
--- a/app-doc/pms/metadata.xml
+++ b/app-doc/pms/metadata.xml
@@ -10,7 +10,7 @@
   <name>Christian Faulhammer</name>
 </maintainer>
 <use>
-  <flag name="binary">Install pre-made PDF file instead of building
+  <flag name="binary">Download pre-built files instead of building
     from sources</flag>
   <flag name="html">Generate PMS as .html as well</flag>
 </use>
diff --git a/app-doc/pms/pms-5-r1.ebuild b/app-doc/pms/pms-5-r2.ebuild
index 542e2320a870..b5dfbb8b83b4 100644
--- a/app-doc/pms/pms-5-r1.ebuild
+++ b/app-doc/pms/pms-5-r2.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-5-r2.ebuild,v 1.1 2013/08/10 06:55:53 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 )"
+	binary? ( mirror://gentoo/${P}-prebuilt.tar.xz )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
@@ -28,31 +28,17 @@ DEPEND="!binary? (
 	)"
 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
+	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\"."
+	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
 }