Version bump (fixes bug #247082 and maybe bug #253549 (unable to reproduce)).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 335 insertions, 13 deletions

diff --git a/dev-libs/xalan-c/ChangeLog b/dev-libs/xalan-c/ChangeLog
index 569be5a0107e..188d3eb7ea57 100644
--- a/dev-libs/xalan-c/ChangeLog
+++ b/dev-libs/xalan-c/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/xalan-c
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.21 2008/12/14 12:42:47 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.22 2009/07/27 00:07:33 dev-zero Exp $
+
+*xalan-c-1.11.0_pre797991 (26 Jul 2009)
+
+  26 Jul 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.11.0_pre797991-as-needed.patch,
+  +files/1.11.0_pre797991-bugfixes.patch,
+  +files/1.11.0_pre797991-parallel-build.patch,
+  +xalan-c-1.11.0_pre797991.ebuild:
+  Version bump (fixes bug #247082 and maybe bug #253549 (unable to
+  reproduce)).
 
   14 Dec 2008; Markus Meier <maekke@gentoo.org>
   xalan-c-1.11.0_pre705082.ebuild:
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index 054f919a71ec..96840bf96e30 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,18 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.10.0-as-needed.patch 4022 RMD160 298171f6d3e6b624dc220ad3d8b2f0d00bfb43b4 SHA1 86d2926aa3dcc382b7491bb3e4c7dad707581f25 SHA256 34e4ccbfcbf11748e60dfb98c6ca2e1b47597031cfcea14cb2df3a43289a8e5a
+AUX 1.11.0_pre797991-as-needed.patch 5376 RMD160 1e9f1f5d99110b89152ca0dfb0b05d5aef0aabc4 SHA1 eb0caccb944bb92c4e9d452f8b324f423034d56c SHA256 5fe1a1ef8320f341118ce27467ecab7d19c23db43f66aa8d3d0c2f178d8ed078
+AUX 1.11.0_pre797991-bugfixes.patch 1652 RMD160 3a6c81b2664984a8cfaf821023c9f11a60113ed1 SHA1 7b6325c95e480448ffd54e567c21036c8763164a SHA256 8b5571fea02b1477b2755fc98bd65aca87096de4ca559b2f53409fbeba2a105a
+AUX 1.11.0_pre797991-parallel-build.patch 2481 RMD160 bfdfc9e1a825cb3fb679bace1c8baf86aeace7a7 SHA1 ec56dac03f53890c97a6b02e348c91f6b7060e55 SHA256 8fdad8eecf83d08bf1b66328464473975112eb844163bd755a9edf711848e6ed
 AUX xalan-c-1.10.0+gcc-4.3.patch 1359 RMD160 746ad62dd8090ad950f24e03cc1c20a36ca8753a SHA1 b2072937c4433cb4e59b85de264ee87f67e986a6 SHA256 f560a9ca0d6a7b716174492450160df58fa3e8d261d629ebe07e5f632442b344
 DIST Xalan-C_1_10_0-src.tar.gz 1554940 RMD160 537ba0be6a14e47eb4453c2d813b31ec416835ab SHA1 3fc63045048176e0ab00ce8aa0d15b2c1e5d646b SHA256 40797957fb22797894d33a2fa0e01e3b6cc509fb89bb772c0e835ae840714cfd
 DIST Xalan-C_r705082-src.tar.gz 1579340 RMD160 e3f4178e794ad63b6d4ccc1369ed100c8938d447 SHA1 176c46d4926b4c21849b6a0422bfba5c8e2d5046 SHA256 8e7d821a1f09fe69258ff436740e755426179150acedb696b3b431682cc8c3f3
+DIST Xalan-C_r797991-src.tar.gz 1569254 RMD160 791776b7d77a8356abba30b145a6e67d5c32870e SHA1 c9079b5e00afd819306c6799848e5981b87ac2f2 SHA256 8b9e192c715b9f9a9af69fcdf11200b35cd2eecbc62d688ad95cbfa9a8cb240e
 EBUILD xalan-c-1.10.0.ebuild 1954 RMD160 052ee4805ef2b89565cfa6dea05e773df691e4d7 SHA1 2509d043390854035ab786359c9998b638a17519 SHA256 6ba8ab64eba70c90e5da587b063c1a88499d2ed4ea3f1917a261352e1a4d49ed
 EBUILD xalan-c-1.11.0_pre705082.ebuild 1610 RMD160 cc81d3ed3c407517455ae26d28b5e9a39b46e504 SHA1 aafdcf8cc580ded8a20befdfbc4472ac0ac618f4 SHA256 1e57e4f809f7add66b490e0a1a98d5b9a0e93243f47dce1d558e400fea502056
