gentoo resync : 16.06.2018

2 files changed, 0 insertions, 71 deletions

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 8a8d5463d2aa..d67856a63443 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,4 +1,3 @@
-AUX schroot-1.6.10-cmake-add-additional-regex-tests.patch 2283 BLAKE2B bbdf631d09fa45c0befdc31c33b821fc5cfb1cc282bee28913a3fb7cc7f48908199e2c16793b3611c0c1287979f78b0d90c03fc1baa22e221d2a57ecb828eb81 SHA512 e68698dbace2e79c9e89525f22314fb75a42568cbeeac570334956b14051ed8dddbdffb3bdd769f77a6609159377a64df7de5041aff7512d100bbdd72aa6d4c0
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
diff --git a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
deleted file mode 100644
index 1660f18ae4b8..000000000000
--- a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
-From: Roger Leigh <rleigh@codelibre.net>
-Date: Sun, 26 Jul 2015 14:00:13 +0100
-Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
- tests
-
----
- cmake/regex-checks.cmake | 10 ++++++++++
- test/sbuild-regex.cc     | 20 ++++++++++++++++++++
- 2 files changed, 30 insertions(+)
-
-diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
-index d0bb211..60507ec 100644
---- a/cmake/regex-checks.cmake
-+++ b/cmake/regex-checks.cmake
-@@ -30,6 +30,16 @@ int main() {
-   if (${namespace}_match(fail, bar)) return 11;
-   if (${namespace}_match(fail, chk)) return 12;
- 
-+  // Checks for broken support in GCC 4.9 and 5.1
-+  ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
-+  ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
-+  if (!${namespace}_match(test, range1)) return 13;
-+  if (!${namespace}_match(test, range2)) return 14;
-+  if (!${namespace}_match(\"a-\", range1)) return 15;
-+  if (!${namespace}_match(\"a-\", range2)) return 16;
-+  if (${namespace}_match(\"-a\", range1)) return 17;
-+  if (${namespace}_match(\"-a\", range2)) return 18;
-+
-   return 0;
- }"
- ${outvar})
-diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
-index 915e915..a8520c5 100644
---- a/test/sbuild-regex.cc
-+++ b/test/sbuild-regex.cc
-@@ -33,6 +33,8 @@ class test_regex : public TestCase
-   CPPUNIT_TEST(test_output);
-   CPPUNIT_TEST(test_input);
-   CPPUNIT_TEST(test_match);
-+  CPPUNIT_TEST(test_match_bracket1);
-+  CPPUNIT_TEST(test_match_bracket2);
-   CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
-   CPPUNIT_TEST_SUITE_END();
- 
-@@ -88,6 +90,24 @@ class test_regex : public TestCase
-   }
- 
-   void
-+  test_match_bracket1()
-+  {
-+    sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
-+    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+  }
-+
-+  void
-+  test_match_bracket2()
-+  {
-+    sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
-+    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+  }
-+
-+  void
-   test_input_fail()
-   {
-     sbuild::regex r;