summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-08-19 08:09:24 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-08-19 08:09:24 +0000
commit7d75fe0aa5b540f436aa71351ffbe6e77ee6adc0 (patch)
tree92fc04b7fb0d8e26e41e9fe457a22819cb5956ab /app-text/texlive-core
parentFix collision with dynamic libs (diff)
downloadgentoo-2-7d75fe0aa5b540f436aa71351ffbe6e77ee6adc0.tar.gz
gentoo-2-7d75fe0aa5b540f436aa71351ffbe6e77ee6adc0.tar.bz2
gentoo-2-7d75fe0aa5b540f436aa71351ffbe6e77ee6adc0.zip
Update lzma deps to allow xz-utils, bug #279871
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'app-text/texlive-core')
-rw-r--r--app-text/texlive-core/ChangeLog6
-rw-r--r--app-text/texlive-core/texlive-core-2008-r5.ebuild4
-rw-r--r--app-text/texlive-core/texlive-core-2008-r6.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index 8a29d6e5da07..529cc2a2bb3c 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.108 2009/08/06 13:02:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.109 2009/08/19 08:09:24 aballier Exp $
+
+ 19 Aug 2009; Alexis Ballier <aballier@gentoo.org>
+ texlive-core-2008-r5.ebuild, texlive-core-2008-r6.ebuild:
+ Update lzma deps to allow xz-utils, bug #279871
*texlive-core-2008-r6 (06 Aug 2009)
diff --git a/app-text/texlive-core/texlive-core-2008-r5.ebuild b/app-text/texlive-core/texlive-core-2008-r5.ebuild
index e66cf81e9200..81c6df45a031 100644
--- a/app-text/texlive-core/texlive-core-2008-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2008-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r5.ebuild,v 1.9 2009/08/03 10:21:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r5.ebuild,v 1.10 2009/08/19 08:09:24 aballier Exp $
EAPI=1
@@ -78,7 +78,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
DEPEND="${COMMON_DEPEND}
sys-apps/ed
sys-devel/flex
- app-arch/lzma-utils"
+ || ( app-arch/xz-utils app-arch/lzma-utils )"
RDEPEND="${COMMON_DEPEND}
tk? ( dev-perl/perl-tk )"
diff --git a/app-text/texlive-core/texlive-core-2008-r6.ebuild b/app-text/texlive-core/texlive-core-2008-r6.ebuild
index 08fa02e49c4e..d1082d5b159a 100644
--- a/app-text/texlive-core/texlive-core-2008-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2008-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r6.ebuild,v 1.1 2009/08/06 13:02:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2008-r6.ebuild,v 1.2 2009/08/19 08:09:24 aballier Exp $
EAPI=1
@@ -78,7 +78,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
DEPEND="${COMMON_DEPEND}
sys-apps/ed
sys-devel/flex
- app-arch/lzma-utils"
+ || ( app-arch/xz-utils app-arch/lzma-utils )"
RDEPEND="${COMMON_DEPEND}
tk? ( dev-perl/perl-tk )"