amd64 stable wrt #301943

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 8 insertions, 172 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 9b792a35fdd1..c407684ed815 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.60 2010/02/09 19:55:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.61 2010/02/10 21:54:53 ssuominen Exp $
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  luatex-0.50.0-r1.ebuild:
+  amd64 stable wrt #301943
 
   09 Feb 2010; Joseph Jezak <josejx@gentoo.org> luatex-0.50.0-r1.ebuild:
   Marked ppc/ppc64 stable.
diff --git a/dev-tex/luatex/luatex-0.50.0-r1.ebuild b/dev-tex/luatex/luatex-0.50.0-r1.ebuild
index c5e740c9bd90..2b316f167fb6 100644
--- a/dev-tex/luatex/luatex-0.50.0-r1.ebuild
+++ b/dev-tex/luatex/luatex-0.50.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.50.0-r1.ebuild,v 1.6 2010/02/09 19:55:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.50.0-r1.ebuild,v 1.7 2010/02/10 21:54:53 ssuominen Exp $
 
 EAPI="2"
 
@@ -15,12 +15,12 @@ SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/364/1424/${PN}-beta-${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="dev-libs/zziplib
 	media-libs/libpng
-	virtual/poppler
+	>=app-text/poppler-0.12.3-r3[xpdf-headers]
 	sys-libs/zlib
 	virtual/tex-base"
 DEPEND="${RDEPEND}
@@ -32,8 +32,6 @@ PRELIBS="libs/dummy libs/obsdcompat texk/kpathsea"
 kpathsea_extraconf="--disable-shared --disable-largefile"
 
 src_prepare() {
-	local EPATCH_EXCLUDE=""
-	has_version '>=virtual/poppler-0.11.3' || EPATCH_EXCLUDE="040_all_poppler-0.11.3.patch"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	eautoreconf
 	elibtoolize
diff --git a/dev-tex/luatex/luatex-0.50.0.ebuild b/dev-tex/luatex/luatex-0.50.0.ebuild
deleted file mode 100644
index edd620ccaaf6..000000000000
--- a/dev-tex/luatex/luatex-0.50.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.50.0.ebuild,v 1.9 2010/02/04 21:39:32 maekke Exp $
-
-EAPI="2"
-
-inherit libtool multilib eutils toolchain-funcs autotools
-
-PATCHLEVEL="17"
-
-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/364/1424/${PN}-beta-${PV}.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
-	media-libs/libpng
-	virtual/poppler
-	sys-libs/zlib
-	virtual/tex-base"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN}-beta-${PV}/source"
-PRELIBS="libs/dummy libs/obsdcompat texk/kpathsea"
-kpathsea_extraconf="--disable-shared"
-
-src_prepare() {
-	local EPATCH_EXCLUDE=""
-	has_version '>=virtual/poppler-0.11.3' || EPATCH_EXCLUDE="040_all_poppler-0.11.3.patch"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	eautoreconf
-	elibtoolize
-}
-
-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-afm2pl    \
-		--disable-aleph		\
-		--disable-bibtex	\
-		--disable-bibtex8	\
-		--disable-cfftot1	\
-		--disable-cjkutils	\
-		--disable-detex		\
-		--disable-devnag	\
-		--disable-dialog	\
-		--disable-dtl		\
-		--enable-dump-share	\
-		--disable-dvi2tty	\
-		--disable-dvidvi	\
-		--without-dviljk    \
-	    --disable-dvipdfm	\
-	    --disable-dvipdfmx	\
-	    --disable-dvipos	\
-	    --disable-dvipsk	\
-		--disable-gsftopk	\
-		--disable-ipc		\
-	    --disable-lacheck	\
-	    --disable-lcdf-typetools \
-		--disable-makeindexk \
-	    --disable-mf		\
-	    --disable-mmafm		\
-	    --disable-mmpfb		\
-	    --disable-mp		\
-	    --disable-musixflx	\
-	    --disable-otfinfo	\
-	    --disable-otftotfm	\
-	    --disable-pdfopen	\
-	    --disable-pdftex	\
-	    --disable-ps2eps	\
-	    --disable-ps2pkm	\
-	    --disable-psutils	\
-	    --disable-seetexk	\
-	    --disable-t1dotlessj  \
-	    --disable-t1lint	\
-	    --disable-t1rawafm	\
-	    --disable-t1reencode	\
-	    --disable-t1testpage \
-		--disable-t1utils	\
-	    --disable-tex		\
-	    --disable-tex4htk	\
-	    --disable-tpic2pdftex	\
-	    --disable-ttf2pk	\
-	    --disable-ttfdump	\
-	    --disable-ttftotype42	\
-	    --disable-vlna		\
-	    --disable-web-progs \
-	    --disable-xdv2pdf	\
-	    --disable-xdvipdfmx \
-		--without-x			\
-	    --without-system-kpathsea	\
-	    --with-system-gd	\
-	    --with-system-libpng	\
-	    --with-system-teckit \
-	    --with-system-zlib \
-	    --with-system-t1lib \
-		--with-system-xpdf \
-	    --disable-largefile \
-	    --disable-multiplatform \
-		--disable-shared \
-		${myconf}
-
-	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() {
-	for i in ${PRELIBS} ; do
-		cd "${S}/${i}"
-		emake || die "failed to build ${i}"
-	done
-	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
-	emake || 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 || die
-
-	dodoc "${WORKDIR}/${PN}-beta-${PV}/README"
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
-		elog "Please note that this package does not install much files, mainly the"
-		elog "${PN} executable that will need other files in order to be useful.."
-		elog "Please consider installing a recent TeX distribution"
-		elog "like TeX Live 2008 to get the full power of ${PN}"
-	fi
-	if [ "$ROOT" = "/" ] && [ -x /usr/bin/fmtutil-sys ] ; then
-		einfo "Rebuilding formats"
-		/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
-}