Version bump. Update DOCS. Reformat.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

5 files changed, 146 insertions, 62 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/Manifest b/net-news/quiterss/Manifest
index 15b7446bb94a..7d7dde54fe18 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,31 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST QuiteRSS-0.16.2-src.tar.bz2 3645410 SHA256 794d0290048b713fe24e2db6967ac3f902c7e8d01fc41f6cd5b30ce24d643f73 SHA512 18456254418fa9854c146cc987a125fdd96618bc2631dbe0bb10f2a899c7ae3fcf168a37920e3e98862cad88dadbc566952e543c77852e01fdb70b3325b4be0c WHIRLPOOL 62463125f20e5747382c24ee8b568479c0f5910b40c11486741d706d39c44e651ac041f05db0b831c30edeb3f9e5bf6604e57a26d288e762c01ebb932b17140c
 DIST QuiteRSS-0.17.6-src.tar.bz2 3832771 SHA256 b14c715755ff6a1a4fa39b1d3efae893835fde07a23e69275fc12fa742cc8e7d SHA512 c6b16bfd7003e343768793a2d972ca9dfa9402c3ce923f0db501249b9f0826707763652ff6f7a37882e9151215245803b0dd6a25781ba5fa166c4594d59d847f WHIRLPOOL 1ae970d36c76f54bf92afd422fc33b5248f4b828c04df2b5705853ded45790ef1bb56711fdb1feec9eee3749abfaea4f569a1ae5ca6bbec1eb8238fd396800fe
 DIST quiterss-0.17.7.tar.gz 5356077 SHA256 5deeeb3fffba57dcc4d9f98d3be15b605549301462388107c45aba222889896c SHA512 ddee530789890fa4462f42fec139fd2dab3cff2f32f27dd49f8b8873ecf2f187731c92adc7804955e6f27cc7f399823f1847b62286aa12268deb8a5192977797 WHIRLPOOL bc7cd42f38a8d7c505af8abb566717bf66d0beef7a5cb709b78b27bce9ac048f5be66705df2eaf426b6669c46c87fbc61aea88b539314cec57226e194bee40fd
+DIST quiterss-0.18.2.tar.gz 3061821 SHA256 7c934c1e2a531662277164765fa4ddc18f691c6a5de3240fd2c2c5cfd95b4d75 SHA512 e55e6a4c52ce19c976e7a47007557d31471a520d896ceddffc6475a75ccef1541960311c175daeeb93a9a395fff33e8bbf6b7dee3e657c465b2c4a0fd91b6531 WHIRLPOOL cdf50c06e17fe20e6fe7f26500ca05f48cdefeaab4c6e3fb354407fe37f9b35051da4bf1e9fe2beea6156deaf9913dcce1ef404d33e6d62211edb6e8502702e6
 EBUILD quiterss-0.16.2.ebuild 1779 SHA256 42215d0fae36fbd98e7d85e4e955dd6a47b5186909e37aaf2656180fb15db5b4 SHA512 9d39119b5b23776b2ef6d58cab60a8d2ba6681208d7e836e9b740a64ce4ebe9059bc9848cb767e586a72ba6560207842af76176e0e637ba0a9531a69fcd98ed7 WHIRLPOOL 68d9b12c16ddcb226bd211716a868f20b495f39512e299f620e38f26e7a14d0e556234f4b6628145bec07630322d4d967f85c9e6a6a1d9dca2befdeac8bf004f
 EBUILD quiterss-0.17.6.ebuild 1742 SHA256 ce54cc6c1563c38f1d2b2af00efe8af47140915d41e781a9f067a98e73db06c0 SHA512 7fe01127f2a7a5d97b6573a9dda100b6422684446883535816e470bccff381daedf7a49a031fd83707e21c297532f6440c33b23c5d94cf4b3267218bc7bcefc4 WHIRLPOOL 947cdbf409d6d8c95824a50544e3182a199b805a8d0518055236dbe434c3e8d5dec46ebb606c6b42dd4187f78eca76c3f66d25282eec52a59f03a6e996386659
 EBUILD quiterss-0.17.7.ebuild 2123 SHA256 8543873fbaca8505919844cf0d56aeddbb099f33fad2dc2dd6df284f72eecd22 SHA512 afbedde410ebc157fad560047f6a0b3529b03c58110b81058673ce156e01c6072e53a45ca22ceb366a7bacbf58605a1885e1b11740abd9a7224dd6e5923496f9 WHIRLPOOL b0a92424aa440352bb2a7a81a56649e66327f8614c1d2804ca241e84a42b12a3f3333e2418e62898ee044071547c674516c4c9b5f4577779917f1e5ba6614fad
