gentoo resync : 29.12.2022

5 files changed, 105 insertions, 2 deletions

diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 7eb5232ae60e..438612b3e35a 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,3 +1,7 @@
+AUX gammu-1.42.0-CMP0110-policy.patch 390 BLAKE2B 549412ca85f7dce8a91afb1b4a558e78a827177f102a8fd6c04ed55bcbae5bd850762710296acf3abef30607381371497d933c1414444afd7dfd639e4b037d2c SHA512 6a043905a3d19b3643b34e01e0870d92b5ba9d1947e9c1ef0daec5e95d7ac49badb0313c2cfeff5ab6e3fd43ded0741d8634cd6e8e501ee2dd6abdcfd377274f
+AUX gammu-1.42.0-gammu-detect.patch 784 BLAKE2B 93392d9fb812f19b6053f8c8246ce4442274ad467355859e52263cd98594fffc131c3919f7088b5340bcbe92d94f7193c5d47337bb5686ddbdc99fce73f6ded9 SHA512 cfcacc96f1dbd9f9d480a0a7f1019484b4c8474980f2c69897bfbca091997a9fcdd7a93f893f9c49220f1094944831bccf3c37410e36c8d2701a790711fc76a8
 DIST gammu-1.41.0.tar.bz2 2167233 BLAKE2B 4b0bf77246cc6a07a52457cff2bae44e63ebfe2715cb0c0b7d89c3d6352bb2df4cd5e7fd9b62d316e316fb1e73108fe561e030b7444eccd601cd0d2541b9f0e9 SHA512 f2c2534d3827216bf015607431938e0cf2524d5f2c670a5f76bb5ab7928962d22de981bbbf2dfa7af833c7903b60a775242048210bac6c35b1a9ee7668db4543
+DIST gammu-1.42.0.tar.bz2 2193946 BLAKE2B 074f870624efbd28aaf9ecb445063ff7ec070cd1498c00a2e93a8842ed2afd5a0bc6475d950885eec883bed158528dda0588809c2d55ef78c83f0eed3e1b4aff SHA512 f440df357578ce7f5ddd17f2f0f6405b4dacbca3e5da65a469f3f1e92c71bf899a7ef0977438c803ed9b1d7d15324d4a43bd9d97d986119a522243e2e6304971
 EBUILD gammu-1.41.0.ebuild 1365 BLAKE2B 74a0b9ed1a90a0b124c7ae1eb0a447a0125d83072c0ad0364885b5e6401b6294735923a42fc53871425a0da356d799183a7300a76710584d4b3d79a41747ca86 SHA512 23c4515ef97b923c699027ed34732b94e450ea134b8bc7e66a5ea6212dccec7457b2d3aad980c848a1e11fc2d30bddbb944eb7be7cc27b12535c73f9d1ee8cda
-MISC metadata.xml 757 BLAKE2B 981aca89002970eafdf77a82a14c2dce0abf453eb8b64e86a0337071f1734f07dfe9a0d0a58ef990d4fec5c01c762dbd9029127bccb187053140acbb75219328 SHA512 70e360352edcc1d177cbfc87daf7fa1ad05fc1a49d8eff37833bbb36553b599c23eb3b56f3744aea160a0149a47663fecfcdbeacd3a5a4c8a2a5efa008277e57
+EBUILD gammu-1.42.0.ebuild 1496 BLAKE2B c05c557ebdd4ed7a3fe1385017f9675786e3137df8ebb2d221cb73692fa098b3ffb64b10e73c46e4ca55ed86f0a83867c03e2071009408bfb13019e7fda35095 SHA512 a9727f3d0b7d7c866a6485a9157bed3b098f865f963996eaca13ec3a2c4da404347670335751e833ecba31e946919eb41543c5455bbafdadfb2b3d00b06d551f
+MISC metadata.xml 693 BLAKE2B 77bb0614028aa94495a11559877ae2bd9b48b823dc573f32a9f7eb2dd65b0fbb3cdd57ebbc597f5d572f2532e84aea88a5150b353b6ff3019d655502af9d38f8 SHA512 dd61359bec371f9f970c77440fca2ea960e01afc040234351dde63ac2d5aa5ac850a5e38945d19cb73e74e32eabff2afb63e9ea94aa7330d28d7c11c1e75fc42
diff --git a/app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch b/app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch
new file mode 100644
index 000000000000..b67cebd17a41
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.42.0-CMP0110-policy.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt.orig b/CMakeLists.txt
+index 6cffb02..f7993cf 100644
+--- a/CMakeLists.txt.orig
++++ b/CMakeLists.txt
+@@ -13,6 +13,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ # Silent some warnings from CMake 2.6
+ cmake_policy(SET CMP0003 NEW)
+ cmake_policy(SET CMP0009 NEW)
++cmake_policy(SET CMP0110 NEW)
+ 
+ option (COVERAGE "Add flags for Coverage analysis" OFF)
+ 
diff --git a/app-mobilephone/gammu/files/gammu-1.42.0-gammu-detect.patch b/app-mobilephone/gammu/files/gammu-1.42.0-gammu-detect.patch
new file mode 100644
index 000000000000..03e9ea631732
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.42.0-gammu-detect.patch
@@ -0,0 +1,22 @@
+diff --git a/gammu-detect/udev.c.orig b/gammu-detect/udev.c
+index 4d25949..e0cd383 100644
+--- a/gammu-detect/udev.c.orig
++++ b/gammu-detect/udev.c
+@@ -189,12 +189,12 @@ void udev_detect(void)
+ 	client = g_udev_client_new(subsys);
+ 
+ 	list = g_udev_client_query_by_subsystem(client, subsys[0]);
+-	for (iter = list; iter; iter = g_list_next(iter)) {
+-		dump_device_and_parent(G_UDEV_DEVICE(iter->data), 0);
+-		if (device_is_valid(G_UDEV_DEVICE(iter->data))) {
+-			device_dump_config(G_UDEV_DEVICE(iter->data));
++	for (iter = g_list_first(list); iter; iter = g_list_next(iter)) {
++		dump_device_and_parent(iter->data, 0);
++		if (device_is_valid(iter->data)) {
++			device_dump_config(iter->data);
+ 		}
+-		g_object_unref(G_UDEV_DEVICE(iter->data));
++		g_object_unref(iter->data);
+ 	}
+ }
+ 
diff --git a/app-mobilephone/gammu/gammu-1.42.0.ebuild b/app-mobilephone/gammu/gammu-1.42.0.ebuild
new file mode 100644
index 000000000000..ffbcfefd1952
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.42.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="https://wammu.eu/gammu/"
+SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
+
+COMMON_DEPEND="
+	dev-libs/glib:2=
+	dev-libs/libgudev:=
+	virtual/libiconv
+	bluetooth? ( net-wireless/bluez:= )
+	curl? ( net-misc/curl:= )
+	dbi? ( >=dev-db/libdbi-0.8.3:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:= )
+	usb? ( virtual/libusb:1= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	irda? ( virtual/os-headers )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-util/dialog
+"
+PATCHES=( "${FILESDIR}/${P}-CMP0110-policy.patch"
+	"${FILESDIR}/${P}-gammu-detect.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BLUETOOTH=$(usex bluetooth)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_Gettext=$(usex nls)
+		-DWITH_Iconv=$(usex nls)
+		-DWITH_IRDA=$(usex irda)
+		-DWITH_LibDBI=$(usex dbi)
+		-DWITH_MySQL=$(usex mysql)
+		-DWITH_ODBC=$(usex odbc)
+		-DWITH_Postgres=$(usex postgres)
+		-DWITH_USB=$(usex usb)
+		-DINSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite "/var/lock/LCK..bar"
+	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/doc/${PF}/examples/
+}
diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index 5fe2fb6a1c5c..58e4d954b478 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
     <!-- maintainer-needed -->
     <use>
-        <flag name="bluetooth">Enables bluetooth support</flag>
         <flag name="curl">Enables curl support</flag>
         <flag name="irda">Enables infrared support</flag>
         <flag name="nls">Enable native language support</flag>