-MISC ChangeLog 3323 RMD160 cb4eb2df66c66129f35b7d97722ac8a19e8b5ac9 SHA1 5cf17a71ca01a915b7f1f0df718bc4cb0d1ea5d0 SHA256 53c907dd137777fcb4b2cc69af5bbe7efd40b4b6369b9a4d53efa6e13930cde2
+EBUILD xalan-c-1.11.0_pre797991.ebuild 2594 RMD160 d409baf23289195fb1a6421a3f8c3b42d41ced41 SHA1 c4d7f6cec63ce80006f6b8910663b70d9da0b52e SHA256 f42db43084f3f2b82ef11a81a959dd3b4d6b1132f08cf51e32f247068ee9b47f
+MISC ChangeLog 3671 RMD160 19ccd174f7e9b4420a819eff0c386c0bbe51c73f SHA1 e175a83d0688b623c47bc36c0860f0ba0d53bc6b SHA256 0635afada36a4001d5843dad7a0088cabc4ef1c3b4d942cb3aa8ccb5e1c4302c
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklE/1sACgkQkKaRLQcq0GJpiQCgoqLOlPPLYwAk03nEonZ9CdtK
-VccAn1+9M5D5uG+h1oaP7CkT2X/QURRx
-=z4A8
------END PGP SIGNATURE-----
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
new file mode 100644
index 000000000000..e8a9cc9d03b3
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
@@ -0,0 +1,108 @@
+diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan.orig/c/src/xalanc/Makefile.in	2009-07-27 00:23:08.411122528 +0200
++++ xml-xalan/c/src/xalanc/Makefile.in	2009-07-27 00:45:09.514777553 +0200
+@@ -174,7 +174,7 @@
+ 
+ "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
++	${EXTRA_LINK_OPTIONS} $^ -o $@	$(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -182,7 +182,7 @@
+ 
+ "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
++	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -192,7 +192,7 @@
+ 
+ $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ endif
+@@ -201,7 +201,7 @@
+ 
+ $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -209,7 +209,7 @@
+ 
+ $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -222,7 +222,7 @@
+ 
+ ${BATCH_TARGET}: $(ALL_OBJECTS)
+ 	@echo Building ${BATCH_TARGET}
+-	$(MAKE_SHARED) $(ALLLIBS) $^ -o $@
++	$(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
+ 
+ else
+ 
+@@ -232,7 +232,7 @@
+ 	$(MAKE) -C Utils $@
+ 
+ $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
+-	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS)
++	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS) $(ALLLIBS)
+ ifeq ($(PLATFORM), OS390)
+ 	mv *.x  ${XSL_LIB_DIR}        
+ else
+diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in
+--- xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:23:08.431122558 +0200
++++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:43:47.674693543 +0200
+@@ -29,7 +29,7 @@
+ 
+ $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
+-	${EXTRA_LINK_OPTIONS} $(LIBS) $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIBS) $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS)
+ 	
+ $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+diff -Naur xml-xalan.orig/c/Tests/Makefile.in xml-xalan/c/Tests/Makefile.in
+--- xml-xalan.orig/c/Tests/Makefile.in	2009-07-27 00:23:08.514445103 +0200
++++ xml-xalan/c/Tests/Makefile.in	2009-07-27 00:45:50.541094978 +0200
+@@ -62,7 +62,7 @@
+ 
+ $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o 
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS}  $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -70,7 +70,7 @@
+ 
+ $(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -92,7 +92,7 @@
+ 
+ $(XSL_BIN_DIR)/Perf: $(PERF_OBJECTS)
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ 	
+ ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Performance/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
new file mode 100644
index 000000000000..d86f1bd45f4b
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
@@ -0,0 +1,50 @@
+diff -Naur xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
+--- xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:23:08.507787691 +0200
++++ xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:53:50.781756249 +0200
+@@ -28,7 +28,7 @@
+ #include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+ 
+ #include <cstring>
+-
++#include <cstdio>
+ #include <cerrno>
+ 
+ XALAN_CPP_NAMESPACE_BEGIN
+@@ -44,7 +44,7 @@
+ 
+ XalanNLSMessageLoader::~XalanNLSMessageLoader()
+ {
+-    if ((int)m_catalogHandle != -1)
++    if ((long)m_catalogHandle != -1)
+     {
+         catclose(m_catalogHandle);
+     }
+@@ -77,7 +77,7 @@
+     */
+     m_catalogHandle = catopen(fileName, 0);
+ 
+-    if (reinterpret_cast<int>(m_catalogHandle) == -1)
++    if (reinterpret_cast<long>(m_catalogHandle) == -1)
+     {
+         // Probably have to call panic here
+         // the user will get an error with retrieving messages
+@@ -87,8 +87,8 @@
+ 
+ bool
+ XalanNLSMessageLoader::loadMsg(
+-            XalanMessages::Codes    msgToLoad
+-            XalanDOMChar*           toFill
++            XalanMessages::Codes    msgToLoad,
++            XalanDOMChar*           toFill,
+             XalanSize_t             maxChars)
+ {
+     
+@@ -99,7 +99,7 @@
+         return bRetValue;
+     }
+ 
+-    if (static_cast<int>(m_catalogHandle) == -1)
++    if (reinterpret_cast<long>(m_catalogHandle) == -1)
+     {
+         // for transcoding to Unicode
+         const XalanDOMString    errorMsg("Message can't be retrieved: the message catalog is not open.", m_memoryManager );
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
new file mode 100644
index 000000000000..a75b9758b09b
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
@@ -0,0 +1,52 @@
+diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan.orig/c/src/xalanc/Makefile.in	2009-07-27 00:47:45.704317114 +0200
++++ xml-xalan/c/src/xalanc/Makefile.in	2009-07-27 01:18:22.914130631 +0200
+@@ -84,6 +84,10 @@
+ SAMPLES_DIR = ${XALANCROOT}/samples
+ TESTS_DIR = ${XALANCROOT}/Tests
+ 
++TESTXSLT_OBJS = ${XSL_OBJ_DIR}/process.o
++XALANEXE_OBJS = ${XSL_OBJ_DIR}/XalanExe.o
++TESTXPATH_OBJS = ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
++
+ ALL_VPATH_CPP = \
+ $(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
+ $(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
+@@ -188,28 +192,28 @@
+ 
+ else # Not OS390BATCH
+ 
+-XalanExe: lib  $(XSL_BIN_DIR)/Xalan
++XalanExe: $(XSL_BIN_DIR)/Xalan
+ 
+-$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
++$(XSL_BIN_DIR)/Xalan: lib ${XALANEXE_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} ${XALANEXE_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ endif
+ 
+-testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
++testXSLT: $(XSL_BIN_DIR)/testXSLT
+ 
+-$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
++$(XSL_BIN_DIR)/testXSLT: lib ${TESTXSLT_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} ${TESTXSLT_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+-testXPath: lib  $(XSL_BIN_DIR)/testXPath
++testXPath: $(XSL_BIN_DIR)/testXPath
+ 
+-$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
++$(XSL_BIN_DIR)/testXPath: lib ${TESTXPATH_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${TESTXPATH_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
diff --git a/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild
new file mode 100644
index 000000000000..82c3ad9dd2ad
--- /dev/null
+++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre797991.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2009 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.11.0_pre797991.ebuild,v 1.1 2009/07/27 00:07:33 dev-zero Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils flag-o-matic multilib
+
+DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
+HOMEPAGE="http://xml.apache.org/xalan-c/"
+SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc examples nls threads"
+
+RDEPEND=">=dev-libs/xerces-c-2.8.0"
+#	icu? ( dev-libs/icu )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/xml-xalan/c"
+
+pkg_setup() {
+#	export ICUROOT="/usr"
+	export XALANCROOT="${S}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-as-needed.patch" \
+		"${FILESDIR}/${PV}-bugfixes.patch" \
+		"${FILESDIR}/${PV}-parallel-build.patch"
+
+	# - do not run configure in runConfigure
+	# - echo the export commands instead exporting the vars
+	# - remove -O3
+	# - make sure our {C,CXX}FLAGS get respected
+	sed -i \
+		-e '/\/configure/d' \
+		-e 's/^export \([a-zA-Z_]*\)/echo export \1=\\"$\1\\"/' \
+		-e 's/\(debugflag\)="-O.\? /\1="/' \
+		-e 's/^\(CXXFLAGS\)="$compileroptions/\1="${\1}/' \
+		-e 's/^\(CFLAGS\)="$compileroptions/\1="${\1}/' \
+		runConfigure || die "sed failed"
+}
+
+src_configure() {
+	export XERCESCROOT="/usr"
+
+	local target="linux"
+	# add more if needed, see xerces-c-2.8.0-r1 ebuild
+
+	local mloader="inmemory"
+	use nls && mloader="nls"
+#	use icu && mloader="icu"
+
+	local transcoder="default"
+#	use icu && transcoder="icu"
+
+	local thread="none"
+	use threads && thread="pthread"
+
+	local bitstobuild="32"
+    $(has_m64) && bitstobuild="64"
+
+	./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \
+		-m ${mloader} -t ${transcoder} \
+		-r ${thread} -b ${bitstobuild} > configure.vars || die "runConfigure failed"	
+
+	eval $(grep export configure.vars)
+	
+	default
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		mkdir build
+		cd "${S}/xdocs"
+		doxygen DoxyfileXalan
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc ; then
+		dodir /usr/share/doc/${PF}
+		dohtml -r build/docs/apiDocs/*
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r samples/*
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If you are upgrading you should run"
+	ewarn "    revdep-rebuild --library=libxalan-c.so.110"
+	ewarn "if using portage or"
+	ewarn "    reconcilio --library libxalan-c.so.110"
+	ewarn "if using paludis as your package manager."
+}