Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/pkgcore: ChangeLog pkgcore-9999.ebuild
Date: Thu, 23 Jul 2015 06:36:44
Message-Id: 20150723063636.1F532C1@oystercatcher.gentoo.org
1 radhermit 15/07/23 06:36:36
2
3 Modified: ChangeLog pkgcore-9999.ebuild
4 Log:
5 Simplify building and installing docs.
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
8
9 Revision Changes Path
10 1.193 sys-apps/pkgcore/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pkgcore/ChangeLog?rev=1.193&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pkgcore/ChangeLog?rev=1.193&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pkgcore/ChangeLog?r1=1.192&r2=1.193
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v
19 retrieving revision 1.192
20 retrieving revision 1.193
21 diff -u -r1.192 -r1.193
22 --- ChangeLog 23 Jul 2015 06:25:12 -0000 1.192
23 +++ ChangeLog 23 Jul 2015 06:36:36 -0000 1.193
24 @@ -1,6 +1,9 @@
25 # ChangeLog for sys-apps/pkgcore
26 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.192 2015/07/23 06:25:12 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.193 2015/07/23 06:36:36 radhermit Exp $
29 +
30 + 23 Jul 2015; Tim Harder <radhermit@g.o> pkgcore-9999.ebuild:
31 + Simplify building and installing docs.
32
33 23 Jul 2015; Tim Harder <radhermit@g.o> pkgcore-9999.ebuild:
34 Add setuptools dep.
35
36
37
38 1.29 sys-apps/pkgcore/pkgcore-9999.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild?rev=1.29&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild?rev=1.29&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild?r1=1.28&r2=1.29
43
44 Index: pkgcore-9999.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v
47 retrieving revision 1.28
48 retrieving revision 1.29
49 diff -u -r1.28 -r1.29
50 --- pkgcore-9999.ebuild 23 Jul 2015 06:25:12 -0000 1.28
51 +++ pkgcore-9999.ebuild 23 Jul 2015 06:36:36 -0000 1.29
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2015 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.28 2015/07/23 06:25:12 radhermit Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.29 2015/07/23 06:36:36 radhermit Exp $
57
58 EAPI=5
59 PYTHON_COMPAT=( python2_7 )
60 @@ -32,41 +32,24 @@
61 pkg_setup() {
62 # disable snakeoil 2to3 caching...
63 unset PY2TO3_CACHEDIR
64 -
65 - mydistutilsargs=(
66 - build
67 - --disable-html-docs
68 - --disable-man-pages
69 - )
70 }
71
72 python_compile_all() {
73 - esetup.py $(use doc && echo 'build_docs')
74 -
75 if [[ ${PV} == *9999 ]]; then
76 esetup.py build_man
77 ln -s "${BUILD_DIR}/sphinx/man" man || die
78 fi
79
80 - # symlinks generated manpages into source root
81 - # dead symlinks are tolerated
82 - ln -s "${BUILD_DIR}/sphinx/html" html || die
83 + if use doc; then
84 + esetup.py build_html
85 + ln -s "${BUILD_DIR}/sphinx/html" html || die
86 + fi
87 }
88
89 python_test() {
90 esetup.py test
91 }
92
93 -src_install() {
94 - mydistutilsargs+=(
95 - install
96 - --disable-html-docs
97 - --disable-man-pages
98 - )
99 -
100 - distutils-r1_src_install
101 -}
102 -
103 python_install_all() {
104 local cmds=(
105 install_man