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 B3E25138ACE for ; Mon, 9 Mar 2015 14:04:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3DE6E094C; Mon, 9 Mar 2015 14:04:24 +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 54D92E094C for ; Mon, 9 Mar 2015 14:04:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4B5334098A for ; Mon, 9 Mar 2015 14:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB4B01361E for ; Mon, 9 Mar 2015 14:04:16 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1425909848.6de5dbd94259c5955fdfdcd2510f034ea444097d.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-tex/pythontex/ X-VCS-Repository: proj/sci X-VCS-Files: dev-tex/pythontex/ChangeLog dev-tex/pythontex/pythontex-0.12.ebuild dev-tex/pythontex/pythontex-0.14.ebuild dev-tex/pythontex/pythontex-9999.ebuild X-VCS-Directories: dev-tex/pythontex/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 6de5dbd94259c5955fdfdcd2510f034ea444097d X-VCS-Branch: master Date: Mon, 9 Mar 2015 14:04:16 +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: da0aa451-66a9-4567-a987-fa2094c75fc1 X-Archives-Hash: 1117b866f5b1b1a1caa89ef566232109 commit: 6de5dbd94259c5955fdfdcd2510f034ea444097d Author: Justin Lecher gentoo org> AuthorDate: Mon Mar 9 14:04:08 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Mar 9 14:04:08 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6de5dbd9 dev-tex/pythontex: Version BUmp Package-Manager: portage-2.2.18 dev-tex/pythontex/ChangeLog | 9 ++++- dev-tex/pythontex/pythontex-0.12.ebuild | 70 --------------------------------- dev-tex/pythontex/pythontex-0.14.ebuild | 57 +++++++++++++++++++++++++++ dev-tex/pythontex/pythontex-9999.ebuild | 50 ++++++++++------------- 4 files changed, 85 insertions(+), 101 deletions(-) diff --git a/dev-tex/pythontex/ChangeLog b/dev-tex/pythontex/ChangeLog index c0fb531..1ea18de 100644 --- a/dev-tex/pythontex/ChangeLog +++ b/dev-tex/pythontex/ChangeLog @@ -1,8 +1,13 @@ # ChangeLog for dev-tex/pythontex -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pythontex-0.14 (09 Mar 2015) + + 09 Mar 2015; Justin Lecher +pythontex-0.14.ebuild, + -pythontex-0.12.ebuild, pythontex-9999.ebuild: + dev-tex/pythontex: Version BUmp + 06 Jan 2014; Justin Lecher pythontex-0.12.ebuild, pythontex-9999.ebuild, +metadata.xml: Switch from git-2 to git-r3 - diff --git a/dev-tex/pythontex/pythontex-0.12.ebuild b/dev-tex/pythontex/pythontex-0.12.ebuild deleted file mode 100644 index 9cd7cac..0000000 --- a/dev-tex/pythontex/pythontex-0.12.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) - -inherit latex-package python-single-r1 - -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" - -SLOT="0" -LICENSE="LPPL-1.3 BSD" -KEYWORDS="~amd64" -IUSE="highlighting" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - app-text/texlive" -RDEPEND="${DEPEND} - dev-texlive/texlive-xetex - >=dev-python/matplotlib-1.2.0[${PYTHON_USEDEP}] - highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )" - -TEXMF=/usr/share/texmf-site - -S="${WORKDIR}"/${PN} -src_prepare() { - rm pythontex.sty || die "Could not remove pythontex.sty!" -} - -src_compile() { - ebegin "Compiling ${PN}" - latex ${PN}.ins extra > "${T}"/build-latex.log || die "Building style from ${PN}.ins failed" - eend - 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!" -} - -src_install() { - python_optimize . - if python_is_python3; then - python_newscript pythontex3.py pythontex.py - python_newscript depythontex3.py depythontex.py - else - python_newscript pythontex2.py pythontex.py - python_doscript pythontex_2to3.py - python_newscript depythontex2.py depythontex.py - fi - - python_export PYTHON_SCRIPTDIR - - python_moduleinto ${PYTHON_SCRIPTDIR} - python_domodule "${S}"/pythontex_engines.py "${S}"/pythontex_utils.py - - insinto /usr/share/texmf-site/tex/latex/pythontex/ - doins "${S}"/pythontex.sty - - insinto /usr/share/texmf-site/source/latex/pythontex/ - doins "${S}"/pythontex.dtx "${S}"/pythontex.ins - - latex-package_src_install - - dodoc README - mktexlsr -} diff --git a/dev-tex/pythontex/pythontex-0.14.ebuild b/dev-tex/pythontex/pythontex-0.14.ebuild new file mode 100644 index 0000000..252dcdc --- /dev/null +++ b/dev-tex/pythontex/pythontex-0.14.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit latex-package python-r1 + +DESCRIPTION="Fast Access to Python from within LaTeX" +HOMEPAGE="https://github.com/gpoore/pythontex" +SRC_URI="https://github.com/gpoore/pythontex/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="LPPL-1.3 BSD" +KEYWORDS="~amd64" +IUSE="highlighting" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-texlive/texlive-latex" +RDEPEND="${DEPEND} + dev-texlive/texlive-xetex + >=dev-python/matplotlib-1.2.0[${PYTHON_USEDEP}] + highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )" + +TEXMF=/usr/share/texmf-site + +src_compile() { + cd ${PN} || die + ebegin "Compiling ${PN}" + rm ${PN}.sty || die + latex ${PN}.ins extra || die + eend +} + +src_install() { + dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/* + + cd ${PN} || die + + installation() { + if python_is_python3; then + python_domodule {de,}${PN}3.py + else + python_domodule {de,}${PN}2.py + fi + python_domodule ${PN}_{engines,utils}.py + python_doscript {de,}${PN}.py syncpdb.py + python_optimize + } + python_foreach_impl installation + + latex-package_src_doinstall ${PN}.{dtx,ins,sty} +} diff --git a/dev-tex/pythontex/pythontex-9999.ebuild b/dev-tex/pythontex/pythontex-9999.ebuild index 5e7ac36..92b36ac 100644 --- a/dev-tex/pythontex/pythontex-9999.ebuild +++ b/dev-tex/pythontex/pythontex-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) -inherit latex-package python-single-r1 git-r3 +inherit latex-package python-r1 git-r3 DESCRIPTION="Fast Access to Python from within LaTeX" HOMEPAGE="https://github.com/gpoore/pythontex" @@ -21,46 +21,38 @@ IUSE="highlighting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} - app-text/texlive" + dev-texlive/texlive-latex" RDEPEND="${DEPEND} dev-texlive/texlive-xetex >=dev-python/matplotlib-1.2.0[${PYTHON_USEDEP}] highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )" -src_prepare() { - S="${WORKDIR}/${P}/${PN}" - cd "${S}" || die - rm pythontex.sty || die "Could not remove pre-compiled pythontex.sty!" -} +TEXMF=/usr/share/texmf-site src_compile() { + cd ${PN} || die ebegin "Compiling ${PN}" - latex ${PN}.ins extra > "${T}"/build-latex.log || die "Building style from ${PN}.ins failed" + rm ${PN}.sty || die + latex ${PN}.ins extra || die eend } src_install() { - python_optimize . + dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/* + + cd ${PN} || die + + installation() { 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 + python_domodule {de,}${PN}3.py else - python_newscript pythontex2.py pythontex.py - python_doscript pythontex_2to3.py - python_newscript depythontex2.py depythontex.py + python_domodule {de,}${PN}2.py fi + python_domodule ${PN}_{engines,utils}.py + python_doscript {de,}${PN}.py syncpdb.py + python_optimize + } + python_foreach_impl installation - python_domodule "${S}"/pythontex_engines.py "${S}"/pythontex_utils.py - - insinto /usr/share/texmf-site/tex/latex/pythontex/ - doins "${S}"/pythontex.sty - - insinto /usr/share/texmf-site/source/latex/pythontex/ - doins "${S}"/pythontex.dtx "${S}"/pythontex.ins - - latex-package_src_install - - dodoc README - mktexlsr || die + latex-package_src_doinstall ${PN}.{dtx,ins,sty} }