Version bump. Update DOCS. Reformat.

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

4 files changed, 124 insertions, 42 deletions

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 7a0d8b2655d3..26466fb5a4b1 100644
--- a/net-news/quiterss/ChangeLog
+++ b/net-news/quiterss/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2015/05/10 13:09:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.58 2015/07/29 12:27:56 yngwin Exp $
+
+*quiterss-0.18.2 (29 Jul 2015)
+
+  29 Jul 2015; Ben de Groot <yngwin@gentoo.org> +quiterss-0.18.2.ebuild,
+  metadata.xml, quiterss-9999.ebuild:
+  Version bump. Update DOCS. Reformat.
 
   10 May 2015; Davide Pesavento <pesa@gentoo.org> quiterss-0.16.2.ebuild,
   quiterss-0.17.6.ebuild:
diff --git a/net-news/quiterss/metadata.xml b/net-news/quiterss/metadata.xml
index 6696d06fcd54..a331f411d871 100644
--- a/net-news/quiterss/metadata.xml
+++ b/net-news/quiterss/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<herd>qt</herd>
-	<maintainer>
-		<email>nikoli@gmx.us</email>
-		<name>Nikoli</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">quite-rss</remote-id>
-		<bugs-to>https://code.google.com/p/quite-rss/issues</bugs-to>
-		<remote-id type="github">QuiteRSS/quiterss</remote-id>
-	</upstream>
-	<use>
-		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg> or <pkg>dev-qt/qtphonon</pkg></flag>
-	</use>
+  <herd>qt</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>nikoli@gmx.us</email>
+    <name>Nikoli</name>
+  </maintainer>
+  <use>
+    <flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg>
+      or <pkg>dev-qt/qtphonon</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="google-code">quite-rss</remote-id>
+    <bugs-to>https://code.google.com/p/quite-rss/issues</bugs-to>
+    <remote-id type="github">QuiteRSS/quiterss</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-news/quiterss/quiterss-0.18.2.ebuild b/net-news/quiterss/quiterss-0.18.2.ebuild
new file mode 100644
index 000000000000..17b17d945694
--- /dev/null
+++ b/net-news/quiterss/quiterss-0.18.2.ebuild
@@ -0,0 +1,83 @@
+# 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.18.2.ebuild,v 1.1 2015/07/29 12:27:56 yngwin 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"
+inherit eutils l10n fdo-mime gnome2-utils qmake-utils
+
+DESCRIPTION="A Qt-based RSS/Atom feed reader"
+HOMEPAGE="https://quiterss.org"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug phonon +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
+	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 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS CHANGELOG README.md )
+
+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
+
+	l10n_find_plocales_changes "lang" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do my_rm_loc
+}
+
+src_configure() {
+	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() {
+	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-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index 3d32eb697b0f..ba54b073ccbe 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -1,36 +1,35 @@
 # 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.23 2015/04/21 16:34:29 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v 1.24 2015/07/29 12:27:56 yngwin 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"
-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"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug phonon +qt4 qt5"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
+RDEPEND="dev-db/sqlite:3
+	dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
+	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
+		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
@@ -38,16 +37,11 @@ RDEPEND="
 		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
-"
+		dev-qt/qtxml:5 )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
-DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
+DOCS=( AUTHORS CHANGELOG README.md )
 
 src_prepare() {
 	my_rm_loc() {
@@ -64,11 +58,9 @@ src_prepare() {
 }
 
 src_configure() {
-	use qt4 && 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
+	use qt5 && eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
 }
 
 src_install() {