gentoo auto-resync : 31:12:2024 - 06:31:02

6 files changed, 2 insertions, 248 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 702afe1fd8b2..1feae14ffa60 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index a6afabd89c02..22ff458efb06 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -2,5 +2,5 @@ DIST enet-1.3.17.tar.gz 703278 BLAKE2B d31838a173f629a2216f59173c259cf7cb3598591
 DIST enet-1.3.18.tar.gz 737164 BLAKE2B 13a4543d11d7b4c727badac2293b28e1fe465e6990b59139ec2af6d43f827aa83e243fe35aa789b22498898faa8091b26c8bbc38165ef2c5980d775e48d93bcc SHA512 d39b3bc78274ed4040580a0b13f7e628829d88993aa1bae15ab02afe64598badb2c6863b128f25234e27c3a8c4bcfbda360b3b237c92388675714549e9757bb5
 EBUILD enet-1.3.17-r1.ebuild 651 BLAKE2B 774101b32dd8e39315a591756d748eabeded15ad08128ac9412fb49bbb986aa664c3236d810caf4dd4578b2cdbcbacebaa31f38077b97be95afa0aea28ba9e8e SHA512 9742b9c5ebdb0f30309cd58daec6952720fe273c6b5bd66a48c3c2dc5c29e9c79a78b838542877bb9c0b1dd76caee8ae815736ba08f1c1f459f3ebc402c188be
 EBUILD enet-1.3.17.ebuild 647 BLAKE2B 51c3569a5f8eb3923b3585804a9dc2e5dd74e76e844f2c9f0b8942ff945923400e4fe30d47a408d6e1c616469b38f93f2d10bbbd40cb4a1b8620749e51babe5e SHA512 689c3e54ef29a620b40e225016c4b2b09f3aa36db43ac6ff64e251c4db64355d888195eeecf331d136c21ed27dc1858cd02ddfdc68dbcd3166cf580e76fe7a93
-EBUILD enet-1.3.18.ebuild 651 BLAKE2B 5a749203ea800acf3e376bbf2477b94e61a006e68da63ead8a6bf0e652d69f867f9b711a9020702587c98fe74ad0b57be1e3e4275e0e5d27be8e753173c0d7cd SHA512 88b54b9f86d915d8637bbbf49597544aadaba84fecc9503aa496207aaadfbe9af024fb107d1fac25627a79e33363f1ffe64013650bce4f97bc93fcc2fb346a2c
+EBUILD enet-1.3.18.ebuild 647 BLAKE2B 879911dd55fd8812624fa3467aa914cd0bf1864151370341cb4845dc6e18dc924d2399377584d8d027ef0cd656c897a063c46856574bea45a74b5eb5d633a39d SHA512 987829db35058d8bfd4670ada456ba4af6704211c4a6625135d442d1cf639574c548ac61dbfad697db5b14b7f2ef86287821664a3d1d96c19659f87ce3a6989b
 MISC metadata.xml 412 BLAKE2B 531f035737f5646642c3d08352d94b25a3fb7e96d8c6a52e9c1f1b3c69af949dda25456c32cfb599ebfca68657cb8699afbb4f583b69d929dd4693f65f01ed51 SHA512 acb6f886f4759fbed4bdb5c785b3f38eb5e1d8d07def250f8678db4fb00c96cec8ef0f7397b10b0aac7dcd2f6a243c0a4930c2de52d7c5339532a4c2ffa6c4c5
