Version bump for Gnome 3.14. Clean up old revisions.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 23 insertions, 84 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/Manifest b/media-gfx/eog-plugins/Manifest
index 522f33b79324..0676c22c1dd1 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST eog-plugins-3.10.1.tar.xz 349376 SHA256 d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12 SHA512 eff81af98a8227bfd23de93c4b79fbb0e3723560737744a9c18210670457e62661abb55ad0f8e6a1df5b3f1d9a3b1705db3701981e26d0a8035b79365f7a9292 WHIRLPOOL a7d429d231b039da298fa10ed2701c0be93e19584af734cb732cd4b12b9ad28e6778b370c1726f33b89d124744a585849737ec2ff9da7ad38d32b97c4ff434ec
 DIST eog-plugins-3.12.1.tar.xz 351844 SHA256 5b9a6854d5411e75aadb9d44694bbe02a35f5a79a23da5c1bb4feb6bacf56f1c SHA512 aefd1036e44afaf5e27f5caa0416e073747932c8f9ae31a291f36a0ccffd09890097bb0b1896be0b974d228c55f3f5116dca4db864208c49debfc9af759ff7e9 WHIRLPOOL 78965967df26bdc2d68768cd9b4adced95b7d3ef11684dba41ba49a7cc294fa3eed4f8c21a95d5bcdd0f27586746a096857ca7f3c8798a45f69b8f6c08d7390d
-EBUILD eog-plugins-3.10.1.ebuild 1755 SHA256 ed6d15b56dff3bd591f4694d52030d19d119fb4216ba498b33c4658728ea78dc SHA512 90efaeb48181e05b8b003e07cbd2774d661fcb3408e5cfa5754647504851b4717a3e59c5de8850328c47cfbbb2f84f19d50fd45f06fb0c78fc51c5ad381be0f7 WHIRLPOOL b44dfb1d510a2ae4a09b8242fda502d7debbec1889914ecb88d84de4833dce0a4a0b46235141b6758adc6933ddaf7afe37b19feb0c43ca09981844da6ee8445f
+DIST eog-plugins-3.14.1.tar.xz 360472 SHA256 12070173d875d6e9f70d8b918bbf3dfcc5af8c1681e4fabf212dae96b85318f5 SHA512 c5f8d652742e8981385ba7d5742e4de3e49d51e2a7785d57fc15e3e23bff2460866173e8163f3870fc57c6f9ddfd16a0dce0a15ec1d2e7fea336d26c11d55f0a WHIRLPOOL 923f50b565c16c9597510a8c605fb1b300cf4859042e23b8329edfc1415945b21769d1850f3edc883d3e68f4a6c9ccccb3fe369d8fbebf5154a27b0be4ac6beb
 EBUILD eog-plugins-3.12.1-r1.ebuild 1794 SHA256 f3c3c9329ad57205048d2970b89e42876b38ef62b41b651171a1428d255c94ad SHA512 d5a93aecb14a956ed6b29fcf1490652ea28874e71a4afae465d6b292a1d822b95e2437446dfe51ea0ba24797b2c471e657885f7bbc6b3a0b8fae07d39b76bd6f WHIRLPOOL c7d323df266902fd92f96449fef269e9927b00862ca92275405caaa5593c093b0261d5171cb45724847217bf118f112a7b329f3925fd4d666ed6541b915fb99c
-EBUILD eog-plugins-3.12.1.ebuild 1882 SHA256 72c764adb4d8eb7b7802a412964f50f6474872f73dbdb70f51b0f617ae7e2447 SHA512 d0afc762dc04c79fc7830ce3bd92c20a2674d823460dd6c79a2abcb66202299fe1b4060a1b041b3ee592767d058fd84f70424b3c2fe6cf9fe0f777e2e48fdbe6 WHIRLPOOL de9852c7e001f4429d49f734dd613d09df0ed73f7f86aa1ba08873bff33c273abf33cf6e48cbd2bae8509fa81909402669f524747791d9723551eb36c5826852
-MISC ChangeLog 3343 SHA256 47c398db36e7deb003c21fc0c20eab1ab0012673bfcb2c86e451aff50862b4e9 SHA512 06d787b44f44bc4fd590929f0634788902cd2afd15496dc56e5cb973a8022e99ec7d171e727289bbf822ee9b6ab5484cdbcbb18ee7e074d03eae45aa8026dacc WHIRLPOOL eea6db0ce680c9f8a8be268dd4ff07458f915a4c1febe9db520ab612ce3ac9c337ceb1a7d2548a2ea7f7d8e2a48a2bbf28faca7c0226fe3fd725b5017dc518ff
+EBUILD eog-plugins-3.14.1.ebuild 1792 SHA256 e9f7717b231adc7b90a5b0cb00d1722a8a2d066fce96bc756439516aee6a101e SHA512 5a78920b6ff108b497b09d93ddbd94a797fe2370e0cca5fc5dcd75fad2ee285ff09507e7bf258f331969c4c3e5ee0337eeb8a4492d94e3edf0c7c9e46afcaa3e WHIRLPOOL afaec72b5e7b78938de69ab57ea2d571917488fd2efd29331fe7e8f457c234854529bd99c12c6a746e3b482e7c18b64a7bf0bd1436a5e20356a11fe7c4cdcbb8
+MISC ChangeLog 3574 SHA256 6d67491c5e4720d54dfb99459f0ebea850d96d7f9490f69fd595f26228196f44 SHA512 67a7f62525dcab8f989d9cf18ad5a8173269565e1e6fd4eaab2490ddee31f7e57bc771dd079648e36000f73da8ac5f82900f769ce1db41ff2eae682ac50c9e5b WHIRLPOOL fd8c0bd32ee54e45841c93dfcc1f6d585a685bd6616bf68128ba230897c5e2997a6b99bb50ac572ae568057bc0e7f3aa829172add4d4e8aadde049c008053e11
 MISC metadata.xml 392 SHA256 05a1968f0920b51d3abd11acb3f11ba6d2badd66482016bcf777d34c825781db SHA512 e5af450d68431727fdf1536b4d58f6960e012e28cabad7cdf98b18c55db7fed6386b2b2916476e5a3cb3fa2fb2dcfe47ab870e2f14b5bf2555d0ef6978c61a62 WHIRLPOOL 515a4f54ec4e17503543e2559a5b5487d27532b23ed048e611cb0e578c2026ae763799f46e1a80be001cf4e1fabcb5ac09811deb42182ff10a88b39c170d9d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUK9cACgkQCaWpQKGI+9QMTgCdHBDcZMpo5P1Q0UWBG7cLCKmz
-93MAni6V1lrI5TkL1wxbd/aWajC3jeh3
-=qU0G
+iEYEAREIAAYFAlSZ5dAACgkQ1fmVwcYIWAbU1gCgm3qb0MNvW91l1PeRDSu+Q0Mk
+lM4An0VWgzpkL8mZHjBqZMAFGlW6sLsS
+=cwvA
 -----END PGP SIGNATURE-----
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() {