Version Bump, bug #545200

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 27 insertions, 134 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index cd90db505f91..2de5a74da31c 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.80 2015/02/22 11:37:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.81 2015/04/07 14:20:19 jlec Exp $
+
+*shotwell-0.22.0 (07 Apr 2015)
+
+  07 Apr 2015; Justin Lecher <jlec@gentoo.org> +shotwell-0.22.0.ebuild,
+  -shotwell-0.20.2-r1.ebuild, -shotwell-0.20.2.ebuild:
+  Version Bump, bug #545200
 
 *shotwell-0.21.0 (22 Feb 2015)
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 2b95406f657a..469bbc39d3c6 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -6,32 +6,31 @@ AUX shotwell-0.13.1-ldflags.patch 1142 SHA256 d7fe75551807d7998c9494c9c065c611f9
 AUX shotwell-0.14.1-libraw.patch 1896 SHA256 f6bb9be6b5b03adcc2aab4d8cf1d7cdc564efec1ccd012283740ef3fd9f7d959 SHA512 bd0cfffefe61d46c341f97564e98fe7af306a345765098ec7410eec86e2985f00b355e13fcb2824051a371876705ef30a1f0ef862293725f6c2764cd19f86649 WHIRLPOOL fbab77a21df7c5689c1c8840b8a1f8a9d5694a9f0cb0c1fd712e0a2259db95ba701c3aa382a15ed6765a3b1a1edbc865f034cfc2c18066835e847f815e88d1b9
 AUX shotwell-0.15.1-format-security.patch 647 SHA256 56493144c5717cb98b319a6512a6a7770ef33dc67adf15ad3fc92fa06840b320 SHA512 45f192adde97d3b7445b969839438fb8f8b2f96325cde30d37948f86625d49353494139add14637abcd16503b4d53d2ef88b5d8f3c19dbc8068021ee1a418eb5 WHIRLPOOL 80cc6bbd54b0bf273030be2bee4790259955e98b6d5d2fc22bb7c90e195bec78e89aa7745e6c11f861b63ac5ef892fcd23f5c181efa310a8b3a517fc7a0578ef
 DIST shotwell-0.20.1.tar.xz 1810488 SHA256 86a869432b7c049e61217ad09eeac7e0d79cabfeca04a57a3629ad25f3070615 SHA512 4c72f648b2778e38b6748b79398481f7d05d4c68c08c3537c4bb0c045f4a7da44f9724bfdd7a612a3c246d936f3d365fd951a4b599ef59eb19ddf94f88beedff WHIRLPOOL 1c088307c5b7e9f6f202a6f4864c2226b86e5d411f77e473275d2f2c774de319c2eddb63604aba445b81e9c5c12872b6a9733aad22ff8cde9c2a06c0e0a84a4e
-DIST shotwell-0.20.2.tar.xz 1815580 SHA256 37e2c89f75013b8afc045f0b7b4dbbaeca49aa1af3938237ddf4ceac3f6bb740 SHA512 b4411408e4ad55af7d7f38d8ba7d22ec7e17ea147a4b9350a15fe515e35bb8411eb14b1f4652393fa454a666e6fa46e7c2ebf45f3c191a8ceede3a6b07de31a8 WHIRLPOOL 4e51b0bc7b50082d166e5405eaa1a4d77d999b365b49b22b5596748f8551111c7324cb5b9436817cc966b5485a1b02bdebf3fec437d9c77f240f9bd87790f622
 DIST shotwell-0.21.0.tar.xz 1839240 SHA256 7764b393987a0a4e82203bfb0c57e8f2f0f7f04110a3339ec650fc705f9feb64 SHA512 4bf8d10c5a5a1e65a17429ca7939cf223c9c9d3b347a7fdc7c16ea800133fe600bbd354c9fbe9dcc083bbab3167519b71b088efcaa66849f0668c762f98ae2e1 WHIRLPOOL ed3ab11144acba65a38d712641522bede3c0dbee9f9d7109e89862638c9ce13267728d2ce01158c3729d8250518a307e717c4eaf9d45364ccfb69cd6f4d26d2b
