Add patch to fix building with -Wl,--as-needed. Fixes bug #165434. Thanks to Daniel Lin <dtlin@andrew.cmu.edu> for the patch. Also fixed LICENSE to Apache-2.0.

Package-Manager: portage-2.1.2.7

4 files changed, 105 insertions, 15 deletions

diff --git a/dev-libs/xalan-c/ChangeLog b/dev-libs/xalan-c/ChangeLog
index bceee804e52d..f01291e1dd1e 100644
--- a/dev-libs/xalan-c/ChangeLog
+++ b/dev-libs/xalan-c/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xalan-c
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.12 2007/04/05 18:19:30 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.13 2007/05/18 09:23:02 betelgeuse Exp $
+
+  18 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.10.0-as-needed.patch, xalan-c-1.10.0.ebuild:
+  Add patch to fix building with -Wl,--as-needed. Fixes bug #165434. Thanks to
+  Daniel Lin <dtlin@andrew.cmu.edu> for the patch. Also fixed LICENSE to
+  Apache-2.0.
 
   05 Apr 2007; Tiziano Müller <dev-zero@gentoo.org> Manifest:
   Manifest rebuilt (bug #173450)
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index 801b7bb63c06..9707a1d3d55c 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.10.0-as-needed.patch 4022 RMD160 298171f6d3e6b624dc220ad3d8b2f0d00bfb43b4 SHA1 86d2926aa3dcc382b7491bb3e4c7dad707581f25 SHA256 34e4ccbfcbf11748e60dfb98c6ca2e1b47597031cfcea14cb2df3a43289a8e5a
+MD5 f34f6a5101c57ce63f133c65480f0871 files/1.10.0-as-needed.patch 4022
+RMD160 298171f6d3e6b624dc220ad3d8b2f0d00bfb43b4 files/1.10.0-as-needed.patch 4022
+SHA256 34e4ccbfcbf11748e60dfb98c6ca2e1b47597031cfcea14cb2df3a43289a8e5a files/1.10.0-as-needed.patch 4022
 DIST Xalan-C_1_10_0-src.tar.gz 1554940 RMD160 537ba0be6a14e47eb4453c2d813b31ec416835ab SHA1 3fc63045048176e0ab00ce8aa0d15b2c1e5d646b SHA256 40797957fb22797894d33a2fa0e01e3b6cc509fb89bb772c0e835ae840714cfd
-EBUILD xalan-c-1.10.0.ebuild 1806 RMD160 bb7b148f31f46f51f5b6edfb0db973a677669375 SHA1 c83640cecf06b95803d25d47dfd54a521fa7ca4f SHA256 c5abdc7a7438f4bd1bb653de27760a60bb9c316feb542e042b435ca0368865d3
-MD5 7d37ee3ecdb4b2578ba9183cf55cd053 xalan-c-1.10.0.ebuild 1806
-RMD160 bb7b148f31f46f51f5b6edfb0db973a677669375 xalan-c-1.10.0.ebuild 1806
-SHA256 c5abdc7a7438f4bd1bb653de27760a60bb9c316feb542e042b435ca0368865d3 xalan-c-1.10.0.ebuild 1806
-MISC ChangeLog 1795 RMD160 bf2232fc36adc85a2b7e0674922985a31d86643c SHA1 5c035805e14aeb0845b83d42b0cf92aa24675711 SHA256 8c6d15c923bc8a5724eaa2bb1d4cf73072bdfa32db0ffc4d1a3015f5e424fe8b
-MD5 0065b0417f5d8e18b4e78aa6dbeb7d77 ChangeLog 1795
-RMD160 bf2232fc36adc85a2b7e0674922985a31d86643c ChangeLog 1795
-SHA256 8c6d15c923bc8a5724eaa2bb1d4cf73072bdfa32db0ffc4d1a3015f5e424fe8b ChangeLog 1795
+EBUILD xalan-c-1.10.0.ebuild 1908 RMD160 8eef64b539f7e438e2c0be307001af5412c08263 SHA1 2ae5bf8c3bfbee3bbacbf068580f084972be79a7 SHA256 5e3a66279e58e8e777bf982121d8296ccdb577fa098849fc9146bd075f54caf4
+MD5 dd32db1a0d243b50040ff0c173e1873f xalan-c-1.10.0.ebuild 1908
+RMD160 8eef64b539f7e438e2c0be307001af5412c08263 xalan-c-1.10.0.ebuild 1908
+SHA256 5e3a66279e58e8e777bf982121d8296ccdb577fa098849fc9146bd075f54caf4 xalan-c-1.10.0.ebuild 1908
+MISC ChangeLog 2073 RMD160 e4d749fe52e958fd8877705705aa790e7e70ac8b SHA1 6388a2e3ea2dee3ff3030d952f287137a5888e27 SHA256 21fc94d9047c28aea26e172039928d70c848e50c931798d5c16224e3c04dd0f5
+MD5 6577840f29d557646d7067baa6c8bd10 ChangeLog 2073
+RMD160 e4d749fe52e958fd8877705705aa790e7e70ac8b ChangeLog 2073
+SHA256 21fc94d9047c28aea26e172039928d70c848e50c931798d5c16224e3c04dd0f5 ChangeLog 2073
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
@@ -18,9 +22,9 @@ MD5 b9a0ee8addeabd5f995d3557148be8e6 files/digest-xalan-c-1.10.0 259
 RMD160 aa4a33c3ebd6997f6e36eec4c98a85ac5341436e files/digest-xalan-c-1.10.0 259
 SHA256 3569e93d269bf4b619540c5039a8c05db10a2d783e89f993461aba179e5d1beb files/digest-xalan-c-1.10.0 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGFT3bGwVqY66cHjARApq8AJwNlIG12TAVY/aE9Bkm9BJmUrOYIACfc5Sa
-9GRwno6L8IL182AMMcnbldw=
-=Ov6S
+iD8DBQFGTXB6cxLzpIGCsLQRAhWvAJ9lWWrYdpmf77qMhI180+IcVL/IzgCfVblW
+yPAyxkGJ5ReWD/lXo9lci0E=
+=USJq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xalan-c/files/1.10.0-as-needed.patch b/dev-libs/xalan-c/files/1.10.0-as-needed.patch
new file mode 100644
index 000000000000..60fa962b5b79
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.10.0-as-needed.patch
@@ -0,0 +1,78 @@
+diff -uprN xml-xalan/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan/c/src/xalanc/Makefile.in	2007-03-31 14:54:16.106346968 -0400
++++ xml-xalan/c/src/xalanc/Makefile.in	2007-03-31 14:57:37.159195728 -0400
+@@ -172,7 +172,7 @@ XalanExe: lib  "//'$(LOADSAMP)(${BATCH_X
+ 
+ "//'$(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 $@ $<
+ 
+@@ -180,7 +180,7 @@ testXSLT: lib  "//'$(LOADSAMP)(${BATCH_T
+ 
+ "//'$(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 $@ $<
+ 
+@@ -190,7 +190,7 @@ XalanExe: lib  $(XSL_BIN_DIR)/Xalan
+ 
+ $(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 $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ endif
+@@ -199,7 +199,7 @@ testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
+ 
+ $(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 $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -207,7 +207,7 @@ testXPath: lib  $(XSL_BIN_DIR)/testXPath
+ 
+ $(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} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS)	$(OTHER_LINK_PARAMETERS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -220,7 +220,7 @@ locale:        
+ 
+ ${BATCH_TARGET}: $(ALL_OBJECTS)
+ 	@echo Building ${BATCH_TARGET}
+-	$(MAKE_SHARED) $(ALLLIBS) $^ -o $@
++	$(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
+ 
+ else
+ 
+@@ -230,7 +230,7 @@ locale:	
+ 	$(MAKE) -C Utils $@
+ 
+ $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
+-	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES)
++	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES)
+ ifeq ($(PLATFORM), OS390)
+ 	mv *.x  ${XSL_LIB_DIR}        
+ else
+diff -uprN xml-xalan/c/src/xalanc/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/MsgCreator/Makefile.in
+--- xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2007-03-31 15:10:07.927334556 -0400
++++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2007-03-31 15:10:35.038804580 -0400
+@@ -29,7 +29,7 @@ MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc
+ 
+ $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
+-	${EXTRA_LINK_OPTIONS}  $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@ $(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 --git a/dev-libs/xalan-c/xalan-c-1.10.0.ebuild b/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
index cbdd8e4021ed..cf0c70274ed8 100644
--- a/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7 2007/02/03 21:41:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.10.0.ebuild,v 1.8 2007/05/18 09:23:02 betelgeuse Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib
 
@@ -12,7 +12,7 @@ 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"
 
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE="doc"
@@ -26,6 +26,8 @@ S=${WORKDIR}/xml-xalan/c
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# https://issues.apache.org/jira/browse/XALANC-643
+	epatch "${FILESDIR}/1.10.0-as-needed.patch"
 	chmod a+r $(find . -type f)
 	chmod a+rx $(find . -type d)