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 --- app-text/opensp/Manifest | 7 ++ app-text/opensp/files/opensp-1.5-gcc34.patch | 10 +++ app-text/opensp/files/opensp-1.5.2-c11-using.patch | 77 +++++++++++++++++++++ .../opensp/files/opensp-1.5.2-fix-segfault.patch | 23 +++++++ app-text/opensp/metadata.xml | 12 ++++ app-text/opensp/opensp-1.5.2-r3.ebuild | 78 +++++++++++++++++++++ app-text/opensp/opensp-1.5.2-r6.ebuild | 80 ++++++++++++++++++++++ 7 files changed, 287 insertions(+) create mode 100644 app-text/opensp/Manifest create mode 100644 app-text/opensp/files/opensp-1.5-gcc34.patch create mode 100644 app-text/opensp/files/opensp-1.5.2-c11-using.patch create mode 100644 app-text/opensp/files/opensp-1.5.2-fix-segfault.patch create mode 100644 app-text/opensp/metadata.xml create mode 100644 app-text/opensp/opensp-1.5.2-r3.ebuild create mode 100644 app-text/opensp/opensp-1.5.2-r6.ebuild (limited to 'app-text/opensp') diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest new file mode 100644 index 000000000000..c381cd071df4 --- /dev/null +++ b/app-text/opensp/Manifest @@ -0,0 +1,7 @@ +AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd46086aa7000947055b800ee5955390ae4aca0d86d49646ffb965f653e4286e1e7c34a1aed6511576831d41813f9 SHA512 bafb4149026e19ef3e4ba34f84510cdc5a5cb6621e58114d06b5979f74a21f4093f141dccd4166a1e83eaeb6310187efbc9a4cadae0c1d55a1929eebac3caa63 +AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11 +AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf +DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e +EBUILD opensp-1.5.2-r3.ebuild 1975 BLAKE2B 2e33accb3db11106c812195cb854bba0f814e3da5422a0e18278d373c73f03b7d9eb3ee31d231189ebfbe374b62bfc1927c47e85ce16942f006063f5f4b871be SHA512 6234b977e1d16e2de5271663800b86dc2b018d365e805e510e704d5d6f8085da1ce5a0d141735bb45fadab1ee9b792f3e8a2e9c1b8c0fc959fd12457d29ee039 +EBUILD opensp-1.5.2-r6.ebuild 2070 BLAKE2B 726d5bb0da39595aeaaa64dcc42b30a980c96f4efddf88c7a0d38702b7d45cf18661874f995b2256d8a3d9da4553d499a17d98d35fd91b3738606897394d4734 SHA512 0da113ed7e63336c4239cba894d715a829f2b7df01befb145b3e84a42cdc5de4ac9509394a8fe879008a626f338f96f5d832424ef6e67a3e6dbe5b034686c23b +MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008 diff --git a/app-text/opensp/files/opensp-1.5-gcc34.patch b/app-text/opensp/files/opensp-1.5-gcc34.patch new file mode 100644 index 000000000000..60ee56085315 --- /dev/null +++ b/app-text/opensp/files/opensp-1.5-gcc34.patch @@ -0,0 +1,10 @@ +--- include/RangeMap.h~ 2004-04-22 20:34:13.729541096 +0300 ++++ include/RangeMap.h 2004-04-22 20:31:48.473049702 +0300 +@@ -8,6 +8,7 @@ + #include "Boolean.h" + #include "ISet.h" + #include "types.h" ++#include "constant.h" + #include + + #ifdef SP_NAMESPACE diff --git a/app-text/opensp/files/opensp-1.5.2-c11-using.patch b/app-text/opensp/files/opensp-1.5.2-c11-using.patch new file mode 100644 index 000000000000..a12bf9a9b55d --- /dev/null +++ b/app-text/opensp/files/opensp-1.5.2-c11-using.patch @@ -0,0 +1,77 @@ +Fix build issues due to access declarations: https://crbug.com/806958 + ISO C++11 does not allow access declarations; use using declarations instead. + +The link to "Bug Tracker" on http://openjade.sourceforge.net/bugs.html +is not working. Sent a mail containing bug report to the Openjade-devel@ +address on that page. + +Patch by Rahul Chaudhry + +--- a/include/IList.h ++++ b/include/IList.h +@@ -26,8 +26,8 @@ public: + void swap(IList &list) { IListBase::swap(list); } + T *head() const { return (T *)IListBase::head(); } + T *get() { return (T *)IListBase::get(); } +- IListBase::clear; +- IListBase::empty; ++ using IListBase::clear; ++ using IListBase::empty; + friend class IListIter; + private: + IList(const IList &); // undefined +--- a/include/IListIter.h ++++ b/include/IListIter.h +@@ -17,8 +17,8 @@ public: + IListIter(const IList &list) : IListIterBase(list) { } + T *cur() const { return (T *)IListIterBase::cur(); } + +- IListIterBase::next; +- IListIterBase::done; ++ using IListIterBase::next; ++ using IListIterBase::done; + }; + + #ifdef SP_NAMESPACE +--- a/include/Ptr.h ++++ b/include/Ptr.h +@@ -69,8 +69,8 @@ public: + const T *operator->() const { return Ptr::pointer(); } + const T &operator*() const { return *Ptr::pointer(); } + void swap(ConstPtr &p) { Ptr::swap(p); } +- Ptr::isNull; +- Ptr::clear; ++ using Ptr::isNull; ++ using Ptr::clear; + Boolean operator==(const Ptr &p) const { return Ptr::operator==(p); } + Boolean operator!=(const Ptr &p) const { return Ptr::operator!=(p); } + Boolean operator==(const ConstPtr &p) const { +--- a/lib/Parser.h ++++ b/lib/Parser.h +@@ -62,16 +62,16 @@ public: + Parser(const SgmlParser::Params &); + Event *nextEvent(); + void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr); +- ParserState::sdPointer; +- ParserState::instanceSyntaxPointer; +- ParserState::prologSyntaxPointer; +- ParserState::activateLinkType; +- ParserState::allLinkTypesActivated; +- ParserState::entityManager; +- ParserState::entityCatalog; +- ParserState::baseDtd; +- ParserState::options; +- ParserState::instantiateDtd; ++ using ParserState::sdPointer; ++ using ParserState::instanceSyntaxPointer; ++ using ParserState::prologSyntaxPointer; ++ using ParserState::activateLinkType; ++ using ParserState::allLinkTypesActivated; ++ using ParserState::entityManager; ++ using ParserState::entityCatalog; ++ using ParserState::baseDtd; ++ using ParserState::options; ++ using ParserState::instantiateDtd; + friend class PiAttspecParser; + private: + Parser(const Parser &); // undefined diff --git a/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch b/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch new file mode 100644 index 000000000000..5a9d328da915 --- /dev/null +++ b/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch @@ -0,0 +1,23 @@ +Resolve segfault in OpenSP::ParsedSystemId::unparse. +Patch taken from Debian. +https://bugs.gentoo.org/show_bug.cgi?id=196230 +--- a/lib/ExtendEntityManager.cxx ++++ b/lib/ExtendEntityManager.cxx +@@ -1238,7 +1238,8 @@ + } + + StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x) +-: codingSystemName(x.codingSystemName), ++: storageManager(x.storageManager), ++ codingSystemName(x.codingSystemName), + codingSystem(x.codingSystem), + specId(x.specId), + baseId(x.baseId), +@@ -1253,6 +1254,7 @@ + StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x) + { + if (this != &x) { ++ storageManager = x.storageManager; + codingSystemName = x.codingSystemName; + codingSystem = x.codingSystem; + specId = x.specId; diff --git a/app-text/opensp/metadata.xml b/app-text/opensp/metadata.xml new file mode 100644 index 000000000000..84b1ddacc397 --- /dev/null +++ b/app-text/opensp/metadata.xml @@ -0,0 +1,12 @@ + + + + + heroxbd@gentoo.org + Benda Xu + + An SGML System Conforming to International Standard ISO 8879. + + openjade + + diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild new file mode 100644 index 000000000000..655afe2945f7 --- /dev/null +++ b/app-text/opensp/opensp-1.5.2-r3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils flag-o-matic + +MY_P=${P/opensp/OpenSP} + +DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management" +HOMEPAGE="http://openjade.sourceforge.net/" +SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc nls static-libs test" + +DEPEND="net-libs/libnsl:0= + nls? ( sys-devel/gettext ) + doc? ( + app-text/xmlto + app-text/docbook-xml-dtd:4.1.2 + ) + test? ( + app-text/docbook-xml-dtd:4.5 + app-text/openjade + app-text/sgml-common + )" +RDEPEND="net-libs/libnsl:0=" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.5-gcc34.patch \ + "${FILESDIR}"/${P}-fix-segfault.patch +} + +src_configure() { + export CONFIG_SHELL=${BASH} # configure needs bash + + # The following filters are taken from openjade's ebuild. See bug #100828. + # Please note! Opts are disabled. If you know what you're doing + # feel free to remove this line. It may cause problems with + # docbook-sgml-utils among other things. + #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march" + strip-flags + + econf \ + --enable-http \ + --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \ + --enable-default-search-path="${EPREFIX}"/usr/share/sgml \ + --datadir="${EPREFIX}"/usr/share/sgml/${P} \ + $(use_enable nls) \ + $(use_enable doc doc-build) \ + $(use_enable static-libs static) +} + +src_compile() { + emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_test() { + # Skipping tests known not to work + emake SHOWSTOPPERS= check + SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \ + install + + prune_libtool_files + + dodoc AUTHORS BUGS ChangeLog NEWS README +} diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild new file mode 100644 index 000000000000..6aa0bed6331c --- /dev/null +++ b/app-text/opensp/opensp-1.5.2-r6.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils flag-o-matic autotools + +MY_P=${P/opensp/OpenSP} + +DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management" +HOMEPAGE="http://openjade.sourceforge.net/" +SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc elibc_glibc nls static-libs test" + +RDEPEND=" + elibc_glibc? ( net-libs/libnsl:0= ) +" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + doc? ( + app-text/xmlto + app-text/docbook-xml-dtd:4.1.2 + ) + test? ( + app-text/docbook-xml-dtd:4.5 + app-text/openjade + app-text/sgml-common + )" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-segfault.patch + epatch "${FILESDIR}"/${P}-c11-using.patch + use prefix && eautoreconf +} + +src_configure() { + export CONFIG_SHELL=${BASH} # configure needs bash + + # The following filters are taken from openjade's ebuild. See bug #100828. + # Please note! Opts are disabled. If you know what you're doing + # feel free to remove this line. It may cause problems with + # docbook-sgml-utils among other things. + #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march" + strip-flags + + econf \ + --enable-http \ + --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \ + --enable-default-search-path="${EPREFIX}"/usr/share/sgml \ + --datadir="${EPREFIX}"/usr/share/sgml/${P} \ + $(use_enable nls) \ + $(use_enable doc doc-build) \ + $(use_enable static-libs static) +} + +src_compile() { + emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_test() { + # Skipping tests known not to work + emake SHOWSTOPPERS= check + SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \ + install + + prune_libtool_files + + dodoc AUTHORS BUGS ChangeLog NEWS README +} -- cgit v1.2.3