diff --git a/net-libs/enet/enet-1.3.18.ebuild b/net-libs/enet/enet-1.3.18.ebuild
index 3ea586ef1690..8bc53850971d 100644
--- a/net-libs/enet/enet-1.3.18.ebuild
+++ b/net-libs/enet/enet-1.3.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.3/8"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 RDEPEND="!${CATEGORY}/${PN}:0"
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 3453f24ee59f..7b916f6ababc 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -4,7 +4,6 @@ AUX 0003-Port-from-QProcess-pid-to-processId.patch 1252 BLAKE2B 710e6c36c5ffe0d9
 AUX 0004-Port-away-from-deprecated-QString-SplitBehavior.patch 1206 BLAKE2B f1353bdb77bb1203651afc41f1412814fc0ac8f5019d062bea47133f260d9f1797de20b0d0b7bed0b545a6f10d313946893dbedeba39ac1db6d4e6c202bdcbf0 SHA512 83bbe883375322b07227e8ecd0a46dfc8904504663a36f7e95ad15bae41cdf653cebd5c71cfcc8bc75ada6ea6cc6643a9ca38628f5e50b05fd07f97c3c675e92
 AUX 0005-Port-away-from-QtContainer-toSet.patch 3541 BLAKE2B 4d3e9e448c8d5641cbb5291ec9fa41776bb28ad686604f2f22a81c4063c022c9e6d87ecda319fe5f650cd2e8112fa798ae18c6d53eda854ecececb07f1041c19 SHA512 f6d6b1e694d2a022915cb1eb944b4f1f6bbb81a3555e460c16c9e406dbd33e16ffe6d0640edb5e0d0f8139762b256443d8f12a98481a63ed74df50d2e8a96fc8
 AUX 0006-Port-away-from-deprecated-QMap-unite.patch 1898 BLAKE2B 73f5a5c7402d8086c7d62f6d6d57d23a953c14f43929d02165b0ea332756cf2c372449cdf0647622b07916c697185525bb0a8d93eacf6046f86573eb9a5a3ebd SHA512 e5282891209715c903417769dcff3e4d73d22c9c6019365d8d3e5f77f93331aa1a342d240e26e21898f7ba59cb211a0dec6dd45f5fa801886daa30cb3c4d4848
-AUX 0007-Add-Qt6-CI.patch 3165 BLAKE2B cea7b292791a0b6c2144c7384770e3c57e5f5e6284a98f5e24d7ea8e0b10a7c7166239d4ba3974d9f880da8012fd46f6b551bbdda494078efe6363c79a29e894 SHA512 3f12fe5295c89535da57ff7ab74cc5afa394370a11e3898b5a4913656027937243b58d5439f1ab177bca0977f55f7b6e873c7122892174a71235ab208d3b8c84
 AUX 0008-Use-return-instead-of-reference-for-DBus-output-para.patch 2234 BLAKE2B 99dc90bf2ef45e744c9208a1655dd76a42255572d560b55be34fc809ec4635484611a5910b4f735b0a500e3ee317d43724db6f2b441c0a18c4c4a61d3508d6fa SHA512 659e8d0d660f42fb165644eb8a507dbc7e18a2ac6c78c538b446530641eacfdf1f0999b251277179e4bbec2887c85b29c8721d1b4e7d36a7d350b197991aeb71
 AUX 0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch 8052 BLAKE2B c78f4a2ce0db9ba6e57c70c0c23af2debf1b892af40d71f128fc55820cd234bb2aafb61a7f9c93becc6e60d10c6ac723706f13e13d7275b0717fd52153be9baf SHA512 06e68df7689d7ce98672e5166e033633934a68eb126f93f0c0b3f7b58cd198a8afafe5a67719f1f0c26be1115b65db045c9338dc2b36890aad46ea9d66a5e883
 AUX 0010-Fix-plugin-datastream-in-Qt6.patch 1299 BLAKE2B 5262c989f40bb5c1a518cbb91eb361d54461c5441d81cdda000af69504c1c508f432668fa2fa8ab6e573f992bfabac6df2f0c04758b1be8ab572cbcb81c0ba6d SHA512 a90e5ef3b6b947efbd321f917c96d4318bbd191f53fff3fe15434b5140e7eb23170e321e7362c8f7ecfbbab409d69adaee1fe0c856298716a48e273a836e7c2f
