Add texlive.infra module, required by updmap now, by Thomas Witt in bug #377609; missing dep on perl-getopt-long for updmap too

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

3 files changed, 20 insertions, 12 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index 8e5c8ecedf21..bc644660f467 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,13 @@
 # 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.145 2011/07/31 07:36:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.146 2011/08/04 06:09:59 aballier Exp $
+
+*texlive-core-2011-r3 (04 Aug 2011)
+
+  04 Aug 2011; Alexis Ballier <aballier@gentoo.org>
+  -texlive-core-2011-r2.ebuild, +texlive-core-2011-r3.ebuild:
+  Add texlive.infra module, required by updmap now, by Thomas Witt in bug
+  #377609; missing dep on perl-getopt-long for updmap too
 
   31 Jul 2011; Alexis Ballier <aballier@gentoo.org>
   texlive-core-2011-r2.ebuild:
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 360e361c9e6c..53478f10869a 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -332,8 +332,10 @@ DIST texlive-module-texdoc.doc-2010.tar.xz 206632 RMD160 19bb5d97a6df2387b577332
 DIST texlive-module-texdoc.doc-2011.tar.xz 140120 RMD160 266c0e03d21957682405eb064382ba9fec47b04f SHA1 29bc45ca6a54f97f20cf532ef9f8c60cb57da4bc SHA256 66f3b850320e0e5eb3f7099ea4348ce68fd591f1baef86c022973dd2c0f337d1
 DIST texlive-module-texlive.infra-2008.tar.lzma 105129 RMD160 9de08b79d943f830ce9d71b32f30dd5e356f3d91 SHA1 1e32319d483f3aafb8003fec2988612f94689256 SHA256 58210f1ecffa1bb3983a10d5df3920220929fa9bd28f63a91661be5b088e74a5
 DIST texlive-module-texlive.infra-2009.tar.xz 230012 RMD160 2f299acb473d534de2cedf26945ab370a8562352 SHA1 4bab6e2e1a7305da3d2b6325dcbb69b808d8595c SHA256 843d8457bd535c54d660479333ff71b1d792fbb1d73b2d88116915a4973b991d
+DIST texlive-module-texlive.infra-2011.tar.xz 189748 RMD160 834a8e99a873dfd5c35d01fefef18421c7b04639 SHA1 2708ec5a57aabd13e92657f0b900f9f8214c1cd5 SHA256 b1102f9e0b863540a679197ccd5e65da0f99fcc1e0528c74cda2bfc20e873200
 DIST texlive-module-texlive.infra.doc-2008.tar.lzma 743421 RMD160 7e7c0f5a0205306f2a4cd02d20306775cba1b5ff SHA1 c4ab6ac0f09572203b268db9318053c34cb36bed SHA256 334cc5ad29d289daee2e638005300cd6b67231f902804276e047b259cca37a7c
 DIST texlive-module-texlive.infra.doc-2009.tar.xz 59864 RMD160 d16cebf6e838cc9a11a4a11da4513427dde8cf44 SHA1 3d7e54957ab43a69f6c97105743cfaf8a4fd399e SHA256 91334e4c593299299b7acde97dd5d9063b92811cfa67bfe44c71e5d4ec0f4af1
+DIST texlive-module-texlive.infra.doc-2011.tar.xz 80492 RMD160 8058f692062612e8666fa82bbe4cff6f7bb90271 SHA1 bb47ab9102c8cc4d33cf769cd643e935abc18dd9 SHA256 0d5173cd8bd3a975c4ebf91194a95026618f08d6f7013bee0f4505fc7f08f2a9
 DIST texlive-module-texloganalyser-2009.tar.xz 3440 RMD160 e375700e042e3b9994e5dc34d9dcbf413ca9774d SHA1 98fe28a57e30fa22f29a7870260efdd9f018924f SHA256 8a418846a4cfc18a8322391f69cf9ec1cb44106ac6630b18912213539bfcefff
 DIST texlive-module-texloganalyser-2010.tar.xz 3476 RMD160 0a1297fb2f8a2a1fc4e85a3949299acbaf63f4d0 SHA1 4d2d60559f915cf5c0b893f1d1307181ccd78f29 SHA256 20d136dfec621b24c75947f3840af054a9b406aebe59f7fd7bd7f1a29c698697
 DIST texlive-module-texloganalyser-2011.tar.xz 3476 RMD160 0a1297fb2f8a2a1fc4e85a3949299acbaf63f4d0 SHA1 4d2d60559f915cf5c0b893f1d1307181ccd78f29 SHA256 20d136dfec621b24c75947f3840af054a9b406aebe59f7fd7bd7f1a29c698697
