Version bump. Added preliminary Qt5 support to live ebuild, but this does not compile yet. Migrate to qmake-utils.eclass and rearrange some lines.

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

4 files changed, 141 insertions, 49 deletions

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 7e3fc16f7386..5cb73842ae5e 100644
--- a/net-news/quiterss/ChangeLog
+++ b/net-news/quiterss/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/quiterss
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.52 2014/12/31 13:42:24 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.53 2015/02/03 10:56:23 yngwin Exp $
+
+*quiterss-0.17.5 (03 Feb 2015)
+
+  03 Feb 2015; Ben de Groot <yngwin@gentoo.org> +quiterss-0.17.5.ebuild,
+  quiterss-9999.ebuild:
+  Version bump. Added preliminary Qt5 support to live ebuild, but this does not
+  compile yet. Migrate to qmake-utils.eclass and rearrange some lines.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org> quiterss-0.15.4.ebuild,
   quiterss-0.16.2.ebuild, quiterss-0.17.1.ebuild, quiterss-9999.ebuild:
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 4016906fe941..4650478e02d3 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -4,27 +4,30 @@ Hash: SHA256
 DIST QuiteRSS-0.15.4-src.tar.bz2 837692 SHA256 923eb61faefe7e83b2bfd10735fa2718d3159600441e5426de04ff151c8095e6 SHA512 f0d0d2cadff46378ec0560523a0208e35b077376b1f5de32f425724e5c620336a8275196c469286203fa63a539b5c35c4872a5c5f57bb25d48f2043ce0bdaba1 WHIRLPOOL 4525a32400e966465cf2d6100524406c3b4129f731381f20be293207bad8c386c854be4593acd74b40fadc5838d28746ea51ae6adf31ad3fb40a3b9acd271e02
 DIST QuiteRSS-0.16.2-src.tar.bz2 3645410 SHA256 794d0290048b713fe24e2db6967ac3f902c7e8d01fc41f6cd5b30ce24d643f73 SHA512 18456254418fa9854c146cc987a125fdd96618bc2631dbe0bb10f2a899c7ae3fcf168a37920e3e98862cad88dadbc566952e543c77852e01fdb70b3325b4be0c WHIRLPOOL 62463125f20e5747382c24ee8b568479c0f5910b40c11486741d706d39c44e651ac041f05db0b831c30edeb3f9e5bf6604e57a26d288e762c01ebb932b17140c
 DIST QuiteRSS-0.17.1-src.tar.bz2 3662152 SHA256 ecb4add0cda7eb5a222f3ac10e4c382084b261b1bfd4565235c94492021d5c0e SHA512 234897d4defd2612c2b352d6716f6a9189efe59ede98ce2948283b87aa852bc8d5b50dbe030dddbfc94afdf6a4162688f1b9d2b1cc625f78386620cd030d5540 WHIRLPOOL e3afd83f4c9a4f546758b66a0d1b01e1fd98107d2b5774e87d487a4a958e3d13fdf9108a1bbcc83d775dbd9665a87759dfe3736004553f2cea068baa64ed1222
+DIST QuiteRSS-0.17.5-src.tar.bz2 3833541 SHA256 a30d9fdf8a115f1c502bb32b4d2de9e4eb51d522f86f6e8f59c4aeba78f8fdae SHA512 830a3906de06ce028c472ea68c788a3fdea8186b00fb44a426280d353cb27ae9a2f06b791ab7f238fb0f20959e0432343fb8d2c85b18dbe5009796342bbd574c WHIRLPOOL 5e27ca5dd0694df8e2c2b3662f6875724e7056ca3330155d1b93ad275a615fc30a88c4ce6580d309a386a2a4a5906455ccbb7701969f346a7919483e045b21fc
 EBUILD quiterss-0.15.4.ebuild 1822 SHA256 1d94b1a6943d5b7cfeed1644da76c5f8392801d4d95df4863163c05c48443db6 SHA512 c92de0ed625f9591198de29e2565ae3c63fb4d957a128bd0ffa0c833cd1e0c4f253f27fd94aa1955ec683bb7aaf58f47de3cece82c924b1c809fcacedeab241b WHIRLPOOL 766ea31e9096e1e3986efe6e77bf200b3e0ddb799a59dbc499d30b15fb043440dadc3f6e16efc21e2788615710f6cca43456ef3d2117d978beb66bfa8bf3605b
 EBUILD quiterss-0.16.2.ebuild 1778 SHA256 861219449c2b18895cc0f05b05074a65828e7ba357bab59b66b500e798281711 SHA512 1bde7a346cf2276f7dfdb49683544991966cdeb70ec32df6c1e93ac32eef8bc42a4892319dc61e97e1b858212706ef8103bb21aa6211c9481ae2792bd2119938 WHIRLPOOL 176b86127d41eec4929f14cfce38f3738d8ed482a197cec85144bfa3caeb29de994ae7198899fabbec7983e1125455a38982aa130e768070c83def570756113d
 EBUILD quiterss-0.17.1.ebuild 1780 SHA256 90873a056766143b866b032808998dacefda542dcdf9b5d4993a16bdbb099a00 SHA512 00fab1b4bacb60ff1cabdfdfb38caa107b7081e1b69d482bdc878c99b20fe06c9685829324ec855e3cfc1fc9f13166cb77bc8997a2490a7955009e0f4a37e6eb WHIRLPOOL a94ac95b0870077d46ebb50258cff429dd0de933def5bc00223bc38a5dc81c6a728f22541fdce55e1e7c4ca3d83751f559d98544a4168cbfdad42c3174db983d