@@ -13,6 +12,5 @@ AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c211
 AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
 AUX signond-8.61-consistent-paths.patch 11609 BLAKE2B 2ad71837dfd949b79b7a5e9501567027b552860be43d94176c19df7a551835e4f5cd00c7661ace881416a38faa61f6aa09c1dfff7ab1b56a063445c701fbf930 SHA512 7869361c25766fbbb2973cae38251c85d19a15fb0bb7c1c5d578c792c50e7b16006ecff889fb6a47d5c7ef9ebbaa2ec029859373e1ddbf19456ad4f56c77f839
 DIST signond-8.61.tar.bz2 203066 BLAKE2B 2f78e08143d346777ab3517ef6b76b54ab1b17efa6d15b2c5a16487c2e11f38c88cb2820bff8dd04deb334d0c178c16bd061c0eba694c5edfb0e31411581648a SHA512 95e83bc672792ec10493f1f456788af7e8051ce0bed6b047b6b6f5fa9ac019dd3392063152930be49cf68d590567fd7467c544d642cc58624b1aabdc0b405258
-EBUILD signond-8.61-r100.ebuild 4262 BLAKE2B cc766c463135f237f02820dc6f42076a9e8f0b5328ac40fa7fc2ec61ee01a2a38d88a7554b766a316dafc346c9f06759e430e3b9aad2695f15738e17eea6cf9b SHA512 11eaa064e3de8c814baff6efe78bb066c2a0751dcf95b5eea8e4012d50b3079fdcbaf167ceba5bcf2939979e49878be74650b193799790b10c5d0ff617837deb
 EBUILD signond-8.61-r101.ebuild 4172 BLAKE2B 309578bb52d8c53d0601b286bb84656223c4cdd6f2f3e0968b799198e5d628d8bdea910d25d7ef364ecdd946746702cde559a55bba0963ef998790e8636abf2c SHA512 1fb781cf81f5f30b7d3a4afb6fcfd7d3e1a845d4d3cc532b218e56263c7710ce2ab88b7b470b479aaa8d7e43ce9aebfdb2a38f6932a1245e5a31325382d96592
 MISC metadata.xml 402 BLAKE2B cbca0310ab027fc70e2c6f3c4fc84a4de8847d4899ed19e848796279c0b03b9ffcc59269487def4b3e6298adfb095a9cf3417a1c7bf083efa30a8894ecfa858f SHA512 1831ad67394a82c3839fb80196982f3252e2bc9c7cf116c782d731a7d315e97cc2e6a299e951f73f92d2a4598a33c7251d8a68c47102c6186344b61486a72515
