gentoo auto-resync : 04:01:2023 - 12:06:28

8 files changed, 130 insertions, 44 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c2e760553b7d..948c20339600 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index e090e49a030f..6885fc4d22ed 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,6 +1,5 @@
+AUX gcal-4.1-configure-clang16.patch 1136 BLAKE2B 452f8c93aa71db4ee732c7412469eaa22d150225d43f3490ff7857f085ded3ca7a5220156f71369e530955c4167e621da0e8d3fc09ff28a382b0aca55a585c0b SHA512 2b3b2d677f98e8fecba6914c36b8f2479b35186b55e10b77f4c8b26b1fd6701617a4928ba21ab7d96e760bd9fbaeaedcf30e5d91bf3fc7ad010584169e117307
 AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89a35b23d028a4ca0cbb6101297066c862b2139ac424b276caf59dd12473d0194ca5b49f42c5bfcdfea2b37d3e1 SHA512 e1d54483561ac5b9473bcc42702b015a196fcde100dd2098dfd07642b7a5ee28887ef259296e98d7a46f18781e2b6a9c89424ebfe65b8ce601457b4f75af08af
-DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
-EBUILD gcal-3.6.3.ebuild 756 BLAKE2B d921836afc98c73ef7040bb23f6672fc80b0c4256351b1ad53d4219de8574d6f20154b7e59dc41517a065411ca24d7f356ebe2c31621837a82fd27c86d4a2b1a SHA512 abec0eb87080b32bdbf86be2643eb9aa56f0fbdd4fe5d8355a3f40fa1ffc241335793150bf1634691448ba60998eee2ed91419d49a3190b6e05043993788d851
-EBUILD gcal-4.1.ebuild 881 BLAKE2B 9e9cf497307c14dc5d745a1d1937976e2b8d1729c3564afe7997f41fa4a1a07a80f89cdce4bc80553f52f7594ad04326332c7f88ef9856f24fed77e2ba60a412 SHA512 b6b5b4ad0353b626c5a0bf80f8a9fb0459182f2e5848130d2761fe91684fc61d95d926eeeb166b6f937260488afe66f153d82af8beab01a53d93f25b52770080
+EBUILD gcal-4.1-r1.ebuild 1039 BLAKE2B 813b1606ba3bc4f48aad3cab902191ac9df5faf56ec96dee242a5ce9096eb34c94128127216764e7a0aaeba562f278a05507d3a24df9e53d699400c23d966932 SHA512 0edd5b429035e6cbe4c19547fb4591037fe2f15fa63911ea396976f19d74fc8d83333250541e0a72f459e77f4932f6116a71bb7a96464270df130e3f79558498
 MISC metadata.xml 1096 BLAKE2B 2d86ba9f428f52f8a716c2a7e5719b647fe4217a7c037d9681885524f0dde1216cf237f2c89df955425a3ccbf0a23f9f16266da53cfa6801efeb537b0a5028aa SHA512 a665d4af51626778e22513885711a95907624a2ef4ce383a4493f8132335790e4bc7bccb75fd319217aa297c28eaf9db8ab04b14f22fefe80820a5ec0a2b0bc4