-EBUILD quiterss-9999.ebuild 1779 SHA256 06a877a5c5d065ab01ab65e2bfc581ff452d202c70d52c5d6b60a005cf8dd065 SHA512 aaebfd7c29e1a6ca7435a975866a34fe496aef5d0f6059bca6b807c29f2f3193a3a3950873826f13e1505958ec6d346250f99d9f1a26d13d7fa3b92bac92c880 WHIRLPOOL 4a1e9e1761e83165bd48e0d5152dbf3bd19fd16d3caf2c99808117c29944a7e750515508116ec0774480235659b589816506634141a87a57e638271d3e9ebc60
-MISC ChangeLog 8857 SHA256 dfa18b794f1f6ed9582e14d120005f8412233ac5cee44f2f40089c9d90a5cc24 SHA512 d51d7abd19fe1ed1ac262b3cdff612046668fc83d75500bbbeab1cb93ec37cda1fd6f3545b3ce4812cd4f7bf19dcffab574aaa1ac45d954f585956d19802fc83 WHIRLPOOL 182475380be9e1805438f3f5a242351825ba56f280a0bb9cce14b9e5cd666c90663813f0318ce80d7bed5e65ba10c37078638ae31ef6ac4e2fb7e7d36ca2f32d
+EBUILD quiterss-0.17.5.ebuild 1741 SHA256 6a7933bdf38049a2a07577b397b84bd0c83404076b4883b249f22ef54ad62be4 SHA512 16003f8090e4da14270c2a2d278037459b276836c95a9ccb0e7b0aa80d95ff98e9fb42b97ccd3b04dc08866a3767354f7b6d31cebe11074bb174384649f9e5ff WHIRLPOOL 54335b4d94ac9b3be986e87afe2819ae59106224c98628df52ce000af9f9a6df643dc24be7d40d388daabea068106de571ae74ddab8456c9c702c70fa9fc564b
+EBUILD quiterss-9999.ebuild 2073 SHA256 d98af5128e9c0876d324e87e335ade29663f8fc609684e61c09f716dbbf25060 SHA512 bc0c7e6a0b85c2770396acf060f849e71fa7ca0e750d178b6ed4c564183eb18f90868b0322711a1403763d1b14e485df9af826085e6aedfb46e4d6ea97c158cc WHIRLPOOL 7884fbd101c7a7387700a3be543412fd2cb4dcdce00944b3ade87d28d71de85e54048d1ec20be12608d97172aad00e3a7797b221f50a3e2fcb4040b79d5805c1
+MISC ChangeLog 9134 SHA256 4f8dfbaa62ff09ed2437fb2f1d36d74a6bf60527e9c491095fc4407a4966bd7b SHA512 a9050301d982027ae387aa3c06514e0b16a7ff188369ef29a2741b2bbe8b28eb75c000995ce06e2438b0036e062734247d57ba7f727dfe886c249627dbe3081a WHIRLPOOL 7e02cdd6cc33dea9e5dfde8c3ded1de6cefbfee1df103ce7eeae006ca06b8546365fa479a96a2d3d774c43e8f603d8cf7590d7c24c1949cf35f552e4081be83a
 MISC metadata.xml 541 SHA256 69ce34fc9d6b9fe9c90aec5987d73272cc0b5a1e47a231fdc8fb062ff70c7d3b SHA512 5f397d6ad6cac106da7a96717647b236c4a5629dcc604b4b2386f21beb2dbcb3872d092c96c9b7d8f4cd91b503f6f0c931075e2a45c568a1907cdfc00cdb0b32 WHIRLPOOL 86115897300e53bf6822f673867321c810b087077eca1fa5062236ced28458a69c1f928b328588b4ef77c8496129a7d8e9b439c1ff7ad1f57ea23fe8e9d6d592
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUo/1RRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7IRED/95oSB5zU7e60FPoDnHt2Qj7Pf8AKHA5Qkgjyjxd2T7MdFt4lsPvy3macxO
-NYH/M6+fJ0cgR8v/6vT/bKpEs8sCyNwvLSA04FtIwxCXH0XtKqztrfX3zYBqBSdX
-8WWjoFi1Mg8Eql8P9S1MEEEW6Kd3HDWy9ydQhfEgi1FW7Ua3XeyVpi2i4jpvmAa6
-OCLlBXJgNz/0kS7y0bCpB3CUDSkPJBQrtLRFmEMiIszzTNv5yIj2oqw1pJ98cxWr
-nnKmtGWeSRD6f67cf+kt1771bL+SBZYXDYQ5rW6uUhbW0fIWXfuxDHd5tlf3Ed3C
-fOySXgQBJ+kdrpqVJElXq60k5uT4+HMKMEcVkLq3QdRU/W0YkP4tk/9qf6oEbCBY
-CQOnHzqfLygGU+iYDK4FtUZ/ugQWJ/K5NtrhxoQuWiYwXxTonw8vN/rZLoB2Zz3Q
-HP/wIMtsc16F7H2qX8fXQgQxWevnN+naP8C7wBGWHD83vmI8aZJnCu8MpUt68qcW
-IjLyT9djpXwuP11/P1gliBYGbJh5OPm+oSYYD5Hdu1zc80+pW3IZ+oecqoTaMmYr
-sdEgv3RXvkVgZSZWKVshcEyAfLKXtWIMbCqx+1TQpj+fWXkMcWVSKITRCURMzkRg
-IMbOwn1rJqjOUitv4sWlQem0S5F7oNjWMrNWH4hwAypyD7UWnQ==
-=4zku
+iQJ8BAEBCABmBQJU0KldXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOz4kP/166oFadd8d4g10LkEMjLILz
+5/iJ7MQ4iy5DyuxOvuK+AxGAo6TEI/usmFg06tuXrm1vMH27r62T48RfqJtNjOGk
+Qo+7kK/0i0AmanGs5dpp9Ix/mYLFUTrF99nWIDp4R6l76jb+v2zzm0dzkdHnw9zZ
+7zzd1c5eGFJCVfKK2el5oXh0f08Imr9OabcFTYsecP5cPA+mYqAyDqjGmGYmc8Ft
+QnEqde59w1X8f4svXEHwbaTjlR4ZrBZ9p6YHvYgP6OS7bmI+ftbZyOHlMK6Tcebt
+M7wM+mmEWDQvQ7xL7XjV8BK7wQ7akaB18PkQeXrC/2JDaU2sBGKtF9q0WcXYIQYE
+A7vkMHQGrNkVp70/pEk0X33N//rMlrs9pdC/B6BzNdJf1p3IbApWai8li8ggT0Mz
+7stTGyr56NdS3vrtIBoejNgLIlzovUcElqxFh9PO6wK2X26SMiUfq5bq9jRTz/MT
+u5yDbBe6qFXfCcZuphzkJHlB6Nnf1eCzB/WtQLZc+avTcHzARpwP3luEvk/kXEA+
+1IdP1qU+k/j/ELAsGuhzfC8mTuiaVpahQTWVx2CyVneI/yuzMJGu1NDfSngdEbxC
+oBQPbmrNaBh/jxPT4X/yt4xKqWWfiObaz7T/t8/qbtXolCCXWzvZ9RCARz3Gy/Vk
+ltNGhbOG+FTjOSH+nD/Y
+=rWgp
 -----END PGP SIGNATURE-----
