[patch] Diff: texlive-2005.ebuild -> texlive-2007.ebuild

ebuild.diff (text/plain), 7.19 KB, created by Fabian Wolf on 2007-03-12 14:42:53 UTC

--- /usr/portage/app-text/texlive/texlive-2005.ebuild	2007-01-28 07:35:41.000000000 +0100
+++ texlive-2007.ebuild	2007-03-12 13:52:47.000000000 +0100
@@ -1,6 +1,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2005.ebuild,v 1.4 2007/01/28 06:10:10 genone Exp $
+# TexLive-2007 ebuild by Fabian Wolf <[e-mail]>
+#   based on texlive-2005.ebuild
 
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
@@ -11,17 +12,16 @@
 SLOT="0"
 LICENSE="GPL-2"
 
-SRC_URI="http://dev.gentoo.org/~ehmsen/texlive/${P}-src.tar.bz2
-	http://dev.gentoo.org/~ehmsen/texlive/${P}-texmf-dist.tar.bz2
-	http://dev.gentoo.org/~ehmsen/texlive/${P}-texmf.tar.bz2"
+SRC_URI="http://134.60.104.12/gentoo/${P}-src.tar.bz2
+	http://134.60.104.12/gentoo/${P}-texmf-dist.tar.bz2
+	http://134.60.104.12/gentoo/${P}-texmf.tar.bz2"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc tk Xaw3d lesstif motif neXt"
+IUSE="X doc tk Xaw3d lesstif motif neXt png zlib"
 
-# This is less than an ideal name
-PROVIDE="virtual/tetex"
+# There's not yet a tex virtual - however: no virtual/tetex either
+PROVIDE="virtual/tex"
 
-# I hope to kick this very soon
 BLOCKS="!dev-tex/memoir
 	!dev-tex/lineno
 	!dev-tex/SIunits
@@ -81,12 +81,6 @@
 	unpack ${P}-texmf-dist.tar.bz2 || die "unpack texmf-dist"
 
 	epatch "${FILESDIR}/${PV}/${P}-use-system-libtool.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-amd64-xdvik-wp.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-mptest.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-fmtutil-in.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-xpdf-vulnerabilities.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-pdftosrc-install.patch" || die
-	epatch "${FILESDIR}/${PV}/${P}-create-empty-files.patch" || die
 	epatch "${FILESDIR}/${PV}/${P}-gentoo-texmf-site.patch" || die
 
 	sed -i -e "/mktexlsr/,+3d" -e "s/\(updmap-sys\)/\1 --nohash/" \
@@ -121,16 +115,22 @@
 		my_conf="${my_conf} --without-xdvik --without-oxdvik"
 	fi
 
+	if use zlib ; then
+		my_conf="${my_conf} --with-system-zlib"
+	fi
+
+	if use png ; then
+		my_conf="${my_conf} --with-system-pnglib"
+	fi
+
 	econf --bindir=/usr/bin \
-		--datadir=${S} \
-		--with-system-wwwlib \
-		--with-libwww-include=/usr/include/w3c-libwww \
+		--datadir="${S}" \
 		--with-system-ncurses \
-		--with-system-pnglib \
+		--with-system-freetype2 \
+		--with-freetype2-include=/usr/include \
 		--without-texinfo \
 		--without-dialog \
 		--without-texi2html \
-		--with-system-zlib \
 		--disable-multiplatform \
 		--with-epsfwin \
 		--with-mftalkwin \
@@ -147,12 +147,12 @@
 		${my_conf} || die "econf"
 
 	if use X && use ppc-macos ; then
