commit:     592b9d052854c492fd58bb228ad7bb3ab0491a27
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 22:23:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 22:41:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592b9d05

x11-themes/gtk-engines-qtpixmap: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gtk-engines-qtpixmap-0.28-gtk_switches.patch   |  5 ++--
 .../gtk-engines-qtpixmap-0.28-r2.ebuild            | 31 ++++++++++------------
 2 files changed, 16 insertions(+), 20 deletions(-)

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
index 8f5e10d6681..4ffbe414554 100644
--- 
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
@@ -1,6 +1,5 @@
-diff -NurdB QtPixmap-0.28/configure.in QtPixmap-0.28-patched/configure.in
---- QtPixmap-0.28/configure.in 2004-02-03 06:26:07.000000000 -0500
-+++ QtPixmap-0.28-patched/configure.in 2005-08-02 21:59:35.000000000 -0500
+--- a/configure.ac
++++ b/configure.ac
 @@ -19,23 +19,28 @@
  FOUND_IMLIB=0
  FOUND_GTK2=0

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
index 3e9fe287667..449e98283a8 100644
--- 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
@@ -1,43 +1,40 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit autotools epatch gnome2
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+inherit autotools gnome2
 
 MY_P="QtPixmap-${PV}"
 
 DESCRIPTION="Theme engine based on GTK pixmap engine using the Plasma color 
scheme"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=7043";
 SRC_URI="http://www.cpdrummond.freeuk.com/${MY_P}.tar.gz";
+S="${WORKDIR}"/${MY_P}
 
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE=""
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 
 RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
+PATCHES=(
        # Add switches to enable/disable gtk1 and gtk2 engines in the configure
        # script.
-       epatch "${FILESDIR}/${P}-gtk_switches.patch"
+       "${FILESDIR}"/${P}-gtk_switches.patch
+)
 
+src_prepare() {
        sed -i -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' configure.in || die
        sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
 
-       rm acinclude.m4
+       rm acinclude.m4 || die
+       mv configure.{in,ac} || die
 
-       eautoreconf
        gnome2_src_prepare
 }
 

Reply via email to