summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-07-31 07:41:04 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-07-31 07:41:04 +0000
commit37f51bfe1165a7f1811b6a23aa26eec08211431c (patch)
treea3de6a32560ad22cf612e336b883f6f86c83b516 /dev-texlive
parentbump luatex dep in par with texlive meta ebuild, should fix bug #377065 (diff)
downloadhistorical-37f51bfe1165a7f1811b6a23aa26eec08211431c.tar.gz
historical-37f51bfe1165a7f1811b6a23aa26eec08211431c.tar.bz2
historical-37f51bfe1165a7f1811b6a23aa26eec08211431c.zip
Block texlive-latexextra-2010 too, they collide, bug #377019 by William Throwe
Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64
Diffstat (limited to 'dev-texlive')
-rw-r--r--dev-texlive/texlive-publishers/ChangeLog7
-rw-r--r--dev-texlive/texlive-publishers/Manifest10
-rw-r--r--dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild4
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-texlive/texlive-publishers/ChangeLog b/dev-texlive/texlive-publishers/ChangeLog
index 08df763cf1d0..da3bab3fe251 100644
--- a/dev-texlive/texlive-publishers/ChangeLog
+++ b/dev-texlive/texlive-publishers/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-texlive/texlive-publishers
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/ChangeLog,v 1.34 2011/07/28 13:35:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/ChangeLog,v 1.35 2011/07/31 07:41:04 aballier Exp $
+
+ 31 Jul 2011; Alexis Ballier <aballier@gentoo.org>
+ texlive-publishers-2011.ebuild:
+ Block texlive-latexextra-2010 too, they collide, bug #377019 by William
+ Throwe
*texlive-publishers-2011 (28 Jul 2011)
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index aedae83d60be..118152204b4f 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -779,13 +779,13 @@ DIST texlive-module-york-thesis.source-2011.tar.xz 12560 RMD160 bf431aa23e51bfce
EBUILD texlive-publishers-2008.ebuild 2558 RMD160 52c0c692231309af2045b391cfd3307d7f132658 SHA1 9964c75f7e11b4dc81e832cf7cfe215be21651b9 SHA256 09a92eb797ef59d91d3935e454ddd76363ebf70dc15e640ea92984b50a1d7142
EBUILD texlive-publishers-2009.ebuild 2992 RMD160 1f0db533343b6be9ddbb983c75e76abb0a974b8a SHA1 8dbffabc5993335b8a93877001ef931ad2197f01 SHA256 3f2e6d307950f06ec38d95cbe31d7090fffed09b5b4539fed2aba7928b547434
EBUILD texlive-publishers-2010.ebuild 3267 RMD160 0722b0fa402719b5452d1be41bcbc78fa18d4e21 SHA1 e5f8c749e9441251aca55dc057f88ce5c256a1eb SHA256 e9aa3a90253f3e4c167d1cf83cff03a8856f3c4a0113a117e18ec8065d0acf51
-EBUILD texlive-publishers-2011.ebuild 3598 RMD160 190212e610c36fb228f95490e74ccfeb58546fa7 SHA1 8bbae71eeb9b3b8ce797dd4ac223d165eb06c205 SHA256 ae85c0db161a0d757628105b01bc946abb9237e6978e8eea5b1f66b3fb0784e0
-MISC ChangeLog 4518 RMD160 40f03e5a55dd69c804c04549ba20e106f6b4c10d SHA1 7d9f22fe9b4e9bb2da14499fa2505fdb1e37b4e5 SHA256 888540856ccd5ee06040a2c7d2fafebb9bdd1b9d81a731271e749561d6561bf9
+EBUILD texlive-publishers-2011.ebuild 3598 RMD160 cab221058fc1bc8ddb169fcfc8b518c77d775a65 SHA1 d384c3069839f65e732d9fad60c5e5f82a323a72 SHA256 11d0936582e46a153b5cb3cc7ed584f15df95f6921aefab4d01d795b2aee23a2
+MISC ChangeLog 4688 RMD160 0f24afb8ee13db8d984d813becbde140d1073706 SHA1 ec4934a3dae7098492a0f2b116f297bb191080de SHA256 85a1d4be82dfd9c34161ce106e78e3a8c4543dedb658ca6fc5b7c8837036c6b3
MISC metadata.xml 300 RMD160 738d67782f00585a7a3a6c0735550f33853bfbc2 SHA1 e1d2a2016e9adfe404c5d04e24263694f5cd444f SHA256 425455da7c4b724c03e2da2631b1ee8287927fab58d7c5fa0663e67bc96a1264
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4xZZoACgkQvFcC4BYPU0qdnQCghumZgVZ865lj63bSjln0teMv
-QqEAoMGBsl14JIrEPNi7Kg6YXUJQF4DM
-=0BK0
+iEYEARECAAYFAk41BxUACgkQvFcC4BYPU0rqOwCdGtmB+PpHDLVX0iFsze4sOWMZ
+se0AniSM1HnR4NPRyEaf8fRNiRfXmrRL
+=KZwU
-----END PGP SIGNATURE-----
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
index 184057376ac7..551004105a4e 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2011.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/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.1 2011/07/28 13:35:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-publishers/texlive-publishers-2011.ebuild,v 1.2 2011/07/31 07:41:04 aballier Exp $
EAPI="3"
@@ -16,6 +16,6 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2011
-!<dev-texlive/texlive-latexextra-2010
+!<dev-texlive/texlive-latexextra-2011
"
RDEPEND="${DEPEND} "