gentoo resync : 25.11.2020

5 files changed, 55 insertions, 24 deletions

diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest
index 8b3fc84304bb..fc6ee653b0b0 100644
--- a/x11-misc/gcolor2/Manifest
+++ b/x11-misc/gcolor2/Manifest
@@ -1,7 +1,8 @@
 AUX gcolor2-0.4-amd64.patch 1484 BLAKE2B ca9dce4a0871e9dbff507c6df74b9a2e9ead18d10d318c5d0cbc108ace666a7ffe4515e8044fb2fa21ec31f0a62ba875b7875faec78cdcff0ea41fea8d4f8c99 SHA512 1b114e31a0a0fd4d500ea992616e72c8b0f1cd3442130f1955acd2d17c7a0239f6036986e9e3297182245ee7846fb9e72394acae72c88ccb2cfcf8049d105077
-AUX gcolor2-0.4-pkg-config-macro.patch 240 BLAKE2B 3cf9e2836caaed0e4d0976f58af91b9e95d76827ac052d34d14dfa293a36ac6c7bd1c8d563fab4ecdcf6f370f8c5bdc40698395c7a58123804055f73216a57b3 SHA512 e86fc73aee59d73e19d5c841169b4e4941aba78e206be67c86b45bddcdf51f86e7ad0dbfbbeafe98c6bf056a314940e27f02087224f271b085154636fbc2983a
-AUX modular-rgb.patch 800 BLAKE2B 2bfa38afc6c781d6686e5a95c99d442bb7694487ef27b34915e700f540efad746a0d2bda5112cc15e8d3c79d9f99a9b15ab0004a00d9f9baea2dd7761655d2a7 SHA512 bf2ffe9bb489869e67b8b595fba649d3a8e0fe6dd168156c61f2a1165d865ac15199e03896c9b8e6a65d6cf84e8445f303f9b8eb190c60478e1334b60716572f
+AUX gcolor2-0.4-fno-common.patch 629 BLAKE2B 9eb930e46c46564df4bf38cbc449f1dbfbe01fe17b36b3e5bd143cb0a01149578d2afe79fcfdebf0775bcb962a049d68d8a68c523e34631780788eca818b4e7f SHA512 d5d2179c27ce4a86460c72032eb6cbfa4830226ec4e8377fa365c0f80036b83eca3b959208ec7c3288968eff6471b4000e80fcdb39169a11c9ae7d2e4fdbdd93
+AUX gcolor2-0.4-pkg-config-macro.patch 168 BLAKE2B 9f66e9012cc231febd622ec9ee4a25b1b0d9f27652baf734076f4e7f430f37050481071b315c5006d999bcd6983457bb3b12269b181ce3dc357727e4723ea0a9 SHA512 5923b8467485e7aa013369196c240bba7ea439347d9c2f96356f7f869da2ac10b744b58b8ce5ba22a4608f81a29b539158661be2c8f302f3d357de01c97b7099
+AUX modular-rgb.patch 654 BLAKE2B 147c1083b6aa4fbdd468c7f30c6755e1fb0b9b3cadb932feb4dc6c2dbf4fb69125f9c4c795aa1a5aab7b4a8be10615a2b4a719de9c2dce107597664998553926 SHA512 71862c771557b23c8ed24960fbd5b43fbefe72902c9d80a59b51fa30d8350c203f1724b9e7e24c3479953cee6b34e5413ff08a74f3975f5a8b01d621af4754ee
 DIST gcolor2-0.4.tar.gz 375217 BLAKE2B c8bc8581c9790106a9461cda03e40c201faec95c9c0d7890dbb8903346a85208c506dd8c9cd0735036b4a294205f44c857edbae8282574d195e77f4954bae91c SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3
 DIST gcolor2.svg 12742 BLAKE2B 40f5e6624a0a90d8d8c81dd5814d836741bab04f19d73cfbd96f224baa78165447d1642c18a55ef282771a02de4bddd77d975c4aa75bb74b98d63227f87031ea SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b
