[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/

2023-12-17 Thread Arthur Zamarin
commit: 9b72b8cfb88318d622bf67bc8c6e4842b6cb72b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b72b8cf

dev-qt/qtwayland: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qtwayland/qtwayland-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwayland/qtwayland-6.6.1.ebuild 
b/dev-qt/qtwayland/qtwayland-6.6.1.ebuild
index 6705f12049b3..d41d5d9e7127 100644
--- a/dev-qt/qtwayland/qtwayland-6.6.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="compositor qml vulkan"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttranslations/

2023-12-17 Thread Arthur Zamarin
commit: 90cb77d8c09e952a198b26efdaea577575a3765e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90cb77d8

dev-qt/qttranslations: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qttranslations/qttranslations-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttranslations/qttranslations-6.6.1.ebuild 
b/dev-qt/qttranslations/qttranslations-6.6.1.ebuild
index a54c57e20dd0..59bc04a2fa86 100644
--- a/dev-qt/qttranslations/qttranslations-6.6.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Translation files for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DEPEND="~dev-qt/qtbase-${PV}:6"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebsockets/

2023-12-17 Thread Arthur Zamarin
commit: 6f24b479478f6d2718f378f516207e51a898eddf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f24b479

dev-qt/qtwebsockets: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qtwebsockets/qtwebsockets-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.6.1.ebuild 
b/dev-qt/qtwebsockets/qtwebsockets-6.6.1.ebuild
index bbcaeda665e8..60d75487bb62 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.6.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 IUSE="qml"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

2023-12-17 Thread Arthur Zamarin
commit: efcb9df01234be90f3b1c816986d1774108ff036
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efcb9df0

dev-qt/qttools: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qttools/qttools-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qttools/qttools-6.6.1.ebuild 
b/dev-qt/qttools/qttools-6.6.1.ebuild
index 814fed85840e..d5c8a41dc777 100644
--- a/dev-qt/qttools/qttools-6.6.1.ebuild
+++ b/dev-qt/qttools/qttools-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop llvm optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-12-17 Thread Arthur Zamarin
commit: 30a24715d3ea44375bcb34eecae897cc47fc60cb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a24715

dev-qt/qtwebengine: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 891fd475a802..e6288297bd1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebview/

2023-12-17 Thread Arthur Zamarin
commit: f19406ca12c4c189ea9414256e1010404420faad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19406ca

dev-qt/qtwebview: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qtwebview/qtwebview-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebview/qtwebview-6.6.1.ebuild 
b/dev-qt/qtwebview/qtwebview-6.6.1.ebuild
index 81210cfc2b80..0853239464c0 100644
--- a/dev-qt/qtwebview/qtwebview-6.6.1.ebuild
+++ b/dev-qt/qtwebview/qtwebview-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Module for displaying web content in a QML application using the 
Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebchannel/

2023-12-17 Thread Arthur Zamarin
commit: 19a01ad3fcecba356b7167b06f34ce35a51bb0ff
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a01ad3

dev-qt/qtwebchannel: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qtwebchannel/qtwebchannel-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.6.1.ebuild 
b/dev-qt/qtwebchannel/qtwebchannel-6.6.1.ebuild
index 7160bd0b64a1..0d3afd47bd87 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.6.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt WebChannel"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 IUSE="qml"



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6/

2023-12-17 Thread Arthur Zamarin
commit: a96143c4ba3f15d519d2f875d4f7b7b2e084d6c9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96143c4

dev-python/PyQt6: Stabilize 6.6.1 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/PyQt6/PyQt6-6.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild 
b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
index b5abeb38b190..1bf42ba63ec2 100644
--- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 # defaults match what is provided with qtbase by default (except testlib),
 # reduces the need to set flags but does increase build time a fair amount
 IUSE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-docs/

2023-12-17 Thread Arthur Zamarin
commit: c30e9cbe05808758acb946214376144fe8571f70
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c30e9cbe

dev-qt/qt-docs: Stabilize 6.6.1_p202311210527 amd64, #920154

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild 
b/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild
index 8c7aa23d5a6e..53abd1be33a6 100644
--- a/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/;
 
 LICENSE="FDL-1.3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+examples +html +qch"
 REQUIRED_USE="|| ( examples html qch )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/leatherman/

2023-12-17 Thread Matthew Thode
commit: 49e5dfb8545964217b30a52993b1e95a3f437a9b
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Dec 17 16:41:51 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Dec 17 19:19:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e5dfb8

dev-libs/leatherman: drop 1.12.10

Signed-off-by: Matthew Thode  gentoo.org>

 dev-libs/leatherman/Manifest  |  1 -
 dev-libs/leatherman/leatherman-1.12.10.ebuild | 56 ---
 2 files changed, 57 deletions(-)

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 0d02d26c40c2..c9a91fbc18c8 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,3 +1,2 @@
-DIST leatherman-1.12.10.tar.gz 816708 BLAKE2B 
65c606c548a0394b6a1619d26f1814ea9a9ab2a3b40346ed9a1805291a9df90227f9f7cb37758fcb7f778a1f28e56fd8bf395c335125e1ede7e1455b1c70c0e5
 SHA512 
c9882553906287c27d79e9f3df8af96a77fdf9a0fc0fdadc26105eed3fd6da3f598344a9a0671cc0a1c70cea29402fb0ca76deff1a1a4b9fd9979815917c62fc
 DIST leatherman-1.12.11.tar.gz 816707 BLAKE2B 
7e94c24b541efb9a8f879897eb13cbb7fbce7e87fd7543625e0c88717a79ccdcd1bc8d06268582ee4445a2628a71ef6ffd64b38f93ad0fbdd811e686623ac4f6
 SHA512 
26fb96a2f8bb34efe4df1220db18f9816ecd3b34d3ef1e84ecfda8833318f7e4f3dcd93535034669110e62fa69bbf9c43599d84739321c6d0075475cd2de7671
 DIST leatherman-1.12.9.tar.gz 816107 BLAKE2B 
1c2e50767585a30da40fdacde0aa8655cefc2a41cadd24a7689be5da0afcbe8627293d37780442873907996f01401b46340a3d7be5d9b2a65b2f87191daca6c3
 SHA512 
e69f2b0c04a1cbd20e097abcc020e7b27fb74f168207fcbcffce9fd0edd1760acc75d5c5f645d3a798f106e129ce73e512f0c11699733475b290dfc876de0565

diff --git a/dev-libs/leatherman/leatherman-1.12.10.ebuild 
b/dev-libs/leatherman/leatherman-1.12.10.ebuild
deleted file mode 100644
index 3e6c8de60a0f..
--- a/dev-libs/leatherman/leatherman-1.12.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman;
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-
-RDEPEND="dev-libs/boost:=[nls]
-   net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/portage-sandbox-test-fix.patch
-   "${FILESDIR}"/1.12.2-shared_nowide.patch
-)
-
-src_prepare() {
-   sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-   # vendored boost lib conflicts with boost 1.73 and above
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DLEATHERMAN_ENABLE_TESTING=$(usex test)
-   # We depend on Boost with nls, so this is always true
-   -DLEATHERMAN_USE_ICU=ON
-
-   -DLEATHERMAN_SHARED=$(usex !static-libs)
-   )
-
-   if use debug; then
-   mycmakeargs+=(
-   -DCMAKE_BUILD_TYPE=Debug
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_test() {
-   "${WORKDIR}/${P}"_build/bin/leatherman_test || die
-}



[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/

2023-12-17 Thread Matthew Thode
commit: e862d86ee1e9b5fb2abb767b1fef3d43060334e5
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Dec 17 19:19:16 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Dec 17 19:19:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e862d86e

net-misc/memcached: drop 1.6.18, 1.6.19, 1.6.20, 1.6.21

Signed-off-by: Matthew Thode  gentoo.org>

 net-misc/memcached/Manifest|   3 -
 net-misc/memcached/memcached-1.6.18.ebuild | 106 -
 net-misc/memcached/memcached-1.6.19.ebuild | 106 -
 net-misc/memcached/memcached-1.6.20.ebuild | 106 -
 net-misc/memcached/memcached-1.6.21.ebuild | 106 -
 5 files changed, 427 deletions(-)

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 39221eead1c1..4e49887545aa 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,5 +1,2 @@
-DIST memcached-1.6.18.tar.gz 1081928 BLAKE2B 
edfaf02cdd3b13930d473fbc4475484602b70bca323f28636b1770780be34fdb325c70d0b0ba7f8d92233aab4dac8a5537be84276489be6a803e1d93d1dc34ab
 SHA512 
85e5a5e7c901b02158ea20cc58f2e7e6ba4806c40a0105185140b31fa40f3ce0fc704f6f17ea4a425a9ff543f9d30092aadbb202ea4ca46476c151e65eac97e6
-DIST memcached-1.6.19.tar.gz 2599941 BLAKE2B 
a66eef916b1d540558cf6487363b95a4228784d921bc0987da803c8d3897ad2ef22ef9949d95251b92b98390d900d4ca26a88862cbf33b8e5d624f3f32cb00d2
 SHA512 
60d93065e0ef2b17e9da5370a497a4fbfc64c0af70e14fdfdab60c0c94c0b19e30da31d615e19565474c278141a4cb401c65fd79bd70947dd96a9fee81824a74
-DIST memcached-1.6.20.tar.gz 2615902 BLAKE2B 
3baa0b2c72619104f43dce6e19b4ae7f54da8342dbdebc06bdd03b5c63bc0133bed71800d8b890d7eb6745a19799fdfd2f1d9f1636bc109ad8827f828639f304
 SHA512 
518784e7ea1f919e3cd67afe394c9435b18f63b612e528d12f554a806ee479139db08ee8ab8e176ee0e88cee6e732cf311fbe6942fc0ca5b1a2286638e1cfcb9
 DIST memcached-1.6.21.tar.gz 1127623 BLAKE2B 
13feb4872f5d196c1c3ded0159c16c2b09661b95f2486fbffb012d3f0bc86a94cbcf82aea9d4e59a9beac7cc4251fb60efd9e2f4c066831cb9b582bd44631d28
 SHA512 
9d8ba8964474e7ed40095e414747a3ce76860ee32b9d8bac19fc7932a79d4bb9947e4cbe810933b6d271f4b0ee5576e25089ca40f414b25faf9245733bfbd369
 DIST memcached-1.6.22.tar.gz 1135926 BLAKE2B 
872594e087e2302ac7901481797aa6fda98a73e39b8ad64e084c87834e86d7026abcdc3a87b016d0c7eb80bc96621ac9a0da8fcc0b46fc93e7c042cc30848cac
 SHA512 
a30adc4f14c32051d2fc112eaa71de96f7ba614bd7f940ab5dd86365fe5e4df1399fa6fe6591cee903c8b914f2156050edef3139bafe38cd4a2b6424ba973e8e

diff --git a/net-misc/memcached/memcached-1.6.18.ebuild 
b/net-misc/memcached/memcached-1.6.18.ebuild
deleted file mode 100644
index 0ed1ae622894..
--- a/net-misc/memcached/memcached-1.6.18.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/;
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-   https://www.memcached.org/files/old/${MY_P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-   dev-lang/perl
-   sasl? ( dev-libs/cyrus-sasl )
-   seccomp? ( sys-libs/libseccomp )
-   selinux? ( sec-policy/selinux-memcached )
-   ssl? ( >=dev-libs/openssl-1.1.0g:= )"
-DEPEND="${RDEPEND}
-   acct-user/memcached
-   test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? 
( dev-perl/IO-Socket-SSL ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-   "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-   "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-   "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-   default
-
-   sed -i -e 's,-Werror,,g' configure.ac || die
-   sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-
-   eautoreconf
-
-   use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-   # Tweak upstream systemd unit to use Gentoo variables/envfile.
-   # As noted by bug #587440
-   sed -i -e '/^ExecStart/{
-   s,{USER},{MEMCACHED_RUNAS},g;
-   s,{CACHESIZE},{MEMUSAGE},g;
-   s,OPTIONS,MISC_OPTS,g;
-   };
-   /Environment=/{s,OPTIONS,MISC_OPTS,g;};
-   /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-   ' \
-   "${S}"/scripts/memcached.service
-}
-
-src_configure() {
-   econf \
-   --disable-docs \
-   

[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/

2023-12-17 Thread Arthur Zamarin
commit: 9d63ab99170b87a6cb9a3dc4355b2a85852e3f47
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d63ab99

media-libs/vulkan-layers: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
index 613a31f1fe41..27e2f4195a3f 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.268.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/

2023-12-17 Thread Arthur Zamarin
commit: d75f9518ef9bfd2d173176daf80cd19ea4825b27
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75f9518

media-libs/vulkan-loader: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
index 97dae5a07742..d423af238203 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.268.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-tools/

2023-12-17 Thread Arthur Zamarin
commit: 2db1791fa72e2f33f505808eee159de857486aff
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db1791f

dev-util/vulkan-tools: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild 
b/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild
index 0490f8fd2d70..04a613651ef1 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.268.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
+   KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv"
S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/

2023-12-17 Thread Arthur Zamarin
commit: 485c9eff0cfc156819d2dc28731f63e64a7129d9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485c9eff

dev-util/vulkan-headers: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild 
b/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild
index 707dcf61adec..cb03c4b9495f 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.268.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-headers/

2023-12-17 Thread Arthur Zamarin
commit: 720e4292ca9dfa545e00b2fa8baa25f52bf70a9c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720e4292

dev-util/spirv-headers: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/spirv-headers/spirv-headers-1.3.268.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild 
b/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild
index 93c110c45b6c..174db0f6928d 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.268.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"



[gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/

2023-12-17 Thread Arthur Zamarin
commit: dae692b75e12c92adb95aa85f9cb9e669e9f97a5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae692b7

dev-util/glslang: Stabilize 1.3.268-r2 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/glslang/glslang-1.3.268-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/glslang/glslang-1.3.268-r2.ebuild 
b/dev-util/glslang/glslang-1.3.268-r2.ebuild
index 5d5918ab2f5c..9bfc3eb78d5c 100644
--- a/dev-util/glslang/glslang-1.3.268-r2.ebuild
+++ b/dev-util/glslang/glslang-1.3.268-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
 else
SNAPSHOT_COMMIT="vulkan-sdk-${PV}.0"

SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-utility-libraries/

2023-12-17 Thread Arthur Zamarin
commit: 2e5e1d746925114093b765e21bf68f5b1f805975
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5e1d74

dev-util/vulkan-utility-libraries: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild 
b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild
index 1f48598460e0..475179270708 100644
--- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.268.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
 else
EGIT_COMMIT="vulkan-sdk-${PV}.0"

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/

2023-12-17 Thread Arthur Zamarin
commit: ea5f08086707b5ebee7c0b4b1bd7643fe155b58a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5f0808

dev-util/spirv-tools: Stabilize 1.3.268 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/spirv-tools/spirv-tools-1.3.268.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild 
b/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild
index c10c6448a687..0fa1ecf7dd3b 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.268.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
 else
EGIT_COMMIT="vulkan-sdk-${PV}.0"

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/

2023-12-17 Thread Arthur Zamarin
commit: 78c08f9ab84a63b0e64c7fd679fa332652fdd700
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c08f9a

media-libs/shaderc: Stabilize 2023.7 ppc64, #920203

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/shaderc/shaderc-2023.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/shaderc/shaderc-2023.7.ebuild 
b/media-libs/shaderc/shaderc-2023.7.ebuild
index 42a8fa001b23..5b3efcf7315e 100644
--- a/media-libs/shaderc/shaderc-2023.7.ebuild
+++ b/media-libs/shaderc/shaderc-2023.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/gengetopt/

2023-12-17 Thread Arthur Zamarin
commit: ecbd15bc628e005d965561584e5e08f4b0113a7e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:22:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:22:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbd15bc

dev-util/gengetopt: Stabilize 2.23-r1 sparc, #920214

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/gengetopt/gengetopt-2.23-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/gengetopt/gengetopt-2.23-r1.ebuild 
b/dev-util/gengetopt/gengetopt-2.23-r1.ebuild
index 2a1925b9221c..a1965d17fd85 100644
--- a/dev-util/gengetopt/gengetopt-2.23-r1.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+ public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-apps/texinfo"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/qtpass/

2023-12-17 Thread Arthur Zamarin
commit: c56f94ea45b8d598987ad8c99087f5b349bb910e
Author: Martin Gysel  bearsh  org>
AuthorDate: Tue Oct  3 17:15:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:36:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56f94ea

app-admin/qtpass: add 1.4.0

Bug: https://bugs.gentoo.org/915124
Signed-off-by: Martin Gysel  bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/33168
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-admin/qtpass/Manifest|  1 +
 app-admin/qtpass/qtpass-1.4.0.ebuild | 61 
 2 files changed, 62 insertions(+)

diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index f8284027bcd5..78f1fc36a962 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1 +1,2 @@
 DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B 
ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a
 SHA512 
9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10
+DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 
12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075
 SHA512 
47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625

diff --git a/app-admin/qtpass/qtpass-1.4.0.ebuild 
b/app-admin/qtpass/qtpass-1.4.0.ebuild
new file mode 100644
index ..d942091a7152
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils virtualx
+
+DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass;
+SRC_URI="https://github.com/IJHack/qtpass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/QtPass-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="|| ( app-admin/pass app-admin/gopass )
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+   dev-qt/qtsvg:5
+   test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
+
+src_prepare() {
+   default
+
+   if ! use test ; then
+   sed -i '/SUBDIRS += src /s/tests //' \
+   qtpass.pro || die "sed for qtpass.pro failed"
+   fi
+}
+
+src_configure() {
+   eqmake5 PREFIX="${EPREFIX}"/usr
+}
+
+src_test() {
+   virtx default
+}
+
+src_install() {
+   emake INSTALL_ROOT="${D}" install
+   einstalldocs
+
+   insinto /usr/share/qtpass/translations
+   doins src/.qm/*.qm
+
+   doman qtpass.1
+   domenu qtpass.desktop
+   newicon artwork/icon.png qtpass-icon.png
+   insinto /usr/share/metainfo
+   doins qtpass.appdata.xml
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/elasticsearch/

2023-12-17 Thread Hans de Graaff
commit: ef7ab5490692cfc0669c4cb7ef7192e2ef8cc7a2
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 09:05:02 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 09:34:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef7ab549

dev-ruby/elasticsearch: add 7.17.10

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/elasticsearch/Manifest|  1 +
 .../elasticsearch/elasticsearch-7.17.10.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 87a79f0df482..b97469efd85d 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,4 +1,5 @@
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 
6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706
 SHA512 
3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
+DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 
72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0
 SHA512 
5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
 DIST elasticsearch-ruby-7.17.7.tar.gz 1017241 BLAKE2B 
5da6a9dc39afb42c5f5b27aebc403743950d7f587229f5aae8e838e68eab760068686d96fcdc5287596130748e2d2017d56afbd72decf50cdf57eeaac4bd8436
 SHA512 
d19722ffd5786570f6d36e915b25916dc6879029a6b93bda2ec001209f3a2b0db1bc465ec0eedb9795addd33e2c265a39730fcac5e6ed35a6df14e08b764e83e
 DIST elasticsearch-ruby-7.17.8.tar.gz 1017287 BLAKE2B 
d204c1992d5006b386dc0996bed852132ded6b9732a38699e804e1a5ee62387ef5374836cdb4e84c6232066139422b5d1e831143dbd682e86ec30df9077b1279
 SHA512 
71288f31e18ff13709962848091e8e0afb128d805be9c3060421bb46fa7bf120700330beb12241b4f7385e88d9f959921fce3721a1050f89c2464ab8dd355706
 DIST elasticsearch-ruby-7.17.9.tar.gz 1030121 BLAKE2B 
5acfc3f2ce9d39e9f02deed043aec90800968fef453d47802b6628598fc3c39875238d29e1c8927b88fb1e7a65960024e43874482da8a0920cca17a4beb2c0b4
 SHA512 
974dde6478345a22f27b4264219759a16878e29eb0aabaf6d57aa0d94d22712e35e55657ff5625a36e8643dcb12bac8aa4e6bb269ac011ca8fddcaae0083bcf0

diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild 
b/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild
new file mode 100644
index ..4bd16db0ddb3
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby;
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz 
-> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+   ~dev-ruby/elasticsearch-api-${PV}
+   ~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+   doc? ( dev-ruby/yard )
+   test? (
+   dev-ruby/ansi
+   dev-ruby/elasticsearch-transport
+   dev-ruby/mocha:1.0
+   dev-ruby/pry
+   dev-ruby/shoulda-context
+   dev-ruby/webmock
+   )
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+   # fix to work without git
+   sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+   # remove useless dependencies from Rakefile
+   sed -e '/bundler/d' \
+   -e '/require.*cane/,/end/d' \
+   -i Rakefile || die
+
+   sed -e '/documentation/ s:^:#:' \
+   -i spec/spec_helper.rb || die
+
+   # Avoid spec requiring a running elasticsearch server
+   rm -f 
spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb
 || die
+
+   # Use the Faraday default adapter instead of a random auto-detected and 
unpackaged one.
+   sed -e '/Elasticsearch::Client.new/ s/$/ adapter: :net_http/' \
+   -i spec/unit/wrapper_gem_spec.rb || die
+   sed -e 's/Elasticsearch::Client.new /Elasticsearch::Client.new adapter: 
:net_http/' \
+   -e '/Elasticsearch::Client.new(/ s/(/(adapter: :net_http, /' \
+   -i spec/unit/elasticsearch_product_validation_spec.rb || die
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/

2023-12-17 Thread Hans de Graaff
commit: 5ed8b3cdc019cec9acb26b6c02517f81ea8d096f
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 09:36:00 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 09:36:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed8b3cd

profiles/package.mask: mask erroneous dev-ruby/elasticsearch slots

Signed-off-by: Hans de Graaff  gentoo.org>

 profiles/package.mask | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 9b05a17d7d13..598df7cb7277 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff  (2023-12-17)
+# Subslots added by accident. Please use the normal "7" or "8" slots
+# instead. Masked for removal on 2024-01-17.
+dev-ruby/elasticsearch:7.17.7
+dev-ruby/elasticsearch:8.8.0
+
 # Michał Górny  (2023-12-17)
 # Broken due to invalid use of tzdata.
 # https://github.com/sdispater/pendulum/issues/769



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/cgi/

2023-12-17 Thread Hans de Graaff
commit: 8a1d19d86d5c0a79de85be0b565e3fbe399d8512
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 08:11:33 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 09:34:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1d19d8

dev-ruby/cgi: add 0.4.1

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/cgi/Manifest |  1 +
 dev-ruby/cgi/cgi-0.4.1.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/dev-ruby/cgi/Manifest b/dev-ruby/cgi/Manifest
index c7efd0f42002..c1461a60482e 100644
--- a/dev-ruby/cgi/Manifest
+++ b/dev-ruby/cgi/Manifest
@@ -1,2 +1,3 @@
 DIST cgi-0.3.6.tar.gz 221001 BLAKE2B 
71f5091c132ec154520f6538a2ba06c164e1ed30f4cc8018052ab49605c674430108d7a87f7bf4b9dc0e1602fd3edd273af0d918de7725ca0127f67516deb1f3
 SHA512 
13f620b38eb4448da4184c80ff33e64bcaacf6ebff8eed219267ec33c1ed75f119a90f37503b21a835612b417100877cacf0a683f4854f97941c9e22618bf658
 DIST cgi-0.4.0.tar.gz 209136 BLAKE2B 
f16b5c30381fa94ccf30f45ddeefded5fb577748d3c8cc7e00e00c2d1b0993bf8687cd461c6aaba6a54b45490b675a4133510c8520a19479e4e17128ad2e7aa1
 SHA512 
412c3c1549e8b2387bec33da056c72cf1ad94267bac2f575abfc022078300304fa7d704a07da67ed699917aa49a41fd2424dc3fa2adf9f1ba1641cfee5c525d3
+DIST cgi-0.4.1.tar.gz 209438 BLAKE2B 
9cce9b7028ae21337686f37b10ccc0912041642407cce437d07f67a01d2cdb52319dd16686b6b33ba1757240b3876a5971892b69a04bcfa1077a1b51fec7a734
 SHA512 
a1224135196b02aaf418adaa21a8afbc319e49650d126baff3a965a4504e2d5eb6fa9d1cd965a0cf41b8158398b3015f3605e3390d689846a2b72f3773d8dae9

diff --git a/dev-ruby/cgi/cgi-0.4.1.ebuild b/dev-ruby/cgi/cgi-0.4.1.ebuild
new file mode 100644
index ..11b7a6ded8f8
--- /dev/null
+++ b/dev-ruby/cgi/cgi-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cgi/escape/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/cgi
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="cgi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the Common Gateway Interface protocol"
+HOMEPAGE="https://github.com/ruby/cgi;
+SRC_URI="https://github.com/ruby/cgi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+   sed -e "/spec.version/ s/= version/= '${PV}'/" \
+   -e "/spec.name/ s/= name/= '${PN}'/" \
+   -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+   ${RUBY} -Ilib:test:. -rtest/lib/helper -e 
"Dir['test/**/test_*.rb'].each { require _1 }" || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/elasticsearch-api/

2023-12-17 Thread Hans de Graaff
commit: 25a013701c3e11249cc0491908f43dff1bb6ace6
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 08:38:23 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 09:34:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a01370

dev-ruby/elasticsearch-api: add 7.17.10

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/elasticsearch-api/Manifest|  1 +
 .../elasticsearch-api-7.17.10.ebuild   | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/dev-ruby/elasticsearch-api/Manifest 
b/dev-ruby/elasticsearch-api/Manifest
index 87a79f0df482..b97469efd85d 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,4 +1,5 @@
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 
6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706
 SHA512 
3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
+DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 
72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0
 SHA512 
5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
 DIST elasticsearch-ruby-7.17.7.tar.gz 1017241 BLAKE2B 
5da6a9dc39afb42c5f5b27aebc403743950d7f587229f5aae8e838e68eab760068686d96fcdc5287596130748e2d2017d56afbd72decf50cdf57eeaac4bd8436
 SHA512 
d19722ffd5786570f6d36e915b25916dc6879029a6b93bda2ec001209f3a2b0db1bc465ec0eedb9795addd33e2c265a39730fcac5e6ed35a6df14e08b764e83e
 DIST elasticsearch-ruby-7.17.8.tar.gz 1017287 BLAKE2B 
d204c1992d5006b386dc0996bed852132ded6b9732a38699e804e1a5ee62387ef5374836cdb4e84c6232066139422b5d1e831143dbd682e86ec30df9077b1279
 SHA512 
71288f31e18ff13709962848091e8e0afb128d805be9c3060421bb46fa7bf120700330beb12241b4f7385e88d9f959921fce3721a1050f89c2464ab8dd355706
 DIST elasticsearch-ruby-7.17.9.tar.gz 1030121 BLAKE2B 
5acfc3f2ce9d39e9f02deed043aec90800968fef453d47802b6628598fc3c39875238d29e1c8927b88fb1e7a65960024e43874482da8a0920cca17a4beb2c0b4
 SHA512 
974dde6478345a22f27b4264219759a16878e29eb0aabaf6d57aa0d94d22712e35e55657ff5625a36e8643dcb12bac8aa4e6bb269ac011ca8fddcaae0083bcf0

diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.10.ebuild 
b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.10.ebuild
new file mode 100644
index ..1dd6949f7571
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby;
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz 
-> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+   dev-ruby/multi_json
+"
+ruby_add_bdepend "
+   doc? ( dev-ruby/yard )
+   test? (
+   dev-ruby/ansi
+   dev-ruby/elasticsearch-transport
+   dev-ruby/mocha:1.0
+   dev-ruby/pry
+   dev-ruby/shoulda-context
+   )
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+   # fix to work without git
+   sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+   # remove useless dependencies from Rakefile
+   sed -e '/bundler/d' \
+   -e '/require.*cane/,/end/d' \
+   -i Rakefile || die
+
+   sed -i -e '/config.formatter/ s/documentation/progress/' 
spec/spec_helper.rb || die
+
+   # Avoid tests that require unpackaged jbuilder and jsonify
+   sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+   -e '/RspecJunitFormatter/ s:^:#:' \
+   -i spec/spec_helper.rb || die
+   rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+   sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' 
spec/elasticsearch/api/utils_spec.rb || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/elasticsearch-transport/

2023-12-17 Thread Hans de Graaff
commit: 4ec077312c0481d7b65dc550304c60ffdadd0fd0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 08:34:52 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 09:34:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec07731

dev-ruby/elasticsearch-transport: add 7.17.10

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/elasticsearch-transport/Manifest  |  1 +
 .../elasticsearch-transport-7.17.10.ebuild | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/dev-ruby/elasticsearch-transport/Manifest 
b/dev-ruby/elasticsearch-transport/Manifest
index 2a64b693375f..2e83f579b5da 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,4 +1,5 @@
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 
6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706
 SHA512 
3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
+DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 
72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0
 SHA512 
5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
 DIST elasticsearch-ruby-7.17.7.tar.gz 1017241 BLAKE2B 
5da6a9dc39afb42c5f5b27aebc403743950d7f587229f5aae8e838e68eab760068686d96fcdc5287596130748e2d2017d56afbd72decf50cdf57eeaac4bd8436
 SHA512 
d19722ffd5786570f6d36e915b25916dc6879029a6b93bda2ec001209f3a2b0db1bc465ec0eedb9795addd33e2c265a39730fcac5e6ed35a6df14e08b764e83e
 DIST elasticsearch-ruby-7.17.8.tar.gz 1017287 BLAKE2B 
d204c1992d5006b386dc0996bed852132ded6b9732a38699e804e1a5ee62387ef5374836cdb4e84c6232066139422b5d1e831143dbd682e86ec30df9077b1279
 SHA512 
71288f31e18ff13709962848091e8e0afb128d805be9c3060421bb46fa7bf120700330beb12241b4f7385e88d9f959921fce3721a1050f89c2464ab8dd355706
 DIST elasticsearch-ruby-7.17.9.tar.gz 1030121 BLAKE2B 
5acfc3f2ce9d39e9f02deed043aec90800968fef453d47802b6628598fc3c39875238d29e1c8927b88fb1e7a65960024e43874482da8a0920cca17a4beb2c0b4
 SHA512 
974dde6478345a22f27b4264219759a16878e29eb0aabaf6d57aa0d94d22712e35e55657ff5625a36e8643dcb12bac8aa4e6bb269ac011ca8fddcaae0083bcf0

diff --git 
a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.10.ebuild 
b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.10.ebuild
new file mode 100644
index ..622c721b1490
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby;
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz 
-> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+   || ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+   dev-ruby/multi_json
+"
+ruby_add_bdepend "
+   doc? ( dev-ruby/yard )
+   test? (
+   dev-ruby/ansi
+   dev-ruby/mocha:1.0
+   dev-ruby/pry
+   dev-ruby/rspec:3
+   dev-ruby/shoulda-context
+   dev-ruby/curb
+   dev-ruby/ethon
+   )
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+   # fix to work without git
+   sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+   # remove useless dependencies from Rakefile
+   sed -e '/bundler/d' \
+   -e '/require.*cane/,/end/d' \
+   -i Rakefile || die
+
+   # Tweak test setup to only run unit tests since we don't have a live 
cluster
+   sed -e "s/RUBY_VERSION > '1.9'/false/" \
+   -e '/module Elasticsearch/,$ s:^:#:' \
+   -e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ 
s:^:#: ; /Reporters.use/ s:^:#:' \
+   -i test/test_helper.rb || die
+
+   sed -e '/pry/ s:^:#:' \
+   -e '/config.formatter/ s:^:#:' \
+   -i spec/spec_helper.rb || die
+
+   # Avoid specs that require a running elasticsearch instance or
+   # unpackaged Faraday adapter.
+   sed -e '/#perform_request/ s/describe/xdescribe/' \
+   -e '/when the client connects/ s/context/xcontext/' \
+   -e '/when using the \(HTTPClient\|Patron\) adapter/ 
s/context/xcontext/' \
+   -e '/require.*\(httpclient\|patron\)/ s:^:#:' \
+   -e '/when the adapter is \(patron\|specified as 

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ammeter/

2023-12-17 Thread Hans de Graaff
commit: 689c83d34472469f15e28254d75830188051d5ed
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 08:06:50 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 09:34:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689c83d3

dev-ruby/ammeter: add 1.1.6

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/ammeter/Manifest |  1 +
 dev-ruby/ammeter/ammeter-1.1.6.ebuild | 59 +++
 2 files changed, 60 insertions(+)

diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 06b6897e19ed..1456435eaa55 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1 +1,2 @@
 DIST ammeter-1.1.5.gem 19968 BLAKE2B 
e4a7af65c8ee798b24f0c8a312315461779f5e1c31d97da1663d73b1a9cc65b99ed9f693259eed01a4152ab220d34ddb91ee4632657035fc1768897fae60d60e
 SHA512 
35758fccaa51c9873747f24710168bdc0a0b25bd825d15e434cd17341d07f73a5078293d5045dcf88061765e92fe08f9b2470b4f206d859e82ec7befe64c1d93
+DIST ammeter-1.1.6.gem 19968 BLAKE2B 
875da6f9be200b6df789f75b98224e30d0223a501fb54b94b9ef1c32a2c3c78cfe54c77e926ba0d17bc64faa42a357861818448889c6c25c698101deba05460d
 SHA512 
13883aae0258c0354d5fec17f86d4851251e2a8138830113c94c20162294852c892f580e14df6407c88b6c64dbe87f241e392a1849d126d12d556462edcda147

diff --git a/dev-ruby/ammeter/ammeter-1.1.6.ebuild 
b/dev-ruby/ammeter/ammeter-1.1.6.ebuild
new file mode 100644
index ..30ef5951988d
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter;
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+   >=dev-ruby/activesupport-3.0:*
+   >=dev-ruby/railties-3.0:*
+   >=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+   test? (
+   >=dev-ruby/rails-4.0
+   >=dev-ruby/uglifier-1.3
+   >=dev-ruby/rake-0.10
+   >=dev-ruby/jquery-rails-3.0
+   dev-util/cucumber
+   dev-util/aruba
+   dev-ruby/sqlite3
+   dev-ruby/bundler
+   )"
+
+all_ruby_prepare() {
+   # fix the gemspec; we remove the version dependencies from there, as
+   # it requires _older_ versions of its dependencies.. it doesn't
+   # really seem to be the case though. Also remove the references to
+   # git ls-files to avoid calling it.
+   sed -i \
+   -e '/git ls-files/d' \
+   -e '/\(cucumber\|aruba\)/s:,.*$::' \
+   ${RUBY_FAKEGEM_GEMSPEC} || die
+
+   # haml-rails is not packaged, coffee-rails and sass-rails are no longer 
maintained
+   sed -i -e '/\(coffee\|haml\|sass\)-rails/ s:^:#:' 
${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+   rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb 
|| die
+}
+
+each_ruby_test() {
+   RSPEC_VERSION=">=4" ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || 
die
+}



[gentoo-commits] proj/kde:master commit in: media-sound/amarok/

2023-12-17 Thread Andreas Sturmlechner
commit: fae611a926c2beaceecfbcdb6422169202d378d8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 10:35:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 10:35:59 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fae611a9

media-sound/amarok: Cleanup metadata.xml

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/amarok/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 9c9ff3c77e..f557bc0cb5 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -16,8 +16,6 @@
Enable Last.fm streaming services support 
through media-libs/liblastfm
Prefer 
dev-db/mariadb-connector-c over 
dev-db/mysql-connector-c
Enable support for libMTP (Plays4Sure) devices 
access through libmtp
-   Use media-libs/libofa to compute 
MusicDNS acoustic
-   fingerprints (used by MusicBrainz)
Enable gpodder.net podcast support via 
media-libs/libmygpo-qt
Enable wikipedia widget using 
dev-qt/qtwebengine




[gentoo-commits] repo/gentoo:master commit in: dev-python/colorful/

2023-12-17 Thread Michał Górny
commit: 989f426590a795e20ebe7795ebefcc37544dbc48
Author: Giuseppe Foti  gmail  com>
AuthorDate: Fri Dec 15 22:30:58 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 10:36:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989f4265

dev-python/colorful: new package, add 0.5.5

Signed-off-by: Giuseppe Foti  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34300
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/colorful/Manifest  |  1 +
 dev-python/colorful/colorful-0.5.5.ebuild | 41 +++
 dev-python/colorful/metadata.xml  | 25 +++
 3 files changed, 67 insertions(+)

diff --git a/dev-python/colorful/Manifest b/dev-python/colorful/Manifest
new file mode 100644
index ..6acf1fa6b07b
--- /dev/null
+++ b/dev-python/colorful/Manifest
@@ -0,0 +1 @@
+DIST colorful-0.5.5.gh.tar.gz 366498 BLAKE2B 
a7ab5dfb7ddfbf6682b75d2ed35f3f4cb7c3826918742316d877a17cb58e639b5fa86d7906be4879e89a5a0e78a16ede7535ade3f9f890c67bfcf42a0d1c9d9c
 SHA512 
dc5e372261bd308a82bd0446a885b4c63a5a5781540731407f1a364d2c5397fe950f96fef3be8ffeab80cf02010be9551ba5b8550930e3fed5173cdc28a69306

diff --git a/dev-python/colorful/colorful-0.5.5.ebuild 
b/dev-python/colorful/colorful-0.5.5.ebuild
new file mode 100644
index ..35e9e56ee19c
--- /dev/null
+++ b/dev-python/colorful/colorful-0.5.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminal string styling done right, in Python"
+HOMEPAGE="
+   https://pypi.org/project/colorful/
+   https://github.com/timofurrer/colorful/
+"
+SRC_URI="
+   https://github.com/timofurrer/colorful/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   # Fix QA_issue python package discovery
+   # https://github.com/timofurrer/colorful/pull/53
+   sed -i \
+   -e "s/find_packages/find_namespace_packages/" \
+   -e "s/(exclude=\['\*tests\*'\])/(exclude=\['\*tests\*'\, 
'\*examples\*'\])/" \
+   setup.py || die "Error fixing setup.py for >=PEP420"
+
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   epytest -s
+}

diff --git a/dev-python/colorful/metadata.xml b/dev-python/colorful/metadata.xml
new file mode 100644
index ..be5dd72ee646
--- /dev/null
+++ b/dev-python/colorful/metadata.xml
@@ -0,0 +1,25 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   foti.giuse...@gmail.com
+   Giuseppe Foti
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   pyt...@gentoo.org
+   Python
+   
+   
+   Package used for styling terminal strings in Python scripts.
+   This package is used as a dependency in net-analyzer/pontos.
+   
+   
+   
+   timofurrer/colorful
+   colorful
+   
+



[gentoo-commits] repo/gentoo:master commit in: app-editors/vim/

2023-12-17 Thread Hans de Graaff
commit: f8f3a37f7302d062bc60f0121234d87e03c5af8b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 10:39:12 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 10:48:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f3a37f

app-editors/vim: enable ruby32

Signed-off-by: Hans de Graaff  gentoo.org>

 app-editors/vim/vim-9.0.2167.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/vim/vim-9.0.2167.ebuild 
b/app-editors/vim/vim-9.0.2167.ebuild
index fa9f884f8193..854c1a5ce766 100644
--- a/app-editors/vim/vim-9.0.2167.ebuild
+++ b/app-editors/vim/vim-9.0.2167.ebuild
@@ -11,7 +11,7 @@ VIM_PATCHES_VERSION="9.0.2092"
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single toolchain-funcs desktop xdg-utils
 



[gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/

2023-12-17 Thread Hans de Graaff
commit: 9188727a320d6811ea0d0c30be522f81a434622f
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 10:46:50 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 10:48:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9188727a

app-editors/gvim: enable ruby32

Signed-off-by: Hans de Graaff  gentoo.org>

 app-editors/gvim/gvim-9.0.2167.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/gvim/gvim-9.0.2167.ebuild 
b/app-editors/gvim/gvim-9.0.2167.ebuild
index a136616f03f9..8c935fcb5164 100644
--- a/app-editors/gvim/gvim-9.0.2167.ebuild
+++ b/app-editors/gvim/gvim-9.0.2167.ebuild
@@ -11,7 +11,7 @@ VIM_PATCHES_VERSION="9.0.2092"
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 
ruby-single toolchain-funcs vim-doc xdg-utils
 
@@ -118,9 +118,9 @@ src_prepare() {
 
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-   >> "${S}"/src/feature.h || die "echo failed"
+   >> "${S}"/src/feature.h || die "echo failed"
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-   >> "${S}"/src/feature.h || die "echo failed"
+   >> "${S}"/src/feature.h || die "echo failed"
 
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
@@ -138,7 +138,7 @@ src_prepare() {
# which isn't even in the source file being invalid, we'll do some 
trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c; do
-   echo >> "$c" || die "echo failed"
+   echo >> "$c" || die "echo failed"
done
 
# Try to avoid sandbox problems. Bug #114475.



[gentoo-commits] repo/gentoo:master commit in: dev-db/qdbm/

2023-12-17 Thread Hans de Graaff
commit: b4ee3f8a3d2908494891b83958eec5af50c9a70b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 10:33:22 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 10:48:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ee3f8a

dev-db/qdbm: enable ruby32

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/qdbm/qdbm-1.8.78-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/qdbm/qdbm-1.8.78-r4.ebuild 
b/dev-db/qdbm/qdbm-1.8.78-r4.ebuild
index 43796938adc8..f1ea111f2075 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r4.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 RUBY_OPTIONAL="yes"
 
 inherit autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng



[gentoo-commits] repo/user/dlang:master commit in: eclass/

2023-12-17 Thread Marco Leise
commit: 8c977f9dc9d15ebcf73032411eed7acf033782fb
Author: Horodniceanu Andrei  proton  me>
AuthorDate: Thu Nov 30 19:32:20 2023 +
Commit: Marco Leise  gmx  de>
CommitDate: Sun Dec 10 21:53:54 2023 +
URL:https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=8c977f9d

dlang.eclass: Support DLANG_COMPILER_DISABLED_BACKENDS

Add support for filtering out possible compilers by their backend,
on top of the frontend version filtering already implemented.
This allows packages that do not support a particular compiler backend
not to advertise USE flags that will fail to build.

Signed-off-by: Horodniceanu Andrei  proton.me>

 eclass/dlang.eclass | 91 +++--
 1 file changed, 60 insertions(+), 31 deletions(-)

diff --git a/eclass/dlang.eclass b/eclass/dlang.eclass
index ab41b18..5c7d3f9 100644
--- a/eclass/dlang.eclass
+++ b/eclass/dlang.eclass
@@ -30,6 +30,14 @@
 # @DESCRIPTION:
 # The path that is used to install include files. A sub-directory specific to 
the package should be used.
 
+# @ECLASS_VARIABLE: DLANG_COMPILER_DISABLED_BACKENDS
+# @PRE_INHERIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Optional list of D compiler backends to disable as a Bash array.
+# Possible values include dmd, ldc2, and gdc.
+# Set before inheritting the eclass.
+
 if [[ ${_ECLASS_ONCE_DLANG} != "recur -_+^+_- spank" ]] ; then
 _ECLASS_ONCE_DLANG="recur -_+^+_- spank"
 
@@ -402,39 +410,45 @@ _dlang_compiler_masked_archs_for_version_range() {
 _dlang_filter_compilers() {
local dc_version mapping iuse depend
 
-   # filter for DMD (hardcoding support for x86 and amd64 only)
-   for dc_version in "${!_dlang_dmd_frontend[@]}"; do
-   mapping="${_dlang_dmd_frontend[${dc_version}]}"
-   iuse="dmd-$(ver_rs 1- _ $dc_version)"
-   if [ "${DLANG_PACKAGE_TYPE}" == "multi" ]; then
-   depend="[${MULTILIB_USEDEP}]"
-   else
-   depend=""
-   fi
-   depend="dev-lang/dmd:$dc_version=$depend"
-   _dlang_compiler_masked_archs_for_version_range "$iuse" 
"$depend" "$mapping" "$1" "$2"
-   done
+   if _dlang_compiler_backend_is_enabled "dmd"; then
+   # filter for DMD (hardcoding support for x86 and amd64 only)
+   for dc_version in "${!_dlang_dmd_frontend[@]}"; do
+   mapping="${_dlang_dmd_frontend[${dc_version}]}"
+   iuse="dmd-$(ver_rs 1- _ $dc_version)"
+   if [ "${DLANG_PACKAGE_TYPE}" == "multi" ]; then
+   depend="[${MULTILIB_USEDEP}]"
+   else
+   depend=""
+   fi
+   depend="dev-lang/dmd:$dc_version=$depend"
+   _dlang_compiler_masked_archs_for_version_range "$iuse" 
"$depend" "$mapping" "$1" "$2"
+   done
+   fi
 
-   # GDC (doesn't support sub-slots, to stay compatible with upstream GCC)
-   for dc_version in "${!_dlang_gdc_frontend[@]}"; do
-   mapping="${_dlang_gdc_frontend[${dc_version}]}"
-   iuse="gdc-${dc_version}"
-   depend="sys-devel/gcc:$dc_version[d,-d-bootstrap(-)]"
-   _dlang_compiler_masked_archs_for_version_range "$iuse" 
"$depend" "$mapping" "$1" "$2"
-   done
+   if _dlang_compiler_backend_is_enabled "gdc"; then
+   # GDC (doesn't support sub-slots, to stay compatible with 
upstream GCC)
+   for dc_version in "${!_dlang_gdc_frontend[@]}"; do
+   mapping="${_dlang_gdc_frontend[${dc_version}]}"
+   iuse="gdc-${dc_version}"
+   depend="sys-devel/gcc:$dc_version[d,-d-bootstrap(-)]"
+   _dlang_compiler_masked_archs_for_version_range "$iuse" 
"$depend" "$mapping" "$1" "$2"
+   done
+   fi
 
-   # filter for LDC2
-   for dc_version in "${!_dlang_ldc2_frontend[@]}"; do
-   mapping="${_dlang_ldc2_frontend[${dc_version}]}"
-   iuse=ldc2-$(ver_rs 1- _ $dc_version)
-   if [ "${DLANG_PACKAGE_TYPE}" == "multi" ]; then
-   depend="[${MULTILIB_USEDEP}]"
-   else
-   depend=""
-   fi
-   depend="dev-lang/ldc2:$dc_version=$depend"
-   _dlang_compiler_masked_archs_for_version_range "$iuse" 
"$depend" "$mapping" "$1" "$2"
-   done
+   if _dlang_compiler_backend_is_enabled "ldc2"; then
+   # filter for LDC2
+   for dc_version in "${!_dlang_ldc2_frontend[@]}"; do
+   mapping="${_dlang_ldc2_frontend[${dc_version}]}"
+   iuse=ldc2-$(ver_rs 1- _ $dc_version)
+   if [ "${DLANG_PACKAGE_TYPE}" == "multi" ]; then
+   depend="[${MULTILIB_USEDEP}]"
+   else
+

[gentoo-commits] repo/user/dlang:master commit in: eclass/

2023-12-17 Thread Marco Leise
commit: 1bb2eb6ab240eec201a15cb78ed0fed2d7c6f9c3
Author: Horodniceanu Andrei  proton  me>
AuthorDate: Thu Nov 30 19:13:46 2023 +
Commit: Marco Leise  gmx  de>
CommitDate: Sun Dec 10 21:53:34 2023 +
URL:https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=1bb2eb6a

dlang.eclass: export PKG_CONFIG_* in phase functions

PKG_CONFIG_LIBDIR and PKG_CONFIG_PATH will now be set to a list of the
the system pkg-config directories and the compiler specific one, allowing
packages that use build systems to easily find both their C and D
dependencies.

Signed-off-by: Horodniceanu Andrei  proton.me>

 eclass/dlang.eclass | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/eclass/dlang.eclass b/eclass/dlang.eclass
index 2817779..ab41b18 100644
--- a/eclass/dlang.eclass
+++ b/eclass/dlang.eclass
@@ -610,6 +610,17 @@ _dlang_use_build_vars() {
# The original value is exported as LIBDIR_HOST.
local libdir_var="LIBDIR_${ABI}"
export LIBDIR_HOST="${!libdir_var}"
+   # Save the default pkgconfig path
+   if [[ ! -v DLANG_SAVE_PKG_CONFIG_PATH ]]; then
+   # Copy the logic from meson.eclass for setting PKG_CONFIG_PATH
+   export 
DLANG_SAVE_PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}/usr/share/pkgconfig"
+   fi
+   if [[ ! -v DLANG_SAVE_PKG_CONFIG_LIBDIR ]]; then
+   # either save the value or provide a sane default lest other 
eclasses get confused.
+   # e.g. meson.eclass will set PKG_CONFIG_LIBDIR using 
$(get_libdir) which won't
+   # work properly since we will overwrite $LIBDIR_$ABI
+   export 
DLANG_SAVE_PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-/usr/$(get_libdir)/pkgconfig}"
+   fi
export ABI="$(echo ${MULTIBUILD_VARIANT} | cut -d- -f1)"
export DC="$(echo ${MULTIBUILD_VARIANT} | cut -d- -f2)"
export DC_VERSION="$(echo ${MULTIBUILD_VARIANT} | cut -d- -f3)"
@@ -699,6 +710,13 @@ _dlang_use_build_vars() {
filter-ldflags -f{no-,}use-linker-plugin -f{no-,}lto -flto=*
fi
export LDFLAGS=`dlang_convert_ldflags`
+
+   # Add the compiler specific pkgconfig paths.
+   export 
PKG_CONFIG_PATH="${DLANG_SAVE_PKG_CONFIG_PATH}:/usr/$(get_libdir)/pkgconfig"
+   # Technically, this value will stay the same so it's enough to export 
it once
+   # but it's cleaner to keep these 2 variables close together.
+   export PKG_CONFIG_LIBDIR="${DLANG_SAVE_PKG_CONFIG_LIBDIR}"
+
"${@}"
 }
 



[gentoo-commits] repo/user/dlang:master commit in: eclass/

2023-12-17 Thread Marco Leise
commit: c6ab2690ead707fa368813014edd75509b07727b
Author: Horodniceanu Andrei  proton  me>
AuthorDate: Thu Nov 30 13:34:14 2023 +
Commit: Marco Leise  gmx  de>
CommitDate: Sat Dec  9 18:13:15 2023 +
URL:https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=c6ab2690

dlang.eclass: Properly set LIBDIR_$ABI for single type packages

Previously, only packages that set DLANG_PACKAGE_TYPE to multi
received a valid value in LIBDIR_$ABI, the path to the compiler
specific directory for libraries, in order to know where to
install their libraries.

Now, both types of packages will have this value set properly,
alowing single type packages to know the exact path to the
compiler library directory for easy access to auxiliary files
like pkg-config files.

Signed-off-by: Horodniceanu Andrei  proton.me>

 eclass/dlang.eclass | 11 ---
 eclass/dmd.eclass   | 18 ++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/eclass/dlang.eclass b/eclass/dlang.eclass
index 385a458..2817779 100644
--- a/eclass/dlang.eclass
+++ b/eclass/dlang.eclass
@@ -584,7 +584,7 @@ _dlang_build_configurations() {
variants="${variants} 
${abi}-${version_component}"
done
else
-   variants="default-${version_component}"
+   
variants="${DEFAULT_ABI:-default}-${version_component}"
fi
;;
selfhost)
@@ -647,10 +647,15 @@ _dlang_use_build_vars() {
# gcc's SLOT is its major version component.
export 
DC="/usr/${CHOST_default}/gcc-bin/${DC_VERSION}/${CHOST_default}-gdc"
export DMD="/usr/${CHOST_default}/gcc-bin/${DC_VERSION}/gdmd"
-   if [[ "${DLANG_PACKAGE_TYPE}" == "multi" ]] && 
multilib_is_native_abi; then
+   if [[ ${DLANG_PACKAGE_TYPE} != multi ]]; then
+   # Both single and dmd enter this branch
export 
LIBDIR_${ABI}="lib/gcc/${CHOST_default}/${DC_VERSION}"
else
-   export 
LIBDIR_${ABI}="lib/gcc/${CHOST_default}/${DC_VERSION}/${MODEL}"
+   if multilib_is_native_abi; then
+   export 
LIBDIR_${ABI}="lib/gcc/${CHOST_default}/${DC_VERSION}"
+   else
+   export 
LIBDIR_${ABI}="lib/gcc/${CHOST_default}/${DC_VERSION}/${MODEL}"
+   fi
fi
export DCFLAGS="${GDCFLAGS} -shared-libphobos"
export DLANG_LINKER_FLAG="-Xlinker "

diff --git a/eclass/dmd.eclass b/eclass/dmd.eclass
index 7d9e1f5..2292e12 100644
--- a/eclass/dmd.eclass
+++ b/eclass/dmd.eclass
@@ -295,8 +295,26 @@ EOF
fi
 
# Install shared lib.
+   # dlang.eclass will set LIBDIR_$ABI to the path of the host 
compiler
+   # library direcory (if not selfhosting). We don't care about 
that
+   # location, however, and we instead want to have it point
+   # to the path where this package is supposed to install the 
libraries
+   # to, i.e. the system library directory. We can use $LIBDIR_HOST
+   # to restore that value to the correct one but only if the ABI
+   # this function is running into is the same as the one set
+   # by dlang.eclass. Since dlang.eclass treats dmd as a 'single'
+   # type package, it will only treat the case where $ABI is the
+   # native one.
+   if ! use selfhost && multilib_is_native_abi; then
+   # We aren't going to use LIBDIR_$ABI for this ABI 
anymore
+   # so just overwrite it, don't bother saving it.
+   export LIBDIR_${ABI}="${LIBDIR_HOST}"
+   fi
+
+   # We are installing the real file into the system libdir.
dolib.so phobos/generated/linux/release/${MODEL}/"${SONAME}"
dosym "${SONAME}" /usr/"$(get_libdir)"/"${SONAME_SYM}"
+   # We create an additional symlink in this package's specific 
libdir.
dosym ../../../../../usr/"$(get_libdir)"/"${SONAME}" 
/usr/"${libdir}"/libphobos2.so
 
# Install static lib if requested.



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/

2023-12-17 Thread Michał Górny
commit: 19ded7a80353cdc3194c898bfd438af1cfd70774
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 11:35:51 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:03:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ded7a8

profiles/arch/arm64/package.use.mask: Fix typo in "neon" flag

Signed-off-by: Michał Górny  gentoo.org>

 profiles/arch/arm64/package.use.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index 472cfe1f360a..210abdcbf20f 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -19,7 +19,7 @@ media-video/obs-studio -mpegts
 
 # Sam James  (2023-10-11)
 # Supports 64-bit NEON
-dev-libs/botan -cpu_flags_arm_neo
+dev-libs/botan -cpu_flags_arm_neon
 
 # Patrick McLean  (2023-10-03)
 # sys-apps/s6-linux-init has not been tested on this arch



[gentoo-commits] repo/gentoo:master commit in: licenses/

2023-12-17 Thread Michał Górny
commit: 8d4fa8a32e2eca3290eded54bcf6ce3fc5779cde
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 11:55:58 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:03:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4fa8a3

licenses: Remove unused Amazon, LPPL-1.3a licenses

Signed-off-by: Michał Górny  gentoo.org>

 licenses/Amazon|  97 -
 licenses/LPPL-1.3a | 404 -
 2 files changed, 501 deletions(-)

diff --git a/licenses/Amazon b/licenses/Amazon
deleted file mode 100644
index 81bc363ded1f..
--- a/licenses/Amazon
+++ /dev/null
@@ -1,97 +0,0 @@
-Amazon Software License
-
-This Amazon Software License ("License") governs your use, reproduction, and
-distribution of the accompanying software as specified below.
-
-1. Definitions
-
-"Licensor" means any person or entity that distributes its Work.
-
-"Software" means the original work of authorship made available under this
-License.
-
-"Work" means the Software and any additions to or derivative works of the
-Software that are made available under this License.
-
-The terms "reproduce," "reproduction," "derivative works," and "distribution"
-have the meaning as provided under U.S. copyright law; provided, however, that
-for the purposes of this License, derivative works shall not include works that
-remain separable from, or merely link (or bind by name) to the interfaces of,
-the Work.
-
-Works, including the Software, are "made available" under this License by
-including in or with the Work either (a) a copyright notice referencing the
-applicability of this License to the Work, or (b) a copy of this License.
-
-2. License Grants
-
-2.1 Copyright Grant. Subject to the terms and conditions of this License, each
-Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free,
-copyright license to reproduce, prepare derivative works of, publicly display,
-publicly perform, sublicense and distribute its Work and any resulting
-derivative works in any form.
-
-2.2 Patent Grant. Subject to the terms and conditions of this License, each
-Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free
-patent license to make, have made, use, sell, offer for sale, import, and
-otherwise transfer its Work, in whole or in part. The foregoing license applies
-only to the patent claims licensable by Licensor that would be infringed by
-Licensor's Work (or portion thereof) individually and excluding any
-combinations with any other materials or technology.
-
-3. Limitations
-
-3.1 Redistribution. You may reproduce or distribute the Work only if (a) you do
-so under this License, (b) you include a complete copy of this License with
-your distribution, and (c) you retain without modification any copyright,
-patent, trademark, or attribution notices that are present in the Work.
-
-3.2 Derivative Works. You may specify that additional or different terms apply
-to the use, reproduction, and distribution of your derivative works of the Work
-("Your Terms") only if (a) Your Terms provide that the use limitation in
-Section 3.3 applies to your derivative works, and (b) you identify the specific
-derivative works that are subject to Your Terms. Notwithstanding Your Terms,
-this License (including the redistribution requirements in Section 3.1) will
-continue to apply to the Work itself.
-
-3.3 Use Limitation. The Work and any derivative works thereof only may be used
-or intended for use with the web services, computing platforms or applications
-provided by Amazon.com, Inc. or its affiliates, including Amazon Web Services
-LLC.
-
-3.4 Patent Claims. If you bring or threaten to bring a patent claim against any
-Licensor (including any claim, cross-claim or counterclaim in a lawsuit) to
-enforce any patents that you allege are infringed by any Work, then your rights
-under this License from such Licensor (including the grants in Sections 2.1 and
-2.2) will terminate immediately.
-
-3.5 Trademarks. This License does not grant any rights to use any Licensor's or
-its affiliates' names, logos, or trademarks, except as necessary to reproduce
-the notices described in this License.
-
-3.6 Termination. If you violate any term of this License, then your rights
-under this License (including the grants in Sections 2.1 and 2.2) will
-terminate immediately.
-
-4. Disclaimer of Warranty. THE WORK IS PROVIDED "AS IS" WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WARRANTIES OR
-CONDITIONS OF M ERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR
-NON-INFRINGEMENT. YOU BEAR THE RISK OF UNDERTAKING ANY ACTIVITIES UNDER THIS
-LICENSE. SOME STATES' CONSUMER LAWS DO NOT ALLOW EXCLUSION OF AN IMPLIED
-WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-5. Limitation of Liability. EXCEPT AS PROHIBITED BY APPLICABLE LAW, IN NO EVENT
-AND UNDER NO LEGAL THEORY, WHETHER IN TORT 

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/

2023-12-17 Thread Michał Górny
commit: c23d15ecafdc6423b7c814f66929506d5d1f6693
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 12:03:02 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:03:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23d15ec

profiles: Remove references to ROS_MESSAGES

Signed-off-by: Michał Górny  gentoo.org>

 profiles/base/make.defaults | 2 +-
 profiles/embedded/make.defaults | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 59a5f1732997..f968c2cccdff 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -12,7 +12,7 @@ USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-...@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS 
APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS 
CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS 
GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS 
LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP 
NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS 
OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS 
PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS 
ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS 
VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS 
APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS 
CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS 
GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS 
LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP 
NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS 
OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS 
PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS 
RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE 
XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 556ea9894288..9b5c9c8f6e08 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -29,7 +29,7 @@ USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-...@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES 
APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM 
CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS 
GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS 
LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP 
NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS 
OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS 
PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS 
ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS 
VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES 
APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM 
CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS 
GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS 
LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP 
NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS 
OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS 
PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS 
RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE 
XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.



[gentoo-commits] repo/gentoo:master commit in: profiles/desc/

2023-12-17 Thread Michał Górny
commit: 255d8b2d9fa1635fb81d9eefef54e094eb144eb6
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 11:55:18 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:03:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255d8b2d

profiles: Remove entries matching UnusedGlobalUseExpand

Signed-off-by: Michał Górny  gentoo.org>

 profiles/desc/collectd_plugins.desc |  3 +--
 profiles/desc/curl_ssl.desc |  1 -
 profiles/desc/ros_messages.desc | 11 ---
 profiles/desc/ruby_targets.desc |  3 +--
 profiles/desc/video_cards.desc  |  3 +--
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/profiles/desc/collectd_plugins.desc 
b/profiles/desc/collectd_plugins.desc
index de7b06543e3d..963c7cd4d5c0 100644
--- a/profiles/desc/collectd_plugins.desc
+++ b/profiles/desc/collectd_plugins.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of COLLECTD_PLUGINS USE_EXPAND flags.
@@ -39,7 +39,6 @@ exec - Build the exec input/output plugin (executes scripts / 
applications and r
 fhcount - Build the file handles input plugin (reports the number of used file 
handles)
 filecount - Build the filecount input plugin (counts the number of files in a 
directory and all its subdirectories)
 fscache - Build the fscache input plugin (collects information about the 
file-system based caching infrastructure for network file-systems and other 
slow media)
-gmond - Build the gmond input plugin (receives data from gmond, the client 
daemon of the Ganglia project)
 gps - Build the gps input plugin (collects number of satellites seen by a GPS 
receiver using sci-geosciences/gpsd)
 gpu_nvidia - Build the NVIDIA GPU input plugin (collects stats from NVIDIA GPU)
 hddtemp - Build the hddtemp input plugin (collects the temperature of disks 
from hddtemp daemon)

diff --git a/profiles/desc/curl_ssl.desc b/profiles/desc/curl_ssl.desc
index 2e78c7ea73da..9023283859e1 100644
--- a/profiles/desc/curl_ssl.desc
+++ b/profiles/desc/curl_ssl.desc
@@ -6,6 +6,5 @@
 
 gnutls - Use GnuTLS
 mbedtls - Use mbed TLS
-nss - Use Mozilla's Network Security Services 
 openssl - Use OpenSSL
 rustls - Use Rustls

diff --git a/profiles/desc/ros_messages.desc b/profiles/desc/ros_messages.desc
deleted file mode 100644
index ec400e7933d5..
--- a/profiles/desc/ros_messages.desc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ROS_MESSAGES USE-EXPANDED variables.
-# Keep it sorted.
-
-cxx - Generate and install C++ messages.
-eus - Generate and install EusLisp messages.
-lisp - Generate and install Common-Lisp messages.
-nodejs - Generate and install Nodejs messages.
-python - Generate and install Python messages. The PYTHON_TARGETS variable 
controls the Python versions to build for.

diff --git a/profiles/desc/ruby_targets.desc b/profiles/desc/ruby_targets.desc
index d1681bebfaf5..61b5e13cbf97 100644
--- a/profiles/desc/ruby_targets.desc
+++ b/profiles/desc/ruby_targets.desc
@@ -1,9 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of RUBY_TARGETS USE_EXPAND flags.
 
-ruby25 - Build with MRI Ruby 2.5.x
 ruby26 - Build with MRI Ruby 2.6.x
 ruby27 - Build with MRI Ruby 2.7.x
 ruby30 - Build with MRI Ruby 3.0.x

diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index 6beea7b60b6d..f749910a11bf 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors.
+# Copyright 1999-2023 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of VIDEO_CARDS USE_EXPAND flags.
@@ -13,7 +13,6 @@ exynos - VIDEO_CARDS setting to build driver for Samsung 
Exynos video cards
 freedreno - VIDEO_CARDS setting to build reverse-engineered driver for 
Qualcomm Adreno cards
 fbdev - VIDEO_CARDS setting to build driver for fbdev video cards
 geode - VIDEO_CARDS setting to build driver for AMD Geode GX and LX video cards
-glint - VIDEO_CARDS setting to build driver for glint video cards
 i915 - VIDEO_CARDS setting to build driver for Intel i915 video cards
 i965 - VIDEO_CARDS setting to build driver for Intel i965 video cards
 intel - VIDEO_CARDS setting to build driver for Intel video cards



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/, profiles/arch/powerpc/ppc64/64ul/, profiles/arch/sparc/, ...

2023-12-17 Thread Michał Górny
commit: fee1802b755d23cc0955800e0e70c779fa4acdc5
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 11:49:58 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:03:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee1802b

profiles: Remove entries matching UnknownProfileUse*

Signed-off-by: Michał Górny  gentoo.org>

 profiles/arch/alpha/use.mask  |  7 ---
 profiles/arch/amd64/use.mask  |  2 --
 profiles/arch/arm/use.mask|  2 --
 profiles/arch/arm/use.stable.mask |  1 -
 profiles/arch/arm64/use.mask  |  3 ---
 profiles/arch/base/use.mask   |  3 ---
 profiles/arch/hppa/use.mask   | 10 --
 profiles/arch/ia64/use.mask   |  7 ---
 profiles/arch/loong/make.defaults |  4 +---
 profiles/arch/mips/make.defaults  |  2 +-
 profiles/arch/powerpc/ppc64/64ul/use.mask |  3 +--
 profiles/arch/powerpc/use.mask|  1 -
 profiles/arch/powerpc/use.stable.mask |  3 +--
 profiles/arch/s390/use.mask   |  2 --
 profiles/arch/sparc/use.mask  |  3 ---
 profiles/arch/sparc/use.stable.mask   |  1 -
 profiles/arch/x86/use.mask|  2 --
 profiles/base/make.defaults   | 12 
 profiles/base/use.mask|  3 ---
 profiles/base/use.stable.mask |  4 
 profiles/default/linux/make.defaults  |  5 ++---
 profiles/embedded/make.defaults   |  2 +-
 22 files changed, 11 insertions(+), 71 deletions(-)

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index ba7b58e20004..ff31c398dfed 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -49,10 +49,6 @@ vulkan
 # media-libs/allegro is not keyworded.
 allegro
 
-# Matt Turner  (2020-03-16)
-# Drop support for ghc and darcs
-darcs
-
 # Matt Turner  (2020-02-02)
 # Neither dev-python/pymongo nor dev-libs/mongo-c-driver are keyworded
 mongodb
@@ -69,7 +65,6 @@ acpi
 # There is no luajit support on alpha. Bugs #554376, #608322.
 lua_single_target_luajit
 lua_targets_luajit
-luajit
 luajittex
 
 # Tobias Klausmann  (2016-06-07)
@@ -135,9 +130,7 @@ openexr
 afs
 ots
 frei0r
-prelude
 libtar
-aacplus
 devil
 gts
 

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 048f26b5883f..aa16fc2685c9 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -122,12 +122,10 @@
 -input_devices_vmmouse
 -input_devices_wacom
 -video_cards_ast
--video_cards_crocus
 -video_cards_d3d12
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel
--video_cards_iris
 -video_cards_nvidia
 -video_cards_siliconmotion
 -video_cards_vesa

diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 0227ba0da37c..7d034beffb71 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -62,7 +62,6 @@ dmi
 tracker
 lasi
 pdfannotextractor
-prelude
 mssql
 gajim
 
@@ -77,7 +76,6 @@ sid
 mms
 mtp
 ieee1394
-darcs
 ggi
 fits
 vaapi

diff --git a/profiles/arch/arm/use.stable.mask 
b/profiles/arch/arm/use.stable.mask
index 106b7593e9af..0022a3aafc7e 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -33,6 +33,5 @@ gcl
 
 # Pacho Ramos  (2014-04-13)
 # Not going to be stabilized on this arch
-devhelp
 eds
 gdm

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 9393056d5433..bedd7a915457 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -99,17 +99,14 @@ mpi
 lasi
 hardened
 pdfannotextractor
-prelude
 mssql
 
 # havent tested yet
-darcs
 afs
 zvbi
 sid
 mms
 ieee1394
-darcs
 bs2b
 ggi
 dvd

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 216f30b7336f..f22a9296aa68 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -84,7 +84,6 @@ cpu_flags_ppc_altivec
 cpu_flags_ppc_vsx
 cpu_flags_ppc_vsx2
 cpu_flags_ppc_vsx3
-ppcsha1
 
 # mips arch specific USE flags
 loongson2f
@@ -133,12 +132,10 @@ video_cards_geode
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse
 video_cards_ast
-video_cards_crocus
 video_cards_d3d12
 video_cards_i915
 video_cards_i965
 video_cards_intel
-video_cards_iris
 video_cards_nvidia
 video_cards_vesa
 video_cards_via

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 589d5aca11a1..702a22fab107 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -95,7 +95,6 @@ clang
 # dev-lang/luajit has not been ported to HPPA
 lua_single_target_luajit
 lua_targets_luajit
-luajit
 luajittex
 
 # Jeroen Roovers  (2014-05-20)
@@ -134,10 +133,6 @@ dvb
 # No support for Blu-ray (bug #397531).
 bluray
 
-# Jeroen Roovers  (2011-09-15)
-# Prelude has not been tested on HPPA.
-prelude
-
 # Jeroen Roovers  (2011-06-09)
 # Lots of untested dependencies (bug #365451)
 facedetect
@@ -154,7 

[gentoo-commits] repo/gentoo:master commit in: profiles/

2023-12-17 Thread Michał Górny
commit: 631784d438f5eb6003433d15ac05b30ab5ae11ba
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 12:01:44 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:03:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631784d4

profiles/package.mask: Remove some old entries

Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask | 61 ---
 1 file changed, 61 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 091caf78009c..4f681c92a5ad 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -136,11 +136,6 @@ dev-ruby/sass-listen
 # dependencies. Masked for removal on 2024-01-06.
 dev-ruby/semver2
 
-# Eli Schwartz  (2023-12-02)
-# Has a bug that breaks sys-apps/portage. Upgrade to 1.3.0-r1 instead.
-# Bug #919072.
-=dev-util/meson-1.3.0
-
 # Michał Górny  (2023-11-30)
 # Last commit in 2020.  It was used exclusively by dev-python/ipython,
 # and it is used no more.
@@ -254,11 +249,6 @@ dev-perl/PathTools
 # Breaks building scipy: https://github.com/cython/cython/issues/5748
 =dev-python/cython-3.0.3
 
-# Michał Górny  (2023-09-22)
-# =dev-python/setuptools-scm-8.0.1 broke compatibility hard but reverted
-# the changes in 8.0.2.
-~dev-python/setuptools-scm-8.0.1
-
 # Sam James  (2023-09-09)
 # OpenSSL 1.1.x is EOL on 2023-09-11. Please upgrade immediately to >= OpenSSL 
3.
 # https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/
@@ -268,10 +258,6 @@ dev-perl/PathTools
  (2023-08-04)
-# Stricter behavior which causes some packages to fail, see bug #911721.
-=dev-util/pkgconf-2.0.0
-
 # Mike Pagano  (2023-07-18)
 # Mask impacted kernels vulnerable to StackRot and
 # ones with a memory corruption bug
@@ -319,11 +305,6 @@ dev-perl/PathTools
 # See bug #909439.
 =dev-util/trace-cmd-3.2
 
-# Sam James  (2023-06-03)
-# Breaks dev-perl/Spreadsheet-ParseExcel, see bug #909564.
-# Please upgrade to >=dev-perl/dev-perl/OLE-StorageLite-0.220.0.
-=dev-perl/OLE-StorageLite-0.210.0
-
 # Michał Górny  (2023-06-21)
 # suitesparseconfig-7.0.0 fails to build with multilib enabled
 # because of dependencies that cannot be satisfied.  All the other
@@ -341,44 +322,15 @@ dev-perl/PathTools
 =sci-libs/suitesparseconfig-7.0.0
 =sci-libs/umfpack-6.1.0
 
-# Sam James  (2023-06-16)
-# Please upgrade to >=app-admin/eselect-1.4.22-r1 for a fix to env-update
-# and the files it generates in /etc/env.d: bug #908401, then run env-update
-# and . /etc/profile.
- (2023-06-12)
-# Buggy version that causes ibdata1 to grow, please update. See bug #908394.
-=dev-db/mariadb-10.5.20
-=dev-db/mariadb-10.6.13
-=dev-db/mariadb-10.11.2
-=dev-db/mariadb-10.11.3
-
 # Sam James  (2023-05-10)
 # Lots of package breakage as usual for new versions. Masked until most/all
 # reverse dependencies are fixed. Tracker bug is bug #906077.
 =dev-libs/libfmt-10*
 
-# Sam James  (2023-05-01)
-# Breaks dev-python/scipy build. See bug #905396 and 
https://github.com/serge-sans-paille/gast/issues/74.
-=dev-python/pythran-0.13.0
-=dev-python/gast-0.5.4
-
 # Andreas Sturmlechner  (2023-04-30)
 # Breaking even latest ~arch version of KDE PIM, bug #905352.
 =dev-libs/ktextaddons-1.3*
 
-# Michał Górny  (2023-04-18)
-# Breaks ABI without SOVERSION bump, effectively preventing
-# xfce4-terminal from starting.
-# https://bugs.gentoo.org/904500
-=xfce-base/libxfce4ui-4.19.0
-
-# Sam James  (2023-04-16)
-# SEEK_HOLE issues causing corruption with (sparse?) copies again.
-# See https://github.com/openzfs/zfs/issues/14753.
-=sys-fs/zfs-kmod-2.1.10
-
 # Sam James  (2023-04-13)
 # Leads to broken terminal output in e.g. vim and openrc and other applications
 # like joe crashing.
@@ -416,24 +368,11 @@ dev-perl/PathTools
 # [2] https://wiki.gentoo.org/wiki/Nouveau
 x11-drivers/nvidia-drivers:0/390
 
-# Sam James  (2023-03-29)
-# Regressions in solving ability affecting e.g. igraph:
-# https://github.com/opencollab/arpack-ng/issues/401
-# https://github.com/opencollab/arpack-ng/issues/410
-# https://github.com/opencollab/arpack-ng/issues/411
-# https://github.com/igraph/igraph/issues/2311
-=sci-libs/arpack-3.9.0
-
 # Mike Pagano  (2023-03-10)
 # Mask =sys-kernel/gentoo-sources-5.15.99 since it does
 # not include 5.15.99 and is misleading
 =sys-kernel/gentoo-sources-5.15.99
 
-# Torokhov Sergey  (2023-02-26)
-# The masked version causes GIMP breaking of Cut/Copy/Paste
-# https://gitlab.gnome.org/GNOME/gimp/-/issues/9175
-=media-libs/babl-0.1.100
-
 # Ben Kohler  (2023-01-30)
 # Breaks too many revdeps for now
 =app-text/discount-3*



[gentoo-commits] proj/kde:master commit in: kde-apps/mailimporter/

2023-12-17 Thread Sam James
commit: 07a82acb762fbff4ac71a4254be0053bb8eafe5c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=07a82acb

kde-apps/mailimporter: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/mailimporter/mailimporter-.ebuild | 28 --
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/kde-apps/mailimporter/mailimporter-.ebuild 
b/kde-apps/mailimporter/mailimporter-.ebuild
index 2d8d429c6e..c05583fb3f 100644
--- a/kde-apps/mailimporter/mailimporter-.ebuild
+++ b/kde-apps/mailimporter/mailimporter-.ebuild
@@ -6,29 +6,27 @@ EAPI=8
 ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Library to import mail from various sources"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-mime-${PVCUT}:5
-   >=kde-apps/kmime-${PVCUT}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-mime-${PVCUT}:6
+   >=kde-apps/kmime-${PVCUT}:6
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/karchive-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/parley/

2023-12-17 Thread Sam James
commit: 1a2c3efdc53d513437e85f884eebf9c5a63ae9bc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:29 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a2c3efd

kde-apps/parley: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/parley/parley-.ebuild | 49 ++
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/kde-apps/parley/parley-.ebuild 
b/kde-apps/parley/parley-.ebuild
index 7557043914..83bb26b5b3 100644
--- a/kde-apps/parley/parley-.ebuild
+++ b/kde-apps/parley/parley-.ebuild
@@ -6,15 +6,15 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 ECM_HANDBOOK_DIR="docs"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org optfeature
 
 DESCRIPTION="Vocabulary trainer to help you memorize things"
 HOMEPAGE="https://apps.kde.org/parley/;
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
@@ -22,31 +22,28 @@ DEPEND="
app-i18n/translate-shell
dev-libs/libxml2:2
dev-libs/libxslt
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtconcurrent-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtmultimedia-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-   >=kde-apps/libkeduvocdocument-${PVCUT}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/knewstuff-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,widgets]
+   >=dev-qt/qtmultimedia-${QTMIN}:6
+   >=dev-qt/qtsvg-${QTMIN}:6
+   >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+   >=kde-apps/libkeduvocdocument-${PVCUT}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kcrash-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/knewstuff-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/sonnet-${KFMIN}:6
 "
 RDEPEND="${DEPEND}
-   >=kde-apps/kdeedu-data-${PVCUT}:5
+   >=kde-apps/kdeedu-data-${PVCUT}:6
 "
 
 src_prepare() {



[gentoo-commits] proj/kde:master commit in: kde-apps/libgravatar/

2023-12-17 Thread Sam James
commit: 098427b6039f35c99f7a92be3bf52a159ea9fd6e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:27 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=098427b6

kde-apps/libgravatar: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/libgravatar/libgravatar-.ebuild | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/kde-apps/libgravatar/libgravatar-.ebuild 
b/kde-apps/libgravatar/libgravatar-.ebuild
index 64e41906d3..521e0c4f97 100644
--- a/kde-apps/libgravatar/libgravatar-.ebuild
+++ b/kde-apps/libgravatar/libgravatar-.ebuild
@@ -6,27 +6,25 @@ EAPI=8
 ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Library for gravatar integration"
 
 LICENSE="GPL-2+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"
 



[gentoo-commits] proj/kde:master commit in: app-office/merkuro/

2023-12-17 Thread Sam James
commit: c5ef13acabaa6d53bdf72c6b86744b17b1a99510
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5ef13ac

app-office/merkuro: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 app-office/merkuro/merkuro-.ebuild | 62 --
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/app-office/merkuro/merkuro-.ebuild 
b/app-office/merkuro/merkuro-.ebuild
index 680605a913..a3cd63d41a 100644
--- a/app-office/merkuro/merkuro-.ebuild
+++ b/app-office/merkuro/merkuro-.ebuild
@@ -6,15 +6,15 @@ EAPI=8
 KDE_ORG_CATEGORY="pim"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Calendar application using Akonadi"
 HOMEPAGE="https://apps.kde.org/kalendar/;
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
@@ -23,36 +23,34 @@ RESTRICT="test"
 
 DEPEND="
app-crypt/gpgme:=[cxx]
-   >=dev-libs/kirigami-addons-0.7.2:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtquickcontrols2-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-contacts-${PVCUT}:5
-   >=kde-apps/akonadi-mime-${PVCUT}:5
-   >=kde-apps/kcalutils-${PVCUT}:5
-   >=kde-apps/kidentitymanagement-${PVCUT}:5
-   >=kde-apps/mailcommon-${PVCUT}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kirigami-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   dev-libs/kirigami-addons:6
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+   >=dev-qt/qtdeclarative-${QTMIN}:6
+   >=dev-qt/qtsvg-${QTMIN}:6
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-contacts-${PVCUT}:6
+   >=kde-apps/akonadi-mime-${PVCUT}:6
+   >=kde-apps/kcalutils-${PVCUT}:6
+   >=kde-apps/kidentitymanagement-${PVCUT}:6
+   >=kde-apps/mailcommon-${PVCUT}:6
+   >=kde-frameworks/kcalendarcore-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kiconthemes-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kirigami-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
 "
 # qtlocation is needed at runtime only or fails to start
 RDEPEND="${DEPEND}
-   >=dev-qt/qtgraphicaleffects-${QTMIN}:5
-   >=dev-qt/qtlocation-${QTMIN}:5
-   >=dev-qt/qtwebengine-${QTMIN}:5
-   >=kde-apps/kdepim-runtime-${PVCUT}:5
-   >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+   >=dev-qt/qt5compat-${QTMIN}:6[qml]
+   >=dev-qt/qtlocation-${QTMIN}:6
+   >=dev-qt/qtwebengine-${QTMIN}:6
+   >=kde-apps/kdepim-runtime-${PVCUT}:6
+   >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 "



[gentoo-commits] proj/kde:master commit in: kde-apps/messagelib/

2023-12-17 Thread Sam James
commit: 81b03d4452534297c76c6824d9a74aa056b02880
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:29 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=81b03d44

kde-apps/messagelib: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/messagelib/messagelib-.ebuild | 99 +++---
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/kde-apps/messagelib/messagelib-.ebuild 
b/kde-apps/messagelib/messagelib-.ebuild
index 1d6596d0cf..88a1f27be0 100644
--- a/kde-apps/messagelib/messagelib-.ebuild
+++ b/kde-apps/messagelib/messagelib-.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 ECM_QTHELP="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Libraries for messaging functions"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="speech"
 
@@ -21,59 +21,56 @@ IUSE="speech"
 RESTRICT="test"
 
 DEPEND="
-   >=app-crypt/gpgme-1.16.0:=[cxx,qt5]
-   >=app-crypt/qca-2.3.0:2[qt5(+)]
-   >=dev-libs/grantlee-5.3.0:5
-   dev-libs/ktextaddons:5[speech?]
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-contacts-${PVCUT}:5
-   >=kde-apps/akonadi-mime-${PVCUT}:5
-   >=kde-apps/akonadi-search-${PVCUT}:5
-   >=kde-apps/grantleetheme-${PVCUT}:5
-   >=kde-apps/kidentitymanagement-${PVCUT}:5
-   >=kde-apps/kldap-${PVCUT}:5
-   >=kde-apps/kmailtransport-${PVCUT}:5
-   >=kde-apps/kmbox-${PVCUT}:5
-   >=kde-apps/kmime-${PVCUT}:5
-   >=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
-   >=kde-apps/libgravatar-${PVCUT}:5
-   >=kde-apps/libkdepim-${PVCUT}:5
-   >=kde-apps/libkleo-${PVCUT}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+   >=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+   >=app-crypt/qca-2.3.7:2[qt6]
+   dev-libs/ktextaddons:6[speech?]
+   >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+   >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-contacts-${PVCUT}:6
+   >=kde-apps/akonadi-mime-${PVCUT}:6
+   >=kde-apps/akonadi-search-${PVCUT}:6
+   >=kde-apps/grantleetheme-${PVCUT}:6
+   >=kde-apps/kidentitymanagement-${PVCUT}:6
+   >=kde-apps/kldap-${PVCUT}:6
+   >=kde-apps/kmailtransport-${PVCUT}:6
+   >=kde-apps/kmbox-${PVCUT}:6
+   >=kde-apps/kmime-${PVCUT}:6
+   >=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+   >=kde-apps/libgravatar-${PVCUT}:6
+   >=kde-apps/libkdepim-${PVCUT}:6
+   >=kde-apps/libkleo-${PVCUT}:6
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/karchive-${KFMIN}:6
+   >=kde-frameworks/kcalendarcore-${KFMIN}:6
+   >=kde-frameworks/kcodecs-${KFMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/kguiaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kiconthemes-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
+   >=kde-frameworks/kjobwidgets-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/ktexttemplate-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
+   

[gentoo-commits] proj/kde:master commit in: kde-apps/libktnef/

2023-12-17 Thread Sam James
commit: 216ccc584087094ed186f7968c368c6904b676ef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec  7 09:38:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=216ccc58

kde-apps/libktnef: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/libktnef/libktnef-.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-apps/libktnef/libktnef-.ebuild 
b/kde-apps/libktnef/libktnef-.ebuild
index b44ded90b5..c666e98cda 100644
--- a/kde-apps/libktnef/libktnef-.ebuild
+++ b/kde-apps/libktnef/libktnef-.ebuild
@@ -7,22 +7,22 @@ ECM_QTHELP="true"
 ECM_TEST="true"
 KDE_ORG_NAME="ktnef"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/kcalutils-${PVCUT}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[widgets]
+   >=kde-apps/kcalutils-${PVCUT}:6
+   >=kde-frameworks/kcalendarcore-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/

2023-12-17 Thread Sam James
commit: ea4b2a9841623743a83cd7106d68d19af1dbf1f0
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 05:43:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:31 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea4b2a98

net-libs/signon-oauth2: drop multibuild

We can't build plugins for both qt5 + qt6, so only build one, and depend
on the corresponding qt version in net-libs/signond.

Signed-off-by: Sam James  gentoo.org>

 net-libs/signon-oauth2/signon-oauth2-.ebuild | 40 +---
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/net-libs/signon-oauth2/signon-oauth2-.ebuild 
b/net-libs/signon-oauth2/signon-oauth2-.ebuild
index be93637379..e0f72c6c28 100644
--- a/net-libs/signon-oauth2/signon-oauth2-.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MY_PN=signon-plugin-oauth2
 MY_PV=VERSION_${PV}
 MY_P=${MY_PN}-${MY_PV}
-inherit qmake-utils multibuild
+inherit qmake-utils
 
 if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://gitlab.com/nicolasfella/${MY_PN}.git/;
@@ -24,6 +24,7 @@ 
HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2;
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,9 +33,10 @@ RDEPEND="
dev-qt/qtnetwork:5[ssl]
)
qt6? ( dev-qt/qtbase:6[network,ssl] )
-   >=net-libs/signond-8.61-r1[qt5?,qt6?]
+   >=net-libs/signond-8.61-r1[qt5=,qt6=]
 "
-DEPEND="${RDEPEND}
+DEPEND="
+   ${RDEPEND}
test? (
qt5? ( dev-qt/qttest:5 )
qt6? ( dev-qt/qtbase:6[test] )
@@ -48,36 +50,24 @@ PATCHES=(
"${FILESDIR}/${PN}-0.25-drop-fno-rtti.patch"
 )
 
-pkg_setup() {
-   MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
 src_prepare() {
default
sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die
 }
 
 src_configure() {
-   my_src_configure() {
-   local myqmakeargs=(
-   LIBDIR=/usr/$(get_libdir)
-   )
-   use test || myqmakeargs+=( CONFIG+=nomake_tests )
-
-   if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-   eqmake6 "${myqmakeargs[@]}"
-   else
-   eqmake5 "${myqmakeargs[@]}"
-   fi
-   }
-
-   multibuild_foreach_variant my_src_configure
-}
+   local myqmakeargs=(
+   LIBDIR=/usr/$(get_libdir)
+   )
+   use test || myqmakeargs+=( CONFIG+=nomake_tests )
 
-src_compile() {
-   multibuild_foreach_variant default
+   if use qt6 ; then
+   eqmake6 "${myqmakeargs[@]}"
+   else
+   eqmake5 "${myqmakeargs[@]}"
+   fi
 }
 
 src_install() {
-   multibuild_foreach_variant emake INSTALL_ROOT="${D}" install
+   emake INSTALL_ROOT="${D}" install
 }



[gentoo-commits] proj/kde:master commit in: kde-apps/kpkpass/

2023-12-17 Thread Sam James
commit: 0fae41dd10be82cd233dbc595ec1e7e21ef0165d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fae41dd

kde-apps/kpkpass: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/kpkpass/kpkpass-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kde-apps/kpkpass/kpkpass-.ebuild 
b/kde-apps/kpkpass/kpkpass-.ebuild
index a89b463be8..ecbbdf99ea 100644
--- a/kde-apps/kpkpass/kpkpass-.ebuild
+++ b/kde-apps/kpkpass/kpkpass-.ebuild
@@ -5,20 +5,20 @@ EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Library to deal with Apple Wallet pass files"
 HOMEPAGE="https://apps.kde.org/kontact/;
 
 LICENSE="LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[gui]
+   >=kde-frameworks/karchive-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/kpimtextedit/

2023-12-17 Thread Sam James
commit: 2cde90de98b878fa24b8ca3bfb7a826c38a51ae9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2cde90de

kde-apps/kpimtextedit: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/kpimtextedit/kpimtextedit-.ebuild | 37 +-
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/kde-apps/kpimtextedit/kpimtextedit-.ebuild 
b/kde-apps/kpimtextedit/kpimtextedit-.ebuild
index 77bb68b7cb..eac0b92a02 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-.ebuild
@@ -6,42 +6,41 @@ EAPI=8
 ECM_DESIGNERPLUGIN="true"
 ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="speech"
 
 RESTRICT="test"
 
 RDEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   >=kde-frameworks/syntax-highlighting-${KFMIN}:5
-   speech? ( dev-libs/ktextaddons:5[speech=] )
+   >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+   >=kde-frameworks/kcodecs-${KFMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kiconthemes-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/sonnet-${KFMIN}:6
+   >=kde-frameworks/syntax-highlighting-${KFMIN}:6
+   speech? ( dev-libs/ktextaddons:6[speech=] )
 "
 DEPEND="${RDEPEND}
-   test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+   test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:6 )
 "
 
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package speech KF5TextEditTextToSpeech)
+   $(cmake_use_find_package speech KF6TextEditTextToSpeech)
)
ecm_src_configure
 }



[gentoo-commits] proj/kde:master commit in: kde-apps/kwordquiz/

2023-12-17 Thread Sam James
commit: a4f195d2efdf2093135b8e6a598721b41019131d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a4f195d2

kde-apps/kwordquiz: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/kwordquiz/kwordquiz-.ebuild | 41 ++--
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/kde-apps/kwordquiz/kwordquiz-.ebuild 
b/kde-apps/kwordquiz/kwordquiz-.ebuild
index 4a58335139..d677f78a1e 100644
--- a/kde-apps/kwordquiz/kwordquiz-.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-.ebuild
@@ -6,38 +6,33 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Powerful flashcard and vocabulary learning program"
 HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/;
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-libs/kirigami-addons-0.9.0:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtquickcontrols2-${QTMIN}:5
-   >=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-apps/libkeduvocdocument-${PVCUT}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kirigami-${KFMIN}:5
-   >=kde-frameworks/knewstuff-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/knotifyconfig-${KFMIN}:5
-   >=media-libs/phonon-4.11.0[qt5(+)]
+   dev-libs/kirigami-addons:6
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+   >=dev-qt/qtdeclarative-${QTMIN}:6
+   >=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+   >=dev-qt/qtsvg-${QTMIN}:6
+   >=kde-apps/libkeduvocdocument-${PVCUT}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcrash-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kirigami-${KFMIN}:6
+   >=kde-frameworks/knewstuff-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/knotifyconfig-${KFMIN}:6
+   >=media-libs/phonon-4.12.0[qt6]
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/ksmtp/

2023-12-17 Thread Sam James
commit: 9157769fc89af6f9d475e6c55a767f8463fb733b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9157769f

kde-apps/ksmtp: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/ksmtp/ksmtp-.ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-apps/ksmtp/ksmtp-.ebuild b/kde-apps/ksmtp/ksmtp-.ebuild
index 83eaa6..73eae86541 100644
--- a/kde-apps/ksmtp/ksmtp-.ebuild
+++ b/kde-apps/ksmtp/ksmtp-.ebuild
@@ -5,15 +5,15 @@ EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Job-based library to send email through an SMTP server"
 HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html;
 
 LICENSE="LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
@@ -21,9 +21,9 @@ RESTRICT="test" # bug 642410
 
 DEPEND="
dev-libs/cyrus-sasl
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[network]
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/libkdepim/

2023-12-17 Thread Sam James
commit: 54084d56584797135c4031bde062a7f698b04593
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:27 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54084d56

kde-apps/libkdepim: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/libkdepim/libkdepim-.ebuild | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/kde-apps/libkdepim/libkdepim-.ebuild 
b/kde-apps/libkdepim/libkdepim-.ebuild
index f423242cd1..2db28ce1f3 100644
--- a/kde-apps/libkdepim/libkdepim-.ebuild
+++ b/kde-apps/libkdepim/libkdepim-.ebuild
@@ -7,25 +7,22 @@ ECM_DESIGNERPLUGIN="true"
 ECM_QTHELP="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/libkgapi/

2023-12-17 Thread Sam James
commit: 41bd19f409154cb636a354ccb52d11adcd8a1f2b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:27 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=41bd19f4

kde-apps/libkgapi: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/libkgapi/libkgapi-.ebuild | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/kde-apps/libkgapi/libkgapi-.ebuild 
b/kde-apps/libkgapi/libkgapi-.ebuild
index 579913557a..9f36f4ee70 100644
--- a/kde-apps/libkgapi/libkgapi-.ebuild
+++ b/kde-apps/libkgapi/libkgapi-.ebuild
@@ -5,30 +5,27 @@ EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Library for accessing Google calendar and contact resources"
 HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html;
 
 LICENSE="LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
dev-libs/cyrus-sasl:2
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+   >=kde-frameworks/kcalendarcore-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kwallet-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
 src_test() {
local myctestargs=(



[gentoo-commits] proj/kde:master commit in: kde-apps/libkleo/

2023-12-17 Thread Sam James
commit: 51719ca6becb5d43022436b89a540644a6bebe75
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:27 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=51719ca6

kde-apps/libkleo: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/libkleo/libkleo-.ebuild | 33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/kde-apps/libkleo/libkleo-.ebuild 
b/kde-apps/libkleo/libkleo-.ebuild
index 8708a36ca2..8bdb6d6c4e 100644
--- a/kde-apps/libkleo/libkleo-.ebuild
+++ b/kde-apps/libkleo/libkleo-.ebuild
@@ -6,31 +6,30 @@ EAPI=8
 ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="+fancyviewer"
 
 RDEPEND="
-   >=app-crypt/gpgme-1.16.0:=[cxx,qt5]
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
+   >=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+   >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+   >=kde-frameworks/kcodecs-${KFMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
+   fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:6 )
 "
 DEPEND="${RDEPEND}
dev-libs/boost
@@ -38,7 +37,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package fancyviewer KPim5TextEdit)
+   $(cmake_use_find_package fancyviewer KPim6TextEdit)
)
 
ecm_src_configure



[gentoo-commits] proj/kde:master commit in: kde-apps/mailcommon/

2023-12-17 Thread Sam James
commit: be0cfd68fd864dab4f70576a262fd23665d8e343
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=be0cfd68

kde-apps/mailcommon: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/mailcommon/mailcommon-.ebuild | 72 ++
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/kde-apps/mailcommon/mailcommon-.ebuild 
b/kde-apps/mailcommon/mailcommon-.ebuild
index 8f8a07c300..1e1266fe77 100644
--- a/kde-apps/mailcommon/mailcommon-.ebuild
+++ b/kde-apps/mailcommon/mailcommon-.ebuild
@@ -7,54 +7,50 @@ ECM_DESIGNERPLUGIN="true"
 ECM_QTHELP="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 RESTRICT="test"
 
 DEPEND="
-   app-crypt/gpgme:=[cxx,qt5]
-   >=dev-qt/qtcore-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtmultimedia-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-contacts-${PVCUT}:5
-   >=kde-apps/akonadi-mime-${PVCUT}:5
-   >=kde-apps/kmailtransport-${PVCUT}:5
-   >=kde-apps/kmime-${PVCUT}:5
-   >=kde-apps/kpimtextedit-${PVCUT}:5
-   >=kde-apps/libkdepim-${PVCUT}:5
-   >=kde-apps/mailimporter-${PVCUT}:5
-   >=kde-apps/messagelib-${PVCUT}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/syntax-highlighting-${KFMIN}:5
-   >=media-libs/phonon-4.11.0[qt5(+)]
+   >=app-crypt/gpgme-1.23.1-r1:=[cxx,qt6]
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+   >=dev-qt/qtmultimedia-${QTMIN}:6
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-contacts-${PVCUT}:6
+   >=kde-apps/akonadi-mime-${PVCUT}:6
+   >=kde-apps/kmailtransport-${PVCUT}:6
+   >=kde-apps/kmime-${PVCUT}:6
+   >=kde-apps/kpimtextedit-${PVCUT}:6
+   >=kde-apps/libkdepim-${PVCUT}:6
+   >=kde-apps/mailimporter-${PVCUT}:6
+   >=kde-apps/messagelib-${PVCUT}:6
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/karchive-${KFMIN}:6
+   >=kde-frameworks/kcodecs-${KFMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/kguiaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kiconthemes-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/syntax-highlighting-${KFMIN}:6
+   >=media-libs/phonon-4.12.0[qt6]
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/libksieve/

2023-12-17 Thread Sam James
commit: 424703b869e2b7f9d30d88a598db39fe85853a19
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=424703b8

kde-apps/libksieve: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/libksieve/libksieve-.ebuild | 54 +++-
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/kde-apps/libksieve/libksieve-.ebuild 
b/kde-apps/libksieve/libksieve-.ebuild
index 8632b2773e..8782e9cfcc 100644
--- a/kde-apps/libksieve/libksieve-.ebuild
+++ b/kde-apps/libksieve/libksieve-.ebuild
@@ -7,14 +7,14 @@ ECM_HANDBOOK="forceoptional"
 ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="speech"
 
@@ -22,38 +22,34 @@ RESTRICT="test"
 
 RDEPEND="
dev-libs/cyrus-sasl
-   dev-libs/ktextaddons:5[speech?]
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/kidentitymanagement-${PVCUT}:5
-   >=kde-apps/kmime-${PVCUT}:5
-   >=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
-   >=kde-apps/libkdepim-${PVCUT}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/knewstuff-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/sonnet-${KFMIN}:5
-   >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+   dev-libs/ktextaddons:6[speech?]
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+   >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+   >=kde-apps/kidentitymanagement-${PVCUT}:6
+   >=kde-apps/kmime-${PVCUT}:6
+   >=kde-apps/kpimtextedit-${PVCUT}:6[speech=]
+   >=kde-apps/libkdepim-${PVCUT}:6
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/karchive-${KFMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/knewstuff-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/sonnet-${KFMIN}:6
+   >=kde-frameworks/syntax-highlighting-${KFMIN}:6
 "
 DEPEND="${RDEPEND}
-   >=kde-apps/kimap-${PVCUT}:5
-   >=kde-apps/kmailtransport-${PVCUT}:5
+   >=kde-apps/kimap-${PVCUT}:6
+   >=kde-apps/kmailtransport-${PVCUT}:6
 "
 
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package speech KF5TextEditTextToSpeech)
+   $(cmake_use_find_package speech KF6TextEditTextToSpeech)
)
 
ecm_src_configure



[gentoo-commits] proj/kde:master commit in: kde-apps/mbox-importer/

2023-12-17 Thread Sam James
commit: a2a08dcaab96c48b59501cfb095c512caa004775
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2a08dca

kde-apps/mbox-importer: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/mbox-importer/mbox-importer-.ebuild | 31 
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/kde-apps/mbox-importer/mbox-importer-.ebuild 
b/kde-apps/mbox-importer/mbox-importer-.ebuild
index 0fc51279bf..c2590cb9de 100644
--- a/kde-apps/mbox-importer/mbox-importer-.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-.ebuild
@@ -5,30 +5,29 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/kidentitymanagement-${PVCUT}:5
-   >=kde-apps/mailcommon-${PVCUT}:5
-   >=kde-apps/mailimporter-${PVCUT}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/kidentitymanagement-${PVCUT}:6
+   >=kde-apps/mailcommon-${PVCUT}:6
+   >=kde-apps/mailimporter-${PVCUT}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kcrash-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde:master commit in: kde-apps/pim-data-exporter/

2023-12-17 Thread Sam James
commit: 9466486d1991f44d8cf0ecfd1a70fb15ec2ae1db
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:29 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9466486d

kde-apps/pim-data-exporter: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 .../pim-data-exporter-.ebuild  | 53 +++---
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-.ebuild 
b/kde-apps/pim-data-exporter/pim-data-exporter-.ebuild
index 365a2e378e..a56d7d40e1 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Assistant to backup and archive PIM data and configuration"
@@ -15,42 +15,41 @@ HOMEPAGE="https://apps.kde.org/pimdataexporter/
 https://userbase.kde.org/KMail/Backup_Options;
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="telemetry"
 
 RESTRICT="test" # 11 out of 21 tests fail...
 
 DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/kidentitymanagement-${PVCUT}:5
-   >=kde-apps/kmailtransport-${PVCUT}:5
-   >=kde-apps/kmime-${PVCUT}:5
-   >=kde-apps/kpimtextedit-${PVCUT}:5
-   >=kde-apps/libkdepim-${PVCUT}:5
-   >=kde-apps/mailcommon-${PVCUT}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
+   >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/kidentitymanagement-${PVCUT}:6
+   >=kde-apps/kmailtransport-${PVCUT}:6
+   >=kde-apps/kmime-${PVCUT}:6
+   >=kde-apps/kpimtextedit-${PVCUT}:6
+   >=kde-apps/libkdepim-${PVCUT}:6
+   >=kde-apps/mailcommon-${PVCUT}:6
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/karchive-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kcrash-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package telemetry KUserFeedback)
+   $(cmake_use_find_package telemetry KF6UserFeedback)
)
 
ecm_src_configure



[gentoo-commits] proj/kde:master commit in: kde-misc/zanshin/

2023-12-17 Thread Sam James
commit: 56ac0313b3b45e961be85258534cd811441c0257
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=56ac0313

kde-misc/zanshin: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-misc/zanshin/zanshin-.ebuild | 59 +---
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/kde-misc/zanshin/zanshin-.ebuild 
b/kde-misc/zanshin/zanshin-.ebuild
index 7aa1bf4425..d0033363a8 100644
--- a/kde-misc/zanshin/zanshin-.ebuild
+++ b/kde-misc/zanshin/zanshin-.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="pim"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Getting things done application by KDE"
@@ -15,7 +15,7 @@ HOMEPAGE="https://zanshin.kde.org/ 
https://apps.kde.org/zanshin/
 https://userbase.kde.org/Zanshin;
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
@@ -23,39 +23,36 @@ RESTRICT="test" # bug 785844
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 COMMON_DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-calendar-${PVCUT}:5
-   >=kde-apps/akonadi-contacts-${PVCUT}:5
-   >=kde-apps/kmime-${PVCUT}:5
-   >=kde-apps/kontactinterface-${PVCUT}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/krunner-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-calendar-${PVCUT}:6
+   >=kde-apps/akonadi-contacts-${PVCUT}:6
+   >=kde-apps/kmime-${PVCUT}:6
+   >=kde-apps/kontactinterface-${PVCUT}:6
+   >=kde-frameworks/kcalendarcore-${KFMIN}:6
+   >=kde-frameworks/kcodecs-${KFMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
+   >=kde-frameworks/kjobwidgets-${KFMIN}:6
+   >=kde-frameworks/kparts-${KFMIN}:6
+   >=kde-frameworks/krunner-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/boost
 "
 RDEPEND="${COMMON_DEPEND}
-   >=kde-apps/kdepim-runtime-${PVCUT}:5
+   >=kde-apps/kdepim-runtime-${PVCUT}:6
 "
 BDEPEND="
-   test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+   test? ( >=kde-apps/akonadi-${PVCUT}:6[tools] )
 "



[gentoo-commits] proj/kde:master commit in: kde-apps/pim-sieve-editor/

2023-12-17 Thread Sam James
commit: 373e2566f7a38812751abd00939742dea8a61cad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=373e2566

kde-apps/pim-sieve-editor: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 .../pim-sieve-editor/pim-sieve-editor-.ebuild  | 52 +++---
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-.ebuild 
b/kde-apps/pim-sieve-editor/pim-sieve-editor-.ebuild
index 2323d6d641..ed4514ce09 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-.ebuild
@@ -6,47 +6,45 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="telemetry"
 
 DEPEND="
-   dev-libs/qtkeychain:=[qt5(+)]
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-contacts-${PVCUT}:5
-   >=kde-apps/akonadi-mime-${PVCUT}:5
-   >=kde-apps/calendarsupport-${PVCUT}:5
-   >=kde-apps/kmailtransport-${PVCUT}:5
-   >=kde-apps/libksieve-${PVCUT}:5
-   >=kde-apps/pimcommon-${PVCUT}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcalendarcore-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   telemetry? ( >=kde-frameworks/kuserfeedback-1.2.0:5 )
+   >=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+   >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-contacts-${PVCUT}:6
+   >=kde-apps/akonadi-mime-${PVCUT}:6
+   >=kde-apps/calendarsupport-${PVCUT}:6
+   >=kde-apps/kmailtransport-${PVCUT}:6
+   >=kde-apps/libksieve-${PVCUT}:6
+   >=kde-apps/pimcommon-${PVCUT}:6
+   >=kde-frameworks/kbookmarks-${KFMIN}:6
+   >=kde-frameworks/kcalendarcore-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kcrash-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package telemetry KUserFeedback)
+   $(cmake_use_find_package telemetry KF6UserFeedback)
)
 
ecm_src_configure



[gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/

2023-12-17 Thread Sam James
commit: ae150890176998951cac4dc6107a7566c1f83c89
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 05:54:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:31 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae150890

net-libs/accounts-qml: fix multibuild

Signed-off-by: Sam James  gentoo.org>

 net-libs/accounts-qml/accounts-qml-.ebuild | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/net-libs/accounts-qml/accounts-qml-.ebuild 
b/net-libs/accounts-qml/accounts-qml-.ebuild
index 5f43ea702f..f04e0f0b77 100644
--- a/net-libs/accounts-qml/accounts-qml-.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-.ebuild
@@ -67,11 +67,14 @@ pkg_setup() {
 
 src_prepare() {
default
-   rm -v .gitignore doc/html/.gitignore || die
+   rm -v doc/html/.gitignore || die
+   multibuild_copy_sources
 }
 
 src_configure() {
my_src_configure() {
+   cd "${BUILD_DIR}" || die
+
local myqmakeargs=(
CONFIG+=no_docs \
PREFIX="${EPREFIX}"/usr
@@ -88,7 +91,12 @@ src_configure() {
 }
 
 src_compile() {
-   multibuild_foreach_variant default
+   my_src_compile() {
+   emake -C "${BUILD_DIR}"
+   }
+
+   multibuild_foreach_variant my_src_compile
+
if use doc; then
local qtanybindir
if has_version "dev-qt/qttools:6[qdoc]"; then
@@ -103,7 +111,11 @@ src_compile() {
 }
 
 src_install() {
-   multibuild_foreach_variant emake INSTALL_ROOT="${D}" install_subtargets
+   my_src_install() {
+   emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install_subtargets
+   }
+
+   multibuild_foreach_variant my_src_install
use doc && local HTML_DOCS=( doc/html )
einstalldocs
 }



[gentoo-commits] proj/kde:master commit in: kde-apps/pimcommon/

2023-12-17 Thread Sam James
commit: 9ca404115efbec17d6dcf8a01b6ac52f09b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:29 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9ca40411

kde-apps/pimcommon: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 kde-apps/pimcommon/pimcommon-.ebuild | 58 +++-
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/kde-apps/pimcommon/pimcommon-.ebuild 
b/kde-apps/pimcommon/pimcommon-.ebuild
index 31a8a25ab2..852082f5cc 100644
--- a/kde-apps/pimcommon/pimcommon-.ebuild
+++ b/kde-apps/pimcommon/pimcommon-.ebuild
@@ -7,46 +7,42 @@ ECM_DESIGNERPLUGIN="true"
 ECM_QTHELP="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-   dev-libs/ktextaddons:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-apps/akonadi-${PVCUT}:5
-   >=kde-apps/akonadi-contacts-${PVCUT}:5
-   >=kde-apps/akonadi-search-${PVCUT}:5
-   >=kde-apps/kimap-${PVCUT}:5
-   >=kde-apps/kldap-${PVCUT}:5
-   >=kde-apps/kpimtextedit-${PVCUT}:5
-   >=kde-apps/libkdepim-${PVCUT}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kcontacts-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knewstuff-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/purpose-${KFMIN}:5
+   dev-libs/ktextaddons:6
+   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+   >=kde-apps/akonadi-${PVCUT}:6
+   >=kde-apps/akonadi-contacts-${PVCUT}:6
+   >=kde-apps/akonadi-search-${PVCUT}:6
+   >=kde-apps/kimap-${PVCUT}:6
+   >=kde-apps/kldap-${PVCUT}:6
+   >=kde-apps/kpimtextedit-${PVCUT}:6
+   >=kde-apps/libkdepim-${PVCUT}:6
+   >=kde-frameworks/karchive-${KFMIN}:6
+   >=kde-frameworks/kcmutils-${KFMIN}:6
+   >=kde-frameworks/kcodecs-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kcontacts-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kjobwidgets-${KFMIN}:6
+   >=kde-frameworks/knewstuff-${KFMIN}:6
+   >=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/purpose-${KFMIN}:6
 "
 DEPEND="${RDEPEND}"
 



[gentoo-commits] proj/kde:master commit in: net-libs/accounts-qt/

2023-12-17 Thread Sam James
commit: b47f4d80795cac60305f1c0da7d138e5ada6b803
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  8 10:56:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b47f4d80

net-libs/accounts-qt: fix multibuild

Signed-off-by: Sam James  gentoo.org>

 net-libs/accounts-qt/accounts-qt-.ebuild | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/net-libs/accounts-qt/accounts-qt-.ebuild 
b/net-libs/accounts-qt/accounts-qt-.ebuild
index 8147971f05..1cdc4f1adb 100644
--- a/net-libs/accounts-qt/accounts-qt-.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io;
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc +qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
 
 # dbus problems
 RESTRICT="test"
@@ -79,10 +80,14 @@ src_prepare() {
sed -e '/^SUBDIRS/s/tests//' \
-i accounts-qt.pro || die "couldn't disable tests"
fi
+
+   multibuild_copy_sources
 }
 
 src_configure() {
my_src_configure() {
+   cd "${BUILD_DIR}" || die
+
if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
else
@@ -94,9 +99,17 @@ src_configure() {
 }
 
 src_compile() {
-   multibuild_foreach_variant default
+   my_src_compile() {
+   emake -C "${BUILD_DIR}"
+   }
+
+   multibuild_foreach_variant my_src_compile
 }
 
 src_install() {
-   multibuild_foreach_variant emake INSTALL_ROOT="${D}" install
+   my_src_install() {
+   emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install
+   }
+
+   multibuild_foreach_variant my_src_install
 }



[gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/

2023-12-17 Thread Sam James
commit: 02fbb2e3e438b9343287db40ed0114506581c7e4
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 05:57:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:31 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=02fbb2e3

net-libs/signon-oauth2: add TODO

Signed-off-by: Sam James  gentoo.org>

 net-libs/signon-oauth2/signon-oauth2-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/signon-oauth2/signon-oauth2-.ebuild 
b/net-libs/signon-oauth2/signon-oauth2-.ebuild
index e0f72c6c28..dc054814c2 100644
--- a/net-libs/signon-oauth2/signon-oauth2-.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-.ebuild
@@ -23,6 +23,7 @@ 
HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+# TODO: drop USE=qt5 and just have USE=qt6 to control which qt?
 IUSE="+qt5 qt6 test"
 REQUIRED_USE="|| ( qt5 qt6 )"
 RESTRICT="!test? ( test )"



[gentoo-commits] proj/kde:master commit in: net-libs/signond/

2023-12-17 Thread Sam James
commit: 558bd85599f1bb0956529e1a734ba863b84aec2a
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  8 10:50:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:04:30 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=558bd855

net-libs/signond: fix multibuild

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.

Signed-off-by: Sam James  gentoo.org>

 net-libs/signond/signond-.ebuild | 21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/net-libs/signond/signond-.ebuild 
b/net-libs/signond/signond-.ebuild
index 5982a22663..1a9d0d7290 100644
--- a/net-libs/signond/signond-.ebuild
+++ b/net-libs/signond/signond-.ebuild
@@ -20,7 +20,12 @@ 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 )"
@@ -90,10 +95,14 @@ src_prepare() {
 
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)
@@ -110,9 +119,17 @@ src_configure() {
 }
 
 src_compile() {
-   multibuild_foreach_variant default
+   my_src_compile() {
+   emake -C "${BUILD_DIR}"
+   }
+
+   multibuild_foreach_variant my_src_compile
 }
 
 src_install() {
-   multibuild_foreach_variant emake INSTALL_ROOT="${D}" install
+   my_src_install() {
+   emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install
+   }
+
+   multibuild_foreach_variant my_src_install
 }



[gentoo-commits] repo/gentoo:master commit in: profiles/

2023-12-17 Thread Michał Górny
commit: 6bec5d2792de7563ce3fb4ab8153759cceba9d08
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 12:25:53 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 12:26:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bec5d27

profiles/license_groups: Remove LPPL-1.3a

Signed-off-by: Michał Górny  gentoo.org>

 profiles/license_groups | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/license_groups b/profiles/license_groups
index 84b093b011f0..52376e42a99c 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -18,7 +18,7 @@
 GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions 
Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD 
ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ 
GPL-2+-with-openssl-exception GPL-2+-with-eCos-exception-2 
GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception 
GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception 
GPL-2+-with-Pyinstaller-Bootloader-exception GPL-3 GPL-3+ 
GPL-3+-with-autoconf-exception GPL-3+-with-font-exception 
GPL-3-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 
LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ 
LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception 
libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP 
PSF-2 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat 
tanuki-community Transmission-OpenSSL-exception Unicode-DFS-2016 Unlicense 
UoI-NCSA UPL-1.0 U
 PX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL
 
 # Free software licenses approved by the FSF
-FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 
BSD-4 CDDL CeCILL-B CeCILL-C CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 
EUPL-1.2 FraunhoferFDK gnuplot IBM LPL-1.02 LPPL-1.2 LPPL-1.3a MPL-1.0 MPL-1.1 
Ms-PL Ms-RL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0
+FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 
BSD-4 CDDL CeCILL-B CeCILL-C CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 
EUPL-1.2 FraunhoferFDK gnuplot IBM LPL-1.02 LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL 
Ms-RL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0
 
 # Licenses approved by the Open Source Initiative
 # https://www.opensource.org/licenses



[gentoo-commits] proj/pambase:master commit in: tests/rendered/custom/, templates/, tests/rendered/minimal/, ...

2023-12-17 Thread Sam James
commit: a125db180b5f9325cdabd90d17477090fbba95e5
Author: Daniel Harding  living180  net>
AuthorDate: Fri May 13 11:25:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:45:22 2023 +
URL:https://gitweb.gentoo.org/proj/pambase.git/commit/?id=a125db18

Honor pam_unix.so return value

Commit eb138196aa2d3cb860d5eb5ab1d05985df34ad2c changed the return value
of pam_authenticate() for the case when the user enters an incorrect
password.  Prior to that change pam_authenticate() would return
PAM_AUTH_ERR for an incorrect password, while after it would return
PAM_PERM_DENIED.

The root cause is that after that change, nothing in the stack before
the final pam_faillock.so auth entry is setting `impression` in
_pam_dispatch_aux().  If the user has not reached the maximum number of
tries, pam_faillock.so returns PAM_IGNORE [1] and thus
_pam_dispatch_aux() sets `status` to PAM_MUST_FAIL_CODE [2], which is
defined to be PAM_PERM_DENIED [3].  This ends up being the return value
for pam_authenticate().

This commit addresses the problem by changing the `default` control
action for the pam_unix.so auth entry from `ignore` to `bad` (the same
as when its control value was `required`).  Thus when processing the
pam_unix.so entry, _pam_dispatch_aux() will set `impression` to
_PAM_NEGATIVE and `status` to the return value of pam_unix.so,
PAM_AUTH_ERR [4]. _pam_dispatch_aux() will then continue to the final
pam_faillock.so auth entry.  Because `impression` is now _PAM_NEGATIVE,
_pam_dispatch_aux() will not change the value of `status` and the return
value of pam_authenticate() is PAM_AUTH_ERR as desired.

Also ensure that `new_authtok_reqd` is handled correctly when returned
from from pam_unix.so.

[1] 
https://github.com/linux-pam/linux-pam/blob/d3b73b6cd818f4fd9c923822592eccbe8ecdd121/modules/pam_faillock/pam_faillock.c#L712

[2] 
https://github.com/linux-pam/linux-pam/blob/d3b73b6cd818f4fd9c923822592eccbe8ecdd121/libpam/pam_dispatch.c#L244

[3] 
https://github.com/linux-pam/linux-pam/blob/d3b73b6cd818f4fd9c923822592eccbe8ecdd121/libpam/pam_dispatch.c#L17

[4] 
https://github.com/linux-pam/linux-pam/blob/d3b73b6cd818f4fd9c923822592eccbe8ecdd121/libpam/pam_dispatch.c#L246

Signed-off-by: Daniel Harding  living180.net>
Closes: https://github.com/gentoo/pambase/pull/10
Signed-off-by: Sam James  gentoo.org>

 templates/system-auth.tpl  | 2 +-
 tests/rendered/custom/system-auth  | 2 +-
 tests/rendered/default/system-auth | 2 +-
 tests/rendered/minimal/system-auth | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl
index 9739b6f..9b078f3 100644
--- a/templates/system-auth.tpl
+++ b/templates/system-auth.tpl
@@ -11,7 +11,7 @@ auth  requisite   pam_faillock.so preauth
 {% if homed %}
 auth[success=2 default=ignore]  pam_systemd_home.so
 {% endif %}
-auth[success=1 default=ignore]  pam_unix.so {{ 
nullok|default('', true) }} {{ debug|default('', true) }} try_first_pass
+auth[success=1 new_authtok_reqd=1 ignore=ignore default=bad]  
pam_unix.so {{ nullok|default('', true) }} {{ debug|default('', true) }} 
try_first_pass
 auth   [default=die]   pam_faillock.so authfail
 
 {% if caps %}

diff --git a/tests/rendered/custom/system-auth 
b/tests/rendered/custom/system-auth
index a84a45a..aae3914 100644
--- a/tests/rendered/custom/system-auth
+++ b/tests/rendered/custom/system-auth
@@ -1,6 +1,6 @@
 auth   requiredpam_env.so
 auth   requisite   pam_faillock.so preauth
-auth[success=1 default=ignore]  pam_unix.so nullok  
try_first_pass
+auth[success=1 new_authtok_reqd=1 ignore=ignore default=bad]  
pam_unix.so nullok  try_first_pass
 auth   [default=die]   pam_faillock.so authfail
 accountrequiredpam_unix.so
 account requiredpam_faillock.so

diff --git a/tests/rendered/default/system-auth 
b/tests/rendered/default/system-auth
index d84e030..4c069c3 100644
--- a/tests/rendered/default/system-auth
+++ b/tests/rendered/default/system-auth
@@ -1,6 +1,6 @@
 auth   requiredpam_env.so
 auth   requisite   pam_faillock.so preauth
-auth[success=1 default=ignore]  pam_unix.so   try_first_pass
+auth[success=1 new_authtok_reqd=1 ignore=ignore default=bad]  
pam_unix.so   try_first_pass
 auth   [default=die]   pam_faillock.so authfail
 accountrequiredpam_unix.so
 account requiredpam_faillock.so

diff --git a/tests/rendered/minimal/system-auth 
b/tests/rendered/minimal/system-auth
index d84e030..4c069c3 100644
--- a/tests/rendered/minimal/system-auth
+++ b/tests/rendered/minimal/system-auth
@@ -1,6 +1,6 @@
 auth   requiredpam_env.so
 auth   requisite   pam_faillock.so preauth
-auth[success=1 default=ignore]  

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/

2023-12-17 Thread Sam James
commit: e7f8509336cf7b72f9cf598bc05994df10b16684
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 08:37:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 08:37:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f85093

dev-db/sqlite: Stabilize 3.44.2-r1 hppa, #915730

Signed-off-by: Sam James  gentoo.org>

 dev-db/sqlite/sqlite-3.44.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlite/sqlite-3.44.2-r1.ebuild 
b/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
index f286f5e4f578..bb4a06c9e8e8 100644
--- a/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
@@ -24,7 +24,7 @@ else
"
S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"



[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/

2023-12-17 Thread Sam James
commit: 7db52325522d69bc69ffd0a1d3f420796fc1c638
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 08:37:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 08:37:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db52325

dev-db/sqlite: Stabilize 3.44.2-r1 ppc64, #915730

Signed-off-by: Sam James  gentoo.org>

 dev-db/sqlite/sqlite-3.44.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlite/sqlite-3.44.2-r1.ebuild 
b/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
index 5b6fe392c4b6..1e435badefa0 100644
--- a/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
@@ -24,7 +24,7 @@ else
"
S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"



[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/

2023-12-17 Thread Sam James
commit: 31978d18e2c2ad1f6bc85990289dd95fd9000816
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 08:37:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 08:37:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31978d18

dev-db/sqlite: Stabilize 3.44.2-r1 sparc, #915730

Signed-off-by: Sam James  gentoo.org>

 dev-db/sqlite/sqlite-3.44.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlite/sqlite-3.44.2-r1.ebuild 
b/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
index 1e435badefa0..f286f5e4f578 100644
--- a/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.44.2-r1.ebuild
@@ -24,7 +24,7 @@ else
"
S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"



[gentoo-commits] proj/kde:master commit in: eclass/

2023-12-17 Thread Andreas Sturmlechner
commit: 0064b9b7eaa908237e22b2bffd64f1c0ed91c5be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 08:21:40 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:09:19 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0064b9b7

frameworks.kde.org.eclass: Support unstable release SRC_URIs

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/frameworks.kde.org.eclass | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 248edede2e..19db30352f 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -69,7 +69,13 @@ case ${KDE_BUILD_TYPE} in
;;
*)
if [[ -z ${KDE_ORG_COMMIT} ]]; then
-   _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/"
+   case ${PV} in
+   5.2[4-9]?.? )
+   
_KDE_SRC_URI+="unstable/frameworks/$(ver_cut 1-3)/"
+   RESTRICT+=" mirror"
+   ;;
+   *) _KDE_SRC_URI+="stable/frameworks/$(ver_cut 
1-2)/" ;;
+   esac
case ${KDE_ORG_NAME} in
kdelibs4support | \
kdesignerplugin | \



[gentoo-commits] proj/kde:master commit in: Documentation/package.mask/, ...

2023-12-17 Thread Andreas Sturmlechner
commit: 6a52ba14664492bf3d791a682c450420a5fd996a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 09:00:52 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:09:19 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a52ba14

Documentation: Drop kde-frameworks/oxygen-icons from KDE Frameworks live

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../.kde-frameworks-live/kde-frameworks-tier1-live   | 1 -
 Documentation/package.accept_keywords/kde-frameworks-live.keywords   | 1 -
 Documentation/package.mask/kde-frameworks-live   | 1 -
 Documentation/package.unmask/kde-frameworks-live | 1 -
 4 files changed, 4 deletions(-)

diff --git 
a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-tier1-live
 
b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-tier1-live
index be4f2c5305..1b5e10c03f 100644
--- 
a/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-tier1-live
+++ 
b/Documentation/package.accept_keywords/.kde-frameworks-live/kde-frameworks-tier1-live
@@ -25,7 +25,6 @@
 ~kde-frameworks/kwindowsystem- **
 ~kde-frameworks/modemmanager-qt- **
 ~kde-frameworks/networkmanager-qt- **
-~kde-frameworks/oxygen-icons- **
 ~kde-frameworks/prison- **
 ~kde-frameworks/solid- **
 ~kde-frameworks/sonnet- **

diff --git a/Documentation/package.accept_keywords/kde-frameworks-live.keywords 
b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
index 723b56fa9b..1714a6e640 100644
--- a/Documentation/package.accept_keywords/kde-frameworks-live.keywords
+++ b/Documentation/package.accept_keywords/kde-frameworks-live.keywords
@@ -30,7 +30,6 @@
 ~kde-frameworks/kwindowsystem- **
 ~kde-frameworks/modemmanager-qt- **
 ~kde-frameworks/networkmanager-qt- **
-~kde-frameworks/oxygen-icons- **
 ~kde-frameworks/prison- **
 ~kde-frameworks/solid- **
 ~kde-frameworks/sonnet- **

diff --git a/Documentation/package.mask/kde-frameworks-live 
b/Documentation/package.mask/kde-frameworks-live
index 555a2e81d2..a281674274 100644
--- a/Documentation/package.mask/kde-frameworks-live
+++ b/Documentation/package.mask/kde-frameworks-live
@@ -30,7 +30,6 @@
 ~kde-frameworks/kwindowsystem-
 ~kde-frameworks/modemmanager-qt-
 ~kde-frameworks/networkmanager-qt-
-~kde-frameworks/oxygen-icons-
 ~kde-frameworks/prison-
 ~kde-frameworks/solid-
 ~kde-frameworks/sonnet-

diff --git a/Documentation/package.unmask/kde-frameworks-live 
b/Documentation/package.unmask/kde-frameworks-live
index 555a2e81d2..a281674274 100644
--- a/Documentation/package.unmask/kde-frameworks-live
+++ b/Documentation/package.unmask/kde-frameworks-live
@@ -30,7 +30,6 @@
 ~kde-frameworks/kwindowsystem-
 ~kde-frameworks/modemmanager-qt-
 ~kde-frameworks/networkmanager-qt-
-~kde-frameworks/oxygen-icons-
 ~kde-frameworks/prison-
 ~kde-frameworks/solid-
 ~kde-frameworks/sonnet-



[gentoo-commits] proj/kde:master commit in: sets/

2023-12-17 Thread Andreas Sturmlechner
commit: 4a7c295c20d0f28ffc15baba520332a4f89d865d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 08:59:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:09:19 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a7c295c

sets: Drop kde-frameworks/oxygen-icons from kde-frameworks-tier1-live

See also:
https://community.kde.org/Frameworks/6.0_Release_notes#Frameworks_No_Longer_Shipped

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sets/kde-frameworks-tier1-live | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sets/kde-frameworks-tier1-live b/sets/kde-frameworks-tier1-live
index ee297b5958..7aa2a3b257 100644
--- a/sets/kde-frameworks-tier1-live
+++ b/sets/kde-frameworks-tier1-live
@@ -25,7 +25,6 @@
 ~kde-frameworks/kwindowsystem-
 ~kde-frameworks/modemmanager-qt-
 ~kde-frameworks/networkmanager-qt-
-~kde-frameworks/oxygen-icons-
 ~kde-frameworks/prison-
 ~kde-frameworks/solid-
 ~kde-frameworks/sonnet-



[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/new/

2023-12-17 Thread Andreas Sturmlechner
commit: d95b69ec1905b95bb9d34d82a4b33c1250a082c1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 08:45:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:09:19 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d95b69ec

Documentation: frameworks-bump.sh: Support KF6 unstable releases

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 Documentation/maintainers/new/frameworks-bump.sh | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/maintainers/new/frameworks-bump.sh 
b/Documentation/maintainers/new/frameworks-bump.sh
index 9180a1a5c9..84b2813b49 100755
--- a/Documentation/maintainers/new/frameworks-bump.sh
+++ b/Documentation/maintainers/new/frameworks-bump.sh
@@ -6,7 +6,7 @@
 help() {
echo "Perform a version bump of KDE Frameworks 5 or 6."
echo
-   echo "Based on the kde-frameworks-(5|6)-live set, this script performs 
a full version bump"
+   echo "Based on the kde-frameworks-(5-)live sets, this script performs a 
full version bump"
echo "of a new unreleased KDE Frameworks."
echo
echo "In addition to the new ebuild being created, the following 
operations are performed:"
@@ -34,12 +34,17 @@ if [[ -z "${VERSION}" ]] ; then
 fi
 
 major_version=$(echo ${VERSION} | cut -d "." -f 1)
+if [[ ${VERSION} == 5.2[4-9]?.? ]]; then
+   major_version=6
+fi
 major_minor_version=$(echo ${VERSION} | cut -d "." -f 1-2)
-kfmv="kde-frameworks-${major_version}-${major_minor_version}"
-setname="kde-frameworks-${major_version}"
 if [[ ${major_version} == 5 ]]; then
+   kfmv="kde-frameworks-${major_version}-${major_minor_version}"
base_version=5.239.
+   setname="kde-frameworks-${major_version}"
 else
+   kfmv="kde-frameworks-${major_minor_version}"
+   setname="kde-frameworks"
base_version=
 fi
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/

2023-12-17 Thread Alfredo Tupone
commit: 60b645821036cba6aecb772566881d9df6f8786e
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sun Dec 17 09:30:11 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Dec 17 09:30:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b64582

sci-libs/caffe2: enable nvidia-cuda-toolkit-12

Closes: https://bugs.gentoo.org/917585
Signed-off-by: Alfredo Tupone  gentoo.org>

 sci-libs/caffe2/{caffe2-2.1.1-r2.ebuild => caffe2-2.1.1-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/caffe2/caffe2-2.1.1-r2.ebuild 
b/sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
rename to sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
index 714b5477c38f..d2022d69585d 100644
--- a/sci-libs/caffe2/caffe2-2.1.1-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.1-r3.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
cuda? (
=dev-libs/cudnn-8*
>=dev-libs/cudnn-frontend-0.9.2:0/8
-   =dev-libs/FBGEMM-2023.11.02 )
ffmpeg? ( media-video/ffmpeg:= )



[gentoo-commits] proj/kde:master commit in: eclass/

2023-12-17 Thread Andreas Sturmlechner
commit: 38ce27e85da2f2e2dbb50ab4ee6a5fc9736a4963
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 09:59:00 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:59:00 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=38ce27e8

gear.kde.org.eclass: Drop kdevelop from SLOT=5 blocklist

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/gear.kde.org.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 4d799ec672..128428641f 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -105,7 +105,6 @@ if $(ver_test -gt 24.01.75); then
kdebugsettings | \
kdegraphics-mobipocket | \
kdenetwork-filesharing | \
-   kdevelop | \
kdf | \
kdialog | \
kdiamond | \



[gentoo-commits] proj/kde:master commit in: media-sound/amarok/

2023-12-17 Thread Andreas Sturmlechner
commit: c1adf2c2e1f8b40de76d19544f65d7ad722be690
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 10:02:25 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 10:02:25 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c1adf2c2

media-sound/amarok: Drop IUSE ofa, media-libs/libofa was last-rited

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/amarok/amarok-.ebuild | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/media-sound/amarok/amarok-.ebuild 
b/media-sound/amarok/amarok-.ebuild
index 8ba31c55ff..e4568afce5 100644
--- a/media-sound/amarok/amarok-.ebuild
+++ b/media-sound/amarok/amarok-.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://amarok.kde.org/;
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="ipod lastfm mariadb mtp ofa podcast wikipedia"
+IUSE="ipod lastfm mariadb mtp podcast wikipedia"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 BDEPEND="virtual/pkgconfig"
@@ -67,10 +67,6 @@ DEPEND="
dev-libs/glib:2
media-libs/libgpod[gtk]
)
-   ofa? (
-   media-libs/libofa
-   media-video/ffmpeg:=
-   )
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
mariadb? ( dev-db/mariadb-connector-c:= )
!mariadb? ( dev-db/mysql-connector-c:= )
@@ -81,7 +77,7 @@ DEPEND="
 RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
-   !ofa? ( media-video/ffmpeg )
+   media-video/ffmpeg
 "
 
 src_configure() {
@@ -90,12 +86,12 @@ src_configure() {
-DWITH_PLAYER=ON
-DWITH_UTILITIES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibOFA=ON
-DCMAKE_DISABLE_FIND_PACKAGE_MySQLe=ON
-DWITH_IPOD=$(usex ipod)
$(cmake_use_find_package lastfm LibLastFm)
$(cmake_use_find_package !mariadb MySQL)
$(cmake_use_find_package mtp Mtp)
-   $(cmake_use_find_package ofa LibOFA)
$(cmake_use_find_package podcast Mygpo-qt5)
$(cmake_use_find_package wikipedia Qt5WebEngine)
)



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/

2023-12-17 Thread Andreas Sturmlechner
commit: b0ebe017b1b96095d6cabc68af55b93115451f41
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 09:56:09 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:56:45 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0ebe017

kde-frameworks/kcoreaddons: Drop IUSE qml

Too big burden to support.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kcoreaddons/kcoreaddons-.ebuild | 6 +++---
 kde-frameworks/kcoreaddons/metadata.xml| 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild 
b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild
index aa24d1dd1f..d1c8a6f1bb 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-.ebuild
@@ -10,12 +10,12 @@ DESCRIPTION="Framework for solving common problems such as 
caching, randomisatio
 
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="dbus qml"
+IUSE="dbus"
 
 DEPEND="
>=dev-qt/qtbase-${QTMIN}:6[dbus?,icu]
+   >=dev-qt/qtdeclarative-${QTMIN}:6
virtual/libudev:=
-   qml? ( >=dev-qt/qtdeclarative-${QTMIN}:6 )
 "
 RDEPEND="${DEPEND}
>=dev-qt/qttranslations-${QTMIN}:6
@@ -24,8 +24,8 @@ BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
 src_configure() {
local mycmakeargs=(
+   -DKCOREADDONS_USE_QML=ON
$(cmake_use_find_package dbus Qt6DBus)
-   -DKCOREADDONS_USE_QML=$(usex qml)
)
 
ecm_src_configure

diff --git a/kde-frameworks/kcoreaddons/metadata.xml 
b/kde-frameworks/kcoreaddons/metadata.xml
index 6709562d0d..506ecf605b 100644
--- a/kde-frameworks/kcoreaddons/metadata.xml
+++ b/kde-frameworks/kcoreaddons/metadata.xml
@@ -8,9 +8,6 @@

https://bugs.kde.org/

-   
-   Enable QML/QtQuick support via 
dev-qt/qtdeclarative
-   


Must only be used by packages that are known to use 
private parts of the Frameworks API.



[gentoo-commits] proj/kde:master commit in: kde-apps/kget/

2023-12-17 Thread Andreas Sturmlechner
commit: 57e2c54f7fdf3122ef1057ed2870a6a2c8160751
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 09:59:36 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 09:59:36 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=57e2c54f

kde-apps/kget: Drop obsolete dependency

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kget/kget-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kget/kget-.ebuild b/kde-apps/kget/kget-.ebuild
index 5b2d99d188..43d8b493af 100644
--- a/kde-apps/kget/kget-.ebuild
+++ b/kde-apps/kget/kget-.ebuild
@@ -42,7 +42,6 @@ RDEPEND="
>=kde-frameworks/solid-${KFMIN}:6
bittorrent? ( net-libs/libktorrent:6 )
gpg? ( >=app-crypt/gpgme-1.23.1-r1:=[qt6] )
-   kde? ( kde-plasma/plasma-workspace:6 )
mms? ( media-libs/libmms )
sqlite? ( dev-db/sqlite:3 )
 "



[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-integration/

2023-12-17 Thread Sam James
commit: fa690a7b01cc743955de1549ab409683edc0994c
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 12:11:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:11:20 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fa690a7b

kde-plasma/plasma-integration: lift xdg-desktop-portal-kde from RDEPEND->PDEPEND

We only need it at runtime so let's lift it to PDEPEND to avoid a circular 
dependency.

```
* Error: circular dependencies:

(kde-plasma/xdg-desktop-portal-kde-:6/6::kde, ebuild scheduled for merge) 
depends on
 (kde-plasma/plasma-workspace-:6/6::kde, ebuild scheduled for merge) 
(buildtime)
  (kde-plasma/plasma-integration-:6/6::kde, ebuild scheduled for merge) 
(runtime)
   (kde-plasma/xdg-desktop-portal-kde-:6/6::kde, ebuild scheduled for 
merge) (runtime)
```

Closes: https://bugs.gentoo.org/920188
Signed-off-by: Sam James  gentoo.org>

 kde-plasma/plasma-integration/plasma-integration-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-integration/plasma-integration-.ebuild 
b/kde-plasma/plasma-integration/plasma-integration-.ebuild
index 98d27eeb3f..8de40f8ee5 100644
--- a/kde-plasma/plasma-integration/plasma-integration-.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-.ebuild
@@ -65,11 +65,13 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.11.1
 "
 RDEPEND="${COMMON_DEPEND}
-   >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6
media-fonts/hack
media-fonts/noto
media-fonts/noto-emoji
 "
+PDEPEND="
+   >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6
+"
 BDEPEND="
>=dev-qt/qtwayland-${QTMIN}:6
qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 )



[gentoo-commits] repo/gentoo:master commit in: profiles/

2023-12-17 Thread Sam James
commit: d28880dfffa65e95dc9eeb05b437524a2ac537dd
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 12:37:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 12:37:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28880df

profiles/license_groups: drop unused Amazon in @BINARY-REDISTRIBUTABLE

Fixes: 8d4fa8a32e2eca3290eded54bcf6ce3fc5779cde
Signed-off-by: Sam James  gentoo.org>

 profiles/license_groups | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/license_groups b/profiles/license_groups
index 52376e42a99c..80323da28776 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -69,7 +69,7 @@ FREE @FREE-SOFTWARE @FREE-DOCUMENTS
 # - IF (and only if) there is an explicit inclusion requirement,
 #   USE=bindist MUST cause a copy of the license to be installed
 #   in a file location compliant with the license
-BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom 
freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 ISSL JSON 
linux-fw-redistributable LSI-tw_cli Mellanox-AS-IS MicroChip-SDCC 
no-source-code NOSA NVIDIA-r1 NVIDIA-r2 qlogic-fibre-channel-firmware shmux 
unRAR
+BINARY-REDISTRIBUTABLE @FREE Atmel AVASYS bh-luxi bonnie Broadcom freedist 
intel-ucode ipw2100-fw ipw2200-fw ipw3945 ISSL JSON linux-fw-redistributable 
LSI-tw_cli Mellanox-AS-IS MicroChip-SDCC no-source-code NOSA NVIDIA-r1 
NVIDIA-r2 qlogic-fibre-channel-firmware shmux unRAR
 
 ##
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/ktexttemplate/

2023-12-17 Thread Andreas Sturmlechner
commit: 51117644d6904cf646ceba05214a2c5b388353ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 17 12:43:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 17 12:43:59 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=51117644

kde-frameworks/ktexttemplate: update DESCRIPTION

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/ktexttemplate/ktexttemplate-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-.ebuild 
b/kde-frameworks/ktexttemplate/ktexttemplate-.ebuild
index 273f9f165f..f3af7aab7e 100644
--- a/kde-frameworks/ktexttemplate/ktexttemplate-.ebuild
+++ b/kde-frameworks/ktexttemplate/ktexttemplate-.ebuild
@@ -8,7 +8,7 @@ PVCUT=$(ver_cut 1-2)
 QTMIN=6.6.0
 inherit ecm frameworks.kde.org
 
-DESCRIPTION="Library to allow separating the structure of documents from the 
data they contain"
+DESCRIPTION="Library to allow separating the structure of documents from data 
they contain"
 
 LICENSE="LGPL-2.1+"
 KEYWORDS=""



[gentoo-commits] repo/user/dlang:master commit in: net-misc/onedrive/, eclass/, dev-util/dub/, dev-util/dcd/, dev-lang/dmd/, ...

2023-12-17 Thread Marco Leise
commit: 728dd9d044473329572c6c04bd202d915d8d2417
Author: Horodniceanu Andrei  proton  me>
AuthorDate: Mon Dec 11 11:03:57 2023 +
Commit: Marco Leise  gmx  de>
CommitDate: Sat Dec 16 12:41:20 2023 +
URL:https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=728dd9d0

stabilization sweep

Signed-off-by: Horodniceanu Andrei  proton.me>

 dev-lang/dmd/dmd-2.100.2.ebuild |  2 +-
 dev-lang/dmd/dmd-2.101.2.ebuild |  2 +-
 dev-lang/dmd/dmd-2.102.2.ebuild |  2 +-
 dev-lang/dmd/dmd-2.103.1.ebuild |  2 +-
 dev-lang/dmd/dmd-2.104.2.ebuild |  2 +-
 dev-lang/ldc2/ldc2-1.30.0-r1.ebuild |  2 +-
 dev-lang/ldc2/ldc2-1.31.0.ebuild|  2 +-
 dev-lang/ldc2/ldc2-1.32.2.ebuild|  2 +-
 dev-lang/ldc2/ldc2-1.33.0.ebuild|  2 +-
 dev-lang/ldc2/ldc2-1.34.0.ebuild|  2 +-
 dev-lang/ldc2/ldc2-1.35.0.ebuild|  2 +-
 dev-util/dcd/dcd-0.13.4.ebuild  |  4 ++--
 dev-util/dlang-tools/dlang-tools-2.104.2.ebuild |  2 +-
 dev-util/dub/dub-1.33.0.ebuild  |  2 +-
 eclass/dlang-compilers.eclass   | 22 +++---
 net-misc/onedrive/onedrive-2.4.25.ebuild|  4 ++--
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/dev-lang/dmd/dmd-2.100.2.ebuild b/dev-lang/dmd/dmd-2.100.2.ebuild
index 6ed0d65..5551d12 100644
--- a/dev-lang/dmd/dmd-2.100.2.ebuild
+++ b/dev-lang/dmd/dmd-2.100.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2022
 DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.100"
 

diff --git a/dev-lang/dmd/dmd-2.101.2.ebuild b/dev-lang/dmd/dmd-2.101.2.ebuild
index e4c61e8..457cef9 100644
--- a/dev-lang/dmd/dmd-2.101.2.ebuild
+++ b/dev-lang/dmd/dmd-2.101.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2023
 DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.102"
 

diff --git a/dev-lang/dmd/dmd-2.102.2.ebuild b/dev-lang/dmd/dmd-2.102.2.ebuild
index e4c61e8..457cef9 100644
--- a/dev-lang/dmd/dmd-2.102.2.ebuild
+++ b/dev-lang/dmd/dmd-2.102.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2023
 DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.102"
 

diff --git a/dev-lang/dmd/dmd-2.103.1.ebuild b/dev-lang/dmd/dmd-2.103.1.ebuild
index 8c2ab85..5a3cf0f 100644
--- a/dev-lang/dmd/dmd-2.103.1.ebuild
+++ b/dev-lang/dmd/dmd-2.103.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2023
 DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.105"
 

diff --git a/dev-lang/dmd/dmd-2.104.2.ebuild b/dev-lang/dmd/dmd-2.104.2.ebuild
index 8c2ab85..5a3cf0f 100644
--- a/dev-lang/dmd/dmd-2.104.2.ebuild
+++ b/dev-lang/dmd/dmd-2.104.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 YEAR=2023
 DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.105"
 

diff --git a/dev-lang/ldc2/ldc2-1.30.0-r1.ebuild 
b/dev-lang/ldc2/ldc2-1.30.0-r1.ebuild
index 85daa28..d258c53 100644
--- a/dev-lang/ldc2/ldc2-1.30.0-r1.ebuild
+++ b/dev-lang/ldc2/ldc2-1.30.0-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="LLVM D Compiler"
 HOMEPAGE="https://github.com/ldc-developers/ldc;
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 LICENSE="BSD"
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 

diff --git a/dev-lang/ldc2/ldc2-1.31.0.ebuild b/dev-lang/ldc2/ldc2-1.31.0.ebuild
index 0f8cad1..91d1490 100644
--- a/dev-lang/ldc2/ldc2-1.31.0.ebuild
+++ b/dev-lang/ldc2/ldc2-1.31.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="LLVM D Compiler"
 HOMEPAGE="https://github.com/ldc-developers/ldc;
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE="BSD"
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 

diff --git a/dev-lang/ldc2/ldc2-1.32.2.ebuild b/dev-lang/ldc2/ldc2-1.32.2.ebuild
index 921f641..76f8bba 100644
--- a/dev-lang/ldc2/ldc2-1.32.2.ebuild
+++ b/dev-lang/ldc2/ldc2-1.32.2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="LLVM D Compiler"
 HOMEPAGE="https://github.com/ldc-developers/ldc;
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE="BSD"
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 

diff --git a/dev-lang/ldc2/ldc2-1.33.0.ebuild b/dev-lang/ldc2/ldc2-1.33.0.ebuild
index 921f641..76f8bba 100644
--- a/dev-lang/ldc2/ldc2-1.33.0.ebuild
+++ b/dev-lang/ldc2/ldc2-1.33.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="LLVM D Compiler"
 HOMEPAGE="https://github.com/ldc-developers/ldc;
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE="BSD"
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 

diff --git a/dev-lang/ldc2/ldc2-1.34.0.ebuild b/dev-lang/ldc2/ldc2-1.34.0.ebuild
index 61d39c9..e2b4dfe 100644
--- a/dev-lang/ldc2/ldc2-1.34.0.ebuild
+++ b/dev-lang/ldc2/ldc2-1.34.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 
 

[gentoo-commits] repo/user/dlang:master commit in: /

2023-12-17 Thread Marco Leise
commit: 5b695e80806a87d6ca7f912549c26789c380fe9e
Author: Marco Leise  gmx  de>
AuthorDate: Sun Dec 17 12:00:38 2023 +
Commit: Marco Leise  gmx  de>
CommitDate: Sun Dec 17 12:00:38 2023 +
URL:https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=5b695e80

Stabilization sweep

Signed-off-by: Marco Leise  gmx.de>

 dev-lang/dmd/Manifest  |  36 -
 dev-lang/dmd/dmd-2.064.2-r7.ebuild |  25 -
 dev-lang/dmd/dmd-2.065.0-r7.ebuild |  18 -
 dev-lang/dmd/dmd-2.066.1-r7.ebuild |  18 -
 dev-lang/dmd/dmd-2.067.1-r8.ebuild |  17 -
 dev-lang/dmd/dmd-2.068.2-r9.ebuild |  17 -
 dev-lang/dmd/dmd-2.069.2-r6.ebuild |  16 -
 dev-lang/dmd/dmd-2.070.2-r6.ebuild |  17 -
 dev-lang/dmd/dmd-2.071.2-r6.ebuild |  15 -
 dev-lang/dmd/dmd-2.072.2-r6.ebuild |  15 -
 dev-lang/dmd/dmd-2.073.2-r6.ebuild |  22 -
 dev-lang/dmd/dmd-2.074.1-r6.ebuild |  22 -
 dev-lang/dmd/dmd-2.075.1-r4.ebuild |  18 -
 dev-lang/dmd/dmd-2.076.1-r4.ebuild |  21 -
 dev-lang/dmd/dmd-2.077.1-r3.ebuild |  21 -
 dev-lang/dmd/dmd-2.078.3-r3.ebuild |  24 -
 dev-lang/dmd/dmd-2.079.1-r3.ebuild |  24 -
 dev-lang/dmd/dmd-2.080.1-r3.ebuild |  21 -
 dev-lang/dmd/dmd-2.081.2-r3.ebuild |  24 -
 dev-lang/dmd/dmd-2.082.1-r3.ebuild |  24 -
 dev-lang/dmd/dmd-2.083.1-r2.ebuild |  24 -
 dev-lang/dmd/dmd-2.084.1-r2.ebuild |  26 -
 dev-lang/dmd/dmd-2.085.1-r2.ebuild |  26 -
 dev-lang/dmd/dmd-2.087.1-r1.ebuild |  26 -
 dev-lang/dmd/dmd-2.088.1-r1.ebuild |  21 -
 dev-lang/dmd/dmd-2.089.1.ebuild|  21 -
 dev-lang/dmd/dmd-2.090.1.ebuild|  20 -
 dev-lang/dmd/dmd-2.091.1.ebuild|  20 -
 dev-lang/dmd/dmd-2.092.1.ebuild|  20 -
 dev-lang/dmd/dmd-2.093.1.ebuild|  14 -
 dev-lang/dmd/dmd-2.094.2.ebuild|  14 -
 dev-lang/dmd/dmd-2.095.1.ebuild|  14 -
 dev-lang/dmd/dmd-2.096.1.ebuild|  14 -
 dev-lang/dmd/dmd-2.097.2.ebuild|  14 -
 dev-lang/dmd/dmd-2.098.1.ebuild|  14 -
 dev-lang/dmd/dmd-2.099.1.ebuild|  14 -
 dev-lang/dmd/dmd-2.100.2.ebuild|  14 -
 dev-lang/dmd/dmd-2.101.2.ebuild|   2 +-
 dev-lang/dmd/dmd-2.102.2.ebuild|   2 +-
 dev-lang/dmd/dmd-2.103.1.ebuild|   2 +-
 dev-lang/dmd/dmd-2.104.2.ebuild|   2 +-
 .../dmd/files/2.063-replace-bits-mathdef-h.patch   |  12 -
 .../2.064-link-32-bit-shared-lib-with-ld.bfd.patch |  14 -
 dev-lang/dmd/files/2.064-makefile-multilib.patch   |  26 -
 dev-lang/dmd/files/2.064-no-narrowing.patch|  12 -
 .../2.065-link-32-bit-shared-lib-with-ld.bfd.patch |  14 -
 dev-lang/dmd/files/2.065-makefile-multilib.patch   |  49 --
 dev-lang/dmd/files/2.065-no-narrowing.patch|  12 -
 dev-lang/dmd/files/2.066-no-narrowing.patch|  14 -
 dev-lang/dmd/files/2.066.1-phobos-makefile.patch   |  81 ---
 dev-lang/dmd/files/2.067-no-narrowing.patch|  17 -
 .../dmd/files/2.068-replace-bits-mathdef-h.patch   |  12 -
 .../2.069-link-32-bit-shared-lib-with-ld.bfd.patch |  11 -
 dev-lang/dmd/files/2.069-no-narrowing.patch|  17 -
 dev-lang/dmd/files/2.070-disable-dwarf.patch   |  11 -
 dev-lang/dmd/files/2.073-default_ddoc_theme.ddoc   | 735 ---
 .../files/2.073-fix-out-of-bounds-in-evalu8.patch  |  11 -
 dev-lang/dmd/files/2.073-fix-segv-in-evalu8.patch  |  13 -
 .../files/2.074-fix-out-of-bounds-in-evalu8.patch  |  11 -
 dev-lang/dmd/files/2.074-fix-segv-in-evalu8.patch  |  13 -
 .../2.074-link-32-bit-shared-lib-with-ld.bfd.patch |  11 -
 dev-lang/dmd/files/2.076-config.sh |  17 -
 dev-lang/dmd/files/2.076-default_ddoc_theme.ddoc   | 737 ---
 dev-lang/dmd/files/2.078-allow-deprecations.patch  |  11 -
 dev-lang/dmd/files/2.080-default_ddoc_theme.ddoc   | 742 ---
 dev-lang/dmd/files/2.081-allow-deprecations.patch  |  11 -
 dev-lang/dmd/files/2.084-config.d  |  77 --
 dev-lang/dmd/files/2.084-default_ddoc_theme.ddoc   | 783 -
 dev-lang/ldc2/ldc2-1.30.0-r1.ebuild|   2 +-
 dev-lang/ldc2/ldc2-1.31.0.ebuild   |   2 +-
 dev-lang/ldc2/ldc2-1.32.2.ebuild   |   2 +-
 dev-lang/ldc2/ldc2-1.33.0.ebuild   |   2 +-
 dev-lang/ldc2/ldc2-1.34.0.ebuild   |   2 +-
 dev-lang/ldc2/ldc2-1.35.0.ebuild   |   2 +-
 dev-libs/gtkd/Manifest |   1 -
 dev-libs/gtkd/gtkd-2.4.2-r1.ebuild | 112 ---
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbutils/

2023-12-17 Thread Arthur Zamarin
commit: fc1f532ab6f4473e52f6aeae5d87faac3ce0e3eb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 13:50:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 13:50:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1f532a

sys-apps/usbutils: Stabilize 016 hppa, #919955

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/usbutils/usbutils-016.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/usbutils/usbutils-016.ebuild 
b/sys-apps/usbutils/usbutils-016.ebuild
index d537e602ff79..0d74f16ba1ba 100644
--- a/sys-apps/usbutils/usbutils-016.ebuild
+++ b/sys-apps/usbutils/usbutils-016.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/debianutils/

2023-12-17 Thread Arthur Zamarin
commit: ab6b11b4f2720a944aac236cb3d6de4ce8d74021
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 13:50:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 13:50:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6b11b4

sys-apps/debianutils: Stabilize 5.14 hppa, #919963

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/debianutils/debianutils-5.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild 
b/sys-apps/debianutils/debianutils-5.14.ebuild
index 2e0ee8b0b4de..614f9cdff54e 100644
--- a/sys-apps/debianutils/debianutils-5.14.ebuild
+++ b/sys-apps/debianutils/debianutils-5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/

2023-12-17 Thread Arthur Zamarin
commit: 3f4968a7efce8fe484f587b032eb17f8cbdceb63
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 13:50:33 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 13:50:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4968a7

sys-libs/zlib: Stabilize 1.3-r2 hppa, #919958

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-libs/zlib/zlib-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/zlib/zlib-1.3-r2.ebuild b/sys-libs/zlib/zlib-1.3-r2.ebuild
index 88e6ce23faba..94ad4d06e8a3 100644
--- a/sys-libs/zlib/zlib-1.3-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 IUSE="minizip static-libs"
 
 RDEPEND="!sys-libs/zlib-ng[compat]"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/

2023-12-17 Thread Arthur Zamarin
commit: b66efd2ad3af91e7b6267c8ba4be61a929f69834
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 13:50:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 13:50:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b66efd2a

sys-fs/fuse: Stabilize 3.16.2 hppa, #919968

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/fuse/fuse-3.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/fuse/fuse-3.16.2.ebuild b/sys-fs/fuse/fuse-3.16.2.ebuild
index 9da9c7126450..10840ae807b0 100644
--- a/sys-fs/fuse/fuse-3.16.2.ebuild
+++ b/sys-fs/fuse/fuse-3.16.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz;
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test ) test? ( userpriv )"
 



[gentoo-commits] repo/gentoo:master commit in: net-print/splix/

2023-12-17 Thread Mart Raudsepp
commit: a4f2b607b71bd128dfb6c8e38dc5881a329817b6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Dec 17 14:21:57 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Dec 17 14:21:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f2b607

net-print/splix: keyword 2.0.0_p20130826-r1 for ~arm64

Signed-off-by: Mart Raudsepp  gentoo.org>

 net-print/splix/splix-2.0.0_p20130826-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild 
b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
index 71e407a58efa..5b17bec8db15 100644
--- a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+jbig"
 
 DEPEND=">=app-text/ghostscript-gpl-9.02



[gentoo-commits] repo/gentoo:master commit in: dev-perl/Shell-EnvImporter/

2023-12-17 Thread Mart Raudsepp
commit: 8f1ca428f7cac1cca006b560f38e3593e659c1ad
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Dec 17 14:23:52 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Dec 17 14:23:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1ca428

dev-perl/Shell-EnvImporter: keyword 1.70.0-r3 for ~arm64

Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild 
b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild
index cbfcbc07538d..62970a2e0e85 100644
--- a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild
+++ b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Import environment variable changes from external commands or 
shell scripts"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
>=dev-perl/Class-MethodMaker-2



[gentoo-commits] repo/gentoo:master commit in: dev-python/intelhex/

2023-12-17 Thread Mart Raudsepp
commit: 334d3a42b3bfd67d0bf03b5a13c774a46da67418
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Dec 17 14:29:32 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Dec 17 14:29:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334d3a42

dev-python/intelhex: keyword 2.3.0-r1 for ~arm64

Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-python/intelhex/intelhex-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/intelhex/intelhex-2.3.0-r1.ebuild 
b/dev-python/intelhex/intelhex-2.3.0-r1.ebuild
index f1cab5be51d3..1b26b4518590 100644
--- a/dev-python/intelhex/intelhex-2.3.0-r1.ebuild
+++ b/dev-python/intelhex/intelhex-2.3.0-r1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~x86"
 
 distutils_enable_tests unittest



[gentoo-commits] repo/gentoo:master commit in: app-portage/g-cpan/

2023-12-17 Thread Mart Raudsepp
commit: 566c2d41aa4d9f0b80146a13b2dc4899ef31d0b0
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Dec 17 14:25:02 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Dec 17 14:25:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566c2d41

app-portage/g-cpan: keyword 0.18.0-r1 for ~arm64

Signed-off-by: Mart Raudsepp  gentoo.org>

 app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild 
b/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
index 01a9e11c8b90..9d71bc053ad6 100644
--- a/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/

2023-12-17 Thread Sam James
commit: da31d13917542ce5d62f939834df91166762643d
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 09:40:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 09:43:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da31d139

sci-libs/hdf5: add 1.14.3

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf5/Manifest   |   1 +
 sci-libs/hdf5/hdf5-1.14.3.ebuild | 120 +++
 2 files changed, 121 insertions(+)

diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index f146f8d34066..cef49f76a841 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,3 +2,4 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B 
ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a
 DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 
99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7
 SHA512 
cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5
 DIST hdf5-1.14.1.tar.bz2 16257319 BLAKE2B 
fbabbe2a61fca3f841d0206e3918390001ec1ec713696b69845eb6390595794a63740db9a7b48fd132814268e216d8fea6288cd23b04b2fa981058b557113e73
 SHA512 
b4dd3fca88547fdcbb2afcc22cb11bb45b7b15c3c01d9e11b7f060301a9d5c4995abb6cf27b0c4e748f1a7ca497a7f2d995ba00586f447fcd2fa537e0e16
 DIST hdf5-1.14.2.tar.bz2 16070491 BLAKE2B 
04acdc5352f7f0455bf6304ef07ddf51b99125bb585984bd3e27a521a784a6ad6723d64aa3b4179e4bd382334b7e68d06650404d7d4617a696d3f64917487dbc
 SHA512 
1e1bfdff50c2e0e172d399c2d5b79b9ad0c7c72b9b30c4849aad7c5656393e8cf2af788cdf62b51fbe596023483fbc7fa23fdebf37bfe3109dae7f0783ea590f
+DIST hdf5-1.14.3.tar.bz2 16320137 BLAKE2B 
4c58edc04788db739c5c74d6edbfb9277011e2d6776862404fc29b30bb2c06a4314eb317393c230ebd2617a9a362ff78183d39ae80ce08f8963bdf6c02e8a865
 SHA512 
06d51638a56f387f6d0ef484b72e182509c15ab639315052be9821adeed6ad08551c50d7fe84d2b550b64211f68484cf3022a4660c8004cd0afd90eaa83c1bb1

diff --git a/sci-libs/hdf5/hdf5-1.14.3.ebuild b/sci-libs/hdf5/hdf5-1.14.3.ebuild
new file mode 100644
index ..47b70efe199b
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.14.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+# We've reverted *back* to autotools from CMake because of
+# https://github.com/HDFGroup/hdf5/issues/1814.
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
+
+MY_P=${PN}-${PV/_p/-patch}
+MAJOR_P=${PN}-$(ver_cut 1-2)
+
+DESCRIPTION="General purpose library and file format for storing scientific 
data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/;
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+   !unsupported? (
+   cxx? ( !mpi ) mpi? ( !cxx )
+   threads? ( !cxx !mpi !fortran !hl )
+   )
+"
+
+RDEPEND="
+   mpi? ( virtual/mpi[romio] )
+   szip? ( virtual/szip )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   
"${FILESDIR}"/hdf5-1.14.2-0001-Make-sure-that-during-runtime-we-ll-use-the-same-lib.patch
+   "${FILESDIR}"/hdf5-1.14.2-0002-Disable-forced-stripping.patch
+   "${FILESDIR}"/hdf5-1.14.2-0003-Drop-broken-Werror-stripping.patch
+)
+
+pkg_setup() {
+   # Workaround for bug 285148
+   tc-export CXX CC AR
+
+   use fortran && fortran-2_pkg_setup
+
+   if use mpi; then
+   if has_version 'sci-libs/hdf5[-mpi]'; then
+   ewarn "Installing hdf5 with mpi enabled with a previous 
hdf5 with mpi disabled may fail."
+   ewarn "Try to uninstall the current hdf5 prior to 
enabling mpi support."
+   fi
+
+   export CC=mpicc
+   use fortran && export FC=mpif90
+   elif has_version 'sci-libs/hdf5[mpi]'; then
+   ewarn "Installing hdf5 with mpi disabled while having hdf5 
installed with mpi enabled may fail."
+   ewarn "Try to uninstall the current hdf5 prior to disabling mpi 
support."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # Respect Gentoo examples directory
+   sed \
+   -e "s:hdf5_examples:doc/${PF}/examples:g" \
+   -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || 
die
+   sed \
+   -e '/docdir/d' \
+   -i config/commence.am || die
+
+   if ! use examples; then
+   # bug #409091
+   sed -e '/^install:/ s/install-examples//' \
+   -i Makefile.am || die
+   fi
+
+  

[gentoo-commits] repo/gentoo:master commit in: dev-java/saxon/

2023-12-17 Thread Miroslav Šulc
commit: d21b4b0c6356ab71aa95e251e3402aa849f998f2
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Dec 14 11:29:03 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 17 10:06:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21b4b0c

dev-java/saxon: fix MissingSlotDep 'dev-java/ant-core'

Also sort CDEPEND alphabetically.

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34283
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/saxon/saxon-9.2.0.6-r3.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild 
b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
index 54b7feedaeb0..f1e4921e2821 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -16,10 +16,11 @@ SLOT="9"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="
-   dev-java/xom:0
-   dev-java/jdom:0
+   dev-java/ant-core:0
dev-java/dom4j:1
-   dev-java/ant-core"
+   dev-java/jdom:0
+   dev-java/xom:0
+"
 
 RDEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/acme-client/

2023-12-17 Thread Hans de Graaff
commit: 10e4669ff0364584b7d5b892154d920c43ce80bb
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Dec 17 10:17:35 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Dec 17 10:18:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e4669f

dev-ruby/acme-client: drop 2.0.9

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/acme-client/Manifest |  1 -
 dev-ruby/acme-client/acme-client-2.0.9.ebuild | 38 ---
 2 files changed, 39 deletions(-)

diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index 395e41c43a90..e813863aeb65 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,3 +1,2 @@
 DIST acme-client-2.0.14.tar.gz 194698 BLAKE2B 
057e968fa7b5bfcc6d3d31b9bf52eb6e9211d754be08e5eac61603a13077cd1a771f3580e42cfc19c0490931252bfdf3989958f580de025c88759f2824035370
 SHA512 
793b0f77b69cf00ac664a71ce12a02bf6a37683c75d6f0b4773f46ca20544b60a4892b40c6309d08bc9bbc412bcc4fc8a62730b106a6df8e36e76df3e74bdd9f
 DIST acme-client-2.0.15.tar.gz 194751 BLAKE2B 
75f6507b8571de8344a777182d98346b1d516a38058d4f1d164e73b647d1953e453c59afd8550c41c711b0dd2699790737c86bd2f7919929e445179cc7098895
 SHA512 
0d09a09c3fb0a665e9e3263aaa4a924653195d3a64baef381069a58ee16064a4dbef40456076198a866c50765b1f68a0c3b381bcb4f35e185aef9e1ce709ff9d
-DIST acme-client-2.0.9.tar.gz 183081 BLAKE2B 
8160b3fe7989645c395fde55624d71bdc933d114901138cb13f9c2114973f2bf65d48bba547f6c0740d0710f9a38a57cc519dbb27898a1507e875c71e5d7bcfb
 SHA512 
a75b093046ec0360cfb78b55c0ad8350ecd1b6f612ab5ddb3956aa4cfef468bddff2dc992cddfc50860e7ea541e76ddc176ab4c7eaf5c3555beab521a6806ac8

diff --git a/dev-ruby/acme-client/acme-client-2.0.9.ebuild 
b/dev-ruby/acme-client/acme-client-2.0.9.ebuild
deleted file mode 100644
index eb40f9622a41..
--- a/dev-ruby/acme-client/acme-client-2.0.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
-HOMEPAGE="https://github.com/unixcharles/acme-client;
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/faraday:1"
-
-ruby_add_bdepend "test? (
-   >=dev-ruby/vcr-2.9.3
-   >=dev-ruby/webmock-3.8:3
-)"
-
-all_ruby_prepare() {
-   # Avoid dependency on git
-   sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} 
|| die
-
-   sed -i -e '3igem "faraday", "<2"' spec/spec_helper.rb || die
-}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2023-12-17 Thread Michał Górny
commit: 3f87d0f277763f1cd621a78e34eb226d89020863
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec 16 15:09:51 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 11:23:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f87d0f2

distutils-r1.eclass: Call gpep517 via EPYTHON

Call gpep517 via EPYTHON, in order to make it possible to use any
plugins that were installed during python_compile() in python_test().
This is used in dev-python/setuptools-gettext that is tested
via building an example project relying on the plugin.

Signed-off-by: Michał Górny  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34312
Signed-off-by: Michał Górny  gentoo.org>

 eclass/distutils-r1.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 0a9815f2d459..5a99ba88eddb 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1243,7 +1243,7 @@ _distutils-r1_get_backend() {
if [[ -f pyproject.toml ]]; then
# if pyproject.toml exists, try getting the backend from it
# NB: this could fail if pyproject.toml doesn't list one
-   build_backend=$(gpep517 get-backend)
+   build_backend=$("${EPYTHON}" -m gpep517 get-backend)
fi
if [[ -z ${build_backend} && ${DISTUTILS_USE_PEP517} == setuptools &&
-f setup.py ]]
@@ -1317,7 +1317,7 @@ distutils_wheel_install() {
 
einfo "  Installing ${wheel##*/} to ${root}"
local cmd=(
-   gpep517 install-wheel
+   "${EPYTHON}" -m gpep517 install-wheel
--destdir="${root}"
--interpreter="${PYTHON}"
--prefix="${EPREFIX}/usr"
@@ -1446,7 +1446,7 @@ distutils_pep517_install() {
local build_backend=$(_distutils-r1_get_backend)
einfo "  Building the wheel for ${PWD#${WORKDIR}/} via ${build_backend}"
local cmd=(
-   gpep517 build-wheel
+   "${EPYTHON}" -m gpep517 build-wheel
--prefix="${EPREFIX}/usr"
--backend "${build_backend}"
--output-fd 3



[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools-gettext/, dev-python/setuptools-gettext/files/, profiles/

2023-12-17 Thread Michał Górny
commit: 75a4cbddebfb4e38aaa07b4b232195e455e62480
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 10:50:24 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 11:23:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a4cbdd

dev-python/setuptools-gettext: Add a patch to fix wheel building

Signed-off-by: Michał Górny  gentoo.org>

 .../files/setuptools-gettext-0.1.8-wheel.patch | 123 +
 ...8.ebuild => setuptools-gettext-0.1.8-r1.ebuild} |   5 +
 profiles/package.mask  |   6 -
 3 files changed, 128 insertions(+), 6 deletions(-)

diff --git 
a/dev-python/setuptools-gettext/files/setuptools-gettext-0.1.8-wheel.patch 
b/dev-python/setuptools-gettext/files/setuptools-gettext-0.1.8-wheel.patch
new file mode 100644
index ..aab0158cd698
--- /dev/null
+++ b/dev-python/setuptools-gettext/files/setuptools-gettext-0.1.8-wheel.patch
@@ -0,0 +1,123 @@
+From a793c1d9938da1c7c962feff13dc948523fcc774 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sat, 16 Dec 2023 21:53:38 -0500
+Subject: [PATCH] fix critical existence failure of install_mo
+
+In commit d28f5fa57eef7fa9baa28dea119b45e74145ecb5 the self.root was
+added, and we ended up with this directory repeated twice and bogus
+installed files
+
+When building a wheel, the value of self.root is internally implemented
+by bdist_wheel as (build/bdist.linux-x86_64/wheel); the resulting wheel
+placed files in random locations inside of the installed site-packages
+directory.
+
+When running `python setup.py install --root=$DESTDIR`, the value of
+self.root is of course `$DESTDIR`, leading to installed files that got
+installed to the staging install directory, e.g. the resulting .deb file
+would attempt to install files to
+```
+/home/$USERNAME/projects/foobar/debian/tmp/usr/share/locale
+```
+during an `apt install`.
+
+This is incorrect use of the setuptools API, as witnessed in
+install_data which does the same task correctly:
+
+```
+if not os.path.isabs(dir):
+dir = os.path.join(self.install_dir, dir)
+elif self.root:
+dir = change_root(self.root, dir)
+```
+
+Rather than continuing to copy-paste code around, inherit correctly from
+the existing class. Update the data_files attribute of the new
+install_mo implementation, and use that to drive the installation of
+files using the same battle-tested logic used by `setup(data_files=[])`.
+
+Fixes #30
+---
+ setuptools_gettext/__init__.py | 43 +++---
+ 1 file changed, 8 insertions(+), 35 deletions(-)
+
+diff --git a/setuptools_gettext/__init__.py b/setuptools_gettext/__init__.py
+index dc4ae73..59769b4 100644
+--- a/setuptools_gettext/__init__.py
 b/setuptools_gettext/__init__.py
+@@ -26,6 +26,7 @@
+ import sys
+ from typing import List, Optional, Tuple
+ 
++from distutils.command.install_data import install_data
+ from setuptools import Command
+ from setuptools.dist import Distribution
+ 
+@@ -165,41 +166,19 @@ def run(self):
+ os.unlink(os.path.join(root, file_))
+ 
+ 
+-class install_mo(Command):
++class install_mo(install_data):
+ 
+ description: str = "install .mo files"
+ 
+-user_options = [
+-(
+-'install-dir=',
+-'d',
+-"base directory for installing data files "
+-"(default: installation base dir)",
+-),
+-('root=', None,
+- "install everything relative to this alternate root directory"),
+-('force', 'f', "force installation (overwrite existing files)"),
+-]
+-
+-boolean_options: List[str] = ['force']
+ build_dir: Optional[str]
+-install_dir: Optional[str]
+-root: Optional[str]
+ 
+ def initialize_options(self) -> None:
+-self.install_dir = None
+-self.outfiles: List[str] = []
+-self.root = None
+-self.force = 0
++super().initialize_options()
++self.data_files: List[str] = []
+ self.build_dir = None
+ 
+ def finalize_options(self) -> None:
+-self.set_undefined_options(
+-'install',
+-('install_data', 'install_dir'),
+-('root', 'root'),
+-('force', 'force'),
+-)
++super().finalize_options()
+ if self.build_dir is None:
+ self.build_dir = (
+ self.distribution.gettext_build_dir)  # type: ignore
+@@ -207,18 +186,12 @@ def finalize_options(self) -> None:
+ def run(self) -> None:
+ assert self.install_dir is not None
+ assert self.build_dir is not None
+-self.mkpath(self.install_dir)
+ import glob
+ for filepath in glob.glob(self.build_dir + "/*/LC_MESSAGES/*.mo"):
+ langfile = filepath[len(self.build_dir.rstrip('/')+'/'):]
+-targetpath = os.path.join(
+-self.install_dir,
+-os.path.dirname(os.path.join("share/locale", langfile)))
+-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

2023-12-17 Thread Sam James
commit: 9c23fa50904bbb495578a8547f6918b0c4f96614
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Dec 17 11:00:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 11:44:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c23fa50

sys-libs/musl: use https for git clone

git:// is unencrypted and could be used by an attacker (mitm) to insert 
malicious code, see also [1]. I think especially for such a critical system 
package like musl it's better to use the more secure https variant.
git:// runs on port 9418 which is also less likely open behind a firewall.

[1] git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols

[sam: I think musl only recently started to support this when they changed 
httpds in the last week.]

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34319
Signed-off-by: Sam James  gentoo.org>

 sys-libs/musl/musl-1.2.3-r7.ebuild | 2 +-
 sys-libs/musl/musl-1.2.3-r8.ebuild | 2 +-
 sys-libs/musl/musl-1.2.3.ebuild| 2 +-
 sys-libs/musl/musl-1.2.4-r1.ebuild | 2 +-
 sys-libs/musl/musl-1.2.4.ebuild| 2 +-
 sys-libs/musl/musl-.ebuild | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-libs/musl/musl-1.2.3-r7.ebuild 
b/sys-libs/musl/musl-1.2.3-r7.ebuild
index efb22037..a201a7574d4a 100644
--- a/sys-libs/musl/musl-1.2.3-r7.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.musl-libc.org/musl"
+   EGIT_REPO_URI="https://git.musl-libc.org/git/musl;
inherit git-r3
 else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc

diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild 
b/sys-libs/musl/musl-1.2.3-r8.ebuild
index dfe257f84b9d..f8962b382f48 100644
--- a/sys-libs/musl/musl-1.2.3-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.musl-libc.org/musl"
+   EGIT_REPO_URI="https://git.musl-libc.org/git/musl;
inherit git-r3
 else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc

diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 9e1f93d9db53..850138951e5e 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eapi8-dosym flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.musl-libc.org/musl"
+   EGIT_REPO_URI="https://git.musl-libc.org/git/musl;
inherit git-r3
 else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc

diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild 
b/sys-libs/musl/musl-1.2.4-r1.ebuild
index 899ae673cc90..1d1973c35acc 100644
--- a/sys-libs/musl/musl-1.2.4-r1.ebuild
+++ b/sys-libs/musl/musl-1.2.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.musl-libc.org/musl"
+   EGIT_REPO_URI="https://git.musl-libc.org/git/musl;
inherit git-r3
 else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc

diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index c41674ff8142..2908fbd17541 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.musl-libc.org/musl"
+   EGIT_REPO_URI="https://git.musl-libc.org/git/musl;
inherit git-r3
 else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc

diff --git a/sys-libs/musl/musl-.ebuild b/sys-libs/musl/musl-.ebuild
index c41674ff8142..2908fbd17541 100644
--- a/sys-libs/musl/musl-.ebuild
+++ b/sys-libs/musl/musl-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.musl-libc.org/musl"
+   EGIT_REPO_URI="https://git.musl-libc.org/git/musl;
inherit git-r3
 else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc



<    1   2   3   4   5   >