gentoo auto-resync : 23:09:2022 - 17:30:17

6 files changed, 142 insertions, 1 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ea4cc3225f37..f941a486ab5d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index ec4a9286fbe6..8e25fa962cd2 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -4,6 +4,8 @@ AUX kernelshark-2.1.0-fix-desktop-version.patch 287 BLAKE2B 1bc518523d6c49d64233
 AUX kernelshark-2.1.0-no-ldconfig.patch 583 BLAKE2B 38cebadb90970f34644915a074cc14867e495e44df35714131d7bd302029dc80b79645f443b5d1f0b6228860535848de60a8930ed94b0c54aeb09f0a606a2539 SHA512 60031ff80c80c7f533c59dd997128ef23091bb693473d2177d2731705e3bd5e516027c424020dfe9f8aa8613d62e8477745f27f187eb5a3b84ccf7d31947cc4c
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
 DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381 SHA512 4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e
+DIST kernelshark-2.1.1.tar.gz 4099851 BLAKE2B d686a0c19b9daeb355fa3c57104b9147cd0b4e492a3b0b57e5fdbd450d265f963bb35c99b896039007ea47c983d86649381fd81ec9402e4482a39e962322de3a SHA512 8fd9d117401961bf892a46890a7fd97c17a2d9839704b43730a5bf90f5e2cf73c68da2453a2e208b1732055abfaf5ddd7532efe8de9256b4232abd172a04f89c
 EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
 EBUILD kernelshark-2.1.0.ebuild 1334 BLAKE2B 36da94dd1146aa980b1bcf06a434e1070e8f1252b3c086d02cfb44985c7324b334510d03e147c0288dde74cb1c22616e616a417859f02b53f3b0a993fe7dcfde SHA512 d9ad05f7c7dff38233ecd71745ca0369508f8928a19690dfcfa9c00b0fd3359954d85b9c6643787d7ce68bc841375c6facc17456ee12b063bc53e92761d5e928
-MISC metadata.xml 410 BLAKE2B 48b6f70e304fd3acde7e9b2f940b0a0d7f39ae36b0779c7e9335f456fa2ff52cfc87fa095ffed6eb918f4fba2e9132d9d496a1bfe63e12a5a7b56ef008e2674e SHA512 ee0b11f53d3f11a4f64225f7a1bfd30052c768ce3512c1a810411404a4b65590b80225ecb1b9cc3627fc80cf317ca2ecfea3e071436126467314bead2675cc68
+EBUILD kernelshark-2.1.1.ebuild 1295 BLAKE2B 36fd6bfbbcfb82377b4832d7ec04c8ed05adb0eec75e4be544539e9f502944ad88558020715dc195f4d4aa184e98c03eb602729536979486106f72f93969651f SHA512 0d69df0d1b565304c638439171ee9f145f4b7dd40866da9a8312945c923a47225526791b5b80b620019994b66fcf537fb65afef032926903867f1ffc1b4476c9
+MISC metadata.xml 517 BLAKE2B aed46aea75417362e25b9c062134ed09fa831548e146224aa6632415e2250251f609e9db4b4d57027b867254dcc1f010f39efff1537305f09e0ff9fd91d345ec SHA512 37ae8b0aff222d6b52830578f6560514d1da51826df18b383ae7b58da7b7e8c34c2bc1fa4810de3f1dc9e33cf17fba9c2dbe51fefeeeafa3d3e345593e1ef378
diff --git a/dev-util/kernelshark/kernelshark-2.1.1.ebuild b/dev-util/kernelshark/kernelshark-2.1.1.ebuild
new file mode 100644
index 000000000000..3c8e34a184d4
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="https://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="kernel-shark-${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND="
+	>=dev-util/trace-cmd-3.0.2
+	dev-libs/json-c:=
+	dev-qt/qtcore:5=
+	dev-qt/qtnetwork:5=
+	dev-qt/qtwidgets:5=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:=
+	>=dev-libs/libtracefs-1.3
+	>=dev-libs/libtraceevent-1.5
+	media-fonts/freefont
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-D_DOXYGEN_DOC=$(usex doc)
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake_src_configure
+}
diff --git a/dev-util/kernelshark/metadata.xml b/dev-util/kernelshark/metadata.xml
index f80ada075e51..ccfdd585f7b6 100644
--- a/dev-util/kernelshark/metadata.xml
+++ b/dev-util/kernelshark/metadata.xml
@@ -5,6 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
   <use>
     <flag name="custom-optimization">Build with user-specified compiler optimizations
       (-Os, -O0, -O1, -O2, -O3) from CFLAGS</flag>
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index d47aae817cc1..4f1a646a010b 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,3 +1,5 @@
 DIST librnp-0.16.1.tar.gz 2897069 BLAKE2B 0ce261a5f1229ab1567d4726b8d75eaf3fa72774ef66280bd587f28282371cde9691de24de329f8209f99c76dc6cf01e7c711e1bd3fd47b8b145762936a1b655 SHA512 948d8c1342c34ec850605b79b490d6da3094b4fb1f8435f4c928473c15a0df364f2ad56091f4b746afc98119d85137cf7b341c72054ccac79ab236f13cca48f4
