gentoo auto-resync : 25:10:2022 - 21:54:27

4 files changed, 43 insertions, 19 deletions

diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 22f2edfb9a42..7a5ff7255386 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,4 +1,5 @@
+AUX telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch 874 BLAKE2B a9d18d8dd7c79b0f14462dbb072f0eecbbd4351341856d52daade09e73b0c977ec5bcad0cb99c2d1113f696499ac538ed76c6ab0b1d95528852e00262fa092d8 SHA512 96e056ca2dfffdd287ae060dacff8d6645cc25df78c9ecd264aba321aa4187be8264129e72f96ac041198e6e4bf4505399db829f760dcab3c85be5adb9b976f9
 DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.8-r1.ebuild 1573 BLAKE2B 6902a26da268b730cfc4df71e95fb64eb967d48beaab175289f330011f70da740ac00429f8e87ce0d908f8e26132fc98c49f12718b4c3e360e647ae47c8b5330 SHA512 5d7c8da155b8dd4f38831e2ed8ae2c8600bce3f8b51cb57c19f5a6733257c9ff7e4d2dfc43af3bc49a545ba16c89b6d0cbba889e3c867c623941f1f4eec0af23
-EBUILD telepathy-qt-9999.ebuild 1702 BLAKE2B c06acb0e6b487ab578d3fe56b3a3cf30a5bbd336e89744c3a067a4568e4306124f4102ac721a6a365d6514fec954d6f6032f7895a58487c2d3fcdd8d4d984d2e SHA512 8f7cb36796235a46cab3df2071cd1e4118a0ae212e99508350b279d72d786e8517042847ddc35aae513ab254acd790cbe8b1a462e63a15c2de9dd2ae50f9ee52
+EBUILD telepathy-qt-0.9.8-r2.ebuild 1634 BLAKE2B 05c9cc0ddfe10ac0488f21d007874bcc5142a7b15f702aba8bb13523f69cf5682ed6e3136402af4a5aae03710630c510393cea8578844db82b4a61f520c623da SHA512 582048df8842aaa377cecd544f9ae29ec25d4fe5af01e4ef4a4f4a621904ff5ad00e96c87d8ec09559fd170a0d9488f0adbed12fd2720a4a89a004742e2ee15f
+EBUILD telepathy-qt-9999.ebuild 1735 BLAKE2B f87958375eabd19d1d3739803e5bee2139e472e89d375faa4a72c571edccded428c9da173d32995c1cbe2542ffaf417b6cacdbcb5b102e305ae02a10de03ba41 SHA512 07f1ee350d005a99810859fdfacc79cf3a9977199bddf0c6195b4a2613e83e7ab63ff760b2bb09f69720b38111ce5f190081537befcfff9f5b82524ecde75916
 MISC metadata.xml 722 BLAKE2B d17eb48d784f9128e24be8dbc68237870291a2b758b0d3009b6aaf0fec4396421f10a332ffac927b4e83dbb3a95bfa9376fe1831d633a38dc3cf1ee8e7f44733 SHA512 ec1dff533720d3f77cfc194332740fb200db1e2d024d2ea64ef13e831911f7ca700b7588bf263be2a24e3b606c2dfa580220b9feda064c2551ebd81a33c9ae5c
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch
new file mode 100644
index 000000000000..0ac61c48a87a
--- /dev/null
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.8-fix-tests-finding-glib-2.patch
@@ -0,0 +1,23 @@
+From 188dece432d090809c5ad88a91cd573c5af61c09 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 6 Jun 2022 09:44:53 +0200
+Subject: [PATCH] Fix build with newer glib
+
+gunixconnection.h is now at /usr/include/glib-2.0/gio/gunixconnection.h
+---
+ cmake/modules/FindGIOUnix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindGIOUnix.cmake b/cmake/modules/FindGIOUnix.cmake
+index 263c093e..7f5513b3 100644
+--- a/cmake/modules/FindGIOUnix.cmake
++++ b/cmake/modules/FindGIOUnix.cmake
+@@ -21,7 +21,7 @@ pkg_check_modules(PC_LibGIOUnix gio-unix-2.0)
+ find_path(GIOUNIX_MAIN_INCLUDE_DIR
+           NAMES gio/gunixconnection.h
+           HINTS ${PC_LibGIOUnix_INCLUDEDIR}
+-          PATH_SUFFIXES gio-unix-2.0)
++          PATH_SUFFIXES gio-unix-2.0 glib-2.0)
+ 
+ set(GIOUNIX_INCLUDE_DIR "${GIOUNIX_MAIN_INCLUDE_DIR}")
+ 
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
index af50e027063c..89e203b7332d 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 cmake virtualx
 
@@ -17,7 +17,6 @@ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="debug farstream test"
 
 REQUIRED_USE="test? ( farstream )"
-
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -47,6 +46,8 @@ BDEPEND="${PYTHON_DEPS}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-tests-finding-glib-2.patch" )
+
 python_check_deps() {
 	use test || return 0
 	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
index 806f66f84703..e61c8d77eecc 100644
--- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI=( "https://gitlab.freedesktop.org/telepathy/${PN}" )
+	EGIT_REPO_URI=( "https://github.com/TelepathyIM/${PN}" )
 	inherit git-r3
 else
 	SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
@@ -16,25 +16,15 @@ fi
 inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
+HOMEPAGE="https://telepathy.freedesktop.org/ https://github.com/TelepathyIM/telepathy-qt/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="debug farstream test"
 
 REQUIRED_USE="test? ( farstream )"
-
 RESTRICT="!test? ( test )"
 
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -52,6 +42,15 @@ DEPEND="${RDEPEND}
 		dev-qt/qttest:5
 	)
 "
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+"
 
 python_check_deps() {
 	use test || return 0