public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2020-10-28 16:15 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2020-10-28 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     4a598d308f34e6fb8bf88c9f27574b4133115860
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 16:14:33 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 16:15:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a598d30

dev-libs/simdjson: Remove old

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/simdjson-0.4.7-tests-compiler.patch      | 41 ----------------------
 dev-libs/simdjson/simdjson-0.4.7.ebuild            | 34 ------------------
 2 files changed, 75 deletions(-)

diff --git a/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch
deleted file mode 100644
index b641373e1a3..00000000000
--- a/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/examples/quickstart/Makefile b/examples/quickstart/Makefile
-index 4d3f227..90c2237 100644
---- a/examples/quickstart/Makefile
-+++ b/examples/quickstart/Makefile
-@@ -5,7 +5,7 @@ JSONEXAMPLES=$(ROOT)/jsonexamples
- test: quickstart twitter.json
- 	./quickstart
- quickstart: quickstart.cpp simdjson.cpp simdjson.h
--	c++ -o ./quickstart quickstart.cpp simdjson.cpp
-+	$(CXX) -o ./quickstart quickstart.cpp simdjson.cpp
- clean:
- 	rm -f simdjson.cpp simdjson.h twitter.json quickstart quickstart11 quickstart14
- simdjson.cpp: $(SINGLEHEADER)/simdjson.cpp
-@@ -17,16 +17,16 @@ twitter.json: $(JSONEXAMPLES)/twitter.json
- 
- quickstart11: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
- 	rm -f simdjson.h simdjson.cpp
--	c++ -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11
-+	$(CXX) -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11
- test11: quickstart11 twitter.json
- 	./quickstart11
- quickstart14: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
- 	rm -f simdjson.h simdjson.cpp
--	c++ -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14
-+	$(CXX) -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14
- test14: quickstart14 twitter.json
- 	./quickstart14
- quickstart17: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
- 	rm -f simdjson.h simdjson.cpp
--	c++ -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17
-+	$(CXX) -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17
- test17: quickstart17 twitter.json
- 	./quickstart17
-diff --git a/singleheader/README.md b/singleheader/README.md
-index fd58a7a..e495ec9 100644
---- a/singleheader/README.md
-+++ b/singleheader/README.md
-@@ -1,2 +1,2 @@
- Try :
--c++ -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson
-+${CXX} -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson

diff --git a/dev-libs/simdjson/simdjson-0.4.7.ebuild b/dev-libs/simdjson/simdjson-0.4.7.ebuild
deleted file mode 100644
index 77da37bac07..00000000000
--- a/dev-libs/simdjson/simdjson-0.4.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/findutils
-	sys-apps/grep
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
-	)
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2020-10-28 16:15 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2020-10-28 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     d11ecb3ef39a2b7cea866976349c6a4bdc3ea16b
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Oct 28 16:12:54 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 16:12:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d11ecb3e

dev-libs/simdjson-0.6.0: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |  2 ++
 .../files/simdjson-0.4.7-tests-compiler.patch      | 41 ++++++++++++++++++++++
 dev-libs/simdjson/metadata.xml                     |  8 +++++
 dev-libs/simdjson/simdjson-0.4.7.ebuild            | 34 ++++++++++++++++++
 dev-libs/simdjson/simdjson-0.6.0.ebuild            | 34 ++++++++++++++++++
 5 files changed, 119 insertions(+)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
new file mode 100644
index 00000000000..edba6dcf5b1
--- /dev/null
+++ b/dev-libs/simdjson/Manifest
@@ -0,0 +1,2 @@
+DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9b0e32c868c8d4ecc15fbc359e6463576c24f38b6623cd72cc4681a1db42ec45ee605df6096876982caa9f96be91 SHA512 023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f
+DIST simdjson-0.6.0.tar.gz 7888638 BLAKE2B 8c42d5a2d57adb75d4c5298e0e1264726d509cdc4dc1e65cafc609b8ecd6623dd74f257f7d736a39e7f969e41e370d5dce1b3c99beec27f151600160d4cd2c81 SHA512 9dbb2b14fb5599b8acf996044953eee15ffecb51a0386f29dead9a3053d3f48531574ee9accde0460239ab8fa76757d329f404c4ce708531b71dc299c742281f

