--- /usr/portage/app-text/texlive/texlive-2005.ebuild	2007-01-28 07:35:41.000000000 +0100
+++ texlive-2007.ebuild	2007-03-12 10:07:57.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 <fabian.wolf@informatik.uni-ulm.de>
+#   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.gz
+	http://134.60.104.12/gentoo/${P}-texmf-dist.tar.gz
+	http://134.60.104.12/gentoo/${P}-texmf.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc tk Xaw3d lesstif motif neXt"
+IUSE="X doc 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
@@ -69,25 +69,17 @@
 RDEPEND="${DEPEND}
 	${BLOCKS}
 	>=dev-lang/perl-5.2
-	tk? ( dev-perl/perl-tk )
 	dev-util/dialog"
 
 src_unpack() {
-	unpack ${P}-src.tar.bz2 || die "unpack src"
+	unpack ${P}-src.tar.gz || die "unpack src"
 
 	cd "${S}"
 
-	unpack ${P}-texmf.tar.bz2 || die "unpack texmf"
-	unpack ${P}-texmf-dist.tar.bz2 || die "unpack texmf-dist"
+	unpack ${P}-texmf.tar.gz || die "unpack texmf"
+	unpack ${P}-texmf-dist.tar.gz || 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/" \
 		Makefile.in || die "sed"
@@ -121,16 +113,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 \
 		--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 \
@@ -152,7 +150,7 @@
 		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() {