[gentoo-commits] repo/gentoo:master commit in: x11-misc/gcolor2/, x11-misc/gcolor2/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/gcolor2/, x11-misc/gcolor2/files/

[David Seifert]

commit:     c462eca3f71a06c416cda3c805ac1f89af4a3441
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 17:32:04 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 17:32:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c462eca3

x11-misc/gcolor2: Port to EAPI 7

Closes: https://bugs.gentoo.org/708752
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../gcolor2/files/gcolor2-0.4-fno-common.patch     | 27 ++++++++++++++++++
 .../files/gcolor2-0.4-pkg-config-macro.patch       |  4 +--
 x11-misc/gcolor2/files/modular-rgb.patch           |  8 +++---
 x11-misc/gcolor2/gcolor2-0.4-r4.ebuild             | 33 ++++++++++++----------
 4 files changed, 51 insertions(+), 21 deletions(-)

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 00000000000..f30552a13e6
--- /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 ee904746f14..c3fcca0af71 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 eec5668c2bc..798fe57e2e3 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 0b164ecf00f..ec842bfb9d4 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"