diff --git a/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch
new file mode 100644
index 00000000000..b641373e1a3
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch
@@ -0,0 +1,41 @@
+diff --git a/examples/quickstart/Makefile b/examples/quickstart/Makefile
+index 4d3f227..90c2237 100644
+--- a/examples/quickstart/Makefile
++++ b/examples/quickstart/Makefile
+@@ -5,7 +5,7 @@ JSONEXAMPLES=$(ROOT)/jsonexamples
+ test: quickstart twitter.json
+ 	./quickstart
+ quickstart: quickstart.cpp simdjson.cpp simdjson.h
+-	c++ -o ./quickstart quickstart.cpp simdjson.cpp
++	$(CXX) -o ./quickstart quickstart.cpp simdjson.cpp
+ clean:
+ 	rm -f simdjson.cpp simdjson.h twitter.json quickstart quickstart11 quickstart14
+ simdjson.cpp: $(SINGLEHEADER)/simdjson.cpp
+@@ -17,16 +17,16 @@ twitter.json: $(JSONEXAMPLES)/twitter.json
+ 
+ quickstart11: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
+ 	rm -f simdjson.h simdjson.cpp
+-	c++ -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11
++	$(CXX) -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11
+ test11: quickstart11 twitter.json
+ 	./quickstart11
+ quickstart14: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
+ 	rm -f simdjson.h simdjson.cpp
+-	c++ -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14
++	$(CXX) -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14
+ test14: quickstart14 twitter.json
+ 	./quickstart14
+ quickstart17: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
+ 	rm -f simdjson.h simdjson.cpp
+-	c++ -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17
++	$(CXX) -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17
+ test17: quickstart17 twitter.json
+ 	./quickstart17
+diff --git a/singleheader/README.md b/singleheader/README.md
+index fd58a7a..e495ec9 100644
+--- a/singleheader/README.md
++++ b/singleheader/README.md
+@@ -1,2 +1,2 @@
+ Try :
+-c++ -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson
++${CXX} -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson

diff --git a/dev-libs/simdjson/metadata.xml b/dev-libs/simdjson/metadata.xml
new file mode 100644
index 00000000000..cee379b1540
--- /dev/null
+++ b/dev-libs/simdjson/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">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/dev-libs/simdjson/simdjson-0.4.7.ebuild b/dev-libs/simdjson/simdjson-0.4.7.ebuild
new file mode 100644
index 00000000000..77da37bac07
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.4.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
+	)
+
+	cmake_src_configure
+}

diff --git a/dev-libs/simdjson/simdjson-0.6.0.ebuild b/dev-libs/simdjson/simdjson-0.6.0.ebuild
new file mode 100644
index 00000000000..77da37bac07
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2020-10-28 16:44 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2020-10-28 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     bdfcda42bfda5fee4ae1826b449f87f05f32dadb
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 16:43:45 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 16:44:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfcda42

Revert "dev-libs/simdjson: Remove old"

This reverts commit 4a598d308f34e6fb8bf88c9f27574b4133115860.

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/simdjson-0.4.7-tests-compiler.patch      | 41 ++++++++++++++++++++++
 dev-libs/simdjson/simdjson-0.4.7.ebuild            | 34 ++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch
new file mode 100644
index 00000000000..b641373e1a3
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch
@@ -0,0 +1,41 @@
+diff --git a/examples/quickstart/Makefile b/examples/quickstart/Makefile
+index 4d3f227..90c2237 100644
+--- a/examples/quickstart/Makefile
++++ b/examples/quickstart/Makefile
+@@ -5,7 +5,7 @@ JSONEXAMPLES=$(ROOT)/jsonexamples
+ test: quickstart twitter.json
+ 	./quickstart
+ quickstart: quickstart.cpp simdjson.cpp simdjson.h
+-	c++ -o ./quickstart quickstart.cpp simdjson.cpp
++	$(CXX) -o ./quickstart quickstart.cpp simdjson.cpp
+ clean:
+ 	rm -f simdjson.cpp simdjson.h twitter.json quickstart quickstart11 quickstart14
+ simdjson.cpp: $(SINGLEHEADER)/simdjson.cpp
+@@ -17,16 +17,16 @@ twitter.json: $(JSONEXAMPLES)/twitter.json
+ 
+ quickstart11: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
+ 	rm -f simdjson.h simdjson.cpp
+-	c++ -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11
++	$(CXX) -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11
+ test11: quickstart11 twitter.json
+ 	./quickstart11
+ quickstart14: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
+ 	rm -f simdjson.h simdjson.cpp
+-	c++ -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14
++	$(CXX) -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14
+ test14: quickstart14 twitter.json
+ 	./quickstart14
+ quickstart17: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp
+ 	rm -f simdjson.h simdjson.cpp
+-	c++ -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17
++	$(CXX) -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17
+ test17: quickstart17 twitter.json
+ 	./quickstart17
+diff --git a/singleheader/README.md b/singleheader/README.md
+index fd58a7a..e495ec9 100644
+--- a/singleheader/README.md
++++ b/singleheader/README.md
+@@ -1,2 +1,2 @@
+ Try :
+-c++ -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson
++${CXX} -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson

