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

(Portage version: 2.1.13.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 15 insertions, 23 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/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
 }