From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-cpp/xsd/Manifest | 7 + .../xsd-4.0.0-disable_examples_and_tests.patch | 50 +++++++ .../xsd/files/xsd-4.0.0-fix-expat-support.patch | 59 ++++++++ dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch | 11 ++ dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch | 159 +++++++++++++++++++++ dev-cpp/xsd/metadata.xml | 11 ++ dev-cpp/xsd/xsd-4.0.0.ebuild | 150 +++++++++++++++++++ 7 files changed, 447 insertions(+) create mode 100644 dev-cpp/xsd/Manifest create mode 100644 dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch create mode 100644 dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch create mode 100644 dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch create mode 100644 dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch create mode 100644 dev-cpp/xsd/metadata.xml create mode 100644 dev-cpp/xsd/xsd-4.0.0.ebuild (limited to 'dev-cpp/xsd') diff --git a/dev-cpp/xsd/Manifest b/dev-cpp/xsd/Manifest new file mode 100644 index 000000000000..24f7ad7d2506 --- /dev/null +++ b/dev-cpp/xsd/Manifest @@ -0,0 +1,7 @@ +AUX xsd-4.0.0-disable_examples_and_tests.patch 1847 BLAKE2B 5f3f9a6fc6588bac2714310814af87a47e4bc8c396d3ea057c7ddf0d524a993cb927e3e7fcb9adf746bae8da2fb0adc9de1b6e88be13d5d247236b2d75e33321 SHA512 3ec04678f9b1b7825d0a594e91b2d79550e26cf8c8992dfb73aa5af98aa70f463f0da9275177d97caea3e637fbbb3a2a21768f585c1237484442cd60ce36027f +AUX xsd-4.0.0-fix-expat-support.patch 2271 BLAKE2B 3a917f91b66a2cafddae5178dbfeaa359f17ac8151db87439fdf029358198772a47f2ee62bf5645c7ca9ca7758736593ca9727c0b4bffd797195a0c475b4b92e SHA512 ef4be3e1f7a27d1b06e7b7eca2824865302b57c6f8cfc46054c880e908a9dea42cf524415cf2ba041c06ea93317ca51eb087e422882651f31e687a1096dd3105 +AUX xsd-4.0.0-fix-include.patch 441 BLAKE2B 6bcccd5e9b15135a2d26dd7ca44d813850793fb6aca760e442e2c1561549f288790c445694f9b774938242221e3c06ad01d5a319e62bccf664be0383cb5c298d SHA512 c785caada9f39a027f7373c26bbf6e4e3c5e01c62b1581bf4643746abdfd64727c047d92630b51a1100f3ca198ffcd9a29bdd4fb277f756541c71973a42ad789 +AUX xsd-4.0.0-xsdcxx-rename.patch 5759 BLAKE2B 8fd196043f2146a1eb68d704e97d9b92f48ac21e1b1e04e8b377a29163b4dc9a0a7272e2aee510365a0854e9bbae5cb4c6a39042ffd3157d70b14d11a56127d0 SHA512 82d7bdefc4b1c0e5cefbcad84b556e2739d034047b13d74007e67bc0192585a25b5f0d44a9d795d88ad9d95f42ee7621417643b7353c5c4ea3e9319f1566509f +DIST xsd-4.0.0.tar.bz2 1042144 BLAKE2B 74ced8b8c68840bce8ac8b0c3df79785745c475136f5092a047e0f71e3b1f41be71fa01982fc1ea0cd7e05727a158bb467f8d1ee0773d4276684f93f558aa47e SHA512 0bac508e6948ef9e2399daed2554fcff3eaa79a7e62a3b245c777fb8bef3c5c80a35403bffdb00f72d3cf1b411747a91c059dd1c932b0a00baf076d3e60da527 +EBUILD xsd-4.0.0.ebuild 3870 BLAKE2B a1b54eab8d7559573f50f00330583e465fa9f4e73062c950d4c942d4471b85dd2a8413ebf1422388b906462d40325a19d69a03a776fa824dbcb8ebd1c29373a7 SHA512 de18e50f313aa59c2d6a34b373c1dbff098ce40e9a47436cba7acce00a86784d3258b0d56fba2ddb1067e1465ba1d7857e202e70ce78d38de83accc1d71b6a91 +MISC metadata.xml 347 BLAKE2B 1a4f36eb2370fe4dff51e741df5033b3680a8600d65254fff5cd616401a6e5657f27b2793a3230195a20800b3560afb039b3ac8b66c5e9e7ec274d6d3facabd3 SHA512 b8c8e3dfc35f84888d8ab3faee76261ee449e15c83e9672e8b33c0929b573f7b009894dd4e0c341ffb03f45bfb13c50d2f90f89075679f643faf41fd686b96ba diff --git a/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch b/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch new file mode 100644 index 000000000000..d04487a17762 --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch @@ -0,0 +1,50 @@ +--- a/makefile ++++ b/makefile +@@ -15,8 +15,6 @@ + .PHONY: $(dist-pre) + + $(default): $(out_base)/xsd/ \ +- $(out_base)/tests/ \ +- $(out_base)/examples/ \ + $(out_base)/doc/ + + # Test. +@@ -28,7 +26,6 @@ + # + $(install): $(out_base)/xsd/.install \ + $(out_base)/libxsd/.install \ +- $(out_base)/examples/.install \ + $(out_base)/doc/.install + $(call install-dir,$(src_base)/dist/examples/build,$(install_doc_dir)/xsd/examples/build) + $(call install-dir,$(src_base)/dist/examples/cxx,$(install_doc_dir)/xsd/examples/cxx,-name makefile) +@@ -44,7 +41,6 @@ + # + $(dist): $(out_base)/xsd/.dist \ + $(out_base)/libxsd/.dist \ +- $(out_base)/examples/.dist \ + $(out_base)/doc/.dist + $(call install-dir,$(src_base)/dist/examples/build,$(dist_prefix)/examples/build) + $(call install-dir,$(src_base)/dist/examples/cxx,$(dist_prefix)/examples/cxx,-name makefile) +@@ -59,7 +55,6 @@ + $(dist-win): $(dist-pre) \ + $(out_base)/xsd/.dist-win \ + $(out_base)/libxsd/.dist-win \ +- $(out_base)/examples/.dist-win \ + $(out_base)/doc/.dist-win + $(call install-dir,$(src_base)/dist/etc,$(dist_prefix)/etc) + $(call install-dir,$(src_base)/dist/examples/build,$(dist_prefix)/examples/build) +@@ -90,14 +85,10 @@ + # Clean. + # + $(clean): $(out_base)/xsd/.clean \ +- $(out_base)/tests/.clean \ +- $(out_base)/examples/.clean \ + $(out_base)/doc/.clean + + $(call include,$(bld_root)/install.make) + + $(call import,$(src_base)/xsd/makefile) + $(call import,$(src_base)/libxsd/makefile) +-$(call import,$(src_base)/tests/makefile) +-$(call import,$(src_base)/examples/makefile) + $(call import,$(src_base)/doc/makefile) diff --git a/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch b/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch new file mode 100644 index 000000000000..e91b74eb4c35 --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch @@ -0,0 +1,59 @@ +## Fix bug in C++/Parser Expat Support http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=94cba986108a0e0f42295572ca42c356d59328d7 +### Author Boris Kolpackov +## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200) +### Committer Boris Kolpackov +## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200) +--- xsd/libxsd/xsd/cxx/parser/expat/elements.hxx ++++ xsd/libxsd/xsd/cxx/parser/expat/elements.hxx +@@ -51,7 +51,9 @@ namespace xsd + } + }; + +- typedef std::unique_ptr parser_auto_ptr; ++ typedef ++ std::unique_ptr ++ parser_auto_ptr; + #else + // Simple auto pointer for Expat's XML_Parser object. + // +--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -283,9 +283,10 @@ namespace xsd + throw std::bad_alloc (); + + if (system_id || public_id) +- parse_begin (parser, system_id ? *system_id : *public_id, eh); ++ parse_begin ( ++ parser.get (), system_id ? *system_id : *public_id, eh); + else +- parse_begin (parser, eh); ++ parse_begin (parser.get (), eh); + + // Temporarily unset the exception failbit. Also clear the + // fail bit when we reset the old state if it was caused +@@ -310,8 +311,10 @@ namespace xsd + break; + } + +- if (XML_Parse ( +- parser, buf, is.gcount (), is.eof ()) == XML_STATUS_ERROR) ++ if (XML_Parse (parser.get (), ++ buf, ++ is.gcount (), ++ is.eof ()) == XML_STATUS_ERROR) + { + r = false; + break; +##http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef +--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -279,7 +279,7 @@ namespace xsd + { + parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' '))); + +- if (parser == 0) ++ if (parser.get () == 0) + throw std::bad_alloc (); + + if (system_id || public_id) + diff --git a/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch b/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch new file mode 100644 index 000000000000..85ea3e54313e --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch @@ -0,0 +1,11 @@ +--- a/xsd/xsd.cxx ++++ b/xsd/xsd.cxx +@@ -15,7 +15,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include diff --git a/dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch b/dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch new file mode 100644 index 000000000000..cb78348e7b67 --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch @@ -0,0 +1,159 @@ +Description: change docu from xsd to xsdcxx +Author: Jörg Frings-Fürst +Reviewed-by: +Last-Update: 2014-07-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/doc/xsd.1 +=================================================================== +--- a/doc/xsd.1 ++++ b/doc/xsd.1 +@@ -1,16 +1,16 @@ + .\" Process this file with + .\" groff -man -Tascii xsd.1 + .\" +-.TH XSD 1 "July 2014" "XSD 4.0.0" ++.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0" + .SH NAME +-xsd \- W3C XML Schema to C++ Compiler ++xsdcxx \- W3C XML Schema to C++ Compiler + .\" + .\" + .\" + .\"-------------------------------------------------------------------- + .SH SYNOPSIS + .\"-------------------------------------------------------------------- +-.B xsd ++.B xsdcxx + .I command + .B [ + .I options +@@ -20,19 +20,19 @@ + .I file + .B ...] + .in +-.B xsd help ++.B xsdcxx help + .B [ + .I command + .B ] + .in +-.B xsd version ++.B xsdcxx version + .\" + .\" + .\" + .\"-------------------------------------------------------------------- + .SH DESCRIPTION + .\"-------------------------------------------------------------------- +-.B xsd ++.B xsdcxx + generates vocabulary-specific, statically-typed C++ mapping from W3C XML + Schema definitions. Particular mapping to produce is selected by a + .IR command . +@@ -96,7 +96,7 @@ + .PP + .RS + .RS 3 +-.B xsd help ++.B xsdcxx help + .I command + .RE + .PP +@@ -133,9 +133,9 @@ + + When the C++11 mode is selected, you normally don't need to perform any + extra steps other than enable C++11 in your C++ compiler, if required\. The +-XSD compiler will automatically add the necessary macro defines to the +-generated header files that will switch the header-only XSD runtime library +-(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD ++XSDCXX compiler will automatically add the necessary macro defines to the ++generated header files that will switch the header-only XSDCXX runtime library ++(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSDCXX + runtime headers directly in your application (normally you just include the + generated headers), then you will need to define the \fBXSD_CXX11\fP macro + for your entire project\. +@@ -1632,7 +1632,7 @@ + .\" + .SH DIAGNOSTICS + If the input file is not a valid W3C XML Schema definition, +-.B xsd ++.B xsdcxx + will issue diagnostic messages to + .B STDERR + and exit with non-zero exit code. +Index: trunk/xsd/doc/xsd.xhtml +=================================================================== +--- a/doc/xsd.xhtml ++++ b/doc/xsd.xhtml +@@ -3,11 +3,11 @@ + + + +- XSD 4.0.0 Compiler Command Line Manual ++ XSDCXX 4.0.0 Compiler Command Line Manual + + + +- ++ + + + +@@ -50,19 +50,19 @@ + +