@@ -369,13 +371,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 9993 RMD160 f999bb1408ba229a2f7f235485c675be6d7effbb SHA1 ea88217aa6464dfbeb84aa416f9e16b2c0a63851 SHA256 7a0b2efa309f19c0d9f42da397d6a514778cc533e1bf9a3666217b622eea15b6
-EBUILD texlive-core-2011-r2.ebuild 10214 RMD160 c043736b21e0b8d414f69340bc4a44e49ac4dfc2 SHA1 ec838e51de5892cc170e89c47f2dedf39ffd132f SHA256 6e8dcc536c699c522caa7e4fdd71ffa3174da69bc0e6640effd3f98fc86dd136
-MISC ChangeLog 24390 RMD160 66aa42a128af57edb1c78f3dd18fee5bb15b4acf SHA1 a8cf492e01fb15c1ae5b2b8a0cd55049967b3f2c SHA256 314b1b54d3a799d4e2b1e28397597c03743f3a9ca4826d4f4009849a53320d7e
+EBUILD texlive-core-2011-r3.ebuild 10245 RMD160 8071d44bfb2677d5b23508a63f304112423562e1 SHA1 d58f732d410339b3d68189d22040ed470864455a SHA256 0a2742a599928f62bde9b94784bb5e031f255304d530bc260dbb2d2da8f60c16
+MISC ChangeLog 24674 RMD160 0d67b53e0aac105c7e2488a1812a1182e502d365 SHA1 987261a0228f5f668bb848cdc2170304b5acbcfb SHA256 62a2fafb704458bc3923788783669794997b93cb148690b085f9c8bcfb22d833
 MISC metadata.xml 448 RMD160 c56e123fc21192bc5cbdba7eb6a3838f251c8342 SHA1 afac1f79f72c02806e1294282d7745b4d89deac6 SHA256 ddaca86e81c2eaf01ff5e7d613777a6c2231ed0f09646cb303e23b0e90c08d02
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk41Bf4ACgkQvFcC4BYPU0pLCwCgsl5Rnxk5uq7DM8wRucWAspVu
-D1IAnj3HaMCVDAywnXYDG5RF8qUX2OSZ
-=7BM7
+iEYEARECAAYFAk46N70ACgkQvFcC4BYPU0p5AACfXMyiU4ZXI1MefLXzFcpy8XLQ
+Eb8AoKkXedQi6FAngzx68peOq1c/U7oU
+=lbCJ
 -----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/texlive-core-2011-r2.ebuild b/app-text/texlive-core/texlive-core-2011-r3.ebuild
index 78d0eee23ce0..261f8dcfea05 100644
--- a/app-text/texlive-core/texlive-core-2011-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2011-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2011/07/31 07:36:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r3.ebuild,v 1.1 2011/08/04 06:09:59 aballier Exp $
 
 EAPI=3
 
@@ -39,8 +39,8 @@ TL_CORE_BINEXTRA_DOC_MODULES="
 	"
 TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source"
 
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
 TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
 
 for i in ${TL_CORE_EXTRA_MODULES}; do
@@ -101,6 +101,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-text/ps2pkm-1.5_p20110705
 	>=app-text/dvipsk-5.991_p20110705
 	>=dev-tex/bibtexu-3.71_p20110705
+	virtual/perl-Getopt-Long
 	xetex? ( >=app-text/xdvipdfmx-0.7.8 )
 	tk? ( dev-perl/perl-tk )"
 
@@ -212,9 +213,7 @@ src_install() {
 
 	dodir /usr/share # just in case
 	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
-	fi
+	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
 
 	newsbin "${FILESDIR}/texmf-update2010" texmf-update