gentoo resync : 28.11.2020

10 files changed, 90 insertions, 7 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ccdbdad619c6..677b1826caa4 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index 888882c8142b..5646f10192f1 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -1,4 +1,5 @@
 AUX gkrellmss-2.6-Respect-LDFLAGS.patch 498 BLAKE2B 2eb34f01a8f20325f34ba6176d68046645528fd7cddd3ee342be5df4c812e7f986b0d39d6a25e1d52d9521ca73cb30fc3784a1cf0aecc634b0618b3c09240bbd SHA512 8c050353c212ea0791b7e5160ba720ee1e91359612565bc9b074424de8d2da93a581696d54ec5210265609267c767eb8d5bb0678dcd9e1e9d7d61648a626e472
+AUX gkrellmss-2.6-fno-common.patch 195 BLAKE2B eaf45029a236aa63ac216d3a2d6e7f8481626b20f4caf3e5d24f83a09608c967cf162b261e87148911a72bab933ca799b0698f82971f90cbe156e1849d737e7d SHA512 40efc369491339139f8b54652aac155a995a078968b19d3a445d593510a655cbfc67098c0c8656ff22e5a3662824b3e9049d50a90a2a4c87b204887ad369206b
 DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
-EBUILD gkrellmss-2.6-r4.ebuild 717 BLAKE2B c4678970f98537516c449e1011e2dc494d11c767f65715e7248b27116d03feabb8988983cc44e4340a24736c8c6bdd92a4128817d56adefd6407de6b1a67193f SHA512 1843c99ce290ce1264f2653cca79a0b1ded1e5995820a0fc8ecaea9856a876fb39f4b2a655c1bd5d31fe438d371f56980343d43dc720d46bc3ddb6bf2b5810fa
+EBUILD gkrellmss-2.6-r4.ebuild 752 BLAKE2B b4bacd23f3917a64e2b9ec8301c2fdbb7cff743edafcb92f7227e78d63df7e1b7b41af56c5df512f7db37f3c27e54a324f7de003d0cd17cb28589f51a28ed66d SHA512 3fedf43c057ba1f9d5ee5293db16265b894e09d59e090a29ceda906e478e040c4832f87b57a2384244fe2e8314dd2bd633fb7e41c2f2f6081802227108a915f7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch
new file mode 100644
index 000000000000..8cb9c9e21e19
--- /dev/null
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-fno-common.patch
@@ -0,0 +1,12 @@
+--- a/src/gkrellmss.h
++++ b/src/gkrellmss.h
+@@ -212,7 +212,7 @@
+ #define	DRAW_GRID	1
+ 
+ 
+-SoundMonitor	*gkrellmss;
++extern SoundMonitor *gkrellmss;
+ 
+ 
+ void		gkrellmss_add_sound_sources(void);
+
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
index 473087da1408..e038708f288a 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,10 @@ RDEPEND="
 	sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 PLUGIN_SO=( src/gkrellmss$(get_modname) )
 PLUGIN_DOCS=( Themes )
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index 9f3f79ef310c..6f92e1bc4896 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,4 +1,5 @@
-AUX respect-cc-cflags-ldflags.patch 1232 BLAKE2B e983a46154113d21586e0b59121f0798fc1d359dbbf7b5388421b88a46b018fcc740bcfc23fc6074ec985b7c377197fb431027d9a623ef381b540601e2908d72 SHA512 0ce0b0ed7832ede335447d4abb7cf3904e97f9dff334aeb14a03e09cfe042de47bca456b7fc38bd7171440bcefd0da8a17cc01f1d540b84ffbf644e216f273a2
+AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1232 BLAKE2B e983a46154113d21586e0b59121f0798fc1d359dbbf7b5388421b88a46b018fcc740bcfc23fc6074ec985b7c377197fb431027d9a623ef381b540601e2908d72 SHA512 0ce0b0ed7832ede335447d4abb7cf3904e97f9dff334aeb14a03e09cfe042de47bca456b7fc38bd7171440bcefd0da8a17cc01f1d540b84ffbf644e216f273a2
+AUX gkwebmon-0.2-fno-common.patch 1058 BLAKE2B 68205c69c36e48678886c3bea5b0b14d4755d05a389daa6c2ee450f4fb543eb3fbf30618ec99d315b34d0de379af4c7ad13174de364ca4b46ce09c3be49a7176 SHA512 225b7767284aebfbc1437810930442c342f977abfe8cd3af8ac1b8122cb17964bf63388a56265febe20914bf4893a258d4fddb9d895abe0048239d8ab78e208f
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
-EBUILD gkwebmon-0.2-r2.ebuild 577 BLAKE2B fbeb6d01de2e5f4d5f4b76e9e2327dba5b19e3611f58637fba2a8bcbde8451cd03676386fe885bce27a8d38a44e704918f34699db818e4bd61ce5eb63486a231 SHA512 b75da32bfd8505fcb7fac458a200b5cd8beaa504d68077a561f7cf066738c424a1cbaecfa9eed5a76e0cda6690d9d3e0b3e3a82a5e4d121123ccf5b72217afe2
+EBUILD gkwebmon-0.2-r2.ebuild 604 BLAKE2B d8189d1cca01153717074d194cd0b6c0b1adce69804b4e0f6a6f055b05d94daa02154c9ec86961f8a16b295be4495534850996d3c941f39b70002ae9f478600f SHA512 4ba51be9baf94fd3d3a5b0bf316cd8ee6e8eabfbfb0001ed3cccfa6d70f32669a74f808394df76a19413556799736ee9c266197017139823e9589b94d333b145
 MISC metadata.xml 245 BLAKE2B 75768cbacfd8436bec6cd03c95eaf6aea36aad0fff02f24e9be259be1a01722d32c3cc84a7f54ab7da842fbf036aa4ac6a65ee3ea77a01ad8d0e55b89303d49d SHA512 9059fda6f95a78a0bb5334c05a118b9159d8dd28701bf6986574bb95ba897f1ff03257a8a939c6353136e5ab28f4614cd927cc593c41558ec8826b9c1ca1a015
diff --git a/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
index 7b3ee50f5321..7b3ee50f5321 100644
--- a/x11-plugins/gkwebmon/files/respect-cc-cflags-ldflags.patch
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch
diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch
new file mode 100644
index 000000000000..9738177db6fe
--- /dev/null
+++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-fno-common.patch
@@ -0,0 +1,38 @@
+--- a/webmon.c
++++ b/webmon.c
+@@ -7,6 +7,8 @@
+ #include <openssl/md5.h>
+ #include <pthread.h>
+ 
++int updatetime;
++
+ 
+ void clear_entry(int i)
+ {
+--- a/webmon.h
++++ b/webmon.h
+@@ -6,7 +6,7 @@
+ 
+ /* this is included in the saved config file */
+ 
+-int	updatetime;   /* how often to check webpages (in hours) */
++extern int	updatetime;   /* how often to check webpages (in hours) */
+ 
+ struct webinfo {
+   char          *urlData;       /* full url, pointed into by pointers below, internal '\0' */
+@@ -21,11 +21,13 @@ struct webinfo {
+   char		use;
+   char		updated; /* new md5 checksum in place */
+   char		flagged; /* a changed has been posted to tooltips for this entry */
+-} wi[20];
++};
++
++extern struct webinfo wi[20];
+ 
+ /* end of data for config file */
+ 
+-char wheretostore;  /* 0 == webinfo.init_md5, 1 == webinfo.new_md5 */
++extern char wheretostore;  /* 0 == webinfo.init_md5, 1 == webinfo.new_md5 */
+ 
+ void parse_url_to_config_struct(int i, gchar *instr);  /* parse URL and store data in webinfo struct */
+ char *make_url_from_config_struct(int i);
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
index d7fc617e9437..5a5387b6c02c 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
-IUSE=""
 
 # The Makefile links with -lssl.
 RDEPEND="
@@ -20,7 +19,10 @@ RDEPEND="
 	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/respect-cc-cflags-ldflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-cc-cflags-ldflags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 7e1e92e3370a..35000709c48a 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -1,4 +1,6 @@
 DIST pidgin-skypeweb-1.5.tar.gz 295956 BLAKE2B 0a45c709570c9093df9f0e674e5556a21b832b5e73ab2f32d439aa4fe3ce224df0bab05e054ef352ed337113e6800020cf0da60a7b37a6f39a22fc95ad40d28b SHA512 93043b83132654144f333e90bdff88dec5efe2495412a0b40f0ab64ec96d9427acea553ff73dee054de87e77121cbfd1a7bcaddeb17ab4d91baef55d658b6478
+DIST pidgin-skypeweb-1.7.tar.gz 297565 BLAKE2B 94d4fe7b6408fe054bdb79729493929551aabce03c9157992c7cab283c360adfa20c0b9775d82ec7017d762e208259fbf365e6311df566eda033f5a8c71ce20a SHA512 0981aefe23a7bce423fbc447ae22f79077742ac5cc1fd235611acc34175b4a6d9fd4a4af38f7fc3aa7ff7442be71a70c68ca8c271adbe39c085d6ae599cb0871
 EBUILD pidgin-skypeweb-1.5.ebuild 658 BLAKE2B 4e608465edab12b481ebeab075d9cb9e5de9519c62856de3e2780abb06d302f1d91f4a259d162b7cdb0539ec93e26be57eb51c602e4bfabd09573d0463747552 SHA512 449de42850da9881b7451b5558efc50f3305808da197a30302c2bded746bb464134658f53bea3b54b4931444e6d1596fc25e375dc5a7ed8f4e8d103c2b2e1edb
+EBUILD pidgin-skypeweb-1.7.ebuild 667 BLAKE2B 99582ccea996c734104be87d4ae604288edf1590266538dec9eee721893d79cec8213b9cef244af8bcffad9edff862c9971fccd134e2efb2b99a0b186ead27ea SHA512 a92e21392bed475a432f7e80438947f866dae146a7ea18d03df229957c55dc5617c98f649dbedad154aaf6ff09856bc9a6d56f2f5c5385c3a2ec623cb49e7248
 EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
 MISC metadata.xml 444 BLAKE2B 99319eb5979a7e51ff0699ae5c524c2eee61fcc6407a32c8e5323a1f029b1f9bf2c0f56508bd4bd18e59a70256d6e62f9e0c86973577496e7e990ba565c855da SHA512 dcaaa5cd9f80a414d5931e39228f85482a086f1a55d5b44933feedb0949c2277847df60400bb8cde6a57d3524f8b52f384b1eba5728e6aea523ee6161381f734
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild
new file mode 100644
index 000000000000..c99028c2b379
--- /dev/null
+++ b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="SkypeWeb Plugin for Pidgin"
+HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
+SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="dev-libs/json-glib
+	net-im/pidgin"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
+
+pkg_postinst() {
+	elog "If you get error message like 'Failed getting Magic T value':"
+	elog "Go to https://web.skype.com ; Log In and follow the instructions to enable your account!"
+}