Merge branch 'master' into feature/rename-gitlabhq-to-gitlab-ce

net-news/feedreader/Manifest

@@ -0,0 +1,3 @@
+DIST FeedReader-1.2.1.tar.gz 970118 SHA256 cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a SHA512 386c4c137bb4abba918e4f987666358ebe3926b0d4d3b466648d2679efd218376baf1ff58c987dfff953e9b6f084a47db34df8044a3a64ecb1f8e560f0f09e74 WHIRLPOOL 3e6f62c18ffb1dbe669f969b76de496463a49804c3da5d9e35e8726e4cef45552291c94b33cf3129805720cacc51953d60dfb4b54658344c261b412f29ab847f
+EBUILD feedreader-1.2.1.ebuild 1454 SHA256 023d0c3fa1490302e975b8f8e7c2a674cba4b21a9c3ca071ef2894758fe7a53e SHA512 411e0da9ac84b2cce0486e5f161485381952c0ab32490ce5f890244b909a7ad4692b227896844fe7b7ccbc4a6cdf07f4be45ff811a946908dde00c5120f9c831 WHIRLPOOL e478933dccf5faa5eb54e8081a31dce490acd5707a158d180f907e8f7a3f607533fd077fe5d49890f7c34c803c1415bf6241a230dd572e230e0ffb580a571a02
+MISC metadata.xml 338 SHA256 065c970f65dc2d874999563e23f1cd3b3eb7d81b3858c7c9fed5ede9c9230d03 SHA512 9f668348e070853e0b24d1bf8f18dcc33d80f40f8d70fe7363b6d008f3a1e841b14a3cadf94e40643b39b4fec18bb06df5ae0a3412b96cc5c43a8c5fe7aa1f19 WHIRLPOOL 51094d7ce385f827f140171e796cfa35a0acc4e69d6c5eea5e305af79be3c255d5d8d1b08fdb219a54e9771b6d8311a03845c1ef1ca4076cd93617d16cb35ed6

net-news/feedreader/feedreader-1.2.1.ebuild

@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils gnome2 vala
+
+CMAKE_MIN_VERSION="2.6"
+VALA_MIN_API_VERSION="0.24"
+
+MY_P="FeedReader"
+
+DESCRIPTION="Simple and modern News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly"
+HOMEPAGE="http://jangernert.github.io/${PN}/"
+SRC_URI="https://launchpad.net/${PN}/1.2/${PV}/+download/${MY_P}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+gnome webkit4"
+
+RDEPEND=">=x11-libs/gtk+-3.12:3
+	app-text/html2text
+	$(vala_depend)
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	net-libs/libsoup:2.4
+	dev-db/sqlite:3
+	app-crypt/libsecret
+	x11-libs/libnotify
+	dev-libs/libxml2
+	net-libs/rest:0.7
+	!webkit4? ( net-libs/webkit-gtk:3 )
+	webkit4? ( net-libs/webkit-gtk:4 )
+	dev-libs/gobject-introspection
+	gnome? ( gnome-base/gnome-keyring )"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}-${PV}"
+
+src_prepare() {
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LIBUNITY=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DCMAKE_INSTALL_PREFIX="${PREFIX}"
+		-DGSETTINGS_LOCALINSTALL=OFF
+	)
+	$(cmake-utils_use_use webkit4 WEBKIT_4)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}

net-news/feedreader/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+	<use>
+		<flag name="webkit4">Use net-libs/webkit-gtk:4 instead of net-libs/webkit-gtk:3</flag>
+	</use>
+</pkgmetadata>