Merge updates from master

2026-07-16 02:23:16 -04:00 · 2022-09-10 00:10:14 +00:00
parent 36f7714669 6ec032dc40
commit 49e9e1e396
10 changed files with 83 additions and 31 deletions
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,2 +1,3 @@
 DIST mtxclient-0.8.0.tar.gz 606271 BLAKE2B 7a12f1f595d509cb2a0bbf9052393f67e427925875124398bf7fa6fc1f96f78084eb357d8ed1642df15274523b66ac78117ab1d088328131a5103d6a4da9b6d4 SHA512 4156432bf66d00bdabb6feee2521b659ee8b50cbcab8eae9d1c8dd496442822d204f7085baa616e51acd4cb7037994d5746fb37be73e71c1c5a3f882229f1e18
 DIST mtxclient-0.8.1.tar.gz 609617 BLAKE2B 00decdcb5a049feebaa9b1d96037923118c49633441c12320fc268e2f09d0dbaf7437f015f74752dd0fec1aa69fe957bcae7a82a0829eec8c1027c88131db653 SHA512 da2f195478cca3f9464aa8d7ca360bdca10f08f8cf658d55124ada3b37ed5b3d9d1ee640019dde58e434a1351b36bf461f4d022ad3d16f33d2957af23ea8a707
+DIST mtxclient-0.8.2.tar.gz 609627 BLAKE2B c88441dfb8792246199cdf8cfd5c69c52d6086ab4013be15fe0c471345ebd157e5a1451eceb7e5b73ac06229e87977103ed1f439c47e3d25172d5c39152b29fa SHA512 0f9d07f5001f933dbf0163b865056361b583de2f2aeae159c5d05ff54adbf88cf7033ad57ee3232b032b4f75328bc410d0059a9dcc209b62aa0ae67b2405667f
--- a/dev-libs/mtxclient/mtxclient-0.8.0.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 inherit cmake flag-o-matic

-DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
+DESCRIPTION="Client API library for Matrix, built on top of libcurl"
 HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
 SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

--- a/dev-libs/mtxclient/mtxclient-0.8.1.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 inherit cmake flag-o-matic

-DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
+DESCRIPTION="Client API library for Matrix, built on top of libcurl"
 HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
 SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

--- a/dev-libs/mtxclient/mtxclient-0.8.2.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.8.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Client API library for Matrix, built on top of libcurl"
+HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}" # ABI may break even on patch version changes
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libfmt:=
+	dev-libs/olm
+	>=dev-libs/openssl-1.1.0:=
+	dev-libs/spdlog:=
+	>=dev-cpp/coeurl-0.2.1:=[ssl]
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/0.6.0_remove_network_tests.patch"
+)
+
+src_prepare() {
+	if use test; then
+		filter-lto # bug 861731
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_LIB_TESTS="$(usex test)"
+		-DBUILD_LIB_EXAMPLES=OFF
+	)
+
+	cmake_src_configure
+}
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit cmake desktop

@@ -19,7 +19,7 @@ MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450"

 DESCRIPTION="A free, open-source Monero wallet"
 HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PVR}.tar.gz -> ${PF}.tar.gz
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PVR}.tar.gz -> ${P}.tar.gz
 	https://github.com/tevador/polyseed/archive/${POLYSEED_DIST_COMIT}.tar.gz -> ${PF}-polyseed.tar.gz
 	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> ${PF}-singleapplication.tar.gz
 	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> ${PF}-monero.tar.gz
@@ -71,8 +71,8 @@ src_prepare() {
 	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/rapidjson
 	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/supercop
 	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/trezor-common
-	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h
+	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
+	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
 	cmake_src_prepare
 }

--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit cmake git-r3 desktop

--- a/net-p2p/monero/files/monerod.initd
+++ b/net-p2p/monero/files/monerod.initd
@@ -6,6 +6,7 @@ pidfile=/var/run/monerod.pid
 command=/usr/bin/monerod
 command_args="${monerod_args}"
 start_stop_daemon_args="-u ${monerod_user} -b -m -p ${pidfile}"
+retry="SIGTERM/30"

 name="Monero P2P Daemon"
 description="Connects to the Monero P2P network"
--- a/net-p2p/p2pool/p2pool-2.3.ebuild
+++ b/net-p2p/p2pool/p2pool-2.3.ebuild
@@ -18,13 +18,13 @@ DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io https://github.com/SChernykh/p2pool"

 SRC_URI="https://github.com/SChernykh/p2pool/archive/${P2POOL_DIST_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMMIT}.tar.gz -> ${PF}-randomx.tar.gz
