From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D73DD139695 for ; Sat, 18 Feb 2017 11:31:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FCF321C0F4; Sat, 18 Feb 2017 11:31:15 +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 E034921C081 for ; Sat, 18 Feb 2017 11:31:14 +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 E905033BF1B for ; Sat, 18 Feb 2017 11:31:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5810C4C0A for ; Sat, 18 Feb 2017 11:31:12 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1487417460.f08f73e9dfb4fe3b9cc75fcba125a1ca45ed8a78.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/texamator/, dev-tex/texamator/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tex/texamator/files/texamator dev-tex/texamator/texamator-1.7.5-r1.ebuild dev-tex/texamator/texamator-1.7.5.ebuild X-VCS-Directories: dev-tex/texamator/files/ dev-tex/texamator/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f08f73e9dfb4fe3b9cc75fcba125a1ca45ed8a78 X-VCS-Branch: master Date: Sat, 18 Feb 2017 11:31:12 +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: 327263f3-8947-4330-832d-93c3e49ffcf4 X-Archives-Hash: 256cc2d6b951d87350f1b91ad356a1ab commit: f08f73e9dfb4fe3b9cc75fcba125a1ca45ed8a78 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 18 11:01:28 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 18 11:31:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08f73e9 dev-tex/texamator: python-single-r1, EAPI=6 dev-tex/texamator/files/texamator | 3 -- ...ator-1.7.5.ebuild => texamator-1.7.5-r1.ebuild} | 35 +++++++++------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dev-tex/texamator/files/texamator b/dev-tex/texamator/files/texamator deleted file mode 100644 index 93e860dc09..0000000000 --- a/dev-tex/texamator/files/texamator +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /usr/lib/TeXamator -exec python2 TeXamator.py diff --git a/dev-tex/texamator/texamator-1.7.5.ebuild b/dev-tex/texamator/texamator-1.7.5-r1.ebuild similarity index 52% rename from dev-tex/texamator/texamator-1.7.5.ebuild rename to dev-tex/texamator/texamator-1.7.5-r1.ebuild index df0e135ca3..94f1c410ff 100644 --- a/dev-tex/texamator/texamator-1.7.5.ebuild +++ b/dev-tex/texamator/texamator-1.7.5-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 -PYTHON_DEPEND="2" +EAPI=6 +PYTHON_COMPAT=( python2_7 ) -inherit multilib python +inherit python-single-r1 MY_PN=TeXamator @@ -19,30 +19,23 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="app-text/dvipng - dev-python/PyQt4 + dev-python/PyQt4[${PYTHON_USEDEP}] virtual/latex-base" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_PN} -pkg_setup() { - python_set_active_version 2 - python_pkg_setup +src_compile() { + cat >> ${PN} <<-_EOF_ || die + #!/bin/sh + cd /usr/lib/${MY_PN} && + exec "${EPYTHON}" ${MY_PN}.py + _EOF_ } src_install() { - python_need_rebuild + dobin ${PN} - dobin "${FILESDIR}"/${PN} - - insinto /usr/$(get_libdir)/${MY_PN} - doins -r ${MY_PN}.py partielatormods {ts,ui}_files -} - -pkg_postinst() { - python_mod_optimize /usr/$(get_libdir)/${MY_PN} -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/${MY_PN} + python_moduleinto /usr/lib/${MY_PN} + python_domodule ${MY_PN}.py partielatormods {ts,ui}_files }