EAPI=5 and poppler subslot dependency; remove old

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key EBE6A336BE19039C!)

3 files changed, 8 insertions, 129 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 44796618f51a..897f91b8b90e 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.130 2013/03/31 11:17:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.131 2013/04/14 15:37:36 dilfridge Exp $
+
+  14 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> -luatex-0.70.1.ebuild,
+  luatex-0.74.0.ebuild:
+  EAPI=5 and poppler subslot dependency; remove old
 
   31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> luatex-0.70.1-r2.ebuild:
   Stable for sh, wrt bug #459866
diff --git a/dev-tex/luatex/luatex-0.70.1.ebuild b/dev-tex/luatex/luatex-0.70.1.ebuild
deleted file mode 100644
index 873b4fa3f6bc..000000000000
--- a/dev-tex/luatex/luatex-0.70.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.18 2013/03/09 23:55:02 dilfridge Exp $
-
-EAPI=4
-
-inherit libtool eutils
-
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language."
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${PV}.tar.bz2
-	http://foundry.supelec.fr/gf/download/frsrelease/392/1732/${PN}-beta-${PV}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
-	>=media-libs/libpng-1.4
-	<app-text/poppler-0.22[xpdf-headers(+)]
-	sys-libs/zlib
-	>=dev-libs/kpathsea-6.0.1_p20110627"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-beta-${PV}/source"
-PRELIBS="libs/obsdcompat"
-#texk/kpathsea"
-#kpathsea_extraconf="--disable-shared --disable-largefile"
-
-src_prepare() {
-	has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
-	has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
-	epatch "${FILESDIR}/kpathsea2012.patch"
-	S="${S}/build-aux" elibtoolize --shallow
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #244619
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	local myconf
-	myconf=""
-	#has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
-
-	cd "${S}/texk/web2c"
-	econf \
-		--disable-cxx-runtime-hack \
-		--disable-all-pkgs	\
-		--disable-mp		\
-		--disable-ptex		\
-		--disable-tex		\
-		--disable-mf		\
-	    --disable-largefile \
-		--disable-ipc		\
-		--disable-shared	\
-		--enable-luatex		\
-		--enable-dump-share	\
-		--without-mf-x-toolkit \
-		--without-x			\
-	    --with-system-kpathsea	\
-	    --with-kpathsea-includes="${EPREFIX}"/usr/include \
-	    --with-system-gd	\
-	    --with-system-libpng	\
-	    --with-system-teckit \
-	    --with-system-zlib \
-	    --with-system-t1lib \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-zziplib \
-	    --disable-multiplatform \
-
-	for i in ${PRELIBS} ; do
-		einfo "Configuring $i"
-		local j=$(basename $i)_extraconf
-		local myconf
-		eval myconf=\${$j}
-		cd "${S}/${i}"
-		econf ${myconf}
-	done
-}
-
-src_compile() {
-	texk/web2c/luatexdir/getluatexsvnversion.sh || die
-	for i in ${PRELIBS} ; do
-		cd "${S}/${i}"
-		emake || die "failed to build ${i}"
-	done
-	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
-	emake luatex || die "failed to build luatex"
-}
-
-src_install() {
-	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
-	emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
-		install-exec-am || die
-
-	dodoc "${WORKDIR}/${PN}-beta-${PV}/README" || die
-	doman "${WORKDIR}/texmf/doc/man/man1/"*.1 || die
-	if use doc ; then
-		dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf || die
-		dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf || die
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
-		elog "Note that this package does not install many files, mainly just the"
-		elog "${PN} executable, which needs other files in order to be"
-		elog "useful. Please consider installing a recent TeX distribution such as"
-		elog "TeX Live 2008 or later to take advantage of the full power of"
-		elog "${PN} ."
-	fi
-	if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then
-		einfo "Rebuilding formats"
-		"${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null
-	else
-		ewarn "Cannot run fmtutil-sys for some reason."
-		ewarn "Your formats might be inconsistent with your installed ${PN} version"
-		ewarn "Please try to figure what has happened"
-	fi
-}
diff --git a/dev-tex/luatex/luatex-0.74.0.ebuild b/dev-tex/luatex/luatex-0.74.0.ebuild
index f9ab5b99ffbd..beb49859891f 100644
--- a/dev-tex/luatex/luatex-0.74.0.ebuild
+++ b/dev-tex/luatex/luatex-0.74.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.74.0.ebuild,v 1.1 2013/01/15 21:21:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.74.0.ebuild,v 1.2 2013/04/14 15:37:36 dilfridge Exp $
 
-EAPI=4
+EAPI=5
 
 inherit libtool eutils texlive-common
 
@@ -21,7 +21,7 @@ RDEPEND="dev-libs/zziplib
 	>=media-libs/libpng-1.4
 	x11-libs/cairo
 	x11-libs/pixman
-	>=app-text/poppler-0.12.3-r3[xpdf-headers(+)]
+	app-text/poppler:=[xpdf-headers(+)]
 	sys-libs/zlib
 	>=dev-libs/kpathsea-6.0.1_p20110627"
 DEPEND="${RDEPEND}