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

[Patrice Clement]

commit:     c78f373d203af14988d0c3f0a247b9de48ba9083
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 11:28:44 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 11:29:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78f373d

app-doc/diveintopython: Installs ebook as a pdf file.

Turning on USE=pdf now installs the diveintopython ebook as a pdf file.

Package-Manager: portage-2.2.26

 app-doc/diveintopython/Manifest                |  4 +++-
 app-doc/diveintopython/diveintopython-2.ebuild | 18 ++++++++++++------
 app-doc/diveintopython/diveintopython-3.ebuild | 14 +++++++++-----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app-doc/diveintopython/Manifest b/app-doc/diveintopython/Manifest
index 3f32670..675d993 100644
--- a/app-doc/diveintopython/Manifest
+++ b/app-doc/diveintopython/Manifest
@@ -1,2 +1,4 @@
+DIST diveintopython-2-pdf.zip 782047 SHA256 
fc7249731166362a91267e5ff74f63f11ec44bafe9af86cb0b8f99105789e9c4 SHA512 
24857e22b587878e22b8347bb53ca60697b3940ea2d2f9ea7fe5eabc5d8d2b3d580b278379436f4282f515a25a285f3f558f461daa9edaae6f565c246154978c
 WHIRLPOOL 
bcd4f0c268318219f80a9d427373fd0038a25e0f94aaaaf21823f9b5f46b9cf918387c50ea0c513223f3836ed065838af55602bd0de22e91b5201c5264b86133
 DIST diveintopython-2.zip 865555 SHA256 
cf51555500b77c51f6a35c59eaf049b23c8729ef3bef31fc445b6aea45d150a6 SHA512 
9c57a9e228d30186b1e6fc10a47d4fa69704fd83ea68bba030d7909ad8df2b9cfeee942caf359b1dd1fd8f9459fee58ea8ddb3813759b17f06b93b3ccf4ca296
 WHIRLPOOL 
6af00e6d36c8240867b8753478ad749737adffafee2d7641759a1e269981292288b27360f936663716a7cdca5fd1bb27bbdae94b70b497837a6bdda1261cba20
-DIST diveintopython-3.zip 7796744 SHA256 
b8708fc035c8272caf3d25e9cfcdb824d2c21ecf1b3c34aba900e0c99dd96a9f SHA512 
0d62e85184138f67a21020064bb59805c21ac41b3044e4af3d7de0e92e4c0068a3ec389430dfd5c3bd3e234af6a1079aaa3d2794aabaa3b5ef8d0a26c7c88323
 WHIRLPOOL 
16484ab0211ec5181acefb2e687436990c71efea94e042bd31a8c75e4eb71e5f64877b7cb02f8ad7d0e57188dc6d25e483c91c84610888030940fd4cf4a9ce6d
+DIST diveintopython-3-pdf.tar.gz 2235256 SHA256 
2bd23e41f0621a386699066d2a8e25b7bf22aca3be7c2c9dd7c39ac44b6263cc SHA512 
ecca7ba1540a48eb41b5bfd7ca878962939b9ec47eac6100f13d75eb24c6cae20177110877d34e6d1de47bed6883f9a25b379ced5c03b8c220103774a00a54b4
 WHIRLPOOL 
697b6b446f35fae0259ec3aea34c1336238f01648c8515a883ed848d1fff5d89437eba93c0bde581cf4821f0e0730869c38a7ff01dfdfaeec3774f2a08a68bb3
+DIST diveintopython-3.tar.gz 9958889 SHA256 
01d0d1f0b53252e0eb8bdf5ff7857d8f5e871574751eadfcfe13d011fb114c3f SHA512 
19a8498e4d91fc2ea2c899400336696732dae73da48faf55de43507e41e72a68c6ac25cea0acfdf3ca783344cd12c41326190ac9bbaf7ebdc113833e8bfea3a4
 WHIRLPOOL 
719607af0abcf4d1ca74c7450cb6402c8263d542d5940f9b33d9323005f1f05ba4dc537423f5d83f87be9f0bb4714ffb4806babae6cbcd5065067375d8e8066e

diff --git a/app-doc/diveintopython/diveintopython-2.ebuild 
b/app-doc/diveintopython/diveintopython-2.ebuild
index ead1ca4..f7ff354 100644
--- a/app-doc/diveintopython/diveintopython-2.ebuild
+++ b/app-doc/diveintopython/diveintopython-2.ebuild
@@ -9,16 +9,21 @@ inherit eutils
 MY_PV="5.4"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 2.x book"
+IUSE="pdf"
+
+DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 2"
 HOMEPAGE="http://www.diveintopython.net/";
-SRC_URI="http://www.diveintopython.net/download/${PN}-html-${MY_PV}.zip -> 
${P}.zip"
+
+SRC_URI="http://www.diveintopython.net/download/${PN}-html-${MY_PV}.zip -> 
${P}.zip
+       pdf? (
+               http://www.diveintopython.net/download/${PN}-pdf-${MY_PV}.zip 
-> ${P}-pdf.zip
+       )"
+
 LICENSE="FDL-1.1"
 SLOT="2"
 
 KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
 
-IUSE=""
-
 DEPEND=""
 RDEPEND="${DEPEND}"
 
@@ -29,8 +34,9 @@ src_prepare() {
 }
 
 src_install() {
-       insinto /usr/share/doc/${PN}-${SLOT}
+       insinto "/usr/share/doc/${PN}-${SLOT}"
+       use pdf && dodoc "${PN}.pdf"
        doins -r html/*
-       insinto /usr/share/doc/${PN}-${SLOT}/examples
+       insinto "/usr/share/doc/${PN}-${SLOT}"/examples
        doins -r py
 }

diff --git a/app-doc/diveintopython/diveintopython-3.ebuild 
b/app-doc/diveintopython/diveintopython-3.ebuild
index b98d97d..b39e1ba 100644
--- a/app-doc/diveintopython/diveintopython-3.ebuild
+++ b/app-doc/diveintopython/diveintopython-3.ebuild
@@ -6,26 +6,30 @@ EAPI=6
 
 inherit eutils
 
-DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 3.x book"
+DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 3"
 HOMEPAGE="http://www.diveintopython3.net/";
-SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.zip";
+
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz
+       pdf? (
+               http://dev.gentoo.org/~monsieurp/packages/${P}-pdf.tar.gz
+       )"
+
 LICENSE="CC-BY-SA-3.0"
 SLOT="3"
 
 KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
 
-IUSE=""
+IUSE="pdf"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}${PV}-master"
-
 src_prepare() {
        default
 }
 
 src_install() {
        insinto /usr/share/doc/${PN}-${SLOT}
+       use pdf && dodoc "${P}.pdf"
        doins -r *
 }