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

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

[Florian Schmaus]

commit:     bfbbc7e530e1607ba7d4157493eda0b8b7cd5369
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  9 15:00:56 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 15:01:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbbc7e5

dev-cpp/json11: initial import

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-cpp/json11/Manifest                                |  1 +
 .../files/json11-1.0.0-fix-multiarch-install.patch     | 14 ++++++++++++++
 dev-cpp/json11/json11-1.0.0.ebuild                     | 18 ++++++++++++++++++
 dev-cpp/json11/metadata.xml                            |  8 ++++++++
 4 files changed, 41 insertions(+)

diff --git a/dev-cpp/json11/Manifest b/dev-cpp/json11/Manifest
new file mode 100644
index 00000000000..f64a0cde584
--- /dev/null
+++ b/dev-cpp/json11/Manifest
@@ -0,0 +1 @@
+DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3

diff --git a/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch b/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch
new file mode 100644
index 00000000000..fef15e0e153
--- /dev/null
+++ b/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch
@@ -0,0 +1,14 @@
+diff -Naur before/CMakeLists.txt after/CMakeLists.txt
+--- before/CMakeLists.txt	2019-05-12 16:45:39.995871663 +0200
++++ after/CMakeLists.txt	2019-05-12 16:44:56.154872666 +0200
+@@ -52,6 +52,7 @@
+   target_link_libraries(json11_test json11)
+ endif()
+ 
+-install(TARGETS json11 DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
+-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include/${CMAKE_LIBRARY_ARCHITECTURE})
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)
++install(TARGETS json11 DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

diff --git a/dev-cpp/json11/json11-1.0.0.ebuild b/dev-cpp/json11/json11-1.0.0.ebuild
new file mode 100644
index 00000000000..94fcfeb98c4
--- /dev/null
+++ b/dev-cpp/json11/json11-1.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-multiarch-install.patch
+)

diff --git a/dev-cpp/json11/metadata.xml b/dev-cpp/json11/metadata.xml
new file mode 100644
index 00000000000..87a759d410c
--- /dev/null
+++ b/dev-cpp/json11/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>

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

[Florian Schmaus]

commit:     bebab38678b84cc6bc2793d20be80ea74efc4863
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 09:24:44 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 09:24:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebab386

dev-cpp/json11: fix pkg-config file

Closes: https://bugs.gentoo.org/863098
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 ...1.0.0-json11.pc-do-not-state-the-defaults.patch | 22 ++++++++++++++++++++++
 dev-cpp/json11/json11-1.0.0-r1.ebuild              | 19 +++++++++++++++++++
 2 files changed, 41 insertions(+)

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
+)