From 374561aeaff53ce5a2836af934749923b4ea3763 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 20 Jan 2023 23:41:21 +0000 Subject: gentoo auto-resync : 20:01:2023 - 23:41:20 --- dev-libs/Manifest.gz | Bin 95956 -> 95956 bytes dev-libs/xalan-c/Manifest | 7 +- .../xalan-c/files/1.11.0_pre797991-as-needed.patch | 105 --------------------- .../xalan-c/files/1.11.0_pre797991-bugfixes.patch | 49 ---------- .../files/1.11.0_pre797991-parallel-build.patch | 61 ------------ dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild | 92 ------------------ dev-libs/xalan-c/xalan-c-1.12-r2.ebuild | 6 +- 7 files changed, 4 insertions(+), 316 deletions(-) delete mode 100644 dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch delete mode 100644 dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch delete mode 100644 dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch delete mode 100644 dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 452b531d4581..91b3781c7d26 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest index 17e3c01136df..c248418e1bc8 100644 --- a/dev-libs/xalan-c/Manifest +++ b/dev-libs/xalan-c/Manifest @@ -1,12 +1,7 @@ -AUX 1.11.0_pre797991-as-needed.patch 4803 BLAKE2B 1dd127bb9fd93cc58ac0a09e45354df5b0e8eaa4e53b9eb0f8a6d96f00e1606fe202b46ea4f9e105c0d20fd58a52761df1bf52f51e19fb70892d5909912db30e SHA512 f0805dc8456ed803d92e2b913d4996881078e402ad053be5175aeeb6126b6e752a39e02fc1d4f37853e5e2aaee229a82c11cc7e0b298d3474e4d638d3fd0025b -AUX 1.11.0_pre797991-bugfixes.patch 1409 BLAKE2B 78c628ae10560bf950c7fed9ae4c28216bfb97bc7936064f20ee91403e74297d0b15ea1755901f26d900e53ba935fee937b726bee65511272e305f2731bdc94d SHA512 3eaa70d2936b7091e036d936ff8b35cbf2399ccbb81444b8a6a9583cbd11aa865e7f927a035b1d0223c172eb8de891e4da3b7113b155dfc4e8b19d0da5c4c4da -AUX 1.11.0_pre797991-parallel-build.patch 2530 BLAKE2B 2d88ed70b30643cae4bcf6a88de56706fd1f0cf5b71e2d12dd24812217ce06023b08b8914dcbcfd828e8c8ba8b116d227d621cc785fbd3591a2d2d502be5fa37 SHA512 be994c118b212b3b96409c273b01d2b00b0a8b0f7ec53338f8efc6ec9d9dccd4fb6fdcaf7c365351024a965e96992ff23ba849c90d6d6aa1e7086c51c763cbef AUX xalan-c-1.12-fix-lto.patch 823 BLAKE2B db4000d8959e5869d0f0afd92ede88f2bb279af6a9dfb1109655628a23357673dfe1594033d49eb595b8e0bfe1197ecb4492be81b47df6d367fa78378f3bae59 SHA512 efe6df198bd68ae4feb5f75e9679b57a2d53e21b1efa724889cb74a9fa90ac77fc598bada8042bac01e1a898a53ad0ef9e7b9bc3a328aab22b9c5506d477b671 AUX xalan-c-1.12-fix-threads.patch 1074 BLAKE2B 086208fa8dbebc3b5edc5119386ba3976d7a939e505a81c625ab6fb7b8dddd198aa41bbc93177e575d8475a8ee4fdec62d27d4c3442121c29f72c341a123df8d SHA512 33aa9cc55bc4cc29e3d1fedd9dbd1792695ad52f50e2ed46f7872585892dca579d75622ad91d4d854d9ed1dabf38b282c69ef39a3d909321ad2b48e5e8244066 -DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653 DIST xalan_c-1.12.tar.gz 1130924 BLAKE2B c2f0fb98d39e516d5219ab0e075517c2c916b451bfce6d90399899870a8a73fb59f8d2465f58bd97208d19c5a7a18df5a49ece156d8dfe47bf57fc875793fb43 SHA512 a9f72f0e8e199ee2cfb4c19ecf390d5007f597aad96a53f55bc475805190302c7e0d800d776b7fb20fe8e2dddb6391e70aa3a8861a2303370135e8b0a5fd15fc DIST xalan_c-1.12.tar.gz.asc 488 BLAKE2B 1e5d7091ca184ac7e2897fe52417b01d9618ab0435f2bcc7748d563287ad81692e61bee92ec9bc71e5c21c11bc8245a4ec09ff7e6ed44a4b3113264b096ba277 SHA512 1c532367d5a3f16622cda3eaca05eac648b415a9de8685cf43f5e62683db30b396e669b6952f5bbe161327b8171cd1e54ad4dbefa54122243aa01298d53d400d -EBUILD xalan-c-1.11.0_pre1153059.ebuild 2180 BLAKE2B a31ce8f492efc514caec802d6d855d0329561d47c7692c3bc864415c545f644decd633427eb03f4065799215f80a8fa8c0e309391f6542f808e876bb036b249d SHA512 948a65343d58b40f06aae2cf4625782679528e714a1f3de5f2ecd10062135d4cdc39d49a84b1248989e7b42d3ee11e7ea83d4aef4ad9ee5fb06cd062aedc845b -EBUILD xalan-c-1.12-r2.ebuild 1247 BLAKE2B bf9bb59fbba8408dce961936e656d157130eda7a8c182f4f4eac7ece7e0e122a0eb74dd44fc58843adf2dc033cfffa59091a313e8d3fc6921c58793935d8c8d5 SHA512 2e9d660bf1d79796e24e58b47f8c683d3b736310d145f8047483bf1dd93e4b023f5784cecde829c5e4e037d0c4706d24fe9d838faee9e1444d4bf840cf07911f +EBUILD xalan-c-1.12-r2.ebuild 1254 BLAKE2B 387df4b537e4d3b41ead50c6002212dbb8e0b01412766018df81dc0af880a8c4e69e474f29b11d3381cab86dad92f810696cbc442bf32073e2e9554914431d8b SHA512 aa7f3c0db4c88cd3f6600492bcf18f00a6d2e1ac2806fe91cad77bab78011d16ab5ef76477ed4a571f53c2836317ed56927dea0c6b072aaf08c708110e6b64b4 EBUILD xalan-c-9999.ebuild 1215 BLAKE2B 6d7e50d203f4533e17a5846d4d74a189c7e6bf9f6fc39954fbf6b1db524a9b40e91e631ef884bc98a93839e2444543d31846916eca1a9779f82c7b8d0a4321a4 SHA512 23183fa1e95f45ac7e9d5d2da6a6676f924b1ca4128e22f45fccdb4961c481e0e7da88429a7854cc94d7af7a99648745b8454d6a2270d47b7b7cab65723e031f MISC metadata.xml 321 BLAKE2B a2e8e4499ce42f511537b6f3a1975f857ef40205dca2220536cc124bcb9f94c1017efe3f5e9124490f65758ac277b5db57bace8987e8118ea4a524b57d1a07a2 SHA512 af706a4b4d2a6e5f9ce31f83f367423097168c97fc8ca42e82a1c93a542329cd699d52902aaa63fc9b43cfc5a5c15cd26a87b754cc314d25131f9bb8652447ef 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 deleted file mode 100644 index 791da1cd7e75..000000000000 --- a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- a/src/xalanc/Makefile.in -+++ b/src/xalanc/Makefile.in -@@ -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 ---- a/src/xalanc/Utils/MsgCreator/Makefile.in -+++ b/src/xalanc/Utils/MsgCreator/Makefile.in -@@ -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 $@ $< ---- a/Tests/Makefile.in -+++ b/Tests/Makefile.in -@@ -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 deleted file mode 100644 index 8b7f618bb8b1..000000000000 --- a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp -+++ b/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp -@@ -28,7 +28,7 @@ - #include - - #include -- -+#include - #include - - 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(m_catalogHandle) == -1) -+ if (reinterpret_cast(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(m_catalogHandle) == -1) -+ if (reinterpret_cast(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 deleted file mode 100644 index da2c79572984..000000000000 --- a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/src/xalanc/Makefile.in -+++ b/src/xalanc/Makefile.in -@@ -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): \ -@@ -169,6 +173,9 @@ - - compile: $(ALL_OBJECTS) - -+$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale -+locale: prepare -+ - ifeq (${OS390BATCH},1) - XalanExe: lib "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'" - -@@ -188,28 +195,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_pre1153059.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild deleted file mode 100644 index 8d8eda0a2222..000000000000 --- a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types" -HOMEPAGE="https://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 x86" -IUSE="doc examples nls threads" - -RDEPEND=">=dev-libs/xerces-c-2.8.0" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" - -S="${WORKDIR}/xml-xalan/c" - -PATCHES=( - "${FILESDIR}"/1.11.0_pre797991-as-needed.patch - "${FILESDIR}"/1.11.0_pre797991-bugfixes.patch - "${FILESDIR}"/1.11.0_pre797991-parallel-build.patch -) - -src_prepare() { - default - - # - 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" - export XALANCROOT="${S}" - - local target="linux" - local transcoder="default" - local mloader=$(usex nls nls inmem) - local thread=$(usex threads pthread none) - - ./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \ - -m ${mloader} -t ${transcoder} \ - -r ${thread} > configure.vars || die "runConfigure failed" - - eval $(grep export configure.vars) - - default -} - -src_compile() { - default - - if use doc; then - mkdir build || die - cd xdocs || die - doxygen DoxyfileXalan || die - HTML_DOCS=( build/docs/apiDocs/. ) - - # clean doxygen cruft - find "${S}"/build \( -iname '*.map' -o -iname '*.md5' \) -delete || die - fi -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc -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." -} diff --git a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild index 74e63f8e818f..debb844f9e1e 100644 --- a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild +++ b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,13 +16,13 @@ if [[ ${PV} == *9999 ]]; then else inherit verify-sig SRC_URI=" - mirror://apache/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz + https://dlcdn.apache.org/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz verify-sig? ( https://dlcdn.apache.org/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz.asc ) " VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/apache-xalan-c.asc SLOT="0/$(ver_cut 1-2)" - KEYWORDS="~amd64 ~ppc ~x86" + KEYWORDS="amd64 ~ppc x86" S="${WORKDIR}/${MY_PN}-${PV}" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-apache-xalan-c ) -- cgit v1.2.3