diff --git a/app-misc/gcal/files/gcal-4.1-configure-clang16.patch b/app-misc/gcal/files/gcal-4.1-configure-clang16.patch
new file mode 100644
index 000000000000..077a1f5e5105
--- /dev/null
+++ b/app-misc/gcal/files/gcal-4.1-configure-clang16.patch
@@ -0,0 +1,31 @@
+https://src.fedoraproject.org/rpms/barcode/c/80372a75c7ee2a448913350f19f9e3f7c8495b8c?branch=rawhide
+
+Include <term.h> during the terminal library check for function
+prototypes.  Otherwise this configure check always fails if the
+compiler does not accept implicit function declarations.
+
+Submitted upstream:
+
+  <https://lists.gnu.org/archive/html/bug-gcal/2022-12/msg00000.html>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -319,7 +319,7 @@ if test "$gcal_cv_use_term" = yes; then
+   AC_MSG_CHECKING(for working terminal libraries)
+   SAVE_LIBS=$LIBS
+   LIBS="$LIBS $TTYLIBS"
+-  AC_TRY_LINK(,
++  AC_TRY_LINK([#include <term.h>],
+     [tgetent(0); tgetflag(0); tgetnum(0); tgetstr(0);],
+     [gcal_ttylibs_ok=yes])
+   if test "$gcal_ttylibs_ok" = yes; then
+@@ -334,7 +334,7 @@ if test "$gcal_cv_use_term" = yes; then
+         [TTYLIBS="-ltermcap"])
+       AC_MSG_CHECKING(for working terminal libraries again)
+       LIBS="$LIBS $TTYLIBS"
+-      AC_TRY_LINK(,
++      AC_TRY_LINK([#include <term.h>],
+         [tgetent(0); tgetflag(0); tgetnum(0); tgetstr(0);],
+         [gcal_ttylibs_ok=yes])
+       if test "$gcal_ttylibs_ok" = yes; then
+
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
deleted file mode 100644
index f872ffb027c7..000000000000
--- a/app-misc/gcal/gcal-3.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Calendar - a replacement for cal"
-HOMEPAGE="https://www.gnu.org/software/gcal/"
-SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ncurses nls unicode"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
-
-src_configure() {
-	tc-export CC
-	append-cppflags -D_GNU_SOURCE
-	econf \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_enable ncurses term) \
-		$(use_enable unicode)
-}
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1-r1.ebuild
index ee18f98e3850..39a20a9fc729 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="https://www.gnu.org/software/gcal/"
@@ -24,12 +24,24 @@ BDEPEND="
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
-PATCHES=( "${FILESDIR}/${P}-glibc228.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-glibc228.patch"
+	"${FILESDIR}/${PN}-4.1-configure-clang16.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop once ${PN}-4.1-configure-clang16.patch merged
+	eautoreconf
+}
 
 src_configure() {
 	tc-export CC
 	append-cppflags -D_GNU_SOURCE
+
 	use unicode && append-libs -lunistring
+
 	econf \
 		--disable-rpath \
 		$(use_enable nls) \
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 405539a3c15f..6c7bd8a6fcfe 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -3,10 +3,12 @@ DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B 6bb221d603dc74bf21ac44ca6611d817889285c
 DIST solaar-1.1.1.tar.gz 1418025 BLAKE2B c6fd053002727a372bf9672fc22c0acc123f814003c14172f7d13e59b82ab42ecee9b71a09289b2d234874850e0921debaa069506a07d8957f52a2e9953a47f4 SHA512 c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25
 DIST solaar-1.1.2rc2.tar.gz 1462081 BLAKE2B b5bcf37f75631d39ac726b564bfd7f329f80e9931461fceb5ce7442113df50db82679dabfd08150a87ebe9a9de68aeb111138a005e450c3e025c57e5f1219312 SHA512 65320d7193124d1444ecddf5a162e925f373c7c06d0e582af29b1c9d82ea16a32a69accd53f53568b228474691eacd5c0f16bce1bccef1e9a1846151e86dc203
 DIST solaar-1.1.3.tar.gz 1478166 BLAKE2B 79bfe8a88cecfefc9795d65027f18df5d39c3d43df3e20d3b167bd41365a721ed670e5a60c883b10a2a4cf34d476536003f71d20882e4f30dca590edc441ddeb SHA512 6175d72d8c13b23d0543728315a3d8b5ec506cbaafd821efda92398d640b127d8eb6742c4a22240dca08cdc1ba3ea00e824e2232e41b4fb88ad938dc0df270b8
+DIST solaar-1.1.8.tar.gz 1550947 BLAKE2B a33879e3c1b161d86c4c8a2c8edcc79eff285cb8937bf1e6621f3595ba5cf420e75fe700902b9f375698085bb929401154fa2bd25ae9663265e38c8406205bf6 SHA512 543c6257b36181813c9ed36747e53a15403da251fdd431c32525cada3ac88611da2c5f2a8212767ba3c7bb0071a3c2024f114805d9a33c761701bf958df29d85
 EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
 EBUILD solaar-1.0.7.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 EBUILD solaar-1.1.1.ebuild 1790 BLAKE2B da70652eab86d1c7d379fb4f465be4dbad75e09d80a82037a7352f21081fa4f77af74ce5ae0067f66cddc2373ffad35628c6a80c7b501918f050901e6bb0381e SHA512 8755bd1a0a06cf23d0d2d7ff2a8986c61521218cece1f839350819adda47567cd46d9a6f5ef480a1cd65eb7ae6669256f060b78c7d06dd55e6f923d9d9714356
 EBUILD solaar-1.1.2_rc2-r1.ebuild 1835 BLAKE2B 4b696545efd662c766eebaa6e157d9f667e028ddf4af82bb35ab0099f853ba71a2be7b79d536026a65970a52628c0313cfa128730f35ee7a246929ced5149010 SHA512 cf99c242f872c427855557094aa69a0a277ab076e0b8a588dd0a7a6dbad475e82d7b34213981a5a880bf672693cc8c337e7d4417d3d6a8b5136305ddfb177caf
 EBUILD solaar-1.1.3.ebuild 1867 BLAKE2B 26e0372a4d2a9c02ea523e9e59d5e07c0477566e48663b01e0006942d6b629f73e53ce9eaca525b037ffbd4eb6ae9dde52bf5ab113b22da7ffc1a57ab4a01701 SHA512 5a2bf910588bcb9b1d5ee4bec5332ca6fba44cced1d8e56f7dee02cc355203e966f2e1c0729d52b50e4808876a13cfe8c3499b19533ce1ede37e57ef64082da3
-EBUILD solaar-9999.ebuild 1869 BLAKE2B 161c0b58571f4b05f857573085d0fb8d114271144b4d8a40531843cb7f3805a30d3c287c2ea43e8a5adf7fc18d4d792c86e6d1a65af41baca4412a2813c16d8d SHA512 add1c84dc38869c444abcd094c5d5a92088f871909dbc846f5711b75c8d9e7493535c25cc15e5ce027a74270fdd41d98c6a101b6c2799c06e5053051ad893ad8
+EBUILD solaar-1.1.8.ebuild 1901 BLAKE2B 69769ced73b7b2c1087396ea228e8200af09d1e3b612087b38e9d6ef201d48e878d567c0beb10780178e7499c3b0b16b83b3cada3c525ff6640ea1c4d2832346 SHA512 d4eb56e0dfd8743041147b87bfd36ff5c0afef7a4ee9f35a546ff7c0f96d188a83ec88599753cd1962482b7139715d8196318dd91483febb5776096fda17d5c7
+EBUILD solaar-9999.ebuild 1901 BLAKE2B 69769ced73b7b2c1087396ea228e8200af09d1e3b612087b38e9d6ef201d48e878d567c0beb10780178e7499c3b0b16b83b3cada3c525ff6640ea1c4d2832346 SHA512 d4eb56e0dfd8743041147b87bfd36ff5c0afef7a4ee9f35a546ff7c0f96d188a83ec88599753cd1962482b7139715d8196318dd91483febb5776096fda17d5c7
 MISC metadata.xml 302 BLAKE2B 55938561021d105894875ec5158bd1a744c91039744ff789bffed4ab483eebe73450a9cd62cb4a97c984213fa2f1e8799f8b0d97bd6202e826e4609434086f5e SHA512 3bff70d27a9934d48f848cf0131e01415e13426ea705ef7721a9b59e29ff7bf32718d015de9e4a4f89f23405a8f372f038d2f0c3485cf9a7939a33ebda9d1681
diff --git a/app-misc/solaar/solaar-1.1.8.ebuild b/app-misc/solaar/solaar-1.1.8.ebuild
new file mode 100644
index 000000000000..868f9d19920d
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md ChangeLog.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-misc/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
index 502ef240ea40..868f9d19920d 100644
--- a/app-misc/solaar/solaar-9999.ebuild
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit linux-info udev xdg distutils-r1