-EBUILD gcolor2-0.4-r4.ebuild 1030 BLAKE2B 01c252a591e73b8abfe3b90488f92e1c9e8fadfe08bc809aa43103ea7e9491475b53e0b02fc9ff548ba0871508972b0dc08df0924b5b51194d790d9dacdd51ce SHA512 4749498596653dd27afff678ee521934d9a538d5173061ef94e3e66b6047c554cddc1f69cfab171d1cc2b71969e962fefc46ab2612a9245bdd4b6e8a54f4ef30
+EBUILD gcolor2-0.4-r4.ebuild 1034 BLAKE2B 8abe01179114908dc0f3f593a64c18784e4f3f4b12b17543169ee3935f8932eae8b5dd837e2f49a441c70f1100eef9b0838097037537fbbe26241d34bcc35618 SHA512 2fd37f1dd44583e9943583ee07dcf562e9c57047fb375d1d7a64daa781de649249fe840263beb07b338ddb69e2fcffa0efb64092737f9f26ef7dbef1b907b684
 MISC metadata.xml 330 BLAKE2B c19955a2fb7320cb01c45f1c478f0ca6adc253862399ee4fc52e64dc728ccc2550779b3c6d9e4784ad59e303947a45009a7cff803cbe278c51aa50d41a5b1c39 SHA512 93ca94884b92665bd0e26010bdc1120a3014a0c22ab2de2b06bfff14ac716ca28017e04ec6607a0ec4b90818692ecd6d701147b8e5068e933b3fe0641a7f735f
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch
new file mode 100644
index 000000000000..f30552a13e60
--- /dev/null
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -13,6 +13,9 @@
+ #include "support.h"
+ 
+ 
++GtkWidget        *gcolor2;
++GtkWidget        *menu;
++GdkColor          colorvalue;
+ GtkWidget        *savedialog;
+ gchar            *colorname;
+ static GtkWidget *aboutdialog = NULL;
+--- a/src/callbacks.h
++++ b/src/callbacks.h
+@@ -42,9 +42,9 @@
+                            "\302\267 Usability / user interface enhancements\n" \
+                            "\302\267 Code cleanup"
+ 
+-GtkWidget *gcolor2;
+-GtkWidget *menu;
+-GdkColor   colorvalue;
++extern GtkWidget *gcolor2;
++extern GtkWidget *menu;
++extern GdkColor   colorvalue;
+ 
+ enum
+ {
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
index ee904746f147..c3fcca0af712 100644
--- a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2008-01-08 09:36:24.000000000 +0100
-+++ configure.ac	2008-01-08 09:37:06.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -26,6 +26,7 @@
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch
index eec5668c2bc7..798fe57e2e3f 100644
--- a/x11-misc/gcolor2/files/modular-rgb.patch
+++ b/x11-misc/gcolor2/files/modular-rgb.patch
@@ -1,5 +1,5 @@
---- src/callbacks.h.orig	2006-01-10 21:26:19.000000000 -0500
-+++ src/callbacks.h	2006-01-10 21:26:44.000000000 -0500
+--- a/src/callbacks.h
++++ b/src/callbacks.h
 @@ -12,6 +12,7 @@
  #define SYSTEM_FILE_2      "/usr/lib/X11/rgb.txt"
  #define SYSTEM_FILE_3      "/etc/X11/rgb.txt"
@@ -8,8 +8,8 @@
  
  /* about dialog text */
  #define ABOUT_CREDITS_TEXT "Developer:\n" \
---- src/main.c.orig	2006-01-10 21:43:20.000000000 -0500
-+++ src/main.c	2006-01-10 21:42:14.000000000 -0500
+--- a/src/main.c
++++ b/src/main.c
 @@ -36,6 +36,8 @@
  		sys_filename = SYSTEM_FILE_3;
  	else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS))
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
index 0b164ecf00f6..ec842bfb9d47 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
+EAPI=7
 
-inherit autotools eutils gnome2
+inherit autotools desktop xdg
 
 DESCRIPTION="A GTK+ color selector"
 HOMEPAGE="http://gcolor2.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/gnome/${PN}.svg"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.27
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/modular-rgb.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-pkg-config-macro.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/modular-rgb.patch
-	epatch "${FILESDIR}"/${P}-amd64.patch
-	epatch "${FILESDIR}"/${P}-pkg-config-macro.patch
+	xdg_src_prepare
 
 	# To check at each bump.
 	sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed"
-	echo "gcolor2.glade" >> po/POTFILES.in
+	echo "gcolor2.glade" >> po/POTFILES.in || die
 
 	eautoreconf
-	gnome2_src_prepare
 }
 
 src_install() {
-	gnome2_src_install
+	default
 
 	# Icon from https://sourceforge.net/p/gcolor2/patches/5/
 	doicon -s scalable "${DISTDIR}/${PN}.svg"