summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-12-27 15:51:36 +0100
committerAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-12-29 18:18:29 +0100
commit47a51d2bc6a88a63dfc337c99efeb36a58f1a219 (patch)
tree2986a5037b5a24b006a8547613145a5cafb6d0b6
parentbac9bb07c909293236d346e28bf8ca0f3ce20b8f (diff)
downloadtexlive-47a51d2bc6a88a63dfc337c99efeb36a58f1a219.tar.gz
texlive-47a51d2bc6a88a63dfc337c99efeb36a58f1a219.tar.xz
texlive-core: fix collision with ptexenc
when using [-cjk] it ended up as '--enable-system-ptexenc --disable-sysem-ptexenc' which means it installed its own ptexenc. however it hard-deps on ptexenc, so just assume its always available. Change-Id: If8098c76a31da6e0e3f7b9b879b35e90546ba5b4 Reviewed-on: https://galileo.mailstation.de/gerrit/4780 Reviewed-by: Thomas Witt <pyromaniac@thwitt.de> Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Wouter van Kesteren <woutershep@gmail.com>
-rw-r--r--packages/app-text/texlive-core/texlive-core-2015-r2.exheres-0 (renamed from packages/app-text/texlive-core/texlive-core-2015-r1.exheres-0)6
-rw-r--r--packages/dev-libs/ptexenc/ptexenc-1.3.3_p20150521-r1.exheres-0 (renamed from packages/dev-libs/ptexenc/ptexenc-1.3.3_p20150521.exheres-0)0
2 files changed, 1 insertions, 5 deletions
diff --git a/packages/app-text/texlive-core/texlive-core-2015-r1.exheres-0 b/packages/app-text/texlive-core/texlive-core-2015-r2.exheres-0
index ed4068b..35d8b59 100644
--- a/packages/app-text/texlive-core/texlive-core-2015-r1.exheres-0
+++ b/packages/app-text/texlive-core/texlive-core-2015-r2.exheres-0
@@ -88,7 +88,7 @@ DEPENDENCIES="
app-text/poppler [[ note = [ --with-system-xpdf ] ]]
dev-libs/icu:= [[ note = [ --with-system-icu ] ]]
dev-libs/kpathsea[>=6.2.1_p${TL_PV}] [[ note = [ --with-system-kpathsea ] ]]
- dev-libs/ptexenc[>=1.3.3_p${TL_PV}] [[ note = [ --with-system-ptexenc ] ]]
+ dev-libs/ptexenc[>=1.3.3_p${TL_PV}-r1] [[ note = [ --with-system-ptexenc ] ]]
dev-libs/zziplib [[ note = [ --with-system-zziplib ] ]]
dev-tex/luatex[>=0.76]
media-libs/freetype:2 [[ note = [ --with-system-freetype2 ] ]]
@@ -111,9 +111,6 @@ DEPENDENCIES="
media-libs/fontconfig
media-libs/freetype:2
)
- cjk? (
- dev-libs/ptexenc
- )
recommendation:
dev-tex/biblatex-biber [[ note = [ Replacement for BibTeX ] ]]
"
@@ -225,7 +222,6 @@ src_configure() {
$(option_enable cjk euptex)
$(option_enable cjk mendexk)
$(option_enable cjk makejvf)
- $(option_with cjk system-ptexenc)
$(option_with X x)
diff --git a/packages/dev-libs/ptexenc/ptexenc-1.3.3_p20150521.exheres-0 b/packages/dev-libs/ptexenc/ptexenc-1.3.3_p20150521-r1.exheres-0
index b8a90ea..b8a90ea 100644
--- a/packages/dev-libs/ptexenc/ptexenc-1.3.3_p20150521.exheres-0
+++ b/packages/dev-libs/ptexenc/ptexenc-1.3.3_p20150521-r1.exheres-0