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 EE06B138247 for ; Thu, 7 Nov 2013 20:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9BB3E0AC0; Thu, 7 Nov 2013 20:05:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB404E0AB9 for ; Thu, 7 Nov 2013 20:05:18 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAB1C33DACA for ; Thu, 7 Nov 2013 20:05:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6E009E54D9 for ; Thu, 7 Nov 2013 20:05:15 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1381687269.8ab8f26a8eaba19780ff83ccda6cee608711ad67.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-tex/pythontex/ X-VCS-Repository: proj/sci X-VCS-Files: dev-tex/pythontex/pythontex-0.12.ebuild X-VCS-Directories: dev-tex/pythontex/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 8ab8f26a8eaba19780ff83ccda6cee608711ad67 X-VCS-Branch: master Date: Thu, 7 Nov 2013 20:05:15 +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: 138d19cf-54d5-4b61-bf0c-2a146725e336 X-Archives-Hash: c440f640ac8595ad6099b7cc4af9ce40 commit: 8ab8f26a8eaba19780ff83ccda6cee608711ad67 Author: Horea Christian mail ru> AuthorDate: Sun Oct 13 18:01:09 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Oct 13 18:01:09 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8ab8f26a Finally works on all tested machines (creating the scripts normally, and the modules in the directory suggested by upstream) --- dev-tex/pythontex/pythontex-0.12.ebuild | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dev-tex/pythontex/pythontex-0.12.ebuild b/dev-tex/pythontex/pythontex-0.12.ebuild index 6eeaadd..3f91516 100644 --- a/dev-tex/pythontex/pythontex-0.12.ebuild +++ b/dev-tex/pythontex/pythontex-0.12.ebuild @@ -8,7 +8,6 @@ PYTHON_COMPAT=( python{2_7,3_2,3_3} ) inherit latex-package python-single-r1 -S="${WORKDIR}/${PN}" DESCRIPTION="Fast Access to Python from within LaTeX" HOMEPAGE="https://github.com/gpoore/pythontex" SRC_URI="https://github.com/gpoore/pythontex/raw/master/package_downloads/${PN}_${PV}.zip https://github.com/gpoore/pythontex/raw/master/package_downloads/old_versions/${PN}_${PV}.zip" @@ -27,7 +26,6 @@ RDEPEND="${DEPEND} TEXMF=/usr/share/texmf-site S="${WORKDIR}"/${PN} - src_prepare() { rm pythontex.sty || die "Could not remove pythontex.sty!" } @@ -36,7 +34,6 @@ src_compile() { ebegin "Compiling ${PN}" latex ${PN}.ins extra >/dev/null || die "Building style from ${PN}.ins failed" eend - sed -i -e '1i#!/usr/bin/env python' depythontex.py || die "adding shebang failed!" sed -i -e '1i#!/usr/bin/env python' depythontex2.py || die "adding shebang failed!" sed -i -e '1i#!/usr/bin/env python' depythontex3.py || die "adding shebang failed!" } @@ -44,41 +41,26 @@ src_compile() { src_install() { python_optimize . if python_is_python3; then - python_scriptinto /usr/share/texmf-site/scripts/${PN}/ python_newscript pythontex3.py pythontex.py python_newscript depythontex3.py depythontex.py - insinto /usr/share/texmf-site/scripts/${PN}/ - doins "${S}"/${PN}3.py - else ! python_is_python3; - python_scriptinto /usr/share/texmf-site/scripts/${PN}/ - python_newscript pythontex2.py pythontex.py + else python_newscript pythontex2.py pythontex.py python_doscript pythontex_2to3.py python_newscript depythontex2.py depythontex.py - insinto /usr/share/texmf-site/scripts/${PN}/ - doins "${S}"/${PN}2.py fi - python_moduleinto /usr/share/texmf-site/scripts/pythontex/ + python_moduleinto /usr/lib64/python-exec/python2.7 python_domodule "${S}"/pythontex_engines.py python_domodule "${S}"/pythontex_utils.py insinto /usr/share/texmf-site/tex/latex/pythontex/ doins "${S}"/pythontex.sty - #insinto /usr/$(get_libdir)/python-exec - #doins "${S}"/pythontex_engines.py - insinto /usr/share/texmf-site/source/latex/pythontex/ doins "${S}"/pythontex.dtx doins "${S}"/pythontex.ins latex-package_src_install - #which env-updatedosym /usr/share/texmf-site/scripts/${PN}/${PN}.py /usr/bin/${PN} - - echo "PATH=/usr/share/texmf-site/scripts/pythontex/" >> "${T}"/99${PN} || die "Can't write environment variable." - doenvd "${T}"/99${PN} - dodoc README mktexlsr }