add upstream patches from branch 2011

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index ab84fd5b097dbc7b663452256464c8c14f41ce7f..ae4686befe3b1e25de730cbfcc0a2b21934d5072 100644 (file)
--- 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/Manifest b/app-text/texlive-core/Manifest
index 72fd4fc5503e826f514dbb10830548762175bdc7..0438ebf319130f0459491c083072a7aa24cc1112 100644 (file)
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -15,7 +15,8 @@ DIST texlive-core-patches-15.3.tar.lzma 32111 RMD160 8ef0935e9a0436f6b7f7426de85
 DIST texlive-core-patches-17.tar.xz 6288 RMD160 388a8b56a5bab07f4bbc47154304bf401f88c41f SHA1 923ca0edf69c66351b3bece6a4944489ba17a04f SHA256 aaf18bbb78a32f0dda8ad18856674cdaa49d65ac697d822bc3ac39da5ca9da32
 DIST texlive-core-patches-18.tar.xz 7024 RMD160 fc3eb111aab980ebd13165eb4026e5941c90cbed SHA1 19e759df2155aa3f3c15f7da275de5a8bce36bf8 SHA256 b8cfecc802e852360b6e5eeeed5de0c6f841396bd9fd80dc5b909f7ffc4432d1
 DIST texlive-core-patches-29.tar.xz 7100 RMD160 06e9e1a6e4dca828ceb746f443e93951892e8114 SHA1 4f0eb3e5925c42f73dfce4a366e5b1994fce0689 SHA256 629bad9dd08bb9ebfdda0994111e06a79960badd55d0e0615cdddc8b53126b99
-DIST texlive-core-patches-30.tar.xz 3488 RMD160 1214f54cd9ceb4f77f120f15efdf4633ddc983d6 SHA1 0e9e698f2343ee545000ec64c55a95d44291b653 SHA256 283130ebbcf07554763b24e7b46dcad7636b93116c25e1d8c05e814623ab914c
+DIST texlive-core-patches-31.tar.xz 3108 RMD160 dd3597cc7cab7e7035540544b575706d5f8a7d74 SHA1 b8d927bc484005470a0dc7f49cdabc0461186634 SHA256 69ec6e7d69e5c9feb50f115ca40ee4cd161ea319871adbc314f884b5055fcf91
+DIST texlive-core-upstream-patches-1.tar.xz 4316 RMD160 df6d51e1ffc3f15ed7146dc9e817773bf8ad3e14 SHA1 38a258fdd7966b3f559f4d0fc0f60e01cd5cbcf6 SHA256 0a3eccc79ad608ea543e2ce04adcca0dbe968dbaebaa43014854f51d609659a5
 DIST texlive-module-a2ping-2008.tar.lzma 31077 RMD160 d9a156c3e063831bc66fe3bf444903e7a5344d03 SHA1 2c7cbfb771fcb6f3b522fe7879de6904b34bb602 SHA256 e69a466b698a3c08fbb0cd7e8edf3d591d4d50d81b1a213e0d614aff78c77697
 DIST texlive-module-a2ping-2009.tar.xz 31132 RMD160 9c414487d510455b9e3d86914f2777390818ec73 SHA1 55334cd2a44c91f53bd46845377a9671a5cb185b SHA256 3f1cc29edcf4991381bc539fb8481266b0d7686bdbb1375e914c28ce461a52d1
 DIST texlive-module-a2ping-2010.tar.xz 31132 RMD160 bff661d92075f25a47652e89e4af53df59b31c97 SHA1 42e8a1f9ae922a02b31cd70776839ebe8604f741 SHA256 72f4cd7b89965d8dedc726dca0fa04c82b882b595630ab2ad7457ad9cae2b193
@@ -371,13 +372,13 @@ EBUILD texlive-core-2008-r8.ebuild 11579 RMD160 3c647bbe902ed13252fae8e00bd62b9e
 EBUILD texlive-core-2009-r1.ebuild 10910 RMD160 681b12f3fdc1539e62cb4a18f22e32b9b1f1cdde SHA1 5f4d493b46deed1e7cd0d9ffd18f21c89b0caca3 SHA256 96fa4a17d884d56a9d6f6e47f7df62c1db36f998f4465d0123c2f8f089bded31
 EBUILD texlive-core-2009-r2.ebuild 10909 RMD160 b135f3f18be275b2dd56303c282a39e72045e02f SHA1 867ac2e550437a13417f94a6f3193a67e8332333 SHA256 92c1c160dadf2d0f22b4f2875198b307270e457fd875cb074602f6e97ad907b7
 EBUILD texlive-core-2010-r4.ebuild 10062 RMD160 b0b998a218e855208e43e23267082b3f67d091aa SHA1 1b977dbf11da796c19aaba82b6ef33f20adee02a SHA256 4407c49a1c905f649bfab820bd80c6a73c8594b3e2375c9d2b5b5a29f40e8b5c
-EBUILD texlive-core-2011-r4.ebuild 10325 RMD160 4de6c4b03d32e5e9a0cb0a4814a6c3320ce57118 SHA1 5b6cac289a01c184f39d97a4f00ae4b3dc07c6f8 SHA256 a6f692e190c2f43b830d218f6a3bb33ffdfe11bcfd10c2d4c3d165c799a97f41
-MISC ChangeLog 25843 RMD160 2d6880176fa1df2882127eb558f12da8d24ad6f4 SHA1 3b1fe95989d94c504b8f3effd97d612df4aeabc5 SHA256 ed97093d3e48dbeb6007933f13423f73e0c3d449f890fdfa830692abbec099fe
+EBUILD texlive-core-2011-r4.ebuild 10570 RMD160 639fbcfe61257deca7e9b5fa753ff9d01fe2ba68 SHA1 1d6f3442a16704f39c9a23fea099a98e4f437ff2 SHA256 a8e5af16f74321fe267c686ed561396236ffa7a14159b00022aab1cfdc0284fd
+MISC ChangeLog 25968 RMD160 f2b5e32b139586295c7b56a68ec60a4423518906 SHA1 43a3f4cd9d06375657e523ced7b87c751b2c9b69 SHA256 e9e772da30bb7cae4ecc961e5ee063b9aa26cd019dcf27ef1ac5e87e332db880
 MISC metadata.xml 448 RMD160 c56e123fc21192bc5cbdba7eb6a3838f251c8342 SHA1 afac1f79f72c02806e1294282d7745b4d89deac6 SHA256 ddaca86e81c2eaf01ff5e7d613777a6c2231ed0f09646cb303e23b0e90c08d02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6VrWYACgkQuQc30/atMkBVqwCfWdJ5POcll5M7YWTKktOkhe5Q
-g1kAoKF6uPXALjz6cqt8G9laiSV7TAFh
-=bBn7
+iEYEARECAAYFAk6xsOkACgkQvFcC4BYPU0rCLwCgmasCCZPziVV3pad9U1HomfHX
+U+YAni8EGL0FjGLdCWEgUXojWQFFS/0a
+=5pwi
 -----END PGP SIGNATURE-----

diff --git a/app-text/texlive-core/texlive-core-2011-r4.ebuild b/app-text/texlive-core/texlive-core-2011-r4.ebuild
index 4cbf2bc94db4f49bc24a5b6d193d0edaeb2c7c65..5daf0950a4acc24253b42a737a08322d7c52aceb 100644 (file)
--- 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