diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-11-02 21:06:43 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-11-02 21:06:43 +0000 |
| commit | dc250fbe2a6bb864ed404662f758d669919f7615 (patch) | |
| tree | ca14b8117a4da0ed0e09fa9878c9e23dcb5099ea /app-text/texlive-core | |
| parent | [kde-base] KDE SC 4.7.3 (diff) | |
| download | gentoo-2-dc250fbe2a6bb864ed404662f758d669919f7615.tar.gz gentoo-2-dc250fbe2a6bb864ed404662f758d669919f7615.tar.bz2 gentoo-2-dc250fbe2a6bb864ed404662f758d669919f7615.zip | |
add upstream patches from branch 2011
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'app-text/texlive-core')
| -rw-r--r-- | app-text/texlive-core/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/texlive-core/texlive-core-2011-r4.ebuild | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog index ab84fd5b097d..ae4686befe3b 100644 --- a/app-text/texlive-core/ChangeLog +++ b/app-text/texlive-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/texlive-core # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.155 2011/10/12 15:08:15 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.156 2011/11/02 21:06:43 aballier Exp $ + + 02 Nov 2011; Alexis Ballier <aballier@gentoo.org> + texlive-core-2011-r4.ebuild: + add upstream patches from branch 2011 12 Oct 2011; Raúl Porcel <armin76@gentoo.org> texlive-core-2010-r4.ebuild, texlive-core-2011-r4.ebuild: diff --git a/app-text/texlive-core/texlive-core-2011-r4.ebuild b/app-text/texlive-core/texlive-core-2011-r4.ebuild index 4cbf2bc94db4..5daf0950a4ac 100644 --- a/app-text/texlive-core/texlive-core-2011-r4.ebuild +++ b/app-text/texlive-core/texlive-core-2011-r4.ebuild @@ -1,13 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r4.ebuild,v 1.2 2011/10/12 15:08:15 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r4.ebuild,v 1.3 2011/11/02 21:06:43 aballier Exp $ EAPI=3 +TL_UPSTREAM_PATCHLEVEL="1" +PATCHLEVEL="31" +TL_SOURCE_VERSION=20110705 + inherit eutils flag-o-matic toolchain-funcs libtool texlive-common -PATCHLEVEL="30" -TL_SOURCE_VERSION=20110705 MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source DESCRIPTION="A complete TeX distribution" @@ -18,7 +20,8 @@ LICENSE="GPL-2 LPPL-1.3c TeX" SRC_URI="mirror://gentoo/${MY_PV}.tar.xz" # Fetch patches -SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz" +SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz + mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz" TL_CORE_BINEXTRA_MODULES=" a2ping asymptote bibtex8 bundledoc ctie cweb de-macro dtl dvi2tty dviasm @@ -113,6 +116,7 @@ S="${WORKDIR}/${MY_PV}" src_prepare() { mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files" + EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" elibtoolize |