From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-cpp/libcutl/Manifest | 6 + .../files/libcutl-1.10.0-boost-1.65-tr1.patch | 162 +++++++++++++++++++++ .../libcutl/files/libcutl-1.10.0-fix-c++14.patch | 53 +++++++ dev-cpp/libcutl/libcutl-1.10.0.ebuild | 52 +++++++ dev-cpp/libcutl/metadata.xml | 8 + 5 files changed, 281 insertions(+) create mode 100644 dev-cpp/libcutl/Manifest create mode 100644 dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch create mode 100644 dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch create mode 100644 dev-cpp/libcutl/libcutl-1.10.0.ebuild create mode 100644 dev-cpp/libcutl/metadata.xml (limited to 'dev-cpp/libcutl') diff --git a/dev-cpp/libcutl/Manifest b/dev-cpp/libcutl/Manifest new file mode 100644 index 000000000000..a4d1ebef57e9 --- /dev/null +++ b/dev-cpp/libcutl/Manifest @@ -0,0 +1,6 @@ +AUX libcutl-1.10.0-boost-1.65-tr1.patch 4688 SHA256 d8a36b5732e85eabb76bbb15581b3a547cbf25067ede6eccd47dd3162c34b99c SHA512 0fc264a7e8b19c1da93384ec799cf2f8178af26f2baca53d92530ca6086371a6fc6ba5b7c8134b318846079b99fb2ba8872e1b14ab58da4422e0309bcbfe2b9f WHIRLPOOL 8280fafcc20a6a28a80692cb6e6c1e6179e66abc99caac8252af3d1502fc0cb14dc111235137216bbf33b78ff1e273332befc34d9115435b36a9afd3e7315d07 +AUX libcutl-1.10.0-fix-c++14.patch 1045 SHA256 5e30038754c80344e977e564579c2757927983e95cb5b5a67855fd5280dbf52f SHA512 37033c583b55e66d4edc03e483f01e3c6d331862748eaa23cecc8a24614368d294193642c481ba91d9ee56eed952c6ad0f4997e30ace9e572653b3780be75cec WHIRLPOOL 75b6e3816d68eae785813027e71de2150390a259643eab4cb16cd37c33ff9281217e72bbe6f65acb5d320c2eb3572671ba364815609aa8b57a9fe1e19b781686 +DIST libcutl-1.10.0.tar.bz2 763920 SHA256 125163c670e372b47d5626d54379ff8fbaded6ccd5db77ac0bf5912a4017121c SHA512 c03f39e87e660fdd07aa9cccb2d82d411ca8226b56475c74b7b2147b90cdb83d13246bc0c09513e407271bcf568d6a08f92c9006e48d1e7f06e4b18dde34dc5f WHIRLPOOL c7a3ddbf632851a0188db5704883db683e6f720ee324040d5d8af08cdae7cc6e47959efdc15819197f857719f178e1d88c042c2590a43a312c4d45f7a28c4f2d +EBUILD libcutl-1.10.0.ebuild 1025 SHA256 3f05a84092853cce1ebd25f1865de6047388a26924ccfd0eb24d27b39ec05142 SHA512 edb252465d9baec3e7b51c08024f76e763d4e7b940eb039e82ad5e7ccdb62588280aec9d6c1d597c21969db3d9540751b16f94e7c05d68d4f4768c07333c350a WHIRLPOOL 01a06d58b650ac1a2323fadbf398a3c9cc41891bb5f723525afb673541620f2bb9060f74b0504098d50041b974fc420c84586ed81b0b04d42ccf83ddb000b17c +MISC ChangeLog 375 SHA256 0e6dfa75fb00b622fc87ae67fec2cd8eb46fbb6a27f68bbd74d2d2b750489889 SHA512 55753f6ae4074df44887ed9440081b901c82fa63550bd8e175e1682f8358872ced38b231bd61f3b9addbf1b02b68f8d040087fcf88b1f2d792a49c937dad7b98 WHIRLPOOL bc46d66d60b605408d20754411d4c46c62113e1e8e485a1948bdb0d860f4af58ae2dd3e0885ba581d5f8234bb877e35db493096338f2aadedeca8d842b6a0d5a +MISC metadata.xml 249 SHA256 61486b4cff6de2a1836eafc04bbbbf33cdc826b48b6a39d61e802dd4b223a82b SHA512 0b2b2d015d6d3310efdedc20cd12cb2f587c105f1e84b243d3a7dc6337dde082c16683781eba9a0cb09341756f10f651579df35837ee232309a97017ec02cbee WHIRLPOOL 5a337f74ddddf4b9843f8b2950990f44f843627ae72b1dabf3b0ad09df9704bb96c0571af55fd754ddbf9e8bd77ff0ee9023126c717a5cf4553b5f1f8cede310 diff --git a/dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch b/dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch new file mode 100644 index 000000000000..ebb15ee9b404 --- /dev/null +++ b/dev-cpp/libcutl/files/libcutl-1.10.0-boost-1.65-tr1.patch @@ -0,0 +1,162 @@ +Use regex from C++11 instead of boost/tr1's version (the latter is gone as of boost 1.65). +Patch: https://svnweb.freebsd.org/ports/head/devel/libcutl/files/patch-cutl_re_re.cxx?view=markup&pathrev=445764 +Bug: https://bugs.gentoo.org/show_bug.cgi?id=630016 + +--- a/cutl/re/re.cxx ++++ b/cutl/re/re.cxx +@@ -9,7 +9,7 @@ + #ifndef LIBCUTL_EXTERNAL_BOOST + # include + #else +-# include ++# include + #endif + + using namespace std; +@@ -40,17 +40,17 @@ + struct basic_regex::impl + { + typedef basic_string string_type; +- typedef tr1::basic_regex regex_type; ++ typedef std::basic_regex regex_type; + typedef typename regex_type::flag_type flag_type; + + impl () {} + impl (regex_type const& r): r (r) {} + impl (string_type const& s, bool icase) + { +- flag_type f (tr1::regex_constants::ECMAScript); ++ flag_type f (std::regex_constants::ECMAScript); + + if (icase) +- f |= tr1::regex_constants::icase; ++ f |= std::regex_constants::icase; + + r.assign (s, f); + } +@@ -118,15 +118,15 @@ + impl_ = s == 0 ? new impl : new impl (*s, icase); + else + { +- impl::flag_type f (tr1::regex_constants::ECMAScript); ++ impl::flag_type f (std::regex_constants::ECMAScript); + + if (icase) +- f |= tr1::regex_constants::icase; ++ f |= std::regex_constants::icase; + + impl_->r.assign (*s, f); + } + } +- catch (tr1::regex_error const& e) ++ catch (std::regex_error const& e) + { + throw basic_format (s == 0 ? "" : *s, e.what ()); + } +@@ -146,15 +146,15 @@ + impl_ = s == 0 ? new impl : new impl (*s, icase); + else + { +- impl::flag_type f (tr1::regex_constants::ECMAScript); ++ impl::flag_type f (std::regex_constants::ECMAScript); + + if (icase) +- f |= tr1::regex_constants::icase; ++ f |= std::regex_constants::icase; + + impl_->r.assign (*s, f); + } + } +- catch (tr1::regex_error const& e) ++ catch (std::regex_error const& e) + { + throw basic_format (s == 0 ? L"" : *s, e.what ()); + } +@@ -166,28 +166,28 @@ + bool basic_regex:: + match (string_type const& s) const + { +- return tr1::regex_match (s, impl_->r); ++ return std::regex_match (s, impl_->r); + } + + template <> + bool basic_regex:: + match (string_type const& s) const + { +- return tr1::regex_match (s, impl_->r); ++ return std::regex_match (s, impl_->r); + } + + template <> + bool basic_regex:: + search (string_type const& s) const + { +- return tr1::regex_search (s, impl_->r); ++ return std::regex_search (s, impl_->r); + } + + template <> + bool basic_regex:: + search (string_type const& s) const + { +- return tr1::regex_search (s, impl_->r); ++ return std::regex_search (s, impl_->r); + } + + template <> +@@ -196,13 +196,13 @@ + string_type const& sub, + bool first_only) const + { +- tr1::regex_constants::match_flag_type f ( +- tr1::regex_constants::format_default); ++ std::regex_constants::match_flag_type f ( ++ std::regex_constants::format_default); + + if (first_only) +- f |= tr1::regex_constants::format_first_only; ++ f |= std::regex_constants::format_first_only; + +- return tr1::regex_replace (s, impl_->r, sub, f); ++ return std::regex_replace (s, impl_->r, sub, f); + } + + template <> +@@ -211,13 +211,13 @@ + string_type const& sub, + bool first_only) const + { +- tr1::regex_constants::match_flag_type f ( +- tr1::regex_constants::format_default); ++ std::regex_constants::match_flag_type f ( ++ std::regex_constants::format_default); + + if (first_only) +- f |= tr1::regex_constants::format_first_only; ++ f |= std::regex_constants::format_first_only; + +- return tr1::regex_replace (s, impl_->r, sub, f); ++ return std::regex_replace (s, impl_->r, sub, f); + } + } + } +--- a/m4/libboost.m4 ++++ b/m4/libboost.m4 +@@ -129,13 +129,13 @@ + AC_DEFUN([LIBBOOST_REGEX], [ + LIBBOOST_LIB([regex],[ + AC_LANG_SOURCE([ +-#include ++#include + + int + main () + { +- std::tr1::regex r ("te.t", std::tr1::regex_constants::ECMAScript); +- return std::tr1::regex_match ("test", r) ? 0 : 1; ++ std::regex r ("te.t", std::regex_constants::ECMAScript); ++ return std::regex_match ("test", r) ? 0 : 1; + } + ])], + [$1], diff --git a/dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch b/dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch new file mode 100644 index 000000000000..a6f1a505485b --- /dev/null +++ b/dev-cpp/libcutl/files/libcutl-1.10.0-fix-c++14.patch @@ -0,0 +1,53 @@ +Make dtors noexcept(false) when compiling in C++11 and above. This avoids silent +breakage due to the semantic exception changes between C++98 and C++11. + +--- a/cutl/fs/auto-remove.cxx ++++ b/cutl/fs/auto-remove.cxx +@@ -13,6 +13,9 @@ + { + auto_remove:: + ~auto_remove () ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + if (!canceled_) + { +@@ -23,6 +26,9 @@ + + auto_removes:: + ~auto_removes () ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif + { + if (!canceled_) + { +--- a/cutl/fs/auto-remove.hxx ++++ b/cutl/fs/auto-remove.hxx +@@ -26,7 +26,11 @@ + { + } + +- ~auto_remove (); ++ ~auto_remove () ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + void + cancel () +@@ -51,7 +55,11 @@ + struct LIBCUTL_EXPORT auto_removes + { + auto_removes (): canceled_ (false) {} +- ~auto_removes (); ++ ~auto_removes () ++#if __cplusplus >= 201103L ++ noexcept(false) ++#endif ++ ; + + void + add (path const& p) diff --git a/dev-cpp/libcutl/libcutl-1.10.0.ebuild b/dev-cpp/libcutl/libcutl-1.10.0.ebuild new file mode 100644 index 000000000000..652471ccb886 --- /dev/null +++ b/dev-cpp/libcutl/libcutl-1.10.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic versionator + +DESCRIPTION="A collection of C++ libraries (successor of libcult)" +HOMEPAGE="http://www.codesynthesis.com/projects/libcutl/" +SRC_URI="http://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/expat + dev-libs/boost:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0-fix-c++14.patch + "${FILESDIR}"/${PN}-1.10.0-boost-1.65-tr1.patch +) + +src_prepare() { + default + + # remove bundled libs + rm -r cutl/details/{boost,expat} || die + + eautoreconf +} + +src_configure() { + # ensure works on GCC 5 and below + # bug 630016 + append-cxxflags -std=c++14 + + econf \ + --disable-static \ + --with-external-boost \ + --with-external-expat +} + +src_install() { + default + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-cpp/libcutl/metadata.xml b/dev-cpp/libcutl/metadata.xml new file mode 100644 index 000000000000..d4905c84fc34 --- /dev/null +++ b/dev-cpp/libcutl/metadata.xml @@ -0,0 +1,8 @@ + + + + + cpp@gentoo.org + Gentoo C++ Project + + -- cgit v1.2.3