summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-06-18 09:23:37 +0000
committerPeter Volkov <pva@gentoo.org>2009-06-18 09:23:37 +0000
commitf475c9a32fb853cf7911b837c34857ff9d87e5f9 (patch)
tree65a7b05119317da1f403113e2dac48d34d5af7ae
parentRevision bump for CVE-2009-1390, add related patches (diff)
downloadgentoo-2-f475c9a32fb853cf7911b837c34857ff9d87e5f9.tar.gz
gentoo-2-f475c9a32fb853cf7911b837c34857ff9d87e5f9.tar.bz2
gentoo-2-f475c9a32fb853cf7911b837c34857ff9d87e5f9.zip
Revert previous commit. Fixes bug #274381, thank Oliver Borm for report.
(Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)
-rw-r--r--media-gfx/gwenview/ChangeLog8
-rw-r--r--media-gfx/gwenview/gwenview-1.4.2-r3.ebuild (renamed from media-gfx/gwenview/gwenview-1.4.2-r2.ebuild)10
-rw-r--r--media-gfx/gwenview/gwenview-1.4.2.ebuild3
3 files changed, 14 insertions, 7 deletions
diff --git a/media-gfx/gwenview/ChangeLog b/media-gfx/gwenview/ChangeLog
index 9b6b8fcbc72f..7a1400da86de 100644
--- a/media-gfx/gwenview/ChangeLog
+++ b/media-gfx/gwenview/ChangeLog
@@ -1,6 +1,12 @@
# 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.67 2009/06/15 11:44:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.68 2009/06/18 09:23:37 pva Exp $
+
+*gwenview-1.4.2-r3 (18 Jun 2009)
+
+ 18 Jun 2009; Peter Volkov <pva@gentoo.org> -gwenview-1.4.2-r2.ebuild,
+ +gwenview-1.4.2-r3.ebuild:
+ Revert previous commit. Fixes bug #274381, thank Oliver Borm for report.
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:
diff --git a/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild b/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild
index f5991af8a81e..92e510cf2fc2 100644
--- a/media-gfx/gwenview/gwenview-1.4.2-r2.ebuild
+++ b/media-gfx/gwenview/gwenview-1.4.2-r3.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.5 2009/06/15 11:44:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild,v 1.1 2009/06/18 09:23:37 pva Exp $
ARTS_REQUIRED="never"
@@ -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 143151a9e184..a524f4fe0a49 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-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.7 2009/06/15 11:44:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2.ebuild,v 1.8 2009/06/18 09:23:37 pva Exp $
inherit kde
@@ -18,6 +18,7 @@ IUSE="kipi kdeenablefinal"
DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )
media-gfx/exiv2"
+RDEPEND="${DEPEND}"
need-kde 3.5