bump kpathsea to texlive 2014 version

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

2 files changed, 19 insertions, 12 deletions

diff --git a/dev-libs/kpathsea/ChangeLog b/dev-libs/kpathsea/ChangeLog
index c5c87f119ba0..7497cd3ececd 100644
--- a/dev-libs/kpathsea/ChangeLog
+++ b/dev-libs/kpathsea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/kpathsea
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/ChangeLog,v 1.44 2014/10/05 18:45:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/ChangeLog,v 1.45 2014/11/02 08:37:09 aballier Exp $
+
+*kpathsea-6.2.0_p20140525 (02 Nov 2014)
+
+  02 Nov 2014; Alexis Ballier <aballier@gentoo.org>
+  -kpathsea-6.2.0_p20140523.ebuild, +kpathsea-6.2.0_p20140525.ebuild:
+  bump kpathsea to texlive 2014 version
 
 *kpathsea-6.2.0_p20140523 (05 Oct 2014)
 
diff --git a/dev-libs/kpathsea/kpathsea-6.2.0_p20140523.ebuild b/dev-libs/kpathsea/kpathsea-6.2.0_p20140525.ebuild
index a4401dcb8c5f..e89d4174eb0b 100644
--- a/dev-libs/kpathsea/kpathsea-6.2.0_p20140523.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.2.0_p20140525.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/kpathsea-6.2.0_p20140523.ebuild,v 1.1 2014/10/05 18:45:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/kpathsea-6.2.0_p20140525.ebuild,v 1.1 2014/11/02 08:37:09 aballier Exp $
 
 EAPI=5
 
 inherit texlive-common eutils libtool prefix
 
-TEXMFD_VERSION=5
-TL_VERSION=2014
-TEXMF_PATH=/usr/share/texmf-dist
+TEXMFD_VERSION="6"
 
 DESCRIPTION="Library implementing generic path searching, configuration, and TeX-specific file searching"
 HOMEPAGE="http://tug.org/texlive/"
@@ -16,28 +14,31 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
 	mirror://gentoo/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${PV%_p*}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
-DEPEND="!<app-text/texlive-core-${TL_VERSION}
+DEPEND="!<app-text/texlive-core-2013
 	!app-text/ptex"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 
+TL_VERSION=2014
 EXTRA_TL_MODULES="kpathsea"
 EXTRA_TL_DOC_MODULES="kpathsea.doc"
 
 for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI+=" mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
 done
 
-SRC_URI+=" doc? ( "
+SRC_URI="${SRC_URI} doc? ( "
 for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI+=" mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
 done
-SRC_URI+=" )"
+SRC_URI="${SRC_URI} ) "
+
+TEXMF_PATH=/usr/share/texmf-dist
 
 src_prepare() {
 	cd "${WORKDIR}/texlive-${PV#*_p}-source"
@@ -61,7 +62,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -delete
 
 	dodir /usr/share # just in case
 	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"