Gentoo Archives: gentoo-commits

From: "André Erdmann" <dywi@×××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/R_overlay:master commit in: /
Date: Thu, 05 Jun 2014 22:09:20
Message-Id: 1396553863.92616609309a3e5775463e880438a3e8ef2a5ddc.dywi@gentoo
1 commit: 92616609309a3e5775463e880438a3e8ef2a5ddc
2 Author: André Erdmann <dywi <AT> mailerd <DOT> de>
3 AuthorDate: Thu Apr 3 19:37:43 2014 +0000
4 Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
5 CommitDate: Thu Apr 3 19:37:43 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=92616609
7
8 update roverlay-9999.ebuild
9
10 * fix python deps
11 * create "roverlay" group during pkg_preinst()
12 * compress config during src_compile()
13 * adopt Makefile changes
14
15 ---
16 roverlay-9999.ebuild | 25 +++++++++----------------
17 1 file changed, 9 insertions(+), 16 deletions(-)
18
19 diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
20 index abe6b6a..290bd51 100644
21 --- a/roverlay-9999.ebuild
22 +++ b/roverlay-9999.ebuild
23 @@ -25,42 +25,35 @@ KEYWORDS=""
24 IUSE="compress-config xz +prebuilt-documentation"
25
26 DEPEND="
27 - dev-python/setuptools
28 + dev-python/setuptools[${PYTHON_USEDEP}]
29 !prebuilt-documentation? ( >=dev-python/docutils-0.9 )
30 compress-config? ( app-arch/bzip2 )"
31 RDEPEND="
32 sys-apps/portage
33 - virtual/python-argparse
34 + virtual/python-argparse[${PYTHON_USEDEP}]
35 dev-python/mako[${PYTHON_USEDEP}]
36 - xz? ( $(python_gen_cond_dep dev-python/backports-lzma[${PYTHON_USEDEP}] python{2_7,3_2}) )
37 + xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python{2_7,3_2})] python{2_7,3_2} ) )
38 virtual/python-futures[${PYTHON_USEDEP}]"
39
40 -pkg_setup() {
41 +pkg_preinst() {
42 enewgroup roverlay
43 }
44
45 -python_prepare_all() {
46 - distutils-r1_python_prepare_all
47 +python_compile_all() {
48 + use prebuilt-documentation || emake htmldoc
49 if use compress-config; then
50 einfo "Compressing dependency rules and license map"
51 emake X_COMPRESS=bzip2 BUILDDIR="${S}/compressed" compress-config
52 fi
53 }
54
55 -python_compile_all() {
56 - use prebuilt-documentation || emake htmldoc
57 -}
58 -
59 python_install_all() {
60 distutils-r1_python_install_all
61
62 emake BUILDDIR="${S}/compressed" DESTDIR="${D}" \
63 - install-data $(usex compress-config install-config{-compressed,})
64 -
65 - # could be done in the Makefile as well
66 - dobin "${S}/bin/install/${PN}-setup-interactive"
67 -
68 - newbashcomp "${S}/files/misc/${PN}.bashcomp" "${PN}"
69 + BASHCOMPDIR="${D}/$(get_bashcompdir)" \
70 + COMPRESSED_CONFIG="$(usex compress-config 1 0)" \
71 + install-nonpy
72 }
73
74 pkg_config() {