NAME

+ +-

xsd - W3C XML Schema to C++ Compiler

++

xsdcxx - W3C XML Schema to C++ Compiler

+ +

SYNOPSIS

+ +
+-
xsd command [options] file [file ...]
+-
xsd help [command]
+-
xsd version
++
xsdcxx command [options] file [file ...]
++
xsdcxx help [command]
++
xsdcxx version
+
+ +

DESCRIPTION

+ +-

xsd generates vocabulary-specific, statically-typed ++

xsdcxx generates vocabulary-specific, statically-typed + C++ mapping from W3C XML Schema definitions. Particular mapping to + produce is selected by a command. Each mapping has + a number of mapping-specific options that should +@@ -138,10 +138,10 @@ + +

When the C++11 mode is selected, you normally don't need to perform any + extra steps other than enable C++11 in your C++ compiler, if required. The +- XSD compiler will automatically add the necessary macro defines to the +- generated header files that will switch the header-only XSD runtime library ++ XSDCXX compiler will automatically add the necessary macro defines to the ++ generated header files that will switch the header-only XSDCXX runtime library + (libxsd) to the C++11 mode. However, if you include any +- of the XSD runtime headers directly in your application (normally you just ++ of the XSDCXX runtime headers directly in your application (normally you just + include the generated headers), then you will need to define the + XSD_CXX11 macro for your entire project.