+DIST librnp-0.16.2.tar.gz 2897137 BLAKE2B 5f756047506531e0ed3d431cebd3977f3492b464445f6dc54850badc795478f5d04ff036147e8212b4a3e2d4fd939f4bcf668e9a260c2e7fc616ef51dea02117 SHA512 5fd5fceb39429e130adafd4869d9a01149d9c08271770da4eedbe75910788f8256c8bf19e6bb0886a902b22dd5564eb93baddaf84689cbf5e6617674f4f0efac
 EBUILD librnp-0.16.1.ebuild 1747 BLAKE2B 09dd5d19778e51b1b66bc2ed5b6bcb2fc0a2fbac93283ea90f883cca8e5af26e138a5d4bfa8fd7421d58f9f980e53367bc6d2a7e9398fca25eeb6c37902d2790 SHA512 79f346bc6a991503d0791e12fce50f8e98ea604e14e9e5df3edb7b0317429cdb575c5bdd1328bcf7c9c356b18d032842704de848682d738d476e18cc1a74c43b
+EBUILD librnp-0.16.2.ebuild 1678 BLAKE2B 956356aaac32d45058fadbfda62e0e39da0941ffa45bf37a0a37ff8685abb7973b6f28028d78c492c265b709b97da0b200334b8c3411f77840b0b3d4f156e322 SHA512 6b1a5734521c5d58309dcba49a0e6d5f0180817b3e759b8fe0ea5d7d684ea89e57589e57b3ecca71e608c46f4c8f44a4ec5c2ab9f30c5c7702aaf7258506ffb9
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/librnp-0.16.2.ebuild b/dev-util/librnp/librnp-0.16.2.ebuild
new file mode 100644
index 000000000000..71779ee7a592
--- /dev/null
+++ b/dev-util/librnp/librnp-0.16.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High performance C++ OpenPGP library"
+HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp"
+SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2"
+SLOT="0/0.16.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+botan man test"
+
+RDEPEND="app-arch/bzip2
+	dev-libs/json-c:=
+	sys-libs/zlib
+	botan? ( dev-libs/botan:2= )
+	!botan? ( >=dev-libs/openssl-1.1.1:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="man? ( dev-ruby/asciidoctor )"
+
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${P/*lib/}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test on off)
+
+		-DCRYPTO_BACKEND=$(usex botan botan openssl)
+
+		-DDOWNLOAD_GTEST=off
+		-DDOWNLOAD_RUBYRNP=off
+
+		-DENABLE_COVERAGE=off
+		-DENABLE_DOC=$(usex man on off)
+		-DENABLE_FUZZERS=off
+		-DENABLE_SANITIZERS=off
+	)
+
+	if use botan; then
+		local mycmakeargs+=(
+			-DENABLE_AEAD=on
+			-DENABLE_BRAINPOOL=on
+			-DENABLE_IDEA=on
+			-DENABLE_SM2=on
+			-DENABLE_TWOFISH=on
+		)
+
+	# OpenSSL support is still not as complete as botan.
+	# https://github.com/rnpgp/rnp/issues/1642 AEAD,
+	# https://github.com/rnpgp/rnp/issues/1902 BRAINPOOL,
+	# https://github.com/rnpgp/rnp/issues/1877 SM2,
+	# https://github.com/openssl/openssl/issues/2046 TWOFISH.
+	else
+		local mycmakeargs+=(
+			-DENABLE_AEAD=off
+			-DENABLE_BRAINPOOL=on
+			-DENABLE_IDEA=on
+			-DENABLE_SM2=off
+			-DENABLE_TWOFISH=off
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	ctest -j"${MAKEOPTS}" -R .* --output-on-failure || die
+}