gentoo resync : 05.02.2020

7 files changed, 198 insertions, 12 deletions

diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index cc3946e090ff..72d2cde0c5e1 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,5 +1,9 @@
+AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
 AUX gtkdialog-0.8.3-optdeps.patch 1573 BLAKE2B 1db31db450da622f91920611c93bd4d8cec0378ab2baab27dbb0f3ea750a6ca83ac6e0bb14ba6f4b4043ab80205d140d4b5fad6e9a120445499a4c0984577956 SHA512 a26d46716b46a909c4346c3fc3d9999991c98649ce4fc97cb6f0010dd768c81c62fec6561210dad89ef3911d2fe751c1cf321df60d5e6321647b818f8ed91475
 DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
-EBUILD gtkdialog-0.8.3-r2.ebuild 856 BLAKE2B 11c7acc7942c656985102486fcce90e2ddc694a705164af85d5f47bb769d1e737fb88e31ef4d6c8d82766977561d39a7114b51c61ea1bc6c9708a57079926cac SHA512 b8e4bb6409b96a671b35f22f298340e28e1cdca2489b4e9e0f6eceadb965cbfea5b82fcb19142937fa2398c0b540d289c690f19ae34af48c4d2ba1b6fc2b9f04
-EBUILD gtkdialog-99999.ebuild 844 BLAKE2B 104a0056c4d2c2f2e27a139de0744c0e88d4189028b401753a47ceab2107abce147bdc9239f91cf9f3eeb2a2b36d9893f438a4d16d5154dfc71d3a56c7aadd86 SHA512 4f7ffb05409162b010dfb1adbd1cec27aab26e8c7546bd738c6e2db34ceab82532584c72b98357a7fc6da6e7e03575a3419b8abd26a8c7115233c96b99d7fe34
-MISC metadata.xml 1061 BLAKE2B bda57a1f52134507775d030d4fbf19704ab69b138635ad6001e12e13a779390f7d8b3640dcab4696da1bfd267db4b772d5e5ff233b7ec1d0ff2feee90e9648ab SHA512 90b0871d127602aef6b3066f32c8b7abca20634afdd4879ca06fbfd1971ff3ea0d03165e076912cabd1ae0b730f1621999c220ce9fe195700a778a11c71adb36
+DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
+EBUILD gtkdialog-0.8.3-r2.ebuild 897 BLAKE2B 6d445aefb7cc5825df30d4ba7e9157710bbd2266fc047efe47e8525a2899eb75879b878f9f122f067f9c4f974922c340b22e5ba6c952c5dd91d2981a030e41d6 SHA512 294e88293061c8cae807fcb95529a46b54e3a3357b28de2f67cfaaa17af8b237946871ed9fdc10f334a23fe0944190a5c7981e7e001ee104b9c6e0b6f1c57b2b
+EBUILD gtkdialog-0.8.3-r3.ebuild 994 BLAKE2B 53e7ad93fa84c2776552f11365411cf64d19a9329986501717dc4a824af23072f7acb39d1e8003eaaca714087ab39a028ee09213fe3d2792d67e551150e6c9b2 SHA512 aff4969b5d95b6a0a3a19cd37f41c8f7dd554a83fb3a0522fbedece6f1fdcfb37363f6887d2dfabb6ed3c239a72d2f7e152cf87827c9bbdebb3aba22facc1a82
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1020 BLAKE2B 4aa2b78907c9fa0c09174c279da06d3a029cb17a0de7eeefecb04665850a05a505b1e5136640ea8b8442f76d903efcf4e4aba0646254905b4cce528d1d2875cd SHA512 81ea7caabf698da80587b5814c2ad908c35636d1291d97f281ef1adb9fcd74d56663553c4e2011d5d8b065a8bfe7dbf65ce06916233128cc0214842bab45a2d4
+EBUILD gtkdialog-99999.ebuild 1015 BLAKE2B f1573ba5e470253ef5bdd2b279d9aacbbf63d3e45e96410f9370eecdb35ebeb412b817ef4be6dc494dfda2e6f60963150e0b8c366e54b7e2980fc46d010cdc2a SHA512 5d31e2026a186436166cf0eee9a322dec5b71e05807db275d7d736f03780c6df45f77af28d40ea12d89ce87e4bb3ca975f4e4186f72d13e0627a8879e513400f
+MISC metadata.xml 1061 BLAKE2B 0befbe35090efdcd6567b30df2263e2e9de09921b98e78ac829705d5dd667c02074b0e45816be46919cd0a4fa7e97f8b16dd619f0449257b9038daed4a10dc56 SHA512 d58b989f9601950b77e9711ba86e127c7bbe7e770322fb02cf9db26742f43d6e7f80b40cf1f59f086a7c26d1453c78a5c4143e5bb99213819167b1c602f4c11c
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch
new file mode 100644
index 000000000000..86fa6a9700a4
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch
@@ -0,0 +1,51 @@
+--- a/src/gtkdialog.h
++++ b/src/gtkdialog.h
+@@ -40,24 +40,24 @@
+ #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++)
+ #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--)
+ #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE)
+-gint function_signals_block;
++extern gint function_signals_block;
+ 
+ /* Thunor: Used to control/override the widget packing expand and fill
+  * states at the project level */
+-gint project_space_expand;
+-gint project_space_fill;
++extern gint project_space_expand;
++extern gint project_space_fill;
+ 
+ /* The most recently created radiobutton widget (used for grouping) */
+-GtkWidget *lastradiowidget;
++extern GtkWidget *lastradiowidget;
+ 
+ /* An accumulated list of menu accelerator groups to be added to the window */
+-GList *accel_groups;
++extern GList *accel_groups;
+ 
+ /* A list of widgets to hide and to show */
+-GList *widget_hide_list, *widget_show_list;
++extern GList *widget_hide_list, *widget_show_list;
+ 
+ /* An auto-incremented unique id for each window created */
+-gint window_id;
++extern gint window_id;
+ 
+ void reset_program_source(void);
+ //Redundant: gint set_program_source(gchar *name);
+--- a/src/gtkdialog.c
++++ b/src/gtkdialog.c
+@@ -82,6 +82,14 @@
+ gint geometry_x = 0;
+ gint geometry_y = 0;
+ 
++gint function_signals_block;
++gint project_space_expand;
++gint project_space_fill;
++GtkWidget *lastradiowidget;
++GList *accel_groups;
++GList *widget_hide_list, *widget_show_list;
++gint window_id;
++
+ static gboolean 
+ get_geometry(const char *argument)
+ {
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
index bf0610c4fd83..5e5b48165a4b 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
 	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
 )
 
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
new file mode 100644
index 000000000000..f6947de49587
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://code.google.com/p/gtkdialog/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="glade vte"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	glade? ( gnome-base/libglade )
+	vte? ( x11-libs/vte:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	virtual/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
+)
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with glade) $(use_with vte)
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
new file mode 100644
index 000000000000..5c51b9d790bf
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://github.com/oshazard/gtkdialog"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk2"
+
+RDEPEND="
+	gtk2? (
+		x11-libs/gtk+:2
+		x11-libs/vte:0=
+	)
+	!gtk2? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.91=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex gtk2 --disable-gtk3  --enable-gtk3)
+}
+
+src_compile() {
+	emake -C doc stamp-vti
+	default
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index d90e208f2ef6..131519d09a46 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools git-r3
+EAPI=7
+inherit autotools git-r3 xdg-utils
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
@@ -11,14 +11,14 @@ EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk3"
+IUSE="gtk2"
 
 RDEPEND="
-	!gtk3? (
+	gtk2? (
 		x11-libs/gtk+:2
 		x11-libs/vte:0=
 	)
-	gtk3? (
+	!gtk2? (
 		x11-libs/gtk+:3
 		x11-libs/vte:2.91=
 	)
@@ -30,6 +30,9 @@ DEPEND="
 	virtual/pkgconfig
 	virtual/yacc
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+)
 
 src_prepare() {
 	default
@@ -38,7 +41,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable gtk3)
+		$(usex gtk2 --disable-gtk3  --enable-gtk3)
 }
 
 src_compile() {
@@ -51,3 +54,11 @@ src_install() {
 	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 2de333f9467d..7d0ca79e2c46 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -19,7 +19,7 @@ provided.
 </upstream>
 <use>
 <flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
-<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
 <flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
 </use>
 </pkgmetadata>