Remove special revision and just conditionally apply the poppler-0.26 patch

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

3 files changed, 8 insertions, 107 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index a553adb134ec..b3e320369536 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.137 2014/04/30 23:46:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.138 2014/05/24 19:57:43 dilfridge Exp $
+
+  24 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> luatex-0.76.0.ebuild,
+  -luatex-0.76.0-r1.ebuild:
+  Remove special revision and just conditionally apply the poppler-0.26 patch
 
 *luatex-0.76.0-r1 (30 Apr 2014)
 
diff --git a/dev-tex/luatex/luatex-0.76.0-r1.ebuild b/dev-tex/luatex/luatex-0.76.0-r1.ebuild
deleted file mode 100644
index a9a4ee044204..000000000000
--- a/dev-tex/luatex/luatex-0.76.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.76.0-r1.ebuild,v 1.1 2014/04/30 23:46:58 dilfridge Exp $
-
-EAPI=5
-
-inherit libtool eutils texlive-common
-
-MY_P=${PN}-beta-${PV}
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language."
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="
-	http://foundry.supelec.fr/frs/download.php/file/15745/${MY_P}-source.tar.bz2
-	http://foundry.supelec.fr/frs/download.php/file/15747/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.12
-	>x11-libs/pixman-0.18
-	app-text/poppler:=[xpdf-headers(+)]
-	sys-libs/zlib
-	>=dev-libs/kpathsea-6.1.0_p20120701"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/source"
-
-src_prepare() {
-	epatch "${FILESDIR}/remove-zlib-version-check.patch" \
-		"${FILESDIR}/includes.patch" \
-		"${FILESDIR}/poppler026.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
-
-	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-cairo \
-		--with-system-pixman \
-	    --with-system-gd	\
-	    --with-system-libpng	\
-	    --with-system-teckit \
-	    --with-system-zlib \
-	    --with-system-t1lib \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-zziplib \
-		--with-system-ptexenc \
-	    --disable-multiplatform
-}
-
-src_compile() {
-	texk/web2c/luatexdir/getluatexsvnversion.sh || die
-	cd "${WORKDIR}/${MY_P}/source/texk/web2c"
-	emake luatex
-}
-
-src_install() {
-	cd "${WORKDIR}/${MY_P}/source/texk/web2c"
-	emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
-		install-exec-am
-
-	dodoc "${WORKDIR}/${MY_P}/README" luatexdir/NEWS
-	cp source/texk/web2c/man
-	cp man/luatex.man "${T}/luatex.1"
-	doman "${T}/luatex.1"
-	use doc && dodoc "${WORKDIR}/${MY_P}/manual/"*.pdf
-}
-
-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
-	efmtutil-sys
-}
diff --git a/dev-tex/luatex/luatex-0.76.0.ebuild b/dev-tex/luatex/luatex-0.76.0.ebuild
index 7427ee0a09cd..f37f4f50ca4d 100644
--- a/dev-tex/luatex/luatex-0.76.0.ebuild
+++ b/dev-tex/luatex/luatex-0.76.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.76.0.ebuild,v 1.2 2013/07/01 13:22:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.76.0.ebuild,v 1.3 2014/05/24 19:57:43 dilfridge Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}/source"
 
 src_prepare() {
+	has_version '>=app-text/poppler-0.26.0:0' && epatch "${FILESDIR}/poppler026.patch"
 	epatch "${FILESDIR}/remove-zlib-version-check.patch" \
 		"${FILESDIR}/includes.patch"
 	S="${S}/build-aux" elibtoolize --shallow