3 files changed, 144 insertions, 2 deletions
diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 5edbce5de0b1..25292ba5530e 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.73 2014/10/11 17:52:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.74 2014/10/12 12:48:00 jlec Exp $
+
+*shotwell-0.20.1-r1 (12 Oct 2014)
+
+  12 Oct 2014; Justin Lecher <jlec@gentoo.org> +shotwell-0.20.1-r1.ebuild:
+  Import changes from fedora regarding icons and man page
 
 *shotwell-0.20.1 (11 Oct 2014)
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index fad6f66babff..28781b210ada 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX shotwell-0.13.1-gst-1.0.patch 10251 SHA256 6f8ba6762f9e6d353881896b61a9ef2a6abe3956e2efd9c23dd58027cf9893c4 SHA512 0bd436765d4e77f65ff452853fd722e6da74ec67a226e68c698b3e3b7756dfacfb917713d324df6f4f79fee28c07b0439b70f394e479fa2600393e2d1030c324 WHIRLPOOL c6ba5930c7c9ccf874d59bc59f1567602b0c81cfdb384d8f2343813c2e93aca72333d220bd8559a087df83ea96a0ea5e2b4b3e45eaebf6ff7650bad4421a8083
 AUX shotwell-0.13.1-ldflags.patch 1142 SHA256 d7fe75551807d7998c9494c9c065c611f98dbfd8db2b09bed8a1430048063b12 SHA512 036a99134afb69ab8f7ded853aec427f5c3289cab753c1796be71e75544ae18fdd628a82c628c1f6939c852c6abaf3b2841b4155fdb4831a8c091bdc5761d5c3 WHIRLPOOL 088c4fa519c32d36f663411468daa0b5547855d3d744f148282ea86c5743a4601669f2b82a9d5581a1dc34dfce3b001ee55810a96515e1db6316985857a1ed3b
 AUX shotwell-0.14.1-libraw.patch 1896 SHA256 f6bb9be6b5b03adcc2aab4d8cf1d7cdc564efec1ccd012283740ef3fd9f7d959 SHA512 bd0cfffefe61d46c341f97564e98fe7af306a345765098ec7410eec86e2985f00b355e13fcb2824051a371876705ef30a1f0ef862293725f6c2764cd19f86649 WHIRLPOOL fbab77a21df7c5689c1c8840b8a1f8a9d5694a9f0cb0c1fd712e0a2259db95ba701c3aa382a15ed6765a3b1a1edbc865f034cfc2c18066835e847f815e88d1b9
@@ -7,10 +10,32 @@ DIST shotwell-0.18.0.tar.xz 1727216 SHA256 6717b73cb243918ae71d251fddae27d0967a1
 DIST shotwell-0.18.1.tar.xz 1727276 SHA256 af1e1a682a7d293b04970b81f2c25c267f5dd9b2cd7b1ebc84eb0bb45c123317 SHA512 3deb0fbb77625cf5e7f48cd9e681b8e9d0c19e6d21d944976cd392c291c9dc1a739774a1fc5616561586609cdb6c5f236dbc9d1ff198386b5d00a37d72ee3dd2 WHIRLPOOL 71af0ef38ae00a3e9cb21438fd92af9192f100200fb7a13e8eeeda133f0960fb604431463ec000f81aeb15d37754ff964c524876e11ecdd2ba1502a4fe46995d
 DIST shotwell-0.20.0.tar.xz 1809492 SHA256 d698ee59e2b582b4553ff343aa92a5bbc3e56146e5cbd3f2af321be4bca56f70 SHA512 2651b0004aa5e5e63ea7468337571b75c877b174421cba1cca2fe9aff1541f740ef9040ea256c48183b343f1463dae54a2f51c8f18d47492a297c67d2b7c1468 WHIRLPOOL 66ea91e8edb8f0bec0d8b9450819820f986bbcb6d342086715ae1888e9730ebad050f8b9eafad5b14ee4f85720572176b66f96b3ddc80858bf8573a110fa9133
 DIST shotwell-0.20.1.tar.xz 1810488 SHA256 86a869432b7c049e61217ad09eeac7e0d79cabfeca04a57a3629ad25f3070615 SHA512 4c72f648b2778e38b6748b79398481f7d05d4c68c08c3537c4bb0c045f4a7da44f9724bfdd7a612a3c246d936f3d365fd951a4b599ef59eb19ddf94f88beedff WHIRLPOOL 1c088307c5b7e9f6f202a6f4864c2226b86e5d411f77e473275d2f2c774de319c2eddb63604aba445b81e9c5c12872b6a9733aad22ff8cde9c2a06c0e0a84a4e
+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.15.1.ebuild 2861 SHA256 b348aadb88a3f890e60e50c1e6d3e1b03cf2d7f96e1057b533cbf47061f91373 SHA512 acbecb312b696442873353f9b355f14d15d5901c3bc07bf2c337acd157d3a3dc5f8e76ee28202f23f4cfe6dc620c628b9fac849074f7117959773def20674208 WHIRLPOOL 13a6e0b00cc053b5de51169eed8c133bf0ac0d473da65007e2381deb96d96b890ffd3e69e4a911a67a1d00fb009aa3305ab978f1d8641e34a493a5246fa88872
 EBUILD shotwell-0.18.0.ebuild 2586 SHA256 e010c16a39ec04064ef2171192fbfbfce87cd10894475a7de63b198a1f3a76ca SHA512 868283174dc21fb09bfe804a8e7bb6c390951cf1e720a95d3431608763200b5d3a8aae22fb0fc336bf31d6331fc5908aa695739d71a45eec5cd5fb5fcb4dc4bf WHIRLPOOL 4ea6ede9a1bc558e79c2d2a3e22a69ccb16b0526781ff887fe6b96010467476bf1cb9eb234605ddcf09d2f9f1d748aa1e6dd2b50dbbeca4d3270a161d6a30846
 EBUILD shotwell-0.18.1.ebuild 2586 SHA256 cba9a70b958da9e5dd7c6a24dd71ffe8ebf11f913cd02c253b63fd15a0121448 SHA512 6b8e016e3bb531192a8f2b7b31d239d6b34472cfeaadd7a5d25c410dccdf409320fe8e4ae2795fd0186cc601d426f00a00cad51a1e986e6d8d6f6203f643dcc1 WHIRLPOOL 0cd534bcb72deea359106484f50208bbd97dddea260e052a379824217c85f380095d353fad9292f05a8a2c3e7ccf4edd1c32af7939643e60f4f96a6585e08854
 EBUILD shotwell-0.20.0.ebuild 2584 SHA256 f4c90d2c421e8f23163c8e3185eaefbbdda931f129cf0b985b698cf70df5d35f SHA512 fc5f00256db5290ee1e85ec7cc7102a358f82e3d5f76b094a82e71b3bbce1f116eaff71ac56dabce8b9852c6e7a1d88b187bbaa5d504569e8cef190b9cd7ca8c WHIRLPOOL f5463d896e603f159690bafaffb65bce14fb48cb086952bb0a186aa349ddd83c9cbfa4157cbad2562cc8cba23d6906777b7c383384ebaa994e993b67c287fb01
+EBUILD shotwell-0.20.1-r1.ebuild 2872 SHA256 71dab8318f252ae9fa7710eddca391b5a69d622f02d8dfd72ed72937ee986cb6 SHA512 6179228ae3db41a808ad476dc06fb8505288bbe4705b787941a6b3d54ed2ea3564c02cd3c4747aae1352595807863339faab6e14a678dae028ae7311ddb81691 WHIRLPOOL 24a2a1f53f0f5dd427bf6f949ec69d6afac38e7c9757fa839fbebc5ff4350ddcc3c0c447e68e2c5fcd3aeab21968ac828c4167dc9727128c37606694f1f20466
 EBUILD shotwell-0.20.1.ebuild 2584 SHA256 1e71b22dfd4e68cfec3ba420629bef01e8e283af9b873c783e24785478a5e767 SHA512 afe6242ed643240a9e14302492b219dcab6d9bd225292ef72fb7631f361833913742e0490e49455039e9d45e21c8d09eec34b6f911cae43831490cc4a6afcaa3 WHIRLPOOL 90bb66378963476239a63397dd76f66f82c1c58103141d9238384f2d5d679dc438e8ab6a13391ba2e7a3a1060e37fc45e131b552e8fb1a7fa1a1a3d6f118c52a
-MISC ChangeLog 11514 SHA256 b299c63a75186bb21c92d1e266c31b68d7935b27734a89f4f4864b2962dbf7f8 SHA512 318b4e1f2f70e48e5bc0291155fa2c7dbbc2a69b56264172f409b54a27d115786114f7b86dc1ce843ca666dfa2feb56f2e4d01f3aec9c9ae39da6ff2ef95e0df WHIRLPOOL 846336bfc3802f5f322906d7cc1e0bf1a08ce54541108b0af387f90c8e771d99f89d245a1ab7eba86a4567cecee3e171608eec63dbf8b565d88418552321d0b0
+MISC ChangeLog 11683 SHA256 c4de82869ef89aba92d2fe8e7b5ec596705abf34dc4a5662c673314373b95617 SHA512 e7be2253e320a8f85185f190fba6ca2a1c69c0db615465a64f775535250e711238be9ecfbf1b06ff0f0e5e9cadeaad98a6a929768cdf93cb0ffe9cd485ce8189 WHIRLPOOL 69a86976acc5e6e0a497ccd417c4d21a7892c5419a13cd8025b26db76db90f62065be65091e51584a02f0b047374ffcc24461f4262ea232c5bdc0baf8108d733
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJUOniBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirXWUQAIaFeh9t5UVoB0V+jNmiKfLR
+b6jtdFZngBalnsbB9/An/UuRCAiCv13UqTDsSWkwuLapRs8ZTF/M3L0jx5mOdBfo
+SvRZnaBYIE1/N+oEs0ib3hbP5BPGhIY+77yoOjhoguqks3vRo3M9cgxCnF0PCOru
+0jSlITkUOtxfT4sCANAGR91xVzAZC1DzLW5Ufyl9wmTypUIyfC9eDUjli3CwcT6p
+dA8/b8nZdqqhxOl7tNuObeRmHan0KpTU4hw5G3yZUPIhXD4OViGKLPi85abRxlEL
+fDFb7iUFcYFUXaOzwVr3Kftw2W7ITf4+57kuQBhK0w5ir/+9hFhST/Sfvzla4/8E
+Cr4Q3uorT4vDgePOGqdecyFYc6BQUM46hWq3EcO0ExRD3KAyI9GM0dfH5Nisu3fe
+j3yw+CV9RPNMOQgbUrk0+oDVXr+TSt16azkvzvet7PEyDvXfZIGFnA/YxCYGh574
+G7UceMyxY2V6n0MqtA/6L4SE5wQ53lfMakBNWYV4int1TMVAshuvg8BLwP6nqzw0
+dl2TmZlXQ4J4DOtbkNCnUHVOj/QkVMK0eFbIpYnjyRGwWwbDsZ16Ye8dfG/m3Lpt
+pwQgRZoNl1fcUuexdwo6XWwQaz8nqDCqAW/KtXqbfeQ55FDgCfEK86P5eY0LdUBH
+0pIloEjP0wIXbs8ubnPq
+=WTet
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/shotwell-0.20.1-r1.ebuild b/media-gfx/shotwell/shotwell-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..0c7be0123c6d
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.20.1-r1.ebuild
@@ -0,0 +1,112 @@
+# 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.1-r1.ebuild,v 1.1 2014/10/12 12:48:00 jlec 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
+}