diff --git a/dev-libs/simdjson/simdjson-0.4.7.ebuild b/dev-libs/simdjson/simdjson-0.4.7.ebuild
new file mode 100644
index 00000000000..77da37bac07
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.4.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2021-01-22 18:39 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2021-01-22 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d03bbbe108ea2d44a44d41e104c015686d24094c
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Jan 22 18:39:05 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:39:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03bbbe1

dev-libs/simdjson-0.8.0: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |  1 +
 .../files/simdjson-0.8.0-dont-bundle-cxxopts.patch | 40 +++++++++++++
 dev-libs/simdjson/simdjson-0.8.0.ebuild            | 67 ++++++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 18e6617aa5f..8410ab85325 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,3 +2,4 @@ DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9
 DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
 DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
+DIST simdjson-0.8.0.tar.gz 7993692 BLAKE2B f2f04b3f9815645fcb4fcf2d10b0a234177042a0f4e306b0e130d5136c627344201a1f7c4d1ba6cb1ce30debf44f00694bc9a5bb646040bb614e91ae31bf43bb SHA512 8c41e07dbc3668105131c5a22060891c54f7663ec512d6c12f18eed0971fe245c3adb8d27c27305827314ebff39d2c940bd3715fa12e1ce9332d9bf3693424f2

diff --git a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
new file mode 100644
index 00000000000..6a76cf83ed9
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,40 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 2c41169f..2f5d4436 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -129,15 +129,3 @@ endfunction()
+ if(SIMDJSON_COMPETITION)
+   competition_scope_()
+ endif()
+-
+-cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
+-        SIMDJSON_ALLOW_DOWNLOADS OFF)
+-
+-if(SIMDJSON_CXXOPTS)
+-  set_off(CXXOPTS_BUILD_EXAMPLES)
+-  set_off(CXXOPTS_BUILD_TESTS)
+-  set_off(CXXOPTS_ENABLE_INSTALL)
+-
+-  import_dependency(cxxopts jarro2783/cxxopts 794c975)
+-  add_dependency(cxxopts)
+-endif()
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f1a82be7..b1b7b1a0 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,10 +1,8 @@
+-if(TARGET cxxopts) # we only build the tools if cxxopts is available
+   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
+-  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
++  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
+   add_executable(json2json json2json.cpp)
+   add_executable(jsonstats jsonstats.cpp)
+-  add_executable(jsonpointer jsonpointer.cpp)
++  add_executable(simdjsonpointer jsonpointer.cpp)
+   add_executable(minify minify.cpp)
+-else()
+-  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
+-endif()
+\ No newline at end of file
++  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
++

diff --git a/dev-libs/simdjson/simdjson-0.8.0.ebuild b/dev-libs/simdjson/simdjson-0.8.0.ebuild
new file mode 100644
index 00000000000..b97cc2e514e
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.8.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=ON
+		)
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2021-05-15 17:47 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2021-05-15 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     7ca2192750bcd16fa2962d32aeb45f443d06eabc
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 17:45:38 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat May 15 17:47:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca21927

dev-libs/simdjson: Remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |  2 -
 .../files/simdjson-0.7.0-dont-bundle-cssopts.patch | 30 ----------
 dev-libs/simdjson/simdjson-0.7.1.ebuild            | 57 ------------------
 dev-libs/simdjson/simdjson-0.8.2.ebuild            | 67 ----------------------
 4 files changed, 156 deletions(-)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 6473785cbae..5cef261c3d1 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,3 +1 @@
-DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
-DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6

