summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/pkgcore/ChangeLog5
-rw-r--r--sys-apps/pkgcore/Manifest18
-rw-r--r--sys-apps/pkgcore/pkgcore-9999.ebuild27
3 files changed, 18 insertions, 32 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index c43290df088d..139209918206 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/pkgcore
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.192 2015/07/23 06:25:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.193 2015/07/23 06:36:36 radhermit Exp $
+
+ 23 Jul 2015; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
+ Simplify building and installing docs.
23 Jul 2015; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
Add setuptools dep.
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 7ef3d9e67c9a..8e50d0c1923c 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
DIST pkgcore-0.9.1.tar.gz 570633 SHA256 d5f556c7dcf69aa45f8bc80c95cc5273de389d21ab7932a1cd8babcd5aa2fc10 SHA512 3cd221070369af07729afa2af5bba20a544d2d58913a6e8d7da90b7a59d043fec906b7276032194cc5c86d84417793ba732f326a342b5ac439f1f2bf6b14a262 WHIRLPOOL f39f927f0334be9ab95ed6bf6b8074f707fcee57eb124dc25b48bdc40c4743959fa9826e7cec593f082233624335d753f09990ce3faf7a798abf442c8879bbda
EBUILD pkgcore-0.9.1.ebuild 1777 SHA256 1f473216b34e9ffb5c9cd2102d7c38de44a10dbbd295289c1bc30e0e6a82804a SHA512 f60091366e7a86b2e0b5a115b09151f6387e6ca4d22b67c7c70c1e06e3959481e8b3c6ed5a80ee4e53372005645ce978dcc473ba3cd4c5f56b5bfd8937ea365a WHIRLPOOL 423b6fe5ba0cfe1210fc141a7cdaca6305de1939457bdce8d0fab5c499c737bfbb86e3b050edc154b3b418e1506b9308dbe3c9e1e385a28231e097a4fa1c1aaa
-EBUILD pkgcore-9999.ebuild 1871 SHA256 2962fa22df3ff75264fee9634b468131f9bc07c5165c86e902f6eb75d3085cc9 SHA512 50ad9c52ad9ac8e46c4a9d3fb59bc8446c29895f03eda4dfad6035c9abe525971f2e3b56b2f5379b131310f7c894a5cac567b159be8d611ad7305ab9aad4ba03 WHIRLPOOL e8f8e10a463821d0086f896c252babad046a4337538ce01ba68d8ff9174e692a68fc89dd13bd2aee8b6614a8ca13d18ec51279c4244ba2578b76d007305334c3
-MISC ChangeLog 31821 SHA256 b59ff4a009b3e6d6b3502ad6adaf3522396265136e6c0ecc28040bb31a042b46 SHA512 ffb165e067760ce62bfae01830f423422502f5e7b73170a19f1d381c5abe02665a110b2594bcd5099045b388c578411b3306481f31186e80874b4f939d0e3b81 WHIRLPOOL 98c4d721278222960760f95d0c807e81d55bdfe563c216e129369b3a228d7a73584a2acd51f0d74aa9a64b13a7321da9844a8852baf04e3174c059e3df909464
+EBUILD pkgcore-9999.ebuild 1596 SHA256 b733c91a632acf15cb2e825fa72d7ad30c0b3812214b5ebe977b4b6328810ca1 SHA512 18857f6f7e60b35a7032bd8618af1c5cfc11b74f4eb3ae060986a86fe384f8fb3811c15a634027be4ccfc53f37e92be85aa509953836634f0273a3bd7edac67d WHIRLPOOL 51c51e6eb2f2644763d1010b9325794fef5895aa7bd5c4457e1d1d52a4109095ab2d87ff506cd781d82fb8cc57fe1a2aa1678cf60effe850c72ea63161787d09
+MISC ChangeLog 31933 SHA256 1360bbd1c3d351368edae6967f70a445982a456934c19fb20e5b24309f1c8803 SHA512 066cbc5429062b84ac141c6a25b6f58101f27a7b0c6e3f15030309561d9560a815deff311ca987ac1505b569042913b0aff3d05c64386ab540f4a834249be3b3 WHIRLPOOL ba485e7205b4035328f8c451bea5512262437f9d1ef3bfea12642b8691b25a6f046e9894e080249e3c628ddf146b2e6cb432078d0833e8f1c327bb1c281afe54
MISC metadata.xml 442 SHA256 54352bca8c15555161cee96f840be2c597297c9b93b8810ee25fa48290ae143c SHA512 1433d866c0791eef2ff77ec046d8e4def5020ddaea2e40aa3597b857b941a5d9b342b7b2c4d0b74bb37b2a5aa2204ef9f7629bf7d070ff8fc1c3168a23fd7afa WHIRLPOOL 2323075d0a84108b542863eb2bada240bd5479da8e8c4b94305fce45a5caede837a94f2c554ff90e6406b974f4baba373e9f49624545e8ab2a9ef5325d179997
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJVsIivAAoJEEqz6FtPBkyjoWkH/js8mgg6GxBNfjsfzUHlIJfQ
-2ucDAfQSjG65JNX+LB0H82KvmVjzYi3KQgGhWLkmnzyQDFilFDMzzYHgu0AHJxWb
-JazTTO/lPajBv1c+goLj1BYdDcYSXfGf/mEGwz0sl3LQSdeytUuXrrEl7qWKRU6T
-Zj0F4gB3Ycx4zupSI/1TKW+0bOPowfduWv6ZEanrdqGqZ06/aa+0jxU1h0g8uJvN
-VMUwsuSbRJSYTtN1jBNGXrHW9GH/ICMNDmIB4yPZL3Nw4U85Z78aO9kshxktD1LN
-eAyXNS99KJ3RTRZweNkyVyJd1MhGKnw+VpKVeExvPPQFPxC50QfVN9POjWbnzYU=
-=sddg
+iQEcBAEBCAAGBQJVsItaAAoJEEqz6FtPBkyjJi8IAIq7E+X35p2qF7ZIx40pO2OR
+uU7tgb+DbeDgCtB+Mkj75k/5I6VQlkNvQxhmAIZltH66x+z4Afaef7ssHVvDaCnu
+HX7jEz0uU7jVHC1G85o0K1gTTwnkhcVp6WTapz6jP0hWGaDuAjBTmdM2SCu3uHuJ
+emllkRz9Wj6ak/e++Bl8Q47QYN5aCQ2RlA4uVLkFk736mivrtNbe8ndnsLFlKPhy
+Qy2J/u6QgRkQksOEPE8NscDsJ6zqxdVI3RkyInTAA+DtQ+BvbW8carp5mOpzLhW2
+ZvElxER+oVUkQ03OWyAurDGKCXvCji9pCq2j8Ck5nAOozumsaynKNiI5CEXbPDU=
+=+D94
-----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 3483ece0f079..181be79533ea 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.28 2015/07/23 06:25:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.29 2015/07/23 06:36:36 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -32,41 +32,24 @@ DEPEND="${RDEPEND}
pkg_setup() {
# disable snakeoil 2to3 caching...
unset PY2TO3_CACHEDIR
-
- mydistutilsargs=(
- build
- --disable-html-docs
- --disable-man-pages
- )
}
python_compile_all() {
- esetup.py $(use doc && echo 'build_docs')
-
if [[ ${PV} == *9999 ]]; then
esetup.py build_man
ln -s "${BUILD_DIR}/sphinx/man" man || die
fi
- # symlinks generated manpages into source root
- # dead symlinks are tolerated
- ln -s "${BUILD_DIR}/sphinx/html" html || die
+ if use doc; then
+ esetup.py build_html
+ ln -s "${BUILD_DIR}/sphinx/html" html || die
+ fi
}
python_test() {
esetup.py test
}
-src_install() {
- mydistutilsargs+=(
- install
- --disable-html-docs
- --disable-man-pages
- )
-
- distutils-r1_src_install
-}
-
python_install_all() {
local cmds=(
install_man