Don't call kde_src_{compile,install} twice. Moved to 3.5 slot. Thank scarabeus for blessing on #gentoo-kde.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 15 insertions, 79 deletions

diff --git a/media-gfx/gwenview/ChangeLog b/media-gfx/gwenview/ChangeLog
index 67ffc049d3db..9b6b8fcbc72f 100644
--- a/media-gfx/gwenview/ChangeLog
+++ b/media-gfx/gwenview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gwenview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.66 2009/05/30 17:09:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.67 2009/06/15 11:44:42 pva Exp $
+
+  15 Jun 2009; Peter Volkov <pva@gentoo.org> gwenview-1.4.2.ebuild,
+  -gwenview-1.4.2-r1.ebuild, gwenview-1.4.2-r2.ebuild:
+  Don't call kde_src_{compile,install} twice. Moved to 3.5 slot. Thank
+  scarabeus for blessing on #gentoo-kde.
 
   30 May 2009; nixnut <nixnut@gentoo.org> gwenview-1.4.2-r2.ebuild:
   ppc stable #271218
diff --git a/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild b/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild
deleted file mode 100644
index f8c43ee35d0f..000000000000
--- a/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild,v 1.1 2009/01/10 11:44:32 caster Exp $
-
-inherit kde
-
-MY_P=${P/_/}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="image viewer for KDE"
-HOMEPAGE="http://gwenview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="kipi kdeenablefinal"
-
-DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )
-		media-gfx/exiv2"
-
-need-kde 3.5
-
-I18N="${PN}-i18n-${PV}"
-
-LANGS="ar az bg br ca cs cy da de el en_GB es et fi fo fr ga gl he hi hu
-is it ja ka ko lt nb nl nso pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta
-th tr uk xh zh_CN zh_TW zu"
-
-for X in ${LANGS}; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/${PN}/${I18N}.tar.bz2 )"
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_unpack() {
-	kde_src_unpack
-
-	# bug #254049
-	epatch "${FILESDIR}/"${P}"-exiv2.patch"
-
-	if [ -d "${WORKDIR}/${I18N}" ]; then
-		cd "${WORKDIR}/${I18N}"
-		for X in ${LANGS}; do
-			use linguas_${X} || rm -rf "${X}"
-		done
-		rm -f configure
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_enable kipi)"
-	rm -f "${S}/configure"
-
-	kde_src_compile
-
-	if [ -d "${WORKDIR}/${I18N}" ]; then
-		KDE_S="${WORKDIR}/${I18N}" \
-		kde_src_compile
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if [ -d "${WORKDIR}/${I18N}" ]; then
-		KDE_S="${WORKDIR}/${I18N}" \
-		kde_src_install
-	fi
-}
diff --git a/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild b/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild
index d99619fd5152..f5991af8a81e 100644
--- a/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild
+++ b/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild,v 1.4 2009/05/30 17:09:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild,v 1.5 2009/06/15 11:44:42 pva Exp $
 
 ARTS_REQUIRED="never"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://gwenview.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
 IUSE="kipi"
 
@@ -58,19 +58,19 @@ src_compile() {
 	local myconf="$(use_with kipi)"
 	rm -f "${S}/configure"
 
-	kde_src_compile
-
 	if [ -d "${WORKDIR}/${I18N}" ]; then
 		KDE_S="${WORKDIR}/${I18N}" \
 		kde_src_compile
+	else
+		kde_src_compile
 	fi
 }
 
 src_install() {
-	kde_src_install
-
 	if [ -d "${WORKDIR}/${I18N}" ]; then
 		KDE_S="${WORKDIR}/${I18N}" \
 		kde_src_install
+	else
+		kde_src_install
 	fi
 }
diff --git a/media-gfx/gwenview/gwenview-1.4.2.ebuild b/media-gfx/gwenview/gwenview-1.4.2.ebuild
index 4f3ab6eed22f..143151a9e184 100644
--- a/media-gfx/gwenview/gwenview-1.4.2.ebuild
+++ b/media-gfx/gwenview/gwenview-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2.ebuild,v 1.6 2008/05/17 16:00:58 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2.ebuild,v 1.7 2009/06/15 11:44:42 pva Exp $
 
 inherit kde
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://gwenview.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE="kipi kdeenablefinal"