diff --git a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
deleted file mode 100644
index f734a65bd89..00000000000
--- a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 51ab3a31..d3d5e86e 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -105,6 +105,3 @@ endif()
- set_off(CXXOPTS_BUILD_EXAMPLES)
- set_off(CXXOPTS_BUILD_TESTS)
- set_off(CXXOPTS_ENABLE_INSTALL)
--
--import_dependency(cxxopts jarro2783/cxxopts 794c975)
--add_dependency(cxxopts)
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f1a82be7..5c36d994 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,10 +1,7 @@
--if(TARGET cxxopts) # we only build the tools if cxxopts is available
-   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
--  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
-+  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
-   add_executable(json2json json2json.cpp)
-   add_executable(jsonstats jsonstats.cpp)
--  add_executable(jsonpointer jsonpointer.cpp)
-+  add_executable(simdjsonpointer jsonpointer.cpp)
-   add_executable(minify minify.cpp)
--else()
--  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
--endif()
-\ No newline at end of file
-+  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)

diff --git a/dev-libs/simdjson/simdjson-0.7.1.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild
deleted file mode 100644
index 40e114a8f65..00000000000
--- a/dev-libs/simdjson/simdjson-0.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/findutils
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.7.0-dont-bundle-cssopts.patch"
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}

diff --git a/dev-libs/simdjson/simdjson-0.8.2.ebuild b/dev-libs/simdjson/simdjson-0.8.2.ebuild
deleted file mode 100644
index 8dd574e4361..00000000000
--- a/dev-libs/simdjson/simdjson-0.8.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/findutils
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2021-09-08 18:24 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2021-09-08 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     06a27d0d6efa8f6a5919fbe0c6ad08d1a44a938d
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  8 18:24:10 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 18:24:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a27d0d

dev-libs/simdjson-1.0.0: Version bump

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |  2 +
 .../files/simdjson-1.0.0-dont-bundle-cxxopts.patch | 32 +++++++++
 .../simdjson-1.0.0-dont-fetch-data-tarball.patch   | 14 ++++
 dev-libs/simdjson/simdjson-1.0.0.ebuild            | 76 ++++++++++++++++++++++
 4 files changed, 124 insertions(+)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 6f87beb869c..1fc40bc707f 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,3 +1,5 @@
 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
 DIST simdjson-0.9.6.tar.gz 7956235 BLAKE2B 8d1ffb96a937f859598f45232f1c55a767c4dcb401e1b15b8745df0b3b1907a9ecf3319080b5f7dd6deeac7c97b6b7ee608a98173c2c92794ea5f79ea0083b18 SHA512 bfe565dd00e95e1c5c409fce1ec2a8d88c83fc61d9f46265afc0254f8a37f241fcb5b0729bc5ac58695766e2a6cb05abbf93220fa21fd8fe34872ac4a538140c
 DIST simdjson-0.9.7.tar.gz 7956250 BLAKE2B 2fa04be699eb5573ac17db9b476ded1853cfe45c0993c9303b70bfd0e8e4343b69e4a02f21dac35d2c0255826bfedf41123fd635d36d48a08f74b28b5a6536ce SHA512 6f4ad854adc2b932f9926610cdd28ddda7fc1776b84a224adb5b337f81c92721bd11c8ab180897117891cdefe9c1ef14b9f062c9a1a2ebc5b5582c29cb656bf0
+DIST simdjson-1.0.0.tar.gz 1546728 BLAKE2B 6b70416404776b4fcc30cd3ab07b8048899bbe3497af779504a685bc2459424e82bd40bf100d7ed8ccfa05e871a0a1edd9eebd11294cdc3d1780797d7f79ba1e SHA512 dbf8abfeec5c079f4d87e8bf31d1af27601f7f0578ebb8ad28a25f496b4b771b68a75f9a11f61706c539d54c36a493a2d2819bd15427c3b7f7a0b36811177f17
+DIST simdjson-data-1.0.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1

diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
new file mode 100644
index 00000000000..316c4ba4006
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,32 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 76651318..2cc06e9e 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -133,15 +133,3 @@ endfunction()
+ if(SIMDJSON_COMPETITION)
+   competition_scope_()
+ endif()
+-
+-cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
+-        SIMDJSON_ALLOW_DOWNLOADS OFF)
+-
+-if(SIMDJSON_CXXOPTS)
+-  set_off(CXXOPTS_BUILD_EXAMPLES)
+-  set_off(CXXOPTS_BUILD_TESTS)
+-  set_off(CXXOPTS_ENABLE_INSTALL)
+-
+-  import_dependency(cxxopts jarro2783/cxxopts 794c975)
+-  add_dependency(cxxopts)
+-endif()
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f3eaa054..62c34cdd 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ if(TARGET cxxopts) # we only build the tools if cxxopts is available
+   message(STATUS "We have cxxopts as a dependency and we are building the tools (e.g., json2json).")
+-  foreach(tool IN ITEMS json2json jsonstats jsonpointer minify)
++  foreach(tool IN ITEMS json2json jsonstats simdjsonpointer minify)
+     add_executable("${tool}" "${tool}.cpp")
+     simdjson_apply_props("${tool}")
+     target_link_libraries(

diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch b/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch
new file mode 100644
index 00000000000..2459604d980
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch
@@ -0,0 +1,14 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 76651318..91232ce0 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -19,8 +19,7 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
+ endif()
+ 
+ # The bulk of our benchmarking and testing data has been moved simdjson/simdjson-data
+-import_dependency(simdjson-data simdjson/simdjson-data a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
+-add_dependency(simdjson-data)
++add_subdirectory(simdjson-data dependencies/simdjson-data)
+ 
+ # This prevents variables declared with set() from unnecessarily escaping and
+ # should not be called more than once

diff --git a/dev-libs/simdjson/simdjson-1.0.0.ebuild b/dev-libs/simdjson/simdjson-1.0.0.ebuild
new file mode 100644
index 00000000000..c68fa749db0
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-1.0.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+		-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+		)
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2022-05-25 17:26 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2022-05-25 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e974a3b00ac8320a43b3915139972704ca14558c
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 17:26:31 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed May 25 17:26:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e974a3b0

dev-libs/simdjson: drop 0.9.7

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/simdjson-0.8.0-dont-bundle-cxxopts.patch | 40 -------------
 dev-libs/simdjson/simdjson-0.9.7.ebuild            | 67 ----------------------
 2 files changed, 107 deletions(-)

diff --git a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
deleted file mode 100644
index 6a76cf83ed98..000000000000
--- a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 2c41169f..2f5d4436 100644
---- a/dependencies/CMakeLists.txt
-+++ b/dependencies/CMakeLists.txt
-@@ -129,15 +129,3 @@ endfunction()
- if(SIMDJSON_COMPETITION)
-   competition_scope_()
- endif()
--
--cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
--        SIMDJSON_ALLOW_DOWNLOADS OFF)
--
--if(SIMDJSON_CXXOPTS)
--  set_off(CXXOPTS_BUILD_EXAMPLES)
--  set_off(CXXOPTS_BUILD_TESTS)
--  set_off(CXXOPTS_ENABLE_INSTALL)
--
--  import_dependency(cxxopts jarro2783/cxxopts 794c975)
--  add_dependency(cxxopts)
--endif()
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f1a82be7..b1b7b1a0 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,10 +1,8 @@
--if(TARGET cxxopts) # we only build the tools if cxxopts is available
-   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
--  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
-+  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
-   add_executable(json2json json2json.cpp)
-   add_executable(jsonstats jsonstats.cpp)
--  add_executable(jsonpointer jsonpointer.cpp)
-+  add_executable(simdjsonpointer jsonpointer.cpp)
-   add_executable(minify minify.cpp)
--else()
--  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
--endif()
-\ No newline at end of file
-+  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
-+

diff --git a/dev-libs/simdjson/simdjson-0.9.7.ebuild b/dev-libs/simdjson/simdjson-0.9.7.ebuild
deleted file mode 100644
index 9ce02457aecb..000000000000
--- a/dev-libs/simdjson/simdjson-0.9.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/8"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=ON
-		)
-	fi
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/
@ 2024-03-19 18:33 Patrick McLean
  0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2024-03-19 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     5e62d51a6854f970c0641e8a0c3eacd3507ff77e
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 18:33:29 2024 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 18:33:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e62d51a