diff --git a/net-news/quiterss/quiterss-0.17.5.ebuild b/net-news/quiterss/quiterss-0.17.5.ebuild
new file mode 100644
index 000000000000..6427f02aab3e
--- /dev/null
+++ b/net-news/quiterss/quiterss-0.17.5.ebuild
@@ -0,0 +1,73 @@
+# 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 $
+
+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
+
+DESCRIPTION="A Qt-based RSS/Atom feed reader"
+HOMEPAGE="https://quiterss.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug phonon"
+
+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"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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
+}
+
+src_configure() {
+	eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 \
+		$(usex phonon '' 'DISABLE_PHONON=1')
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+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 d5bb515a8f78..2ae2ce71c93c 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -1,43 +1,50 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.20 2014/12/31 13:42:24 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v 1.21 2015/02/03 10:56:23 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"
 
-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
+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
 
-[[ ${PV} == *9999* ]] || \
-MY_P="QuiteRSS-${PV}-src"
+inherit fdo-mime gnome2-utils l10n qmake-utils
 
-DESCRIPTION="A Qt4-based RSS/Atom feed reader"
+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"
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug phonon"
+IUSE="debug phonon +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 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 ) )
-"
+	qt4? ( 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 ) ) )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsingleapplication[X,qt5]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5 )
+	dev-db/sqlite:3"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] || \
-S="${WORKDIR}/${MY_P}"
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
 
@@ -50,14 +57,16 @@ src_prepare() {
 
 	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 \
+	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
 }
 
 pkg_preinst() {