Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines-qtpixmap/files/, x11-themes/gtk-engines-qtpixmap/
Date: Mon, 19 Apr 2021 22:42:03
Message-Id: 1618872091.592b9d052854c492fd58bb228ad7bb3ab0491a27.sam@gentoo
1 commit: 592b9d052854c492fd58bb228ad7bb3ab0491a27
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 19 22:23:55 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 19 22:41:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592b9d05
7
8 x11-themes/gtk-engines-qtpixmap: port to EAPI 7
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../gtk-engines-qtpixmap-0.28-gtk_switches.patch | 5 ++--
13 .../gtk-engines-qtpixmap-0.28-r2.ebuild | 31 ++++++++++------------
14 2 files changed, 16 insertions(+), 20 deletions(-)
15
16 diff --git a/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch b/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
17 index 8f5e10d6681..4ffbe414554 100644
18 --- a/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
19 +++ b/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
20 @@ -1,6 +1,5 @@
21 -diff -NurdB QtPixmap-0.28/configure.in QtPixmap-0.28-patched/configure.in
22 ---- QtPixmap-0.28/configure.in 2004-02-03 06:26:07.000000000 -0500
23 -+++ QtPixmap-0.28-patched/configure.in 2005-08-02 21:59:35.000000000 -0500
24 +--- a/configure.ac
25 ++++ b/configure.ac
26 @@ -19,23 +19,28 @@
27 FOUND_IMLIB=0
28 FOUND_GTK2=0
29
30 diff --git a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
31 index 3e9fe287667..449e98283a8 100644
32 --- a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
33 +++ b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
34 @@ -1,43 +1,40 @@
35 # Copyright 1999-2021 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI=5
39 -GCONF_DEBUG="no"
40 -GNOME2_LA_PUNT="yes"
41 +EAPI=7
42
43 -inherit autotools epatch gnome2
44 +GNOME2_LA_PUNT="yes"
45 +GNOME2_EAUTORECONF="yes"
46 +inherit autotools gnome2
47
48 MY_P="QtPixmap-${PV}"
49
50 DESCRIPTION="Theme engine based on GTK pixmap engine using the Plasma color scheme"
51 HOMEPAGE="http://www.kde-look.org/content/show.php?content=7043"
52 SRC_URI="http://www.cpdrummond.freeuk.com/${MY_P}.tar.gz"
53 +S="${WORKDIR}"/${MY_P}
54
55 -KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
56 LICENSE="GPL-2"
57 SLOT="0"
58 -
59 -IUSE=""
60 +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
61
62 RDEPEND="x11-libs/gtk+:2"
63 +DEPEND="${RDEPEND}"
64 +BDEPEND="virtual/pkgconfig"
65
66 -DEPEND="${RDEPEND}
67 - virtual/pkgconfig
68 -"
69 -
70 -S=${WORKDIR}/${MY_P}
71 -
72 -src_prepare() {
73 +PATCHES=(
74 # Add switches to enable/disable gtk1 and gtk2 engines in the configure
75 # script.
76 - epatch "${FILESDIR}/${P}-gtk_switches.patch"
77 + "${FILESDIR}"/${P}-gtk_switches.patch
78 +)
79
80 +src_prepare() {
81 sed -i -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' configure.in || die
82 sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
83
84 - rm acinclude.m4
85 + rm acinclude.m4 || die
86 + mv configure.{in,ac} || die
87
88 - eautoreconf
89 gnome2_src_prepare
90 }