-	https://github.com/SChernykh/cppzmq/archive/${CPPZMQ_DIST_COMMIT}.tar.gz -> ${PF}-cppzmq.tar.gz
-	https://github.com/SChernykh/curl/archive/${CURL_DIST_COMMIT}.tar.gz -> ${PF}-curl.tar.gz
-	https://github.com/SChernykh/libuv/archive/${LIBUV_DIST_COMMIT}.tar.gz -> ${PF}-libuv.tar.gz
-	https://github.com/SChernykh/libzmq/archive/${LIBZMQ_DIST_COMMIT}.tar.gz -> ${PF}-libzmq.tar.gz
-	https://github.com/SChernykh/rapidjson/archive/${RAPIDJSON_DIST_COMMIT}.tar.gz -> ${PF}-rapidjson.tar.gz
-	https://github.com/SChernykh/robin-hood-hashing/archive/${ROBIN_HOOD_HASHING_DIST_COMMIT}.tar.gz -> ${PF}-robin-hood-hashing.tar.gz
+	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMMIT}.tar.gz -> ${P}-randomx.tar.gz
+	https://github.com/SChernykh/cppzmq/archive/${CPPZMQ_DIST_COMMIT}.tar.gz -> ${P}-cppzmq.tar.gz
+	https://github.com/SChernykh/curl/archive/${CURL_DIST_COMMIT}.tar.gz -> ${P}-curl.tar.gz
+	https://github.com/SChernykh/libuv/archive/${LIBUV_DIST_COMMIT}.tar.gz -> ${P}-libuv.tar.gz
+	https://github.com/SChernykh/libzmq/archive/${LIBZMQ_DIST_COMMIT}.tar.gz -> ${P}-libzmq.tar.gz
+	https://github.com/SChernykh/rapidjson/archive/${RAPIDJSON_DIST_COMMIT}.tar.gz -> ${P}-rapidjson.tar.gz
+	https://github.com/SChernykh/robin-hood-hashing/archive/${ROBIN_HOOD_HASHING_DIST_COMMIT}.tar.gz -> ${P}-robin-hood-hashing.tar.gz
 "
 KEYWORDS="~amd64 ~arm64 ~x86"

@@ -38,13 +38,13 @@ DEPEND="
 src_unpack() {
 	unpack ${P}.tar.gz ${PF}-randomx.tar.gz ${PF}-cppzmq.tar.gz ${PF}-curl.tar.gz ${PF}-libuv.tar.gz ${PF}-libzmq.tar.gz ${PF}-rapidjson.tar.gz ${PF}-robin-hood-hashing.tar.gz
 	#mv -T "${WORKDIR}"/p2pool-${P2POOL_DIST_COMMIT} "${WORKDIR}"/${PF}
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/RandomX
-	mv -T "${WORKDIR}"/cppzmq-${CPPZMQ_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/cppzmq
-	mv -T "${WORKDIR}"/curl-${CURL_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/curl
-	mv -T "${WORKDIR}"/libuv-${LIBUV_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/libuv
-	mv -T "${WORKDIR}"/libzmq-${LIBZMQ_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/libzmq
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/rapidjson
-	mv -T "${WORKDIR}"/robin-hood-hashing-${ROBIN_HOOD_HASHING_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/robin-hood-hashing
+	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/RandomX || die
+	mv -T "${WORKDIR}"/cppzmq-${CPPZMQ_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/cppzmq || die
+	mv -T "${WORKDIR}"/curl-${CURL_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/curl || die
+	mv -T "${WORKDIR}"/libuv-${LIBUV_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/libuv || die
+	mv -T "${WORKDIR}"/libzmq-${LIBZMQ_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/libzmq || die
+	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/rapidjson || die
+	mv -T "${WORKDIR}"/robin-hood-hashing-${ROBIN_HOOD_HASHING_DIST_COMMIT} "${WORKDIR}"/${PF}/external/src/robin-hood-hashing || die
 }

 src_configure() {
--- a/sci-chemistry/xcrysden/metadata.xml
+++ b/sci-chemistry/xcrysden/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick.joseph.taylor@gmail.com</email>
+		<name>Patrick J Taylor</name>
+	</maintainer>
+</pkgmetadata>
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -3,8 +3,7 @@

 EAPI=8

-inherit desktop
-inherit xdg-utils
+inherit desktop xdg

 DESCRIPTION="For the visualisation of molecular and crystal structures."

@@ -57,11 +56,3 @@ src_install() {
 		/usr/share/doc/${P}/examples/FermiSurface \
 		/usr/share/man/
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}