+DIST shotwell-0.22.0.tar.xz 1872952 SHA256 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831 SHA512 486f27a1fa06512a925ecae60504f3cbc487d44834f635efd0897dd20cb304a731c08133ab4b04b32a754235fc8c63dc9b05787b1a0c72a98c89ca91c64f452c WHIRLPOOL 8b93b6a92822c26aa7962f30e7402322371db1e6d297d7cd4e612f01f0418bcf2ee3598954e7d2a59d62f7e9704479bb24cb6fcf4263ab5315668c20543445c3
 DIST shotwell-icons.tar.bz2 59644 SHA256 aaf4e1a03ba2d17edb24f1c35bc880573a6066dfa1b2223526a4521cc213acec SHA512 0b2beb845841c7b1a8535742ce68026c21972abee6c02f904c02549ca2af5455d81a48c5344748bb83915e8b7fd4f17f93f6af637de512e6aff91d9b0eb3cff0 WHIRLPOOL 5bb2c13c6a1e5f8c6a1c666d20126474476a97a56f4e70e2c14a0d5281bb310815946db6e6322d3bfe6db8374981823d9bd32e76f3776b9eb9a62a9c1c7d0785
 DIST shotwell.1 1238 SHA256 7f4036f14a6c599835bd121d63705ddc766388aae8c6414eb3a405c85b9a5014 SHA512 8090d5d339a44992d2543ba9ed1bb6e0eb18da8d3fe6ad4f95f917d3aca352e6af0b8c21a7da3a8be9aa1cb04a13e8602d9db8484d4801547cfadc6c40500ad4 WHIRLPOOL cb3c1ef3cb6a577fa94d0aec4dfc06ee84a1f77771268e3217704fed269cd0cd3c220a4e68d270c152b34dc2e438e193d47aee87dd891a39fd8236a6d269eb3b
 EBUILD shotwell-0.20.1-r1.ebuild 2869 SHA256 36747749ad1e1bea7988c05f99c27faa9552a7442083a0f3dad81111e9397edd SHA512 301e69756d72e251b518edec3933fcd1e1665640d53445a39789c870a9f47f65385535137947a58393f448874d7bd87c1bec1fc7b2946088aaf081bc3db12226 WHIRLPOOL 1abc7d10649bb076bdf965a5294db0f91ce61f37f24e480a6f88ea73f6a3ec618df3a0b3934df98690d994409ca042addf08833fd74ccb6ba74fdf7b2baf8003
-EBUILD shotwell-0.20.2-r1.ebuild 2872 SHA256 7ff2cd8a5d241dbdd246eb4b45c460e97fcb7bf0eec08bdc6beb56531849b021 SHA512 287c6c2c27a002fd350f28639050026c77f26bb08e52013e9972b4e6931cdc4a55eaa0fdacfbbd57f304763e753c54c87c1d79b9a7c7e5340833864337d794e8 WHIRLPOOL c12ea859a98244564c0c4b68e11e1c1fce778685ddcdbff552d0d01c6c2f628e17a2d0056c89f635fb1df8ba3844e1472c4bd09dabed76372bdafa4e5d2e0705
-EBUILD shotwell-0.20.2.ebuild 2873 SHA256 e6c942d81b5e893a2dd6ae7738c0526b3eb7ff5604304921b9748706039186af SHA512 6197514d788bba373d133e4bbae8cebc354d2a99ba917a4fefdfde4878353a80959b648f3ed838878ed9d9ef78213160dc40dfe113cbaf41b115fcf00e89ca7d WHIRLPOOL 8b4a4892931022021db9d05b00602c1b5d784cf2566427bed27cea21822e8fecfe157f8537c6a4bb8ddb63294d80b1e724c524e39eebe8a41a7c7a47742401f0
 EBUILD shotwell-0.21.0.ebuild 2880 SHA256 58eac6df5fc730b0bf627c64b54a08c9c031d710b482a4e59330394a0f54fed4 SHA512 78adb8a80b195be4c4a9a4b924ac5a10d2d5126281e60596f335b72d6a0c2d5437f9f20411c0320b4729f6bcc7b631427fe83a57d9acac24e71c1b7f6282f037 WHIRLPOOL a43728000a484aa21fadca5157c4c896cf957fc13d8fee2af647ff09ced137147962965465a96c5afe421da9bb8d74251f509d82183a00bf49708e7230c09d34
