From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9E4811381FA for ; Thu, 5 Jun 2014 22:09:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33790E0984; Thu, 5 Jun 2014 22:09:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A663E0984 for ; Thu, 5 Jun 2014 22:09:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 718E433FE37 for ; Thu, 5 Jun 2014 22:09:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7DEAD18308 for ; Thu, 5 Jun 2014 22:09:10 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1396553863.92616609309a3e5775463e880438a3e8ef2a5ddc.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: / X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay-9999.ebuild X-VCS-Directories: / X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 92616609309a3e5775463e880438a3e8ef2a5ddc X-VCS-Branch: master Date: Thu, 5 Jun 2014 22:09:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 48721635-ffee-4eef-8bd4-ff1c2cc280dc X-Archives-Hash: f0724f080e9aa04d1968aaa3e93d8ebe commit: 92616609309a3e5775463e880438a3e8ef2a5ddc Author: André Erdmann mailerd de> AuthorDate: Thu Apr 3 19:37:43 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Apr 3 19:37:43 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=92616609 update roverlay-9999.ebuild * fix python deps * create "roverlay" group during pkg_preinst() * compress config during src_compile() * adopt Makefile changes --- roverlay-9999.ebuild | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild index abe6b6a..290bd51 100644 --- a/roverlay-9999.ebuild +++ b/roverlay-9999.ebuild @@ -25,42 +25,35 @@ KEYWORDS="" IUSE="compress-config xz +prebuilt-documentation" DEPEND=" - dev-python/setuptools + dev-python/setuptools[${PYTHON_USEDEP}] !prebuilt-documentation? ( >=dev-python/docutils-0.9 ) compress-config? ( app-arch/bzip2 )" RDEPEND=" sys-apps/portage - virtual/python-argparse + virtual/python-argparse[${PYTHON_USEDEP}] dev-python/mako[${PYTHON_USEDEP}] - xz? ( $(python_gen_cond_dep dev-python/backports-lzma[${PYTHON_USEDEP}] python{2_7,3_2}) ) + xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python{2_7,3_2})] python{2_7,3_2} ) ) virtual/python-futures[${PYTHON_USEDEP}]" -pkg_setup() { +pkg_preinst() { enewgroup roverlay } -python_prepare_all() { - distutils-r1_python_prepare_all +python_compile_all() { + use prebuilt-documentation || emake htmldoc if use compress-config; then einfo "Compressing dependency rules and license map" emake X_COMPRESS=bzip2 BUILDDIR="${S}/compressed" compress-config fi } -python_compile_all() { - use prebuilt-documentation || emake htmldoc -} - python_install_all() { distutils-r1_python_install_all emake BUILDDIR="${S}/compressed" DESTDIR="${D}" \ - install-data $(usex compress-config install-config{-compressed,}) - - # could be done in the Makefile as well - dobin "${S}/bin/install/${PN}-setup-interactive" - - newbashcomp "${S}/files/misc/${PN}.bashcomp" "${PN}" + BASHCOMPDIR="${D}/$(get_bashcompdir)" \ + COMPRESSED_CONFIG="$(usex compress-config 1 0)" \ + install-nonpy } pkg_config() {