-		for f in $(find ${S} -name config.status) ; do
+		for f in $(find "${S}" -name config.status) ; do
 			sed -i -e "s:-ldl::g" $f
 		done
 	fi
 
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" texmf=${TEXMF_PATH:-/usr/share/texmf} || die "make"
+	emake -j1 texmf=${TEXMF_PATH:-/usr/share/texmf} || die "make"
 }
 
 src_test() {
@@ -162,99 +162,99 @@
 
 src_install() {
 	dodir /usr/share/
-	cp -R texmf ${D}/usr/share
-	cp -R texmf-dist ${D}/usr/share
+	cp -R texmf "${D}/usr/share"
+	cp -R texmf-dist "${D}/usr/share"
 
 	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
-	einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH:-/usr/share/texmf} || die "install"
+	einstall bindir="${D}/usr/bin" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" || die "install"
 
-	dosbin ${FILESDIR}/${PV}/texmf-update
+	dosbin "${FILESDIR}/texmf-update"
 
 	docinto texk
-	cd ${S}/TeX/texk
+	cd "${S}/texk"
 	dodoc ChangeLog README
 
 	docinto kpathesa
-	cd ${S}/TeX/texk/kpathsea
+	cd "${S}/texk/kpathsea"
 	dodoc BUGS ChangeLog NEWS PROJECTS README
 
 	docinto dviljk
-	cd ${S}/TeX/texk/dviljk
+	cd "${S}/texk/dviljk"
 	dodoc ChangeLog README NEWS
 
 	docinto dvipsk
-	cd ${S}/TeX/texk/dvipsk
+	cd "${S}/texk/dvipsk"
 	dodoc ChangeLog README
 
 	docinto makeindexk
-	cd ${S}/TeX/texk/makeindexk
+	cd "${S}/texk/makeindexk"
 	dodoc ChangeLog NEWS NOTES README
 
 	docinto ps2pkm
-	cd ${S}/TeX/texk/ps2pkm
+	cd "${S}/texk/ps2pkm"
 	dodoc ChangeLog README README.14m
 
 	docinto web2c
-	cd ${S}/TeX/texk/web2c
+	cd "${S}/texk/web2c"
 	dodoc ChangeLog NEWS PROJECTS README
 
 	if use doc ; then
 		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/share/texmf/doc/* \
-			${D}/usr/share/doc/${PF} \
+		mv "${D}/usr/share/texmf/doc/*" \
+			"${D}/usr/share/doc/${PF}" \
 			|| die "mv doc failed."
-		cd ${D}/usr/share/texmf
+		cd "${D}/usr/share/texmf"
 		rmdir doc
 		ln -s ../doc/${PF} doc || die "ln -s doc failed."
 		cd -
 	else
-		rm -rf ${D}/usr/share/texmf/doc
+		rm -rf "${D}/usr/share/texmf/doc"
 	fi
 
 	dodir /var/cache/fonts
 
 	# root group name doesn't exist on Mac OS X
-	chown -R 0:0 ${D}/usr/share/texmf
+	chown -R 0:0 "${D}/usr/share/texmf"
 
 	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c"' > ${D}/etc/env.d/98tetex
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c"' > "${D}/etc/env.d/98tetex"
 	# populate /etc/texmf
 	keepdir /etc/texmf/web2c
 	# _not_ ${TEXMF_PATH}
-	cd ${D}/usr/share/texmf
+	cd "${D}/usr/share/texmf"
 	for d in $(find . -name config -type d | sed -e "s:\./::g") ; do
 		dodir /etc/texmf/${d}
-		for f in $(find ${D}usr/share/texmf/$d -maxdepth 1 -mindepth 1); do
-			mv $f ${D}/etc/texmf/$d || die "mv $f failed"
+		for f in $(find "${D}usr/share/texmf/$d" -maxdepth 1 -mindepth 1); do
+			mv $f "${D}/etc/texmf/$d" || die "mv $f failed"
 			dosym /etc/texmf/$d/$(basename $f) /usr/share/texmf/$d/$(basename $f)
 		done
 	done
 	cd -
-	cd ${D}/${TEXMF_PATH}
+	cd "${D}/${TEXMF_PATH}"
 	for f in $(find . -name '*.cnf' -o -name '*.cfg' -type f | sed -e "s:\./::g") ; do
 		if [ "${f/config/}" != "${f}" ] ; then
 			continue
 		fi
 		dodir /etc/texmf/$(dirname $f)
-		mv ${D}/${TEXMF_PATH}/$f ${D}/etc/texmf/$(dirname $f) || die "mv $f failed."
+		mv "${D}/${TEXMF_PATH}/$f" "${D}/etc/texmf/$(dirname $f)" || die "mv $f failed."
 		dosym /etc/texmf/$f ${TEXMF_PATH}/$f
 	done
 
 	# take care of updmap.cfg, fmtutil.cnf and texmf.cnf
 	dodir /etc/texmf/{updmap.d,fmtutil.d,texmf.d}
 	dosym /etc/texmf/web2c/updmap.cfg ${TEXMF_PATH}/web2c/updmap.cfg
-	mv ${D}/usr/share/texmf/web2c/updmap.cfg ${D}/etc/texmf/updmap.d/00updmap.cfg
-	mv ${D}/etc/texmf/web2c/fmtutil.cnf ${D}/etc/texmf/fmtutil.d/00fmtutil.cnf
-	mv ${D}/etc/texmf/web2c/texmf.cnf ${D}/etc/texmf/texmf.d/00texmf.cnf
+	mv "${D}/usr/share/texmf/web2c/updmap.cfg" "${D}/etc/texmf/updmap.d/00updmap.cfg"
+	mv "${D}/etc/texmf/web2c/fmtutil.cnf" "${D}/etc/texmf/fmtutil.d/00fmtutil.cnf"
+	mv "${D}/etc/texmf/web2c/texmf.cnf" "${D}/etc/texmf/texmf.d/00texmf.cnf"
 
 	# xdvi
 	if use X ; then
 		dodir /etc/X11/app-defaults /etc/texmf/xdvi
-		mv ${D}${TEXMF_PATH}/xdvi/XDvi ${D}/etc/X11/app-defaults || die "mv XDvi failed"
+		mv "${D}${TEXMF_PATH}/xdvi/XDvi" "${D}/etc/X11/app-defaults" || die "mv XDvi failed"
 		dosym /etc/X11/app-defaults/XDvi ${TEXMF_PATH}/xdvi/XDvi
 	fi
 
-	doman ${S}/texk/web2c/pdftexdir/pdftosrc.1
+	doman "${S}/texk/web2c/pdftexdir/pdftosrc.1"
 
 	keepdir /usr/share/texmf-site
 
@@ -262,7 +262,7 @@
 	# The links has to be relative, since the targets
 	# is not present at this stage and MacOS doesn't
 	# like non-existing targets
-	cd ${D}/usr/bin/
+	cd "${D}/usr/bin/"
 	ln -snf tex virtex
 	ln -snf pdftex pdfvirtex
 }