+ +@@ -219,7 +219,7 @@ + +

For example, if you have file hello.xsd with + namespace http://example.com/hello and you run +- xsd on this file, then the string in question will ++ xsdcxx on this file, then the string in question will + be:

+ +

hello.xsd. http://example.com/hello

+@@ -1530,7 +1530,7 @@ +

DIAGNOSTICS

+ +

If the input file is not a valid W3C XML Schema definition, +- xsd will issue diagnostic messages to STDERR ++ xsdcxx will issue diagnostic messages to STDERR + and exit with non-zero exit code.

+ +

BUGS

diff --git a/dev-cpp/xsd/metadata.xml b/dev-cpp/xsd/metadata.xml new file mode 100644 index 000000000000..e09ce345ca3b --- /dev/null +++ b/dev-cpp/xsd/metadata.xml @@ -0,0 +1,11 @@ + + + + + cpp@gentoo.org + Gentoo C++ Project + + + Enable support for serializing to/from an ACE CDR stream + + diff --git a/dev-cpp/xsd/xsd-4.0.0.ebuild b/dev-cpp/xsd/xsd-4.0.0.ebuild new file mode 100644 index 000000000000..612125e91bbf --- /dev/null +++ b/dev-cpp/xsd/xsd-4.0.0.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs versionator + +DESCRIPTION="An open-source, cross-platform W3C XML Schema to C++ data binding compiler" +HOMEPAGE="https://www.codesynthesis.com/products/xsd/" +SRC_URI="https://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="ace doc examples test zlib" + +RDEPEND=" + >=dev-libs/xerces-c-3.0.0 + dev-libs/boost:=[threads] + dev-cpp/libcutl + >=dev-cpp/libxsd-frontend-2.0.0 + ace? ( dev-libs/ace ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + dev-util/build + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.0-disable_examples_and_tests.patch" + "${FILESDIR}/${PN}-4.0.0-xsdcxx-rename.patch" + "${FILESDIR}/${PN}-4.0.0-fix-expat-support.patch" + "${FILESDIR}/${PN}-4.0.0-fix-include.patch" +) + +src_configure() { + # Maintainer notes: + # * xqilla is not required, this is only whether or not to include the xpath + # examples which require xqilla + mkdir -p \ + build/cxx/gnu \ + build/import/lib{ace,boost,cult,backend-elements,xerces-c,xqilla,xsd-frontend,z} || die + + cat >> build/configuration-dynamic.make <<- EOF || die + xsd_with_zlib := $(usex zlib y n) + xsd_with_ace := $(usex ace y n) + xsd_with_xdr := y + xsd_with_xqilla := y + xsd_with_boost_date_time := y + xsd_with_boost_serialization := y + EOF + + cat >> build/cxx/configuration-dynamic.make <<- EOF || die + cxx_id := gnu + cxx_optimize := n + cxx_debug := n + cxx_rpath := n + cxx_pp_extra_options := + cxx_extra_options := ${CXXFLAGS} + cxx_ld_extra_options := ${LDFLAGS} + cxx_extra_libs := + cxx_extra_lib_paths := + EOF + + cat >> build/cxx/gnu/configuration-dynamic.make <<- EOF || die + cxx_gnu := $(tc-getCXX) + cxx_gnu_libraries := + cxx_gnu_optimization_options := + EOF + + # cli + cat >> build/import/cli/configuration-dynamic.make <<- EOF || die + cli_installed := y + EOF + + # ace + cat >> build/import/libace/configuration-dynamic.make <<- EOF || die + libace_installed := y + EOF + + # boost + cat >> build/import/libboost/configuration-dynamic.make <<- EOF || die + libboost_installed := y + libboost_system := y + EOF + + # libcutl + cat >> build/import/libcutl/configuration-dynamic.make <<- EOF || die + libcutl_installed := y + EOF + + # xerces-c + cat >> build/import/libxerces-c/configuration-dynamic.make <<- EOF || die + libxerces_c_installed := y + EOF + + # xqilla + cat >> build/import/libxqilla/configuration-dynamic.make <<- EOF || die + libxqilla_installed := y + EOF + + # libxsd-frontend + cat >> build/import/libxsd-frontend/configuration-dynamic.make <<- EOF || die + libxsd_frontend_installed := y + EOF + + # zlib + cat >> build/import/libz/configuration-dynamic.make <<- EOF || die + libz_installed := y + EOF +} + +src_compile() { + emake verbose=1 + + if use doc; then + emake -C "${S}/doc/cxx/tree/reference" verbose=1 + fi + if use test; then + XERCESC_NLS_HOME="${EPREFIX}/usr/share/xerces-c/msg" emake -C tests verbose=1 + fi +} + +src_test() { + XERCESC_NLS_HOME="${EPREFIX}/usr/share/xerces-c/msg" emake -C tests test +} + +src_install() { + emake install_prefix="${ED%/}/usr" install + + # Renaming binary/manpage to avoid collision with mono-2.0's xsd/xsd2 + mv "${ED%/}"/usr/bin/xsd{,cxx} || die + mv "${ED%/}"/usr/share/man/man1/xsd{,cxx}.1 || die + + # remove incorrectly installed documentation + rm -rf "${ED%/}/usr/share/doc" || die + # clean out all non-html related files + find doc/ \( -iname '*.1' -o -iname 'makefile*' -o -iname '*doxygen' \ + -o -iname '*doxytag' -o -iname '*html2ps' \) -delete || die + + DOCS=( NEWS README FLOSSE ) + HTML_DOCS=( doc/. ) + einstalldocs + + newdoc libxsd/README README.libxsd + newdoc libxsd/FLOSSE FLOSSE.libxsd + + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} -- cgit v1.2.3