diff --git a/net-libs/signond/files/0007-Add-Qt6-CI.patch b/net-libs/signond/files/0007-Add-Qt6-CI.patch
deleted file mode 100644
index 37891277d0de..000000000000
--- a/net-libs/signond/files/0007-Add-Qt6-CI.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://gitlab.com/accounts-sso/signond/-/merge_requests/36
-
-From 10f791a62e229bcb5e3975c752bcd5519758240f Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 1 Aug 2022 19:37:41 +0200
-Subject: [PATCH 07/11] Add Qt6 CI
-
----
- .gitlab-ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 40 insertions(+), 8 deletions(-)
-
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-index 409f6e2..c784909 100644
---- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -1,18 +1,14 @@
--image: ubuntu:bionic
--
- cache:
-   key: apt-cache
-   paths:
-   - apt-cache/
- 
--before_script:
--  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
--  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
--  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev
--  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y lcov gcovr
--
- build_amd64:
-   stage: build
-+  image: ubuntu:bionic
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
-   script:
-     - mkdir build
-     - cd build
-@@ -24,6 +20,10 @@ build_amd64:
- 
- test_amd64:
-   stage: test
-+  image: ubuntu:bionic
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
-   script:
-     - find build | xargs touch # Avoid rebuilding
-     - cd build
-@@ -34,6 +34,38 @@ test_amd64:
-     paths:
-       - ./
- 
-+build_amd64_qt6:
-+  stage: build
-+  image: ubuntu:jammy
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make
-+  script:
-+    - mkdir build
-+    - cd build
-+    - qmake6 CONFIG+=debug CONFIG+=coverage CONFIG+=enable-backup CONFIG+=enable-p2p ..
-+    - make -j 4
-+  artifacts:
-+    paths:
-+      - build/
-+
-+test_amd64_qt6:
-+  stage: test
-+  image: ubuntu:jammy
-+  before_script:
-+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+    - export DEBIAN_FRONTEND=noninteractive
-+    - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make
-+  script:
-+    - find build | xargs touch # Avoid rebuilding
-+    - cd build
-+    - make coverage-html
-+  dependencies:
-+    - build_amd64_qt6
-+  artifacts:
-+    paths:
-+      - ./
-+
- pages:
-   stage: deploy
-   script:
--- 
-2.43.0
-
diff --git a/net-libs/signond/signond-8.61-r100.ebuild b/net-libs/signond/signond-8.61-r100.ebuild
deleted file mode 100644
index 37f08f7263f0..000000000000
--- a/net-libs/signond/signond-8.61-r100.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils multibuild
-
-if [[ ${PV} = *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/nicolasfella/signond.git/"
-	EGIT_BRANCH="qt6"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-VERSION_${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://gitlab.com/accounts-sso"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# The qt5/qt6 situation is complicated: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252
-# 1) the library is coinstallable for qt5/qt6
-# 2) signond (the daemon) must be built for only one Qt version, matching the
-# Qt version of all consumer plugins.
-IUSE="doc +qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-# tests are brittle; they all pass when stars align, bug 727666
-RESTRICT="test !test? ( test )"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5
-	)
-	qt6? ( dev-qt/qtbase:6[dbus,gui,network,sql] )
-	net-libs/libproxy
-"
-DEPEND="${RDEPEND}
-	test? (
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		|| (
-			dev-qt/qttools:6[assistant]
-			dev-qt/qthelp:5
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/0001-Don-t-forward-declare-QStringList.patch
-	"${FILESDIR}"/0002-Remove-usage-of-Q_EXTERN_C.patch
-	"${FILESDIR}"/0003-Port-from-QProcess-pid-to-processId.patch
-	"${FILESDIR}"/0004-Port-away-from-deprecated-QString-SplitBehavior.patch
-	"${FILESDIR}"/0005-Port-away-from-QtContainer-toSet.patch
-	"${FILESDIR}"/0006-Port-away-from-deprecated-QMap-unite.patch
-	"${FILESDIR}"/0007-Add-Qt6-CI.patch
-	"${FILESDIR}"/0008-Use-return-instead-of-reference-for-DBus-output-para.patch
-	"${FILESDIR}"/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
-	"${FILESDIR}"/0010-Fix-plugin-datastream-in-Qt6.patch
-	"${FILESDIR}"/0011-Port-away-from-deprecated-QProcess-signal.patch
-	"${FILESDIR}/${PN}-8.60-buildsystem.patch"
-	"${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346
-	"${FILESDIR}/${PN}-8.61-consistent-paths.patch" # bug 701142
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_prepare() {
-	default
-
-	local qhelpgeneratorpath
-	if has_version "dev-qt/qttools:6[assistant]"; then
-		qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec"
-	elif has_version "dev-qt/qthelp:5"; then
-		qhelpgeneratorpath="$(qt5_get_bindir)"
-	else
-		eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)"
-	fi
-
-	sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \
-		-i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die
-
-	# install docs to correct location
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
-		-i doc/doc.pri || die
-	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \
-		-i lib/plugins/doc/doc.pri || die
-	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
-		-i lib/SignOn/doc/doc.pri || die
-
-	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
-		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
-
-	use test || sed -e '/^SUBDIRS/s/tests//' \
-		-i signon.pro || die "couldn't disable tests"
-
-	multibuild_copy_sources
-}
-
-src_configure() {
-	my_src_configure() {
-		cd "${BUILD_DIR}" || die
-
-		local myqmakeargs=(
-			PREFIX="${EPREFIX}"/usr
-			LIBDIR=$(get_libdir)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			eqmake6 "${myqmakeargs[@]}"
-		else
-			eqmake5 "${myqmakeargs[@]}"
-		fi
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	my_src_compile() {
-		emake -C "${BUILD_DIR}"
-	}
-
-	multibuild_foreach_variant my_src_compile
-}
-
-src_install() {
-	my_src_install() {
-		emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install
-	}
-
-	multibuild_foreach_variant my_src_install
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] && \
-		! has_version "kde-apps/signon-kwallet-extension:*"; then
-		ewarn "Without kde-apps/signon-kwallet-extension installed, passwords"
-		ewarn "will be saved in plaintext!"
-	fi
-}