gentoo resync : 14.12.2020

5 files changed, 89 insertions, 1 deletions

diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index f3a3bfad91e9..51db9c0d08c8 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,6 +1,10 @@
 AUX grsync-1.2.6-gcc-10.patch 1497 BLAKE2B 7b75cb46e4f1fa4df69724441e1a67742469a28b17048a98d6eb87377a6e798a6c72138e74f13be995e414faa0058a66e8c8c591b7f302ec6c08e3cc4c9be000 SHA512 83a09c1601fa5655d3ad29414c0f31f93bd3288c0bb099c17ee5432666bc19b05ccc351dc9f345b769e7d55201788682a872ccb5c141a7b68fde806a3ca99695
+AUX grsync-1.3.0-desktop.patch 971 BLAKE2B d84b3a8dc985a749ec1e06efca88bd4d7055b8abd75a11d38b4ba3155072f1c3dc7161c90c3078259cb61d786e769134e55bea0c77e96d1108e4a2be00297488 SHA512 34db923df4fb6d5fbc3275d9f2b00b638bad22e59f6a91223423928124e6d209548e0a2aa15d461cb42fc8888f61dba379f747f7994cdfd604bedfddb761720d
+AUX grsync-1.3.0-nested_func.patch 954 BLAKE2B ce3aa388652b89278b91d1f10c83bef6e0f3dd5a13a90170d911c325e8581cb081277564eed640e39a8beb86a9f6c2e59d31a093e48c984cc92d53302d0c480c SHA512 b11bae4abdd9de4cb2a2b6acc7af30d7507fbc99dff869521f923c2456cf6316fdb2b36849dc978817915c9839d1b15353e664575bb93fdc0f4ee887c22fad2d
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
 DIST grsync-1.2.8.tar.gz 352885 BLAKE2B fc63db9b2739bc7a253b64cb1820a7c51c7408ebbe5bb950672b6ab08942726467a4966eea3da67c7c7e21e0acc703a06183d58e2fbcd1ec38370257b57bad63 SHA512 7feee6c405b20f147641e9a9a114645a7132345fcfc33c656a190aba0d2b7fedcd40f98328dfb0b123f38d8648d041a2f53cabbae0b8d53a243d3a6029bf0963
+DIST grsync-1.3.0.tar.gz 304725 BLAKE2B 4e58eb7db8082b733468b95db995a2e7f7f970cebe2b3eb614e0a828d2fb34bc20fc2163f8bca7d5d87e648cfe0dd45a0cd22319d6504e9bd491a6da462ee8a3 SHA512 2d2d9e7910f18e061c5259f51510cd5e3c14c1c15b649618ea096777531780c2d5821a7bb415cd762a695302146b4835d793d31c032667431e227ac11a7aa108
 EBUILD grsync-1.2.6.ebuild 531 BLAKE2B 189975475dbb3ee82136f7abb13b9b0934ef550eede295136b3ec4d25bda3cf1494d5f24f9e9a715619f6227557ca88cc993f86083d898d9edeeda57077c9795 SHA512 9f2ab15a2ea536f07e4d12f65b7f1640ea791b54704654da9ec1a75bc0ca6178e0d2dbf777a593523f1d38dfc7a737cbd4c8f3c9aecce419ec8f456617fce448
 EBUILD grsync-1.2.8.ebuild 563 BLAKE2B 43169b43b94c3de0ccbd8c440415882b8c8942c88bf8d74c75ab4930d2c5b7f31a73e4c6500a80b60d7e44cb937f1604f83ae945226404eab833902c48c84a2b SHA512 dc3a99be2b068aa0023b51878de0fee836ed1306f945d62f465d235a722f898a298bc12de1e2f6abb7ff0a08125ddcb0f91bc9aff88e924909a5161d51fc1918
-MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
+EBUILD grsync-1.3.0.ebuild 710 BLAKE2B f579d5e2d5d90d32b2435cdd81afef4035e0dca86b8b76dc77bb5cafdfb602ce6283a67c64a2edf162cc0a35777a853f7ce121299672cf909542da22a4d32571 SHA512 83594f433fe740b70eea5085c8e1a7341ac9db5030b5777e4f50a457d99a9c427ea567fe25f1d2004050c3f077431b895cb3547c4180b302ba8060531c714888
+MISC metadata.xml 382 BLAKE2B 900a8fa87186afeeafd9afdb5e39898e0c4c03f80a8e73af8d9a39117ea71dbce2d8a59de41a732429b09b38b235b1fbbd24dd165ae1a23df90f48d804661a3d SHA512 64f28a7fa9ca489135b65b5ce73f1dfed7580401bd5e0aba1042344e532e31edbdc225a9650fcfc883eb563d7c7f571834852e3af659144c1d6fb5a1db859fe2
diff --git a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch
new file mode 100644
index 000000000000..5cdc49194371
--- /dev/null
+++ b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch
@@ -0,0 +1,24 @@
+diff -Naur grsync-1.3.0.orig/configure.in grsync-1.3.0/configure.in
+--- grsync-1.3.0.orig/configure.in	2020-05-28 10:16:05.000000000 +0200
++++ grsync-1.3.0/configure.in	2020-12-04 09:30:40.082105813 +0100
+@@ -30,7 +30,7 @@
+ 		GTK_API_VERSION="2.0"
+ fi
+ pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0"
+-OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
++OTHER_DESKTOP_ENTRIES="Icon=grsync"
+ MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
+ MIME_OSSOCAT=""
+ 
+diff -Naur grsync-1.3.0.orig/grsync.desktop.in grsync-1.3.0/grsync.desktop.in
+--- grsync-1.3.0.orig/grsync.desktop.in	2015-09-11 13:21:28.000000000 +0200
++++ grsync-1.3.0/grsync.desktop.in	2020-12-04 09:30:50.473110946 +0100
+@@ -4,7 +4,7 @@
+ Terminal=false
+ Type=Application
+ MimeType=application/x-grsync-session;
+-Categories=Application;System;
++Categories=System;
+ GenericName=Synchronize files with rsync
+ GenericName[fr]=Interface GTK pour rsync
+ GenericName[it]=Sincronizza file con rsync
diff --git a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch
new file mode 100644
index 000000000000..6d135674bac8
--- /dev/null
+++ b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch
@@ -0,0 +1,21 @@
+diff -Naur grsync-1.3.0.orig/src/callbacks.c grsync-1.3.0/src/callbacks.c
+--- grsync-1.3.0.orig/src/callbacks.c	2020-11-23 14:52:42.000000000 +0100
++++ grsync-1.3.0/src/callbacks.c	2020-12-04 09:18:27.573776667 +0100
+@@ -40,12 +40,12 @@
+ gboolean more = FALSE, first = TRUE;
+ 
+ 
+-void dialog_set_labels_selectable(GtkWidget *dialog) {
+-	void _set_label_selectable(gpointer data, gpointer user_data) {
+-		GtkWidget *widget = GTK_WIDGET(data);
+-		if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
+-	}
++void _set_label_selectable(gpointer data, gpointer user_data) {
++	GtkWidget *widget = GTK_WIDGET(data);
++	if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE);
++}
+ 
++void dialog_set_labels_selectable(GtkWidget *dialog) {
+ 	GtkWidget *area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog));
+ 	GtkContainer *box = (GtkContainer *) area;
+ 	GList *children = gtk_container_get_children(box);
diff --git a/x11-misc/grsync/grsync-1.3.0.ebuild b/x11-misc/grsync/grsync-1.3.0.ebuild
new file mode 100644
index 000000000000..a941d3f0832e
--- /dev/null
+++ b/x11-misc/grsync/grsync-1.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="A gtk frontend to rsync"
+HOMEPAGE="http://www.opbyte.it/grsync/"
+SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.16:2 )"
+RDEPEND="${DEPEND}
+	net-misc/rsync"
+BDEPEND="virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS NEWS README"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-nested_func.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-unity $(use_enable gtk3)
+}
diff --git a/x11-misc/grsync/metadata.xml b/x11-misc/grsync/metadata.xml
index dc71e24a084b..269ca1f3751e 100644
--- a/x11-misc/grsync/metadata.xml
+++ b/x11-misc/grsync/metadata.xml
@@ -5,4 +5,7 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
+  <use>
+    <flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+  </use>
 </pkgmetadata>