Version bump for Gnome 3.14. Clean up old revisions.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 17 insertions, 77 deletions

diff --git a/media-gfx/eog-plugins/ChangeLog b/media-gfx/eog-plugins/ChangeLog
index e13db065a1cd..541ef24ebc7f 100644
--- a/media-gfx/eog-plugins/ChangeLog
+++ b/media-gfx/eog-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/eog-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v 1.23 2014/12/19 13:44:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v 1.24 2014/12/23 21:59:44 eva Exp $
+
+*eog-plugins-3.14.1 (23 Dec 2014)
+
+  23 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  -eog-plugins-3.10.1.ebuild, -eog-plugins-3.12.1.ebuild,
+  +eog-plugins-3.14.1.ebuild:
+  Version bump for Gnome 3.14. Clean up old revisions.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> eog-plugins-3.12.1-r1.ebuild:
   amd64 stable, bug 529964
diff --git a/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild
deleted file mode 100644
index a9863e71cabc..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1.ebuild,v 1.4 2014/07/23 15:18:51 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_2,3_3} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://live.gnome.org/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+exif +flickr map +picasa +python"
-# Let people emerge this by default, bug #472932
-IUSE+=" python_single_target_python3_2 +python_single_target_python3_3"
-
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.11.4
-	>=x11-libs/gtk+-3.3.8:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	flickr? ( media-gfx/postr )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use flickr && plugins="${plugins},postr"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.10.1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.14.1.ebuild
index fdfbe95af920..57339e039044 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.10.1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.14.1.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.10.1.ebuild,v 1.6 2014/03/09 12:01:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.14.1.ebuild,v 1.1 2014/12/23 21:59:44 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
-inherit gnome2 python-single-r1
+inherit gnome2 python-r1
 
 DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://live.gnome.org/EyeOfGnome/Plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+exif +flickr map +picasa +python"
 REQUIRED_USE="
 	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ^^ ( $(python_gen_useflags '*') ) )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.9.1
+	>=media-gfx/eog-3.11.4
 	>=x11-libs/gtk+-3.3.8:3
 	exif? ( >=media-libs/libexif-0.6.16 )
 	flickr? ( media-gfx/postr )
@@ -42,13 +42,13 @@ RDEPEND="
 		x11-libs/pango[introspection] )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
+	>=dev-util/intltool-0.50.1
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	use python && [[ ${MERGE_TYPE} == binary ]] && python_setup
 }
 
 src_configure() {