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 0344E59CB4 for ; Tue, 19 Apr 2016 14:00:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68D0421C068; Tue, 19 Apr 2016 14:00:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E47F21C04F for ; Tue, 19 Apr 2016 14:00:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B127340845 for ; Tue, 19 Apr 2016 14:00:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AD8017B4 for ; Tue, 19 Apr 2016 14:00:46 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1461074433.c59f27ee7d631913a2afd3502b785d6bde76a762.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/cherrytree/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/cherrytree/cherrytree-0.36.9.ebuild X-VCS-Directories: app-text/cherrytree/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: c59f27ee7d631913a2afd3502b785d6bde76a762 X-VCS-Branch: master Date: Tue, 19 Apr 2016 14:00:46 +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: 3c155c0d-5659-4455-a447-b93f7ad3514b X-Archives-Hash: 90bb202c3a2979163632fc22202b378d commit: c59f27ee7d631913a2afd3502b785d6bde76a762 Author: Jan Chren gmail com> AuthorDate: Sat Apr 16 11:46:24 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Tue Apr 19 14:00:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59f27ee app-text/cherrytree: migrate to distutils-r1.eclass Closes: https://github.com/gentoo/gentoo/pull/1280 Signed-off-by: Ian Delaney gentoo.org> app-text/cherrytree/cherrytree-0.36.9.ebuild | 50 +++++++++------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/app-text/cherrytree/cherrytree-0.36.9.ebuild b/app-text/cherrytree/cherrytree-0.36.9.ebuild index 2c856c0..d952e2d 100644 --- a/app-text/cherrytree/cherrytree-0.36.9.ebuild +++ b/app-text/cherrytree/cherrytree-0.36.9.ebuild @@ -5,8 +5,9 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=true -inherit fdo-mime eutils python-single-r1 +inherit fdo-mime distutils-r1 DESCRIPTION='A hierarchical note taking application' HOMEPAGE='http://www.giuspen.com/cherrytree' @@ -18,7 +19,7 @@ SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar. KEYWORDS='~amd64 ~x86' IUSE='nls' -RDEPEND="${PYTHON_DEPS} +RDEPEND=" x11-libs/libX11 dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pyenchant[${PYTHON_USEDEP}] @@ -32,44 +33,23 @@ DEPEND="${RDEPEND} PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN' inherit l10n -src_prepare() { - use nls && l10n_find_plocales_changes 'locale' '' '.po' - - sed -i '\|update-desktop-database|d' 'setup.py' || die +python_prepare_all() { + if use nls ; then + l10n_find_plocales_changes 'locale' '' '.po' - default -} + rm_loc() { + rm -v -f "locale/${1}.po" || return 1 + } + l10n_for_each_disabled_locale_do rm_loc + fi -src_compile() { - local args=() - use nls || args+=( '--without-gettext' ) + sed -i '\|update-desktop-database|d' 'setup.py' || die - "${EPYTHON}" ./setup.py "${args[@]}" build + distutils-r1_python_prepare_all } -src_install() { - dobin "${PN}" - - doicon -s scalable "glade/svg/${PN}.svg" - domenu "linux/${PN}.desktop" - doman "linux/${PN}.1" - - insinto "/usr/share/${PN}" - doins -r 'glade/' 'modules/' 'language-specs/' - - insinto '/usr/share/mime-info' - doins "linux/${PN}".{mime,keys} - insinto '/usr/share/mime/packages' - doins "linux/${PN}.xml" - - if use nls ; then - ins_loc() { - # cannot use domo() as it installs files into a wrong dir - insinto "/usr/share/locale/${1}/LC_MESSAGES" - doins "build/mo/${1}/${PN}.mo" - } - l10n_for_each_locale_do ins_loc - fi +src_configure() { + use nls || mydistutilsargs+=( '--without-gettext' ) } pkg_postinst() {