-EBUILD quiterss-9999.ebuild 2122 SHA256 2bc29ee7feb9e7d5411657f5b3ae30850b61a65d61b1e44e59a7f6700b47d0df SHA512 5ebd9e3b9ea718ab8d191ccaecbf9f05530be6dbf7a3eca43d0c60c54e1238bc66a9ca66c96f21553d05dc8b8aebc046a401aa2b70ce6c4753e989a3342fe3f5 WHIRLPOOL b479534ae5bc3c3b2d0e586a47f916149e0a9942e7759bd7047b1ac8b75f47f5de78a500ae656a37ceec8184bb640d71f659150fd3a572858f8abd5cd49a17d6
-MISC ChangeLog 9889 SHA256 b5728214255ef85780b084c33a3e4f02d512c12a269ee7cdbeaffb39660b676c SHA512 3d04a9536c7d4eacfa5994158a5b49f54bab45455f71f1580480b712dff9d6b430df7e18c908a736c92e29a3b5abddc250a54bc5f6b3da07f754e3de2c28c370 WHIRLPOOL d76fea218dc557cfaecefab726bad0d947f30828b6451a4e3c04c6a2447aee8cb58974599e1f4818b6892438ed42053eb4826e4a2d3434acf6e94c4c4455cbb5
-MISC metadata.xml 598 SHA256 844ab9cfa74b0866de6f6a7a950fcb0426fca68717695f7fbc482eacd3ced64a SHA512 12985bf347950c2c00faf3a0d6e0aa2bfa8d5e0772eba7419eaf67df2dbb9da4433faa8b08ebd1ce890b8d2bb38b82163f2f820f01e74881d78e16c080cf2d15 WHIRLPOOL 3d398e45e5020556bf144ae7f762075bfc168a6da0e8805206e6bd5d949ce73b57a01622e39838f1a0c8d8d0b1c4f203bc96c1320d9098ec449735a9f5f0f1b0
+EBUILD quiterss-0.18.2.ebuild 2057 SHA256 13797df680ab89bf39a648a04aa19816c57b0ef81ebeb9c84998bf8acb9e562f SHA512 07e3e80484bca7b8dd71c11bd75f832823317e9ae678110d8b25ad51cb3e45fd4d22e0dfa17460460f18baea649a66563f344898a6b60b3c7294a463726ade09 WHIRLPOOL 502226f4f8be87f639f66c72732242578a52526b83e948b47e4066f919f1c30fbadb803c0c3f96e62e133370475e2474cc8d16310350c4bf4d88ede11ee22d6e
+EBUILD quiterss-9999.ebuild 2056 SHA256 5fe06bfc10af5a807b1c807b62c149cc5ae1ef7061230b95f6f0417055f319f5 SHA512 7319676197eadc9f7c43506465cd5dc3828286b56a8a916de87676692ec8e6b755adc45a312186c70ff6300a8ec6e455d36e96069f7ea0495fe2e07539818e2f WHIRLPOOL 5d012ab8e75a4c8e42cb6806b11e4196188cfea48023fde85a79cf574e368cfbed332eb7c6f9763509625917fe5e724a10a460faced04e989009f463e23dbd5a
+MISC ChangeLog 10074 SHA256 f7b5357be4076a1624dea9d533f8e2bb24a135cf5afc6dcb3eab78147cbd8153 SHA512 190fb8f28355b9cb678ab7a61dbce6a92840a30dbdc647f934f5a240dacc39f84948f36e989c3efdf84d68d98495bb65a9bacbd52f62dca593cecbb6562e35ca WHIRLPOOL 644bc4ff9311cf45f1d177d56c344525a04886fe9bf19701f51fd978b9e26bf6f5a7dc00b0b4de8d7e195dd4c3c3feaa872b77a0888e39ffea4931483a2c348f
+MISC metadata.xml 624 SHA256 e950d4c2ee979cb47d7e75ca88a77934ff72a96b447f3bbbeaa3fb3d73cccea7 SHA512 fffcf76996b21d7bd165192381710b75c643ed4fead9fc9b47f95a37643222568642f18fd7caec44a3134e40b6da335e4adea4b051adfbdb5d1076c9f2a15c7f WHIRLPOOL c0cfaa87d91ff2c5d56e18b63f6ea093eba6b9b7ebf0bb2e1aa1d3e8aa03ebc41f09067ca807cc1a060e71f42882fc85a4b78b9e177bc1246fd0572892170936
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfxWmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0bgP/3uL8T2E7W/IHXPk/jBwJja1
-6t30aKxGPJOfA1BE+iWaj7u8AQYFrPUKnhX00E3GpvFlITApJvjDRylvYyZcZBj3
-re8Jtb4GvWyXUWj51Y2763petfSWkT8B1hgPMCCuRr90HLmeQIIxRKJXN+Ih3cQd
-1eYFIkEtcZfksjQOBVmopGupozZj6T+x+I8F++YBo6a/+Ur4x5xi5YIy4jNK1NLP
-LE5zZ43D3x5FalRPLztvmEhBT0Z727KtuYGNPoJOj8dsrcb+su8M49/Gdob/lQ9X
-NalIOTyn32OwVTr9BHIaa41ul60GWhIeeHxUlQRvl+Tpg0w68xsE+kqofIWP778Y
-8fh8lgBgIOK3KSveNLbkW31LdkjimLo9QeqYLMf1j7s79N+BsLRH/o+BAgq9rado
-qmHw1eEllW0W3ER6KZlcYCHR8whfEDJadBxISHxgnV/yda0k0LbrfK2UZzi1tUer
-T5r+eQepCCNhJSQIRpWUQ77wvMvYNuUwhRQ/LnOFPsB+43TLEv3WoQUEMxt4DvuM
-BvX0AfNjqbF63eNcY/9/zZTIKOPGBKI/bSc3tEpJhG3fR1r2ZjCNMFgr0CJiyO1V
-KzSvUcdDnLyEl2hKslRUSkTXiLate2S95SlFtEy3nMgKVQzi/f7Jsnnvd8rjaNiR
-fBlWU/Ly0qZeWxsUoV5u
-=uA17
+iQJ8BAEBCABmBQJVuMbiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOapgQAKb7DtwkWCz//6XDqOdmafCu
+TLLr+ruGcgh4udC6V17qGF5s2sP7T0tyWQeHxnK0lEcipvcW5RGHCd0yVQF4++ql
+NyWIOxYot324lUJ/RcwfsDwAJA9TVXMLgXZw/5DF6n9J0FNM6rMpCuloJFwH/Erd
+Ep6A81K5eQiEusZBoF0p25eUaONM3NIJSn2f0kcxQcH/b6WhSvWmm7+U5HpT/7J8
+gvTHVu2iB7G3m7yfPiagLiU4XGGjyNO1rHWSfdPoAYsaRdrMUXaNpXmLVND4bn5l
+jcL/wB/xPN4qfaEWcHglGpkxrHrk1Yuwlw/l6srI3/1oDSSt71JR3yhww620e8Q6
+HCUgJ4qkXu/n8bc3prpgya5VGFhP4ejhtuOu1MElLiQEqeIGvVTXz5GTanFOd5V+
+h0X60219TDEEKl0V0BSTh4zajKaDFe8rS/j23zgS3OH47cqStEzHEYA+TSA7N/NS
+7j5OSiVGu3V0hIknGC9Ph9FfJ5wazmpXZk3oDqXzz0+tlVLEGIBfnOAEhJHHgM2J
+yesiMmpvUuUViJ+7OGoYz9Toago+nuj4KP+wFKiNOVZ9N3SJAwOyLmjwlS1cTsrt
+q85jrW/KJCPjMyuoYaIcTJ5kLRljtThmHz6mAfRTzsZU54jtf2NtBnoE10T9owGf
+e3scv/ToR6xTZqXPXUg3
+=Qxur
 -----END PGP SIGNATURE-----
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() {