Version bump (bug #544266). Support both qt4 and qt5. Drop dbus useflag as it is no longer used. Update homepage. Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

5 files changed, 59 insertions, 60 deletions

diff --git a/net-news/rssguard/ChangeLog b/net-news/rssguard/ChangeLog
index 42339ad77b91..a7ab02b40cfd 100644
--- a/net-news/rssguard/ChangeLog
+++ b/net-news/rssguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/rssguard
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/rssguard/ChangeLog,v 1.3 2013/03/02 23:07:58 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/rssguard/ChangeLog,v 1.4 2015/07/20 09:51:09 yngwin Exp $
+
+*rssguard-2.4.0 (20 Jul 2015)
+
+  20 Jul 2015; Ben de Groot <yngwin@gentoo.org> +rssguard-2.4.0.ebuild,
+  -rssguard-1.1.1.ebuild, -rssguard-1.1.2.ebuild, metadata.xml:
+  Version bump (bug #544266). Support both qt4 and qt5. Drop dbus useflag as it
+  is no longer used. Update homepage. Remove old.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> rssguard-1.1.1.ebuild,
   rssguard-1.1.2.ebuild:
diff --git a/net-news/rssguard/metadata.xml b/net-news/rssguard/metadata.xml
index dc439f7e84f5..35546e5bb159 100644
--- a/net-news/rssguard/metadata.xml
+++ b/net-news/rssguard/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+  <maintainer>
+    <email>yngwin@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-news/rssguard/rssguard-1.1.1.ebuild b/net-news/rssguard/rssguard-1.1.1.ebuild
deleted file mode 100644
index b230a8301ef0..000000000000
--- a/net-news/rssguard/rssguard-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/rssguard/rssguard-1.1.1.ebuild,v 1.2 2013/03/02 23:07:58 hwoarang Exp $
-
-EAPI=4
-inherit cmake-utils
-
-DESCRIPTION="A tiny RSS and Atom feed reader"
-HOMEPAGE="http://code.google.com/p/rss-guard/"
-SRC_URI="http://rss-guard.googlecode.com/files/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	x11-themes/hicolor-icon-theme
-	dbus? ( dev-qt/qtdbus:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/rss-guard"
-DOCS=( resources/text/AUTHORS resources/text/CHANGELOG )
diff --git a/net-news/rssguard/rssguard-1.1.2.ebuild b/net-news/rssguard/rssguard-1.1.2.ebuild
deleted file mode 100644
index 22cdad0f7353..000000000000
--- a/net-news/rssguard/rssguard-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/rssguard/rssguard-1.1.2.ebuild,v 1.2 2013/03/02 23:07:58 hwoarang Exp $
-
-EAPI=4
-inherit cmake-utils
-
-DESCRIPTION="A tiny RSS and Atom feed reader"
-HOMEPAGE="http://code.google.com/p/rss-guard/"
-SRC_URI="http://rss-guard.googlecode.com/files/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
-	x11-themes/hicolor-icon-theme
-	dbus? ( dev-qt/qtdbus:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/rss-guard"
-DOCS=( resources/text/AUTHORS resources/text/CHANGELOG )
-
-src_prepare() {
-	sed -e '/Encoding/d' -i resources/desktops/${PN}.desktop || die 'sed failed'
-	epatch_user
-}
diff --git a/net-news/rssguard/rssguard-2.4.0.ebuild b/net-news/rssguard/rssguard-2.4.0.ebuild
new file mode 100644
index 000000000000..223cfe4f5328
--- /dev/null
+++ b/net-news/rssguard/rssguard-2.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/rssguard/rssguard-2.4.0.ebuild,v 1.1 2015/07/20 09:51:09 yngwin Exp $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="A tiny RSS and Atom feed reader"
+HOMEPAGE="https://bitbucket.org/skunkos/rssguard"
+SRC_URI="https://bitbucket.org/skunkos/rssguard/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt4 +qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+	qt4? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtwebkit:4
+		dev-qt/qtxmlpatterns:4 )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md resources/text/CHANGELOG )
+
+src_prepare() {
+	sed -e '/Encoding/d' -i resources/desktop/${PN}.desktop.in || die 'sed failed'
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use qt5 QT_5)
+	)
+	cmake-utils_src_configure
+}