dev-libs/simdjson: add 3.7.1, drop 3.7.0

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                              |  2 +-
 .../simdjson/files/simdjson-3.7.1-data-optional.patch   | 17 +++++++++++++++++
 .../{simdjson-3.7.0.ebuild => simdjson-3.7.1.ebuild}    |  5 +++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 81e18b1fe3e1..456066e66f29 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,4 +1,4 @@
 DIST simdjson-3.6.3.gh.tar.gz 2302220 BLAKE2B c46eeb8a07460cc5427fc35714fd262069cd3d913732e6037d808281d0fed0e82e0423dfd16abaeb515264559fe4454c42f81211354723eb21b212decfe7834b SHA512 b9fa7e554ded4e6cbe9d70ee29aa5b582e58b8b2ada1a781e58746082bb7d31791a4e2ea8b43d9391d783e61e489554f260448029c0b7e730cc69dc44f4aa86a
 DIST simdjson-3.6.4.gh.tar.gz 2301736 BLAKE2B 512effe54c6d36e31c95983cd9bd2ddb000c979c5050cb0c4b8ae2eae743ec50720e15ccf8b457b085d7d5bea24e0a0f793cba97a0af35dedbe59cab105ab2b9 SHA512 30dbc39166f092808d8642a2e4ca37c10999c511aa90e349409b3f4765c638498070ed9ed53ec7bfda9a9442557c7407ee0468a0845d53346d4a990f6d8c3c5b
-DIST simdjson-3.7.0.gh.tar.gz 2309580 BLAKE2B 8689169aaaa5a81056524fe3677ff85026173ccec802ddf96bfc993537645537c9116ca3086a35fe31685c67a51745d3b6d70daaa96064f8b09d831aec7cc2bb SHA512 b642327bebc81ecd59debcc8439983db5e1875895987c9939b629b4b0e3432b19691d8ebbf43b57f437d2914ec45250b6abe4d48be5e2a85b863145b8789457e
+DIST simdjson-3.7.1.gh.tar.gz 2319851 BLAKE2B 06de2f3dbdb65e7cd5aa418ecb7db27ae01f1e205e355f4d8cb38929d284407bb3edc93a5ee13e30457123ee83bdee35923a265ada520ff94365d1eb71de6ccb SHA512 536f2cd174d50890611942accdcc5b41f5a0d0bc6f03d5627a64c75fa6d88efc9bf4304da4c4607b472223d2a713edaeecbfa66e0e7e5efa1f45a60c93eee96a
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1

diff --git a/dev-libs/simdjson/files/simdjson-3.7.1-data-optional.patch b/dev-libs/simdjson/files/simdjson-3.7.1-data-optional.patch
new file mode 100644
index 000000000000..f7192d74042c
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.7.1-data-optional.patch
@@ -0,0 +1,17 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 1d98e6f7..ad903481 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -20,8 +20,10 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
+ endif()
+ 
+ # The bulk of our benchmarking and testing data has been moved simdjson/simdjson-data
+-import_dependency(simdjson-data simdjson/simdjson-data a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
+-add_dependency(simdjson-data)
++if(SIMDJSON_TESTS)
++	import_dependency(simdjson-data simdjson/simdjson-data a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
++	add_dependency(simdjson-data)
++endif()
+ option(SIMDJSON_USE_BOOST_JSON "Try to include BOOST_JSON, this may break your binaries under some systems." OFF)
+ # This prevents variables declared with set() from unnecessarily escaping and
+ # should not be called more than once

diff --git a/dev-libs/simdjson/simdjson-3.7.0.ebuild b/dev-libs/simdjson/simdjson-3.7.1.ebuild
similarity index 92%
rename from dev-libs/simdjson/simdjson-3.7.0.ebuild
rename to dev-libs/simdjson/simdjson-3.7.1.ebuild
index 1755f239d7c2..86f2f2dbe6cf 100644
--- a/dev-libs/simdjson/simdjson-3.7.0.ebuild
+++ b/dev-libs/simdjson/simdjson-3.7.1.ebuild
@@ -36,9 +36,9 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
 	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
 	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
 	"${FILESDIR}/simdjson-3.1.7-tests.patch"
+	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
 )
 
 DOCS=(
@@ -51,7 +51,8 @@ DOCS=(
 
 src_prepare() {
 	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+		mkdir "${S}/dependencies/.cache" || die
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
 	fi
 
 	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-03-19 18:33 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-08 18:24 [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/files/, dev-libs/simdjson/ Patrick McLean
  -- strict thread matches above, loose matches on Subject: below --
2024-03-19 18:33 Patrick McLean
2022-05-25 17:26 Patrick McLean
2021-05-15 17:47 Patrick McLean
2021-01-22 18:39 Patrick McLean
2020-10-28 16:44 Patrick McLean
2020-10-28 16:15 Patrick McLean
2020-10-28 16:15 Patrick McLean

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox