gentoo auto-resync : 14:07:2023 - 10:36:56

4 files changed, 65 insertions, 2 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index e8c9f8b16884..3505b4321d76 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 7295b7108763..84d69c45cffb 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,3 +1,4 @@
+AUX pidgin-sipe-1.25.0-bashisms.patch 2421 BLAKE2B be2b8b654aa3c97d51798cc23873060401973d07a4a337223306cb23c8f19fb07b1f15b38a3c4d685e4f97dc073297fad84864f3dae8702683c734ca9ebdba99 SHA512 62044853539c390373597555e23d3d3d7ee2ec0c9d2310055d658bc91d9ae5713ef0cc165a8751d5f43ed6e781fd95cac9714ecb534caf899df8d9277c69e9bb
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
-EBUILD pidgin-sipe-1.25.0-r1.ebuild 1365 BLAKE2B b02343bb14a30ecd1d1abc4b2e9d8704aa1c46ee0480cebf428c7be9ed75d72a4e3501985859d9e50ed47674dc249280182e098336908e425881e644a02228d4 SHA512 b7e502cd5805bc62b8dde5ea48a29efbae3a8c15b59d2869c27eb8cf88c86dbd4825ac0ee93b5b2516acfba9cc0a60eeea3feb4e9c8572945b832516f9ff7e0f
+EBUILD pidgin-sipe-1.25.0-r1.ebuild 1476 BLAKE2B 8ece35a0f4ecb0547da6c86fc04aace565ebaab6a258b5dc2d7591b633a76c6c4f4a3f39e875e10d42cfdd57894bf714e1ad0cab6c30e42a8139788419713571 SHA512 966c09a8658759ece8c91625b16c34fd6e403f72192bd54612f239a88239cb08a197341dbc49dcc0bfaedadbbd2d9ab9806e0cab131cd99a4ae03597630fa148
 MISC metadata.xml 783 BLAKE2B 29403f96df4441319a61e6098fbd378f1671edab7959a76f61e0f61b3dbd5e090a419156698ffdd971175211cd02a511fcfba53fc29d30616a5e999e9e265c8f SHA512 b2004db1ded61932565367a89edfbafbff5d9f5457e54a4a2ef8fcfad0c51c62b1d07de5180753348bf5d49cdcde7b4bb35ed353b98838535d67281405abacf4
diff --git a/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.25.0-bashisms.patch b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.25.0-bashisms.patch
new file mode 100644
index 000000000000..083d41bd0fde
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/files/pidgin-sipe-1.25.0-bashisms.patch
@@ -0,0 +1,53 @@
+Fix bashisms in configure script.
+
+Bug: https://bugs.gentoo.org/821451
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -444,10 +444,10 @@
+ 					[PKG_CHECK_MODULES(_SIPE_MEDIA_RECHECK_PLEASE_IGNORE, [$purple_pkgconfig >= 2.8.0],
+ 						dnl check purple pkgconfig for gstreamer version
+ 						[gstreamer_pkgconfig=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig`
+-						AS_IF([test "x$gstreamer_pkgconfig" == x],
+-							[AS_IF([test "x$purple_pkgconfig" == xpurple-3],
++						AS_IF([test "x$gstreamer_pkgconfig" = x],
++							[AS_IF([test "x$purple_pkgconfig" = xpurple-3],
+ 								[gstreamer_pkgconfig=1.0])])
+-						AS_IF([test "x$gstreamer_pkgconfig" == x1.0],
++						AS_IF([test "x$gstreamer_pkgconfig" = x1.0],
+ 							[gstreamer_pkgconfig="gstreamer-$gstreamer_pkgconfig gstreamer-rtp-$gstreamer_pkgconfig"
+ 
+ 							AC_MSG_NOTICE([using packages "$gstreamer_pkgconfig".])
+@@ -556,18 +556,18 @@
+ AM_CONDITIONAL(SIPE_WITH_VV, [test "x$with_purple_vv" != xno])
+ 
+ dnl raw data RTP streams enable Lync file transfer
+-AM_CONDITIONAL(SIPE_HAVE_XDATA, [test "x$ac_have_xdata" == xyes])
+-AS_IF([test "x$ac_have_xdata" == xyes],
++AM_CONDITIONAL(SIPE_HAVE_XDATA, [test "x$ac_have_xdata" = xyes])
++AS_IF([test "x$ac_have_xdata" = xyes],
+ 	[AC_DEFINE(HAVE_XDATA, 1, [Define if we have raw data RTP in media backend.])])
+ 
+ dnl enable appshare support
+-AM_CONDITIONAL(SIPE_HAVE_APPSHARE, [test "x$ac_have_appshare" == xyes])
+-AS_IF([test "x$ac_have_appshare" == xyes],
++AM_CONDITIONAL(SIPE_HAVE_APPSHARE, [test "x$ac_have_appshare" = xyes])
++AS_IF([test "x$ac_have_appshare" = xyes],
+ 	[AC_DEFINE(HAVE_APPSHARE, 1, [Define to 1 if we have appshare support.])])
+ 
+ dnl RDP server for sharing local desktop
+ AM_CONDITIONAL(SIPE_HAVE_APPSHARE_SERVER, [test "x$ac_have_appshare_server" = xyes])
+-AS_IF([test "x$ac_have_appshare_server" == xyes],
++AS_IF([test "x$ac_have_appshare_server" = xyes],
+ 	[AC_DEFINE(HAVE_APPSHARE_SERVER, 1, [Define if appshare server is enabled.])])
+ 
+ dnl libpurple API relies on GParameter (deprecated in glib-2.0 >= 2.62.0)
+@@ -584,7 +584,7 @@
+ 		   [We need GValueArray for which no replacement is available])
+ 	])
+ dnl libpurple 2.x API relies on G_CONST_RETURN (deprecated in glib-2.0 >= 2.30.0)
+-AS_IF([test "x$purple_pkgconfig" == xpurple],
++AS_IF([test "x$purple_pkgconfig" = xpurple],
+ 	[AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_28,
+ 		   [libpurple 2.x API uses G_CONST_RETURN])
+ 	])
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
index 4b73a6e3e9c1..bbdf8d917086 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.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=7
@@ -7,6 +7,8 @@ DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
 HOMEPAGE="http://sipe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
+inherit autotools
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -43,6 +45,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.25.0-bashisms.patch
+
+	eautoreconf
+	default
+}
+
 src_configure() {
 	local myeconfargs=(
 		--enable-purple