-MISC ChangeLog 12508 SHA256 26ff15af30f1898b1ee40ad3275072059bc82a0462b579ab388099cd15671090 SHA512 71d6a74873cdd27bc150346b1a7fadaf0c05d343303165a28a08ef6974789686d21fac6f3b917cabbf108c9713f81560476987d5fe913f4e8269b63035f4238d WHIRLPOOL 7267d24acaafb059fa7af14704b0551053bab03334592ba7baf4d13f1a3ac4effcc10204e8fe144169c3230e605ae19f404ddbb5745649f2befe4300b0577f8e
+EBUILD shotwell-0.22.0.ebuild 2880 SHA256 d909df0fa02f5f1aa6d86fa55d959792a08811c114d42dc0e5f5b7a47a10f68d SHA512 3d7ebc73a387fc6bca22ba4ff2c2b8d976b27aceb92c5a5ecef13963cd93188bd6a452d19d080393ced960fdd074a870a5fddb91fad3f02b06abb7e7a697d7e2 WHIRLPOOL f341b224bd590da015165ef21b5a3e9d2a1f197e6afc6381389e69dccf624f55d91da6cbca26edb3e1910b98ef00401f047dd6c39d0bc3a75018de316101bde3
+MISC ChangeLog 12696 SHA256 b51a34a1a172804f6ca6835834e45e23a93d251cf81740942a4331d41252ce7f SHA512 38a9162105d52769e379901c1d3d06e6115e234afbfd73f88117ba6ab5cc171c18910097e0b438f1d093e8f446c6f8427c0fcbd47e0f5c6cdf4f545c1c1aede4 WHIRLPOOL e4ad79c976b732a1ea9d1fa9a0402a14f4484c26f3a2b6688b428a78eb6f63d7984845bc731fa62ea4d0b36d5c19695c1241b97215b6f1786f254c9a02dde504
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU6cCFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVI+ekXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNmUP/ig+3rMo/ZJYQTuu63rBMbtK
-WfqD6yZEOye1TpC4XMzn5jVrDhx3kjqVZ29DcTlG2PTdK36SwsomeOH6G/C/CXJM
-b7N0ueA3Ovh+Oz4vIF8A/PtxaYaEAgrxt87Ve5rgnXrlnBUuGvvy8oNOvEbphnj9
-RLh7XPmGr2jkAS6wZRtChRTZjYMIeYxjc/oy6IInISR+6aUxeZQLOUY4IagFVzpV
-JihayJN5P2G8NUhmGhSbq6h2kNYOcMnYoGMO6doF1LXZDOij9o1T5uDbwa0KbeU6
-l88QS793V/qmMGHj2e2GybMM3sHlQA3/QAmVPqumbLcoEmIcfYilxZpbem4wYbnn
-s2KHCBIZ8zmAtI0bO+xE2PMUCYisd2VN2mt+nojxyEJQnk3DX+ir9N7WQoqE5Ko2
-bVe5lV4PHZtaM9KhdLMf0YtLajXc0m4UtQL89ZyoRvjDuQEJQO4WR9rPehn6+KJn
-jMXsDWJOdfuDO0OwuczEDhwTtpE8L8ocEqtOl67xKPmecwgPT7jMK/KuKyjN3fbJ
-faBK8A/nj0e0DyYxJjr/42publaPEKeMlcMjWn5aPbDUxtSSo3RgifPnZV5dYcQc
-phO8cr+rzpTFZxSg41M3r4jWPxLz1EvOZjLNjSgm1AsJP3zYxffJRoalMKczJK7j
-+8M0sWTYGIEKoYbGKhef
-=Ftoz
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirFFQP/iJSR3J4a0/meBSYI4dfMwm0
+6pSJMB3byy8HHhK9GgrPigXdOyfZRvORQ2KiCsjfbbW5m3A1drI9EUpHFYGI/ooK
+LVBN6rYYrohpHl/DyxHpKDYqAiboJvWqaAF3jdNgq6xby/e7MGipw2iRz8iWEJ4Z
+HeXI55cDdZNRXGPPwiVUPC6GURuROIxZ4rhFNtcJAtTV1Un0GlqtZA6V5FVBIic5
+uF30CbvOCvzvdjXA9JJEjT5nJUDDT4qjXWNBiG/DWo3vBGFf5KNZX2BDl/wRZ/0R
+6ZlqTyVh45OerZFWFgAtXSeb4itFhf594GZb+f3JfyDkjXgoONf5ovxJHzyXBLfC
+KGB0wlGsJ/9isQT9h/GgV9wGii6VTwuPR5U/fy812m/Ynecf7p14xcPqVJgm86ay
+Fu9fJGLrm8LafxDqyWK6gQ6yjZIBhTwZel3l+30exgiRNebPz6dmqNnKwtf25G4T
+0No5oBGEr3tKowabtdXV5rLcLdodUQRbQtChzQ1zvds0340hjuXqRmepltA1QCaz
+zUz/QJmKenm1zXPzMb8UVSRu17XWvgAdt6jfgC5hjQB0H32gRD69PyepVNxNYSoQ
+m+nS8Um6lWOm7mts4p753RLCtRj+irws3lBfXaRjNHOK/Q/q2PxguQIv20vYIz/P
+Cnwx/M/vrV9bh0t3YoNw
+=PmiV
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/shotwell-0.20.2.ebuild b/media-gfx/shotwell/shotwell-0.20.2.ebuild
deleted file mode 100644
index 79a0f1827929..000000000000
--- a/media-gfx/shotwell/shotwell-0.20.2.ebuild
+++ /dev/null
@@ -1,112 +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/shotwell/shotwell-0.20.2.ebuild,v 1.1 2014/11/02 19:07:26 hwoarang Exp $
-
-EAPI=5
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.20"
-VALA_MAX_API_VERSION="0.24"
-
-inherit eutils gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="http://yorba.org/shotwell/"
-SRC_URI="
-	mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
-	"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-CORE_SUPPORTED_LANGUAGES="
-	af ar as ast bg bn bn_IN ca cs da de el en_GB eo es et eu fi fr gd gl gu he
-	hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
-	pt_BR ro ru sk sl sr sv ta te th tr uk vi zh_CN zh_HK zh_TW"
-
-for x in ${CORE_SUPPORTED_LANGUAGES}; do
-	IUSE+="linguas_${x} "
-done
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.30.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	>=dev-util/desktop-file-utils-0.13
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.4.90
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.4.2:=
-	>=media-libs/libraw-0.13.2:=
-	>=net-libs/libsoup-2.26.0:2.4
-	>=net-libs/rest-0.7:0.7
-	>=net-libs/webkit-gtk-1.4:3
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.6.0:3[X]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=sys-devel/m4-1.4.13"
-
-DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-pkg_setup() {
-	tc-export CC
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-desktop-update
-		--disable-icon-update
-		--prefix=/usr
-		--lib=$(get_libdir)"
-}
-
-src_prepare() {
-	vala_src_prepare
-	sed \
-		-e 's|CFLAGS :|CFLAGS +|g' \
-		-i plugins/Makefile.plugin.mk || die
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
-}
-
-src_configure() {
-	./configure \
-		${G2CONF} \
-		|| die
-}
-
-src_compile() {
-	local valaver="$(vala_best_api_version)"
-	emake VALAC="$(type -p valac-${valaver})"
-}
-
-src_install() {
-	local res
-	gnome2_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}"/usr/share/locale/${x} -type f -exec rm {} + || die
-		fi
-	done
-	doman "${DISTDIR}"/${PN}.1
-	for res in 16 22 24 32 48 256; do
-		doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
-	done
-}
diff --git a/media-gfx/shotwell/shotwell-0.20.2-r1.ebuild b/media-gfx/shotwell/shotwell-0.22.0.ebuild
index cc37b5e363a4..b1dfd96315bc 100644
--- a/media-gfx/shotwell/shotwell-0.20.2-r1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.20.2-r1.ebuild,v 1.1 2015/01/25 18:29:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.22.0.ebuild,v 1.1 2015/04/07 14:20:19 jlec Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit eutils gnome2 multilib toolchain-funcs vala versionator
 
 MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="http://yorba.org/shotwell/"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 SRC_URI="
 	mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
 	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
@@ -55,7 +55,7 @@ RDEPEND="
 	>=net-libs/rest-0.7:0.7
 	>=net-libs/webkit-gtk-1.4:3
 	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.6.0:3[X]"
+	>=x11-libs/gtk+-3.12.2:3[X]"
 DEPEND="${RDEPEND}
 	$(vala_depend)
 	>=sys-devel/m4-1.4.13"