--- /usr/portage/dev-libs/xalan-c/xalan-c-1.10.0.ebuild	2008-08-09 12:05:45.000000000 +0200
+++ xalan-c-1.11.0_pre705082.ebuild	2008-10-24 15:55:20.000000000 +0200
@@ -1,16 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.10.0.ebuild,v 1.13 2008/08/09 09:36:08 dev-zero Exp $
+# $Header$
 
 inherit toolchain-funcs eutils flag-o-matic multilib
 
-MY_PV=${PV//./_}
-
 DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
 HOMEPAGE="http://xml.apache.org/xalan-c/"
-SRC_URI="ftp://apache.mirrors.pair.com/xml/xalan-c/Xalan-C_${MY_PV}-src.tar.gz
-	http://apache.mirrors.hoobly.com/xml/xalan-c/Xalan-C_${MY_PV}-src.tar.gz
-	http://www.tux.org/pub/net/apache/dist/xml/xalan-c/Xalan-C_${MY_PV}-src.tar.gz"
+SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -26,14 +22,9 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# https://issues.apache.org/jira/browse/XALANC-643
-	epatch "${FILESDIR}/1.10.0-as-needed.patch"
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
-
-	chmod a+r $(find . -type f)
-	chmod a+rx $(find . -type d)
 
 	sed -i \
+		-e 's/\(debugflag\)="-O.\? /\1="/' \
 		-e 's/^\(CXXFLAGS\)="$compileroptions/\1="${\1}/' \
 		-e 's/^\(CFLAGS\)="$compileroptions/\1="${\1}/' \
 		runConfigure || die "sed failed"