media-gfx/shotwell: Fix vala version to 0.26, #537020

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

3 files changed, 135 insertions, 17 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index edc076c1ec8c..1e4a3eafec93 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.78 2014/12/05 10:31:27 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.79 2015/01/25 18:29:44 jlec Exp $
+
+*shotwell-0.20.2-r1 (25 Jan 2015)
+
+  25 Jan 2015; Justin Lecher <jlec@gentoo.org> +shotwell-0.20.2-r1.ebuild:
+  Fix vala version to 0.26, #537020
 
   05 Dec 2014; Justin Lecher <jlec@gentoo.org> -shotwell-0.15.1.ebuild,
   -shotwell-0.18.0.ebuild, -shotwell-0.18.1.ebuild, -shotwell-0.20.0.ebuild,
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 16e1dcfda00b..b04279db8184 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -10,25 +10,26 @@ DIST shotwell-0.20.2.tar.xz 1815580 SHA256 37e2c89f75013b8afc045f0b7b4dbbaeca49a
 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
-MISC ChangeLog 12232 SHA256 223703d51231ac7f9acfa148c370261411e8eee0ef4ecd60c598596ca013d6df SHA512 4857a3522c463e29e71bc8a1321a18a0feb4711bef141a94f9ca7d31a97b27bac4a0ba90d6cd52b07e3435d5e75ace55b81d63295316b74748c2fec523283d0b WHIRLPOOL 5516d9a844e14e660a456c9213207a2a7be044e3fba689ea8e3d26448aacf53554a748b46f4b961b6c4c76af47697dbbf51c623a85c7ce5291b0fba8eaf3e79a
+MISC ChangeLog 12379 SHA256 e1bba7db46a0afcc04b2876ca5e0b921b95cc3bf7d6041613cfc0d6a15125f56 SHA512 c7ef4c304ac891df8d2598d3c62a7c36172e231ba98da407a354ed683569bcc7f09a375ce2b51fe1dd15f4506a4dcd00ac65943e6ef0ae8563278ccb33fa3536 WHIRLPOOL f6c8c0486353b7262b013b3579bca8f47359379509ef6158c312b6749377724fce1abe5da3a11c1f06715cddf0a9c5d213a854f2148778c5692801a285455ecd
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ7BAEBCgBmBQJUgYmAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUxTa4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViruooP90T/qXXSATqPT7dIWdgBosli
-9zIyaYgQ23K9Rwzn04OHZQ0BuoWjU7/o+6M6JKxHgyJeHZ7uKkeSwIipAvIApSjo
-2vzBik3THuNIwMXaIGvwIgZaz/9GVab0p5Yc3yg8ny+t9AiA5oN+7mhE8IMsJk/t
-Xkbw/lyfn4tHr8GiBLSP2rnfj1dIlh9UOthbidut41pE9k1iZLNp5yvRflW9bMib
-FOdduZ9llkYrBOnWZVeS10et+akK2kyLKtHrfE15NyalXvpVxUm3D7Ob3J9lHJTK
-QsbNjFL7kIVcV6JtvFBogLS7zQvt1XOW+v7Cohq0KnDgGsmlFvmgwBOTHsosDLKn
-SDI7OxBoqujaI+zkqicO+9crqWd5SAAuyIACavpiMLDFZn6z8i9T7Rm19cGhb2hQ
-wT++pup8kYYtwmXtHoBJSE2X7i3lQSGXA3pL1hk2QtHnqZgZ2JQ4qGVZlnjyubub
-PlW1Ow0+e8WF7vIBje82NFz0hYfAc5L2VEH/x2LgP097zN0jHIEi6kIw5kAidnML
-9PwD3Qv1kCiRsUD08bdvCKPZiu3fwkqq7ok1WZ78HciPPhSTdk5pmzftH6CY+qe9
-CxCJzvYvPkX4gHD4yruFFU2MaJ6HZywmAKCefALmWkn10rvjVyMen0AdPaqZXSJR
-Om6Ddk9x3nu+KlYOoBM=
-=v2AJ
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlgoQAJykMnvcF1hfK/g26T1he0XP
+0AMjrc2gbi4dAv9Gbf2J1DTs+OOAXvsCRZh0XyRwPk1nqs/iKBgSwMkrftSfdtOS
+6RkbFhSCbg8g2t69WLGyWb2Jnm8iV60ebA8dYTTxIxoyI+hsCATR0iNQS7ucYUUc
+sLnzjsrkKu9fUW0g5kqN9rGRfItbvQCJy8exEYYbf0SYQ+YdhnvS0fqz3KkUTSLn
+lYjT7Ttf6/3smnATswkvmHFniAdE7aebrvlg5w0NT7Iw/Xj7nkljqb2ECndbOUXj
+o1LT97TkKmZHBAX3TChGGQuNFHLLdMPmTOQDcNSV0f/TTP1E3H5nOLn3cruvkmDf
+vMm2YzWX2RC/Uep33vLYyKZqcERhFCYTIxMohfdUJ0q/iYTA6xsJ3gWkQ3/2U0el
+cKxtc85tjYNJ18QlLxKeMvobaK1UCkDb/yy+s95MHLi5Ntwf9Omaj5LNaMY6/Dd8
+kNu75gwc+AL1kpF1RPBbsXtldqTYdYzzZNRjU6K8tJLfWAA4eOWMk9qhGDXbNYPX
+CFBi4lViOUb83q3jE00CGMbgIoDDAMz9BIaMx4KejfpT0w8szzPUDZaGxakk5iwX
+rPcavjwKcqe/u8j0SsJpYFF+JUJTYqz40px6NF7EAlrfUz78FxLjaz4mYl0DGaMY
+O4xJCuK6EW97bzoweBrj
+=Zh4O
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/shotwell-0.20.2-r1.ebuild b/media-gfx/shotwell/shotwell-0.20.2-r1.ebuild
new file mode 100644
index 000000000000..cc37b5e363a4
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.20.2-r1.ebuild
@@ -0,0 +1,112 @@
+# 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 $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.26"
+
+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
+}