gentoo (valentine's day) resync : 14.02.2021

4 files changed, 47 insertions, 8 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 2612b8276a26..a6d93af65eed 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 159d0bb834d9..a91e54dafe7f 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -1,5 +1,6 @@
 AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814fb398cc61bc4164e573a7290b6ff0a1d6c710c6932ce0170b8634459beb8f2f53c296b3fcf79ea56d8ca061459babd4 SHA512 25e026aafc04e488183a7537f37566b30c1300f090cc1b4c9eca6531e30654751e10f72c8d45f0ad1bcfa441c659380831de520f41906daec61b4b069fc84f81
+AUX jpilot-1.8.2-fno-common.patch 1094 BLAKE2B 50e039c59bd36af356c9eb53d144be622cc36af5be86464c135ff3184ad5f7bc59bfcb9d19287ba56d59e3eab33274cb8dcc220c8fc1429d4c82df0711d3feb5 SHA512 50d4f6c924fb3c5241d424ec5457f80f93a4fa5dc6dcd9f31e0a2d44bc696ea5ad9f6cd447dfae6f3a6b97a9c951977a0b98379ef3b548eba4b0d1732443bf87
 AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
 DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
-EBUILD jpilot-1.8.2-r1.ebuild 989 BLAKE2B bb2067b305d3e756a0e35168367f5f495b97dfb1945445c77dbe690a128f697c5e1aacc810a79e9415635189791d840cd1afe076ec10a4ce1a1c7cebe27751af SHA512 0b992569f5651b9b9b52ccc333bc3171b94f694b6468a745b0af80be47af8162f46f8967aeae07c2f1ed5d6d7624533203cd3adad3174eb3d3f6adac24e0174b
+EBUILD jpilot-1.8.2-r1.ebuild 1009 BLAKE2B 21d4a9ddb4582f7fa038edf10a6c7393c5d04359a9b679c60591221edad821fe6b4a55e662763b023806e15bd54d71cb0feacbb587962148eb25ca3200c2ee4f SHA512 59de8c25c95eb9dbe825131a1036ca9fb00b0021e62c1d9a82dfb4f06292e25d26502b2ab0770eef91b7c75eb0f9a7cf678f18b086a2de91fe170c830f46223b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
new file mode 100644
index 000000000000..c6cf3665fdde
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/709790
+--- a/jpilot-dump.c
++++ b/jpilot-dump.c
+@@ -76,7 +76,7 @@ const char *formatT;
+  * this code but must be instantiated for the code to compile.  
+  * The same is true of the functions which are only used in GUI mode. */
+ pid_t jpilot_master_pid = -1;
+-int pipe_to_parent;
++extern int pipe_to_parent;
+ GtkWidget *glob_dialog;
+ GtkWidget *glob_date_label;
+ gint glob_date_timer_tag;
+--- a/jpilot-sync.c
++++ b/jpilot-sync.c
+@@ -37,7 +37,8 @@
+ #include "otherconv.h"
+ 
+ /******************************* Global vars **********************************/
+-int pipe_to_parent, pipe_from_parent;
++extern int pipe_to_parent;
++int pipe_from_parent;
+ pid_t glob_child_pid;
+ unsigned char skip_plugins;
+ 
+--- a/jpilot.c
++++ b/jpilot.c
+@@ -84,7 +84,8 @@
+ /* #define PIPE_DEBUG */
+ /******************************* Global vars **********************************/
+ /* Application-wide globals */
+-int pipe_from_child, pipe_to_parent;
++extern int pipe_to_parent;
++int pipe_from_child;
+ int pipe_from_parent, pipe_to_child;
+ /* Main GTK window for application */
+ GtkWidget *window;
diff --git a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
index e7518b102d75..168934bd8aef 100644
--- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -18,7 +18,8 @@ RDEPEND="
 	app-pda/pilot-link
 	dev-libs/libgcrypt:0=
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
@@ -26,8 +27,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch
-	"${FILESDIR}"/${PN}-1.8.2-fix-paths.patch
+	"${FILESDIR}"/${P}-qa-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-paths.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
@@ -45,6 +47,6 @@ src_install() {
 	default
 	docompress -x /usr/share/doc/${PF}/icons
 
-	# .la files for plugins are useless
-	find "${D}" -name '*.la' -delete || die
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }