sci-mathematics/pspp: Fixing out-of-source doc build

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 27 insertions, 24 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 31733d5309ca..2ff0652c8c58 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/pspp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.26 2013/10/30 17:36:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.27 2013/10/30 18:03:29 jlec Exp $
+
+  30 Oct 2013; Justin Lecher <jlec@gentoo.org> pspp-0.8.1-r1.ebuild:
+  Fixing out-of-source doc build
 
 *pspp-0.8.1-r1 (30 Oct 2013)
 
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 76fc7d0bee2a..7e43e76cb8f2 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -14,23 +14,23 @@ DIST pspp-0.8.0.tar.gz 5526759 SHA256 f1b11a8d68449e917afa05c2378248935296a4fd5f
 DIST pspp-0.8.1.tar.gz 6514528 SHA256 fd48145d2ff77c39f624e26bf3c9a5623c2afaee7c040675b06cb4ce57d31d62 SHA512 2df758b3a2d8eba724d84ce7d77a6c0bbe469a11b86a8eb4227ec12a4957f468e74b3af0f81c953d87403a962937eef2680979a21ceba4fe8b93b55252b84a18 WHIRLPOOL 5be6ebcecffc3d8a7da669ea49028307b784a5b8b5d8a510d0f9e82a3740800966da5390f8abc120b55c9c621850be906f7610f86404b92c994d9a72697d413d
 EBUILD pspp-0.6.2-r1.ebuild 2284 SHA256 bdf8a296a9a4ff6c7dcc736e249dffdd4123ee06cdd671cafbb97c6cc1702a6d SHA512 05c230cbcf8062137f315e3785a8158761eacf82fec6e7522c2787bc4baabe1b6781dcbad8304222f153e0bda3cb383d317fa1daae6c3bf1fa06ae1d92407256 WHIRLPOOL aadca1c4e1061babf3108c954ff9345fed0ceb718b59907bd95470b64becc28ad014684c0591f425f2e096b32c65b8bc9989b16dcfa80cd7a779e16994f90b83
 EBUILD pspp-0.8.0.ebuild 2016 SHA256 32f589ed0a34d8e615b4f08c2fc3aedfcf71277a1eaf92f9c998ee833badefbf SHA512 40fe46743bbdeeeacaeea60743df2d229759a36059d2458a2699b22d3e0faf905f3f3de54098716c24273b17e45c2257aee8fc2472a509579f997a94d215d553 WHIRLPOOL 448b179a19be9fe961d5c811a49f1ecfd8889670936bb7a4d6b095dffa0f56848fc93f11edd239912090948a48a22371240b714a7721bccc6d1ad99eef8d6e32
-EBUILD pspp-0.8.1-r1.ebuild 2026 SHA256 c47425ab6d37e375c7b7940bd96cf2f746d4d3e442eb727f690df155bc593324 SHA512 87e97f46bcc8669403201cd883157a4929e91b5d776c03da13829b7db7777a17189d10b3ea31ef0fc5e1a2215539e9cd00b4a2bf30a32190ada1b38ab62f5262 WHIRLPOOL ffce7a73741188bbcf64aa2623ad0694d285cd58bc258534d109b8f26afc91aa81d7b93085f34e2398ba972ce0df4833d97f5ea0893d9f09d54ad1ec58499249
-MISC ChangeLog 4747 SHA256 706f9f74ec4fde962893b0b001c0d00cf3e6acdc17bf82aa435e76ec56b389bc SHA512 0173d6a86a5af8a0dd1fa98d9efffc3a680a1fec74ab5afcaece8267241ae7a97cd74e089fc884131a7fb149d272cbb2e5ffdfbdfde9620ce583a0157fd8bae1 WHIRLPOOL 992cf788b9fc710614aef1c56b2bc8bdbe73a032aec2e93bcf18b43bd4a0412e02404b18aedfcf2eaa4ecacf8a13d8219b57a4f45ea37989e99c7e3decf15618
+EBUILD pspp-0.8.1-r1.ebuild 2106 SHA256 34f1fac43a108a901e0af7ac309c0ecf8ca9d851ab003cd1a3fc6ffc41a25dd5 SHA512 be12a13b2a8dba07c70bc23cf89b684b6d7137497fb10db3582d8bf84f53e3336c9b48e32d05abfd24130561f7fba0012b51f15419d0d6feac658cefa1e47691 WHIRLPOOL e2836f9ae5d99c1c1191b6ceffc7487251daa0118539cc313befb2fc2f1e24433c4dda2afaef9999415193876172c873d76c0ef93afd7ee0a3405620ed63d572
+MISC ChangeLog 4850 SHA256 bf8c40643451df5bbbcbd95905dd2b6500699c199b22f095b5c1a69d34c8a811 SHA512 d6ba22e522f503bcb98ed251800e0ab4e3a7f7336babea602341675dc472e9aa20cfff69034667fd4ca38714f914a96827f2ff3ae432094f0fe9e34d972d9fda WHIRLPOOL 02402ac0fcdcc244b32fa3ba48b087b2e3dc91f5290d9a9bc89ac08b422dc02b2e0c940cfd7b1334f1ed1718e6a69439f2d44b1855840a1f2ad01442ef3c36c8
 MISC metadata.xml 607 SHA256 6edb6b42de17353fc929b96d74ca5027d09739ae64db9c92fc8ba0f1990c951a SHA512 787f44d8d1badb137eeeea804fbe5c071a26dbbc09bf9b7850368569384c8dde21e25260c44bfd8665c0243e8b5a611ab7eef5271d2ada066f2d280223a2347e WHIRLPOOL 92b8ae37621d6f4b394b4da0414ed993a42adeb804a56424b2774e9164715214c24cde9f150ccd255fb67a142c5435c79dc48064b8abb7e22bb93222435ea37b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJScUO5AAoJELnU8jG9FVirg4AP/jiWOLKolF9oBaOqk8uk4Mmk
-2oYqbjkY6T9OUhw7F0GPWFiFgZLKmb/lRPJWvs1AVBKFksC9xY6uTR4ONvm2ASPm
-W0Dhlpyo8l8pgBNguaH+7nit2fGsosTRznm8cs1FBnVVhWwfZ+6c2rdZj7QeO3Je
-oIlWhWl0U6uGtPA8RgVi2ZJTB4CNIjEZBQ87ofT0dGZGoVM/t+2zjoeO7k5bI2HS
-wT/ufChSdiiW2LYLHFhO+LIp2twvEBawR9MtdDsc/4zPKyJ/2FCVg99hQYI7Y3z/
-maJwj62sqyQ4XkZzpBHvCKB9ySdh8QUHtLPgOgGPwg6g7Ut5TWVJWPnQNz/MSmtp
-MOz8vpH4fSsWtS2JNo85bvFS4FiKmCw6vG1PheBI0XxfqlkySXgjhU26lb68jJ9r
-n1976ZohUcaxPFx48y88vpiP573gMdmchauaNUEvZ1LID+mJnu5e1ZaOGi9cZv2O
-5vJeWKb63i704rmv0/H8cy7kbdVJDIv7JgBSZNIWjfqeum+nwewkD4SAYHH3zHmq
-AmQbBi0S2ffJvAuL62mdGxkJ+J9FMFieK9W3S2CzPTygGa2jNJfW1FjYOEUFijvl
-VMOsYo90IK6nysbLAihyWEdzfW8Z4k11jyKNRgjCm6RRVs8X/z+OpdwhNss5GMud
-UOqmPh1BHSP6OopU/PdT
-=3Jek
+iQIcBAEBCgAGBQJScUnyAAoJELnU8jG9FVirFm8QAKS3ltBMwOOpCRGcXhVCcxbP
+hSBQsoliCcitA2DWjG8XvCilOjIzp1j0C/wmfR9SpMZVJt+GtNTFJ8cuqNR52XOI
+emX8/1ux/6++x7kFW3gqB9ZjFx8BAwh7CK4iKdWPrar09dZGvooHu6bLm3YGaI2v
+Rf+MP15k/B40xdjndxqatqlR8PUmrGDKBXtOyqMyA/m6CTKqBAPEhW2gabQ4An29
+ZZcEJfu1CokOCF1Mtzu17CLigQrCX49wq+j1kYeeU2DNgA93SaYSQft3jEjSAN9u
+6ETTkdXc8XeOgTHE3Dm5KUHXB7PNn+TBlKF9/9cM1tP9nsfizWzMYPZpUWapmD59
+WBeOXQgvHZO40A+2nYj6m0rIDuJ7WxkdRzt/AtXq3CkhiKt6RQvA5ZDpuIH7F6iQ
+btg41LoX7VAthsbcDcwnvxqrOoQjB3xpYSs7AMAFbTxVBSxUbGUHBqh59/fiJsvg
+n+7/Zk1XpudU1uczSIFLvw0lLlib5ksdtGLMaLYAK92w5Y835b4nfSIbi/DWaCoT
+1tqnfMczx3fAOicHNl3OtoeoNybvjPKlW74tPEibdK2bcMucZz6tXCoHwl/6l7V5
+Da5Tufi/C7Setdz3FCWIXbamhu0b2y7gbZ6MlV8yuuMkm9dpftD1T7MXU/QHILoP
+lMYvFP0hXZeO71qAhP5O
+=vUHw
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
index fb0d545222c7..372c41884248 100644
--- a/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
+++ b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild,v 1.1 2013/10/30 17:36:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild,v 1.2 2013/10/30 18:03:29 jlec Exp $
 
 EAPI=5
 
@@ -59,11 +59,16 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile pkglibdir="${EPREFIX}/usr/$(get_libdir)"
-	use doc && emake html pdf
-	use emacs && elisp-compile *.el
+	use doc && autotools-utils_src_compile html pdf
+	use emacs && cd "${BUILD_DIR}" && elisp-compile *.el
 }
 
 src_install() {
+	if use doc; then
+		HTML_DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.html )
+		DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.pdf )
+	fi
+
 	autotools-utils_src_install pkglibdir="${EPREFIX}/usr/$(get_libdir)"
 
 	if use examples; then
@@ -71,11 +76,6 @@ src_install() {
 		doins -r examples
 	fi
 
-	if use doc; then
-		dohtml -r doc/pspp{,-dev}.html
-		dodoc doc/pspp{,-dev}.pdf
-	fi
-
 	if use emacs; then
 		elisp-install ${PN} *.el *.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"