Bump to 0.17.7, update live, bug #547312. Thanks to Nikoli.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

5 files changed, 52 insertions, 182 deletions

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 87e382b51191..461a2d12a237 100644
--- a/net-news/quiterss/ChangeLog
+++ b/net-news/quiterss/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/quiterss
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.55 2015/03/31 19:13:24 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.56 2015/04/21 16:34:29 maksbotan Exp $
+
+*quiterss-0.17.7 (21 Apr 2015)
+
+  21 Apr 2015; Maxim Koltsov <maksbotan@gentoo.org> +quiterss-0.17.7.ebuild,
+  -quiterss-0.15.4.ebuild, -quiterss-0.17.1.ebuild, -quiterss-0.17.5.ebuild,
+  quiterss-9999.ebuild:
+  Bump to 0.17.7, update live, bug #547312. Thanks to Nikoli.
 
   31 Mar 2015; Maxim Koltsov <maksbotan@gentoo.org> quiterss-9999.ebuild:
   Ebuild update by Nikoli: fix docs install, bring back epatch_user, add missing
diff --git a/net-news/quiterss/quiterss-0.15.4.ebuild b/net-news/quiterss/quiterss-0.15.4.ebuild
deleted file mode 100644
index 2030fb01cd64..000000000000
--- a/net-news/quiterss/quiterss-0.15.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.15.4.ebuild,v 1.5 2014/12/31 13:42:24 kensington Exp $
-
-EAPI=5
-
-PLOCALES="ar cs de el_GR es fa fi fr gl hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
-EHG_REPO_URI="https://code.google.com/p/quite-rss"
-inherit qt4-r2 l10n fdo-mime gnome2-utils
-[[ ${PV} == *9999* ]] && inherit mercurial
-
-[[ ${PV} == *9999* ]] || \
-MY_P="QuiteRSS-${PV}-src"
-
-DESCRIPTION="A Qt4-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://quiterss.org/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug phonon"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[X]
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die 'sed on lang.pri failed'
-	}
-	# dedicated english locale file is not installed at all
-	rm "lang/${PN}_en.ts" || die "remove of lang/${PN}_en.ts failed"
-
-	l10n_find_plocales_changes "lang" "${PN}_" '.ts'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr" \
-		SYSTEMQTSA=1 \
-		$(usex phonon '' 'DISABLE_PHONON=1')
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-news/quiterss/quiterss-0.17.1.ebuild b/net-news/quiterss/quiterss-0.17.1.ebuild
deleted file mode 100644
index 3719dea5c55a..000000000000
--- a/net-news/quiterss/quiterss-0.17.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.17.1.ebuild,v 1.2 2014/12/31 13:42:24 kensington Exp $
-
-EAPI=5
-
-PLOCALES="ar cs de el_GR es fa fi fr gl hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
-EHG_REPO_URI="https://code.google.com/p/quite-rss"
-inherit qt4-r2 l10n fdo-mime gnome2-utils
-[[ ${PV} == *9999* ]] && inherit mercurial
-
-[[ ${PV} == *9999* ]] || \
-MY_P="QuiteRSS-${PV}-src"
-
-DESCRIPTION="A Qt4-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://quiterss.org/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug phonon"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[X]
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	dev-db/sqlite:3
-	phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
-	}
-	# dedicated english locale file is not installed at all
-	rm "lang/${PN}_en.ts" || die
-
-	l10n_find_plocales_changes "lang" "${PN}_" '.ts'
-	l10n_for_each_disabled_locale_do my_rm_loc
-
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr" \
-		SYSTEMQTSA=1 \
-		$(usex phonon '' 'DISABLE_PHONON=1')
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-news/quiterss/quiterss-0.17.5.ebuild b/net-news/quiterss/quiterss-0.17.7.ebuild
index 6427f02aab3e..fd986c6a2cbb 100644
--- a/net-news/quiterss/quiterss-0.17.5.ebuild
+++ b/net-news/quiterss/quiterss-0.17.7.ebuild
@@ -1,40 +1,51 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.17.5.ebuild,v 1.1 2015/02/03 10:56:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.17.7.ebuild,v 1.1 2015/04/21 16:34:29 maksbotan Exp $
 
 EAPI=5
-PLOCALES="ar bg cs de el_GR es fa fi fr gl hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="https://code.google.com/p/quite-rss"
-	inherit mercurial
-	KEYWORDS=""
-else
-	MY_P="QuiteRSS-${PV}-src"
-	SRC_URI="https://quiterss.org/files/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
 
-inherit fdo-mime gnome2-utils l10n qmake-utils
+PLOCALES="ar bg cs de el_GR es fa fi fr gl hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ tr uk vi zh_CN zh_TW"
+EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
+inherit eutils l10n fdo-mime gnome2-utils qmake-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
 
 DESCRIPTION="A Qt-based RSS/Atom feed reader"
 HOMEPAGE="https://quiterss.org"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug phonon"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug phonon +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[X,qt4]
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
-	dev-db/sqlite:3"
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtwebkit:4
+		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
+	dev-db/sqlite:3
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
 
@@ -42,6 +53,9 @@ src_prepare() {
 	my_rm_loc() {
 		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
 	}
+
+	epatch_user
+
 	# dedicated english locale file is not installed at all
 	rm "lang/${PN}_en.ts" || die
 
@@ -50,12 +64,16 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 \
+	use qt4 && eqmake4 PREFIX="${EPREFIX}/usr" \
+		SYSTEMQTSA=1 \
 		$(usex phonon '' 'DISABLE_PHONON=1')
+	use qt5 && eqmake5 PREFIX="${EPREFIX}/usr" \
+		SYSTEMQTSA=1
 }
 
 src_install() {
 	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }
 
 pkg_preinst() {
diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index b7d783894429..3d32eb697b0f 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.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/net-news/quiterss/quiterss-9999.ebuild,v 1.22 2015/03/31 19:13:24 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v 1.23 2015/04/21 16:34:29 maksbotan Exp $
 
 EAPI=5
 
@@ -9,13 +9,10 @@ EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
 inherit eutils l10n fdo-mime gnome2-utils qmake-utils
 [[ ${PV} == *9999* ]] && inherit git-r3
 
-[[ ${PV} == *9999* ]] || \
-MY_P="QuiteRSS-${PV}-src"
-
 DESCRIPTION="A Qt-based RSS/Atom feed reader"
 HOMEPAGE="https://quiterss.org"
 [[ ${PV} == *9999* ]] || \
-SRC_URI="https://quiterss.org/files/${PV}/${MY_P}.tar.bz2"
+SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -50,9 +47,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
 
 src_prepare() {