mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 10:17:08 -08:00
dev-cpp/libcutl: Remove last-rited package
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST libcutl-1.10.0.tar.bz2 763920 BLAKE2B 8d6741b19cc7c1d320225b6f412c08d6dd1d975a9f1e2f55914a23b8813e42228616ea525905bcf456f4b6e60a72fbf4128a03275833975ce3b8c87d6e4cb631 SHA512 c03f39e87e660fdd07aa9cccb2d82d411ca8226b56475c74b7b2147b90cdb83d13246bc0c09513e407271bcf568d6a08f92c9006e48d1e7f06e4b18dde34dc5f
|
||||
@@ -1,162 +0,0 @@
|
||||
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 <cutl/details/boost/tr1/regex.hpp>
|
||||
#else
|
||||
-# include <boost/tr1/regex.hpp>
|
||||
+# include <regex>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
@@ -40,17 +40,17 @@
|
||||
struct basic_regex<C>::impl
|
||||
{
|
||||
typedef basic_string<C> string_type;
|
||||
- typedef tr1::basic_regex<C> regex_type;
|
||||
+ typedef std::basic_regex<C> 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<char> (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<wchar_t> (s == 0 ? L"" : *s, e.what ());
|
||||
}
|
||||
@@ -166,28 +166,28 @@
|
||||
bool basic_regex<char>::
|
||||
match (string_type const& s) const
|
||||
{
|
||||
- return tr1::regex_match (s, impl_->r);
|
||||
+ return std::regex_match (s, impl_->r);
|
||||
}
|
||||
|
||||
template <>
|
||||
bool basic_regex<wchar_t>::
|
||||
match (string_type const& s) const
|
||||
{
|
||||
- return tr1::regex_match (s, impl_->r);
|
||||
+ return std::regex_match (s, impl_->r);
|
||||
}
|
||||
|
||||
template <>
|
||||
bool basic_regex<char>::
|
||||
search (string_type const& s) const
|
||||
{
|
||||
- return tr1::regex_search (s, impl_->r);
|
||||
+ return std::regex_search (s, impl_->r);
|
||||
}
|
||||
|
||||
template <>
|
||||
bool basic_regex<wchar_t>::
|
||||
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 <boost/tr1/regex.hpp>
|
||||
+#include <regex>
|
||||
|
||||
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],
|
||||
@@ -1,53 +0,0 @@
|
||||
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)
|
||||
@@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2018 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="https://www.codesynthesis.com/projects/libcutl/"
|
||||
SRC_URI="https://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 <regex> 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
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user