[gentoo-commits] gentoo-x86 commit in app-text/texlive-core: ChangeLog texlive-core-2011-r4.ebuild

[Alexis Ballier (aballier)]

aballier    11/11/02 21:06:43

  Modified:             ChangeLog texlive-core-2011-r4.ebuild
  Log:
  add upstream patches from branch 2011
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

Revision  Changes    Path
1.156                app-text/texlive-core/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/texlive-core/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/texlive-core/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/texlive-core/ChangeLog?r1=1.155&r2=1.156

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog	12 Oct 2011 15:08:15 -0000	1.155
+++ ChangeLog	2 Nov 2011 21:06:43 -0000	1.156
@@ -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@g.o>
+  texlive-core-2011-r4.ebuild:
+  add upstream patches from branch 2011
 
   12 Oct 2011; Raúl Porcel <armin76@g.o> texlive-core-2010-r4.ebuild,
   texlive-core-2011-r4.ebuild:



1.3                  app-text/texlive-core/texlive-core-2011-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/texlive-core/texlive-core-2011-r4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/texlive-core/texlive-core-2011-r4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/texlive-core/texlive-core-2011-r4.ebuild?r1=1.2&r2=1.3

Index: texlive-core-2011-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texlive-core-2011-r4.ebuild	12 Oct 2011 15:08:15 -0000	1.2
+++ texlive-core-2011-r4.ebuild	2 Nov 2011 21:06:43 -0000	1.3
@@ -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 @@
 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 @@
 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