[gentoo-commits] repo/gentoo:master commit in: dev-cpp/rapidfuzz-cpp/, dev-cpp/rapidfuzz-cpp/files/

2023-05-29 Thread Michał Górny 
commit: 89c9a867ee8a054dcae850a8648cfe939c24d99a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 30 02:57:15 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 30 03:03:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c9a867

dev-cpp/rapidfuzz-cpp: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-cpp/rapidfuzz-cpp/Manifest |  4 ---
 .../files/rapidfuzz-cpp-1.11.2-gcc13.patch | 22 
 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild  | 42 --
 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.2.ebuild  | 42 --
 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild  | 32 -
 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild  | 36 ---
 6 files changed, 178 deletions(-)

diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index c4c9767cfe2d..c2f4ac2414fb 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,5 +1 @@
-DIST rapidfuzz-cpp-1.10.1.gh.tar.gz 284749 BLAKE2B 
530476df0120e0a864298f80d786df02e0bc77a9b3482b2be7ff94ed4c4c749828eddadcaae2e8958e991744842380c48e2ce1bfa59062dc592b6a8905dbc234
 SHA512 
9e33601b85189bca8ff1ff21e33f62fb674d6f6ce5713588f303b5879b02eba84e96421fea3c96cfc6a7393ad5a95c755176d7c17e7f4c81498516f163584bf6
-DIST rapidfuzz-cpp-1.10.2.gh.tar.gz 284978 BLAKE2B 
5d2ef555ce2af009d4bb2fbf3e649e6cfc43ab3b20497d8e00c3f99d23173faf3425be4fcaec78820c969a336bb4255e6f680482aba657e838ecc4194e92db01
 SHA512 
65198df529005264ef94cb308eb09d6569ea805f46fbd42e6fedd18ac949722ff10ed30fbc41aaa986d790566168ff46c2b03ec5f7b6041b2f3e522e534f2ee2
-DIST rapidfuzz-cpp-1.10.4.gh.tar.gz 283916 BLAKE2B 
e0c3890628dd9303ff7d67d83df5a53f0466ccefd37fca6e56aa8613abc09fc16523e677cee3061425b2bd7720e5c6b26d43f51556ec7b1ef6d48583a1055a9e
 SHA512 
11dfd3b5f869eaf11edcb2c075709416645c89ab6057dbcaf12eb5defd609c33e792265b131942f22e3e2661f8c00a653e23a83eb2ba4bd8c82a7d16960d3b3b
-DIST rapidfuzz-cpp-1.11.2.gh.tar.gz 285371 BLAKE2B 
c4ac8907f70dbb4718c30e58acca54938a5e53ff7af916a754ec77e353fe628e6db13576c195b35560913410399470cf0f78a23c0e691591786128f0f0ee0d11
 SHA512 
80ae15a6a3d75679a992d2bfd48de318ec9349cf972adfb94a1d1061e9a8af5e6ed354a1ae7c4cd6b2bb8af8b5382dd07c2be71cf7bb9e064a8f3a568139618f
 DIST rapidfuzz-cpp-1.11.3.gh.tar.gz 285399 BLAKE2B 
cc2aeda5e519481d718917738a62fb6747514f4fd4cf2d5a9399c4d3b0192e37f4d8e0ec3578bc84cfaba99f8644f13d1fa8af93629615c20f2d28e4507a4d4f
 SHA512 
a27c26021e49b3b8aa0cf73947ce5696b00e32c94fedb00d8d97b4dcb76ebbf107df1813dc479a9bd26942c09577d0bb84b3aea3398f7d750ecd68de4486996c

diff --git a/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch 
b/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch
deleted file mode 100644
index c3e8117d22e3..
--- a/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/maxbachmann/rapidfuzz-cpp/pull/102
-
-From f3c691bd8a0659ac3acb7510dab5a536f4d41e1b Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Tue, 18 Apr 2023 07:33:39 +0100
-Subject: [PATCH] Fix build with GCC 13
-
-GCC 13 (as usual for new compiler releases) shuffles around some internal 
includes so some
-are no longer transitively included.
-
-See https://gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/895696
 a/test/distance/examples/ocr.hpp
-+++ b/test/distance/examples/ocr.hpp
-@@ -1,4 +1,5 @@
- #pragma once
-+#include 
- #include 
- 
- extern std::basic_string ocr_example1;
-

diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild 
b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild
deleted file mode 100644
index 3e5e9ce8ba7e..
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/;
-SRC_URI="
-   https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   test? (
-   >=dev-cpp/catch-3
-   )
-"
-
-src_prepare() {
-   # apparently "C++ best practices" don't mind fetching random stuff
-   # at build time
-   sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
-   find -name 'CMakeLists.txt' -exec \
-   sed -i -e 's:project_warnings::' {} + || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-   )
-   cmake_src_configure
-}

diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/rapidfuzz-cpp/, dev-cpp/rapidfuzz-cpp/files/

2023-04-18 Thread Sam James 
commit: 945021e9f79c8a7d1c443f2c472c883db3b877f0
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 18 06:36:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 18 06:50:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945021e9

dev-cpp/rapidfuzz-cpp: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/895696
Signed-off-by: Sam James  gentoo.org>

 .../files/rapidfuzz-cpp-1.11.2-gcc13.patch | 22 ++
 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild  |  4 
 2 files changed, 26 insertions(+)

diff --git a/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch 
b/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch
new file mode 100644
index ..c3e8117d22e3
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch
@@ -0,0 +1,22 @@
+https://github.com/maxbachmann/rapidfuzz-cpp/pull/102
+
+From f3c691bd8a0659ac3acb7510dab5a536f4d41e1b Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 18 Apr 2023 07:33:39 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal 
includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/895696
+--- a/test/distance/examples/ocr.hpp
 b/test/distance/examples/ocr.hpp
+@@ -1,4 +1,5 @@
+ #pragma once
++#include 
+ #include 
+ 
+ extern std::basic_string ocr_example1;
+

diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild 
b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild
index 315024591a2e..adba46f925b6 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild
@@ -24,6 +24,10 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.2-gcc13.patch
+)
+
 src_configure() {
local mycmakeargs=(
-DRAPIDFUZZ_BUILD_TESTING=$(usex test)