From 6e20a434f030191fb9f90961ab609abdf86c4b4a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 1 Mar 2023 10:06:27 +0000
Subject: gentoo auto-resync : 01:03:2023 - 10:06:27

---
 dev-cpp/json11/Manifest                            |  4 +++-
 ...1.0.0-json11.pc-do-not-state-the-defaults.patch | 22 ++++++++++++++++++++++
 dev-cpp/json11/json11-1.0.0-r1.ebuild              | 19 +++++++++++++++++++
 dev-cpp/json11/metadata.xml                        |  3 +++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch
 create mode 100644 dev-cpp/json11/json11-1.0.0-r1.ebuild

(limited to 'dev-cpp/json11')

diff --git a/dev-cpp/json11/Manifest b/dev-cpp/json11/Manifest
index d77b85e9680c..77cae097a708 100644
--- a/dev-cpp/json11/Manifest
+++ b/dev-cpp/json11/Manifest
@@ -1,4 +1,6 @@
 AUX json11-1.0.0-fix-multiarch-install.patch 786 BLAKE2B 5362fce55049ed95f0de5467a53c54bd3e0b82c91fcbefe1d6b8d35629a1d968527157720a19c478690d787a1baac634d4b927424d6e4c27abdc89427fe46b7f SHA512 0ef4a3ff19d2ffbf7772b83782ada2fcd2e3baacdd32d6a74931b035166041b7471800fbb01801dbe9b5b1cc003128dbb406a736da1f016c4cb1980ec11a9902
+AUX json11-1.0.0-json11.pc-do-not-state-the-defaults.patch 728 BLAKE2B d96a4a9b0cf5aece5c07181eff4a246c792afb431d1c35715e1c587811108cfef04dc19bbf7fdcb84ac0e5a289ef6697e2e468ef2dc8f190d38ffead8e6d2768 SHA512 98079b0266d30364e47622e58d8d203ef16296aa40c01e318cd7fd902b8d8adcca5c2cae0d09d203137cc219e9288fa7a1187fc8f8fedd4a1ecc68ebd73688e3
 DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3
+EBUILD json11-1.0.0-r1.ebuild 485 BLAKE2B 994424fd51295012d162dce4de5029414278ac90dbd4b018237cabca80fae0159a63bf1626a92447749cf0bc77a4c380164743375b33698b6eaf54d5cc32ca78 SHA512 1267bf541ab6f53866b949efd919a72d71720e6dbb15aa7b0e9a8a2223f28bde2445e3781e6774cd1e6535f3e2f02b31c51efd10daa051ff82765a82d7edadee
 EBUILD json11-1.0.0.ebuild 409 BLAKE2B b0a2e5398ff074d307e0d5715882d89284014679e4b9af332b1e9da2375c08b73229e50513a416ba87c018d63b4fba8c9dacf31baec5cdf1c93c70637dbae222 SHA512 e8c58cfc6a0f404a0f0bceef42420b1e2762913110fe018fc8979e648d7a9ff86b9f26b24fb83b2139d82a303d29282511f5f1a66969eebaa847c09b6c73cb80
-MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
+MISC metadata.xml 326 BLAKE2B de17355ea68ddbed46fa6e2a41ef90ce0d810757f6974f40773dbb547723ef0664d145dc0718d4c01aaf6f569f32bb298e70f5faccadbd00f283304d4c3308aa SHA512 7e02afef76ec6bac01baead08ae25fd11355197abe23162eb41a055c6de8b1643d5a958b93ab39f87377ad166bfb7441a9aa24f21b382511a13a4ab8624056e6
diff --git a/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch
new file mode 100644
index 000000000000..76b1591d1150
--- /dev/null
+++ b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch
@@ -0,0 +1,22 @@
+From d98236beaf015f2693589fca1904fb0dd01b2e6d Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Wed, 1 Mar 2023 10:16:49 +0100
+Subject: [PATCH] json11.pc: do not state the defaults
+
+This appearantly breaks multi-arch installations. See
+https://bugs.gentoo.org/863098
+
+Suggested-by: Thomas Scheider <qsx@chaotikum.eu>
+Signed-off-by: Florian Schmaus <flow@gentoo.org>
+--- a/json11.pc.in
++++ b/json11.pc.in
+@@ -5,5 +5,4 @@ includedir=${prefix}/include/@CMAKE_LIBRARY_ARCHITECTURE@
+ Name: @PROJECT_NAME@
+ Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
+ Version: @PROJECT_VERSION@
+-Libs: -L${libdir} -ljson11
+-Cflags: -I${includedir}
++Libs: -ljson11
+-- 
+2.39.2
+
diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..31d7acab3239
--- /dev/null
+++ b/dev-cpp/json11/json11-1.0.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A tiny JSON library for C++11"
+HOMEPAGE="https://github.com/dropbox/json11"
+SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-multiarch-install.patch
+	"${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch
+)
diff --git a/dev-cpp/json11/metadata.xml b/dev-cpp/json11/metadata.xml
index a7fa285c7476..6947f6c749e8 100644
--- a/dev-cpp/json11/metadata.xml
+++ b/dev-cpp/json11/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dropbox/json11</remote-id>
+	</upstream>
 </pkgmetadata>
-- 
cgit v1.2.3