[gentoo-commits] proj/kde-sunset:master commit in: kde-misc/strigiapplet/, app-office/scribus/, kde-misc/kdocker/, ...

[Andreas Sturmlechner]

commit:     8b7d9bed539b7db393758544f79d1813c2ba0b4a
Author:     Gregory M. Tuner <gmt <AT> be-evil <DOT> net>
AuthorDate: Sat Nov 23 01:13:27 2013 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 13:29:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=8b7d9bed

*/*: Attempt to resolve issues with "EAPI [01] is not supported"

 app-office/scribus/scribus-1.3.3.11.ebuild          | 21 ++++++---------------
 app-office/scribus/scribus-1.3.3.12-r1.ebuild       | 15 ++++-----------
 app-office/scribus/scribus-1.3.3.13.ebuild          | 13 +++++--------
 app-office/scribus/scribus-1.3.4-r1.ebuild          | 18 +++++-------------
 .../libopensync-plugin-kdepim-0.21.ebuild           |  7 +++++--
 .../libopensync-plugin-kdepim-0.22.ebuild           |  7 +++++--
 .../libopensync-plugin-kdepim-0.35.ebuild           |  2 +-
 .../libopensync-plugin-kdepim-0.36.ebuild           |  2 +-
 .../libopensync-plugin-kdepim-9999.ebuild           |  2 +-
 kde-misc/kdocker/kdocker-1.3.ebuild                 | 10 ++++------
 kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild     |  8 +++++---
 .../gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild     |  4 ++--
 12 files changed, 44 insertions(+), 65 deletions(-)

diff --git a/app-office/scribus/scribus-1.3.3.11.ebuild b/app-office/scribus/scribus-1.3.3.11.ebuild
index f3bc937..462d3cc 100644
--- a/app-office/scribus/scribus-1.3.3.11.ebuild
+++ b/app-office/scribus/scribus-1.3.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.11.ebuild,v 1.7 2008/07/27 19:54:02 carlo Exp $
 
-EAPI=1
+EAPI=5
 
 inherit qt3 eutils
 
@@ -21,28 +21,19 @@ DEPEND="dev-qt/qt-meta:3
 	>=media-libs/libart_lgpl-2.3.8
 	>=sys-devel/gcc-3.0.0
 	>=dev-libs/libxml2-2.6.0
-	cairo? ( >=x11-libs/cairo-1.0 )"
+	cairo? ( >=x11-libs/cairo-1.0[X] )"
 
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-pkg_setup() {
-	if use cairo && ! built_with_use 'x11-libs/cairo' 'X' ; then
-		eerror "You must build cairo with X support"
-		die "x11-libs/cairo built without X"
-	fi
-}
+DOCS=( AUTHORS ChangeLog README TODO )
 
-src_compile() {
-	econf `use_enable cairo` || die
-	emake || die
+src_configure() {
+	econf $(use_enable cairo)
 }
 
 src_install() {
-	einstall || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
+	default
 	domenu scribus.desktop
 	doicon scribus/icons/scribusicon.png
 }

diff --git a/app-office/scribus/scribus-1.3.3.12-r1.ebuild b/app-office/scribus/scribus-1.3.3.12-r1.ebuild
index bcfffa1..5b81693 100644
--- a/app-office/scribus/scribus-1.3.3.12-r1.ebuild
+++ b/app-office/scribus/scribus-1.3.3.12-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.12-r1.ebuild,v 1.5 2008/11/21 13:30:04 hanno Exp $
 
-EAPI=1
+EAPI=5
 
 inherit qt3 eutils cmake-utils
 
@@ -25,22 +25,15 @@ DEPEND="dev-qt/qt-meta:3
 	dev-python/imaging
 	media-libs/fontconfig
 	cups? ( net-print/cups )
-	cairo? ( >=x11-libs/cairo-1.4.10 )"
+	cairo? ( >=x11-libs/cairo-1.4.10[X,svg] )"
 
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-pkg_setup() {
-	if ! built_with_use 'x11-libs/cairo' 'X' 'svg'; then
-		eerror "You must build cairo with X and svg support"
-		die "x11-libs/cairo built without X and/or svg"
-	fi
-}
-
-src_compile() {
+src_configure() {
 	local mycmakeargs="$(cmake-utils_use_want cairo CAIRO) \
 		$(cmake-utils_use_enable cups)"
-	cmake-utils_src_compile || die "compile failed"
+	cmake-utils_src_configure
 }
 
 src_install() {

diff --git a/app-office/scribus/scribus-1.3.3.13.ebuild b/app-office/scribus/scribus-1.3.3.13.ebuild
index 096d071..49cb768 100644
--- a/app-office/scribus/scribus-1.3.3.13.ebuild
+++ b/app-office/scribus/scribus-1.3.3.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.13.ebuild,v 1.1 2009/07/30 19:09:14 hanno Exp $
 
-EAPI=2
+EAPI=5
 
 inherit qt3 eutils cmake-utils
 
@@ -30,19 +30,16 @@ DEPEND="dev-qt/qt-meta:3
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cheaders.diff" || die
-}
+PATCHES=( "${FILESDIR}/${P}-cheaders.diff" )
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="$(cmake-utils_use_want cairo CAIRO) \
 		$(cmake-utils_use_enable cups)"
-	cmake-utils_src_compile || die "compile failed"
+	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-
 	domenu scribus.desktop
-	doicon scribus/icons/scribus.png || die "doicon failed"
+	doicon scribus/icons/scribus.png
 }

diff --git a/app-office/scribus/scribus-1.3.4-r1.ebuild b/app-office/scribus/scribus-1.3.4-r1.ebuild
index 562445d..77d7e25 100644
--- a/app-office/scribus/scribus-1.3.4-r1.ebuild
+++ b/app-office/scribus/scribus-1.3.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.4-r1.ebuild,v 1.3 2008/07/27 19:54:02 carlo Exp $
 
-EAPI=1
+EAPI=5
 
 inherit qt3 eutils
 
@@ -21,27 +21,19 @@ DEPEND="dev-qt/qt-meta:3
 	>=media-libs/libart_lgpl-2.3.8
 	>=sys-devel/gcc-3.0.0
 	>=dev-libs/libxml2-2.6.0
-	>=x11-libs/cairo-1.4.0"
+	>=x11-libs/cairo-1.4.0[X,svg]"
 
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-pkg_setup() {
-	if ! built_with_use 'x11-libs/cairo' 'X' 'svg'; then
-		eerror "You must build cairo with X and svg support"
-		die "x11-libs/cairo built without X and/or svg"
-	fi
-}
+DOCS=( AUTHORS ChangeLog README TODO )
 
-src_compile() {
+src_configure() {
 	econf --enable-cairo || die
-	emake || die
 }
 
 src_install() {
-	einstall || die
-
-	dodoc AUTHORS ChangeLog README TODO
+	default
 
 	domenu scribus.desktop
 	doicon scribus/icons/scribusicon.png

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild
index 757be0b..c661b98 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild,v 1.2 2007/02/14 20:24:38 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit qt3
 
@@ -23,8 +23,11 @@ RDEPEND="${DEPEND}"
 # interactive and broken
 RESTRICT="test"
 
-src_compile() {
+src_configure() {
 	econf --without-arts
+}
+
+src_compile() {
 	emake || die "emake failed"
 }
 

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild
index e214de5..3fe5f23 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild,v 1.1 2007/03/28 20:20:29 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit qt3
 
@@ -23,8 +23,11 @@ RDEPEND="${DEPEND}"
 # interactive and broken
 RESTRICT="test"
 
-src_compile() {
+src_configure() {
 	econf --without-arts
+}
+
+src_compile() {
 	emake || die "emake failed"
 }
 

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild
index dc06652..7ce3a5e 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild,v 1.1 2007/12/21 23:15:45 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit cmake-utils kde-functions
 

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild
index c244d92..0092086 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild,v 1.2 2008/07/13 07:07:12 josejx Exp $
 
-EAPI=1
+EAPI=3
 
 inherit cmake-utils kde-functions
 

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild
index 7ccda2f..caeb446 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild,v 1.1 2007/11/26 20:19:47 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit cmake-utils subversion kde-functions
 

diff --git a/kde-misc/kdocker/kdocker-1.3.ebuild b/kde-misc/kdocker/kdocker-1.3.ebuild
index 94949cd..12f24b0 100644
--- a/kde-misc/kdocker/kdocker-1.3.ebuild
+++ b/kde-misc/kdocker/kdocker-1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-1.3.ebuild,v 1.3 2008/07/27 20:52:18 carlo Exp $
 
-EAPI=1
+EAPI=4
 
 inherit eutils qt3
 
@@ -25,10 +25,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-desktop_file.patch
 	epatch "${FILESDIR}"/${PN}-installdir.patch
 }
@@ -41,7 +38,8 @@ src_compile() {
 		QMAKE_RPATH= \
 		"CONFIG += no_fixpath release thread" \
 		|| die "couldn't create fresh Makefiles"
-	emake || die "make failed"
+
+	emake
 
 	# langpacks
 	cd "${S}"/i18n

diff --git a/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild b/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild
index b6b9a9b..255a69d 100644
--- a/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild
+++ b/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild,v 1.4 2009/03/30 13:22:08 loki_val Exp $
 
+EAPI=3
+
 inherit kde multilib cmake-utils
 
 DESCRIPTION="KDE kicker applet to use strigi."
@@ -20,7 +22,9 @@ RDEPEND="${DEPEND}
 
 need-kde 3.5
 
-src_compile() {
+src_prepare() {
+	cmake-utils_src_prepare
+
 	# Fix multi-lib issues
 	sed -i -e "/SET (LIB_DESTINATION/s:\"lib\":\"$(get_libdir)\":" \
 		"${S}"/CMakeLists.txt || die "sed 1 for multilib failed"
@@ -46,6 +50,4 @@ src_compile() {
 		"${S}"/CMakeLists.txt || die "sed to include find_package(Qt3) failed."
 	sed -i -e 's:qt-mt:${QT_LIBRARIES}:' \
 		"${S}"/src/kickerapplet/CMakeLists.txt || die "sed to link libqt-mt.so failed."
-
-	cmake-utils_src_compile
 }

diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
index ccd410f..5000ea8 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
@@ -40,12 +40,12 @@ PATCHES=(
 	"${FILESDIR}/gtk-engines-qt-0.8-optional-bonobo.patch"
 )
 
-src_compile() {
+src_configure() {
 	# enable or disable bonobo support based on gnome useflag (bug #206568)
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_enable gnome BONOBO)"
 	CMAKE_IN_SOURCE_BUILD=1
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }
 
 src_install() {