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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 18 insertions, 83 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/Manifest b/media-gfx/gwenview/Manifest
index 4036905ff704..033727f594f4 100644
--- a/media-gfx/gwenview/Manifest
+++ b/media-gfx/gwenview/Manifest
@@ -2,8 +2,7 @@ AUX gwenview-1.4.2-desktop-file.diff 893 RMD160 8ab0bcc6762ce706287a963f976dba64
 AUX gwenview-1.4.2-exiv2.patch 1355 RMD160 bcd01b67902489a8c6d9f2bd8b4e8bb614ce3376 SHA1 8501ffc18d306feb2bcfe2c8c6734880468a5554 SHA256 bc2a07cc1f7deea253d238ebd79312dda53d73a2794813656f8de9f53123a06c
 DIST gwenview-1.4.2.tar.bz2 984977 RMD160 9c8bc84c90c2eda36f31fb6728990bc7e8063dd4 SHA1 d2168b48eb7f27b4338681acc49b5b2a51268209 SHA256 26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd
 DIST gwenview-i18n-1.4.2.tar.bz2 2035865 RMD160 9b8bc4cc5c8d7f9c3d94201af751ac6e5d56a70a SHA1 1496f5f3448ee56ebcfbde6c06f3ec2a8c2847ae SHA256 6f673e837988faefde25ad9df2242d39bd8c7ff1bde06d8c217c8d5ced48d8c1
-EBUILD gwenview-1.4.2-r1.ebuild 1500 RMD160 2365add72f3804d08008dce872ba6b4bdab7fda5 SHA1 0b4a508dc508b59e55ac7f03c25d8dbf1f6f8b4b SHA256 52c178341c478a56658e871ca35ca8d12b06d717e0a39972f39a226de12f1942
-EBUILD gwenview-1.4.2-r2.ebuild 1616 RMD160 8f997dbd9b032edd6b63c126311f87e478b61e22 SHA1 d677242cf8c98679f77ea4352435b35af33e6083 SHA256 0b88999e9140a32b8aa860445e52611dede0bd23096c9df6164b0f58dda7af9d
-EBUILD gwenview-1.4.2.ebuild 1435 RMD160 12ed7307c0d6bcbabd9c4cd7f070984500199a37 SHA1 cde9ffb3174acb52c790fa685662d9b374fbf0e9 SHA256 da59e5842790a8b4d51b247ce5d9d55c22fcd674bc01c9c66a7f550aba972ee6
-MISC ChangeLog 9309 RMD160 45f288eaa6f7d0cca6932612d62981806b8a2490 SHA1 062713c8fe39f80a10a7c519d1824427c95d1339 SHA256 c027d661555e93caf415da2589a5380f7f45bfd175af8e6af82e880e5201d3fd
+EBUILD gwenview-1.4.2-r2.ebuild 1627 RMD160 f6e732973cf06bb9d79c26552e10ccf092ffbb27 SHA1 de0cbcde5d6e868df1ba327c7a68033bc636f2aa SHA256 e80223246c1b277bad300f0c10b9abcc7b21f21f10e15742fb0c2e6305a61411
+EBUILD gwenview-1.4.2.ebuild 1435 RMD160 4ccc9e86eded455a235df981c8aa32625456ffce SHA1 4b132181cc97658b18421c14869070eb0f1f4f03 SHA256 225e2ce7a58032c792d0e8415375b6556201733739477f688ba5abbbdf7e72ca
+MISC ChangeLog 9542 RMD160 d23b8e4bff3d6e42c54090828e9c8ab88004063b SHA1 444af7590323ad096aaf0210456bf7dfdca719dc SHA256 d55357c7c45160636ecce1e7182d90247dec38e1b1af15254838680db2fc973b
 MISC metadata.xml 244 RMD160 d0dad825021e803beef87d79bb0fad320f106357 SHA1 2e2c424a4cf2fd7e286108f23aea637e44da2879 SHA256 9e924db1025e6dc7d77447f1a04baa87fee3e324394e825e3f7ace393d076139
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"