Update mime database and icon cache, unify live and release ebuilds, clean old, bug #508158. Thanks to Nikoli.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

5 files changed, 65 insertions, 72 deletions

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 1fa9e628c013..a4944afb04cb 100644
--- a/net-news/quiterss/ChangeLog
+++ b/net-news/quiterss/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2014/04/08 19:00:05 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.42 2014/04/26 17:28:40 maksbotan Exp $
+
+  26 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org> -quiterss-0.15.2.ebuild,
+  quiterss-0.15.3.ebuild, quiterss-9999.ebuild:
+  Update mime database and icon cache, unify live and release ebuilds, clean
+  old, bug #508158. Thanks to Nikoli.
 
 *quiterss-0.15.3 (08 Apr 2014)
 
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 5292999b77f9..99a4df2b0f01 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -3,23 +3,21 @@ Hash: SHA256
 
 DIST QuiteRSS-0.13.3-src.tar.bz2 3483003 SHA256 f7b2db6a11543a024862e6e880f09eb22b9f2bae22f48a7c1217206adc49a83e SHA512 762a4fe7d815d643ae8733d299ef00d55dbdb90ecf1f571cc0e694e13f8917a553aa8b9a3c0c7b5f0ffffe9bfcec4cda6936e789598bae1b2ccb34139065c80f WHIRLPOOL f4918e15ed582f100ddc563a5475464371d8bffcfa5291adc3600e09a8f8e53bd96188f6e1ca45d70b5669f76f30658f2a5298dc80a04a3bcbc4fdf899774b9a
 DIST QuiteRSS-0.14.3-src.tar.bz2 3501003 SHA256 df9850df6fc821a03c8d64d995f5ce028773f8eaa54f64688b8d67d536b216a2 SHA512 a01b1a65dff4d5fc8ec8c0a14621167fca729023e505bb63e4d5e46143ae3ba3cef4b1a35a889d5f27df3fa108730cd6ffee9aa56dc82121bd8a3459028fbb69 WHIRLPOOL e36445f1a8722f320eda8c0c55bf8575e8ed139c10d69dda103961cd8b0bfa5d40678a7da2c1fd259f2aa28868094cee7bb001c4bef43c2aac28bc29f2c955ab
-DIST QuiteRSS-0.15.2-src.tar.bz2 832455 SHA256 dab46a725fde75b8f27fea6790436b89af65ce47ab3a40cd05a6ba8d2adecea8 SHA512 488c50fc80c4f1ae4dceebf2e829a6f29bae45a73bd061b507786147edea51c9d69a057381bc0730a26d899b1ca5e237b2bd4dfab56c1baad67ad88c85e8384c WHIRLPOOL b9abd0056b7d2e27d3cec6121aa319c06dba02ebd6a9d5f2f7c3fe3a101611189ea61bc5c2d765be1133cc707ca47e33f2535553fe86b2ea28c2bd6d13b8de17
 DIST QuiteRSS-0.15.3-src.tar.bz2 835940 SHA256 222879423619dfc43cd79f4598e7b3e9b89e2986353b9ee6132ba476fb6c56d0 SHA512 817ffe985dab5374ac8e9361c64466345895bc4bd47ac176648f47feff8877666b0954be77ad4537408fc8afd1fe7720ec118e110dd46e29879940cd7b19caa4 WHIRLPOOL b38b0caeb7d66e312b70f60f3e4df43a191e13cd9a7a684858f10362d96bde3a096cf97ad76345a0bee48385a3a9c349509acf9fa00c7c4424666477b554b9b9
 EBUILD quiterss-0.13.3.ebuild 1250 SHA256 a168c9d2edf6f6acb27b78ec232a2a5a1caf0428af38d759d4dc807131fd0c04 SHA512 57224a1f083f008841f404771e1dc67be854729bc7d69b63f281a8cb09a3a6c5f38fb6e773565f3edb13a8ec55f66385f3421681e4960a8fa11a407f0a5571b6 WHIRLPOOL e57860a7c85e1c38efb5b236aa049f058513e0ebcac68ea66f0786897c39f3614f5cff53b4a8898b63fe4c4b77ef86b49e3104dc1d02b862c75e8d6d19d225a2
 EBUILD quiterss-0.14.3.ebuild 1400 SHA256 e202fd5993f0a11aa4a695c8498ee84c6b3646a3355d218cfbee014a82414f03 SHA512 436cd5931ce15710ae828e0d5313a3d931803a9b8a74c41297c681102907463795dcc30547c3c3c42d381fdccb560dd5b5e24431544dd91312f33820df306c46 WHIRLPOOL d886fd981fe5f46e75e2454b43c758532e3c27fe9062387595db78c06a32ed81d3e78728bb18b5634645292cba07dbf5465454dd16a9a3df823bebb7073fd803
-EBUILD quiterss-0.15.2.ebuild 1389 SHA256 3adef61ba47acaf7a3471f67f0192e503ebebebf1df2b99fae3718ad5cefe912 SHA512 3ab74f2f1cd3a9ae03ebfc72f528de2a4f4e1530c25e6bd6c2ae66f26c3a89dd1f297d687d4ee19f73ddd8a2ada3d32a23079b4aea72af038accccc6f0141ef4 WHIRLPOOL a279da686c7469efb5a93404188e865ece9d20c6d5e951d9a6aaf05835213ae336a38223fd86a71a5ef1e75ded5183183dede777e5c5a97e46a25d40d4695c23
-EBUILD quiterss-0.15.3.ebuild 1392 SHA256 aaf0cd270dbf488e2f0ec0dcc3be0781e6f4ef64939808de555f6632857c52c1 SHA512 91f4fc2fd6c6b5c56501067c6ebc9a05132fccd86f3087f43ac5a2df7186f10a98938bddc978b6bff4ab584e3fcdd8bee710301d21ff0f713a6f222d9440585c WHIRLPOOL ff4fef5bd3d5256d7951cb8b342b2dd95f3d00bb4b52d8c41281f5e24fb2f719d5853924e9dde6dbe32ee39623b4f10f68415923ffb7396c7d51f34bed6ecabc
-EBUILD quiterss-9999.ebuild 1299 SHA256 58690570588ff634ee73f865c36861ea9a23a37f2e154207142f28d9f2a106b3 SHA512 e05893d5dd9d9ebf24471f61b53fb57d2ac285e7b670eefc768481e2aef8aa1b3c64bdf102902f6d7b28c86e980be15dac99c2243968cdec61cd04760ffca87f WHIRLPOOL 2fdcd1427d50e1bfabe2cebb86f3c8c9d804f3a7a4905a0816ba450193082b7e1b3a77a6a3c3e23687da046daf06dc83eeb1520f9bba5031d967fb53d79c3f9c
-MISC ChangeLog 6981 SHA256 1c17f655add2049e8835e3253085b39f74d0a528c37c9615d722c26e644353dd SHA512 034428f580ad381108b83576026d35aee001960702a5a0f3d0cc9126463360708ca915e5741080a47a51221a5234a106d3decb0d146e5eb21dc48d5923f6dabc WHIRLPOOL 602a43e44befc487aa0e52e6ccc63e5eec91631574cedf31fae21773da169a23f58260d9203b92f33d447f0ed4fdb4d5226621e2c00a91bc01b0df18b563692d
+EBUILD quiterss-0.15.3.ebuild 1815 SHA256 d916328517eb7ce546a29b724e235853710fdae3a1dab74a58854dc0350cf481 SHA512 febd689d9a6feaeef811d4f889962263c68234c69fe8a309bea2b8ee57684dd1773b671f01a442bf33b630e1112aae58703b3d0cc71dd6e58d1f2694bfdb5fa1 WHIRLPOOL 465c8b3a37581f4564d6b2422508c12d157be744445e6560d9d0cd55764a4bb4dd56cf9ea4ad619faac1b40b0292484fa463f945b1a279fe212a0bc8b50d7148
+EBUILD quiterss-9999.ebuild 1814 SHA256 6d0f5a52ff924a46add4e4f608a9a1558c9838b349dc6bb0d9ad99794f06816d SHA512 34c7eea3258cd3c3648d312383dfe22e71f596353bcd1bb9fed6785c58833582ae1294b8a2f664c3388080e6551a94722a32cb7eccad64cabb3aaeb64ffc1314 WHIRLPOOL 87ec8dfb509eb12fa749db17cfdb694a57c79ab801e49176420915989ec5677faef69727b7ca04d7e490e003fad412d43103ea56984810d75485f7c99168943c
+MISC ChangeLog 7222 SHA256 19d3b7de0098677cf35fb812250271f519d7fa3b27697805bf972a06796f1eae SHA512 a21e25ff7ee10ebbe8d008f5e72d3be135643875f5ae5bc0b9c379a61872903ec3a13c301d7e339e85f17bf1826ecb89d9d3390dd48dada94e0b812c2ab911ab WHIRLPOOL 510a095f7d5f999e6fc8719f6b6ebfec3f0ac884b088caf2bafa6dca89146fcb2e85d3e21916fecfd70aeb0343f1013b18ab0f9ac9501713134598a306dc7ffe
 MISC metadata.xml 541 SHA256 69ce34fc9d6b9fe9c90aec5987d73272cc0b5a1e47a231fdc8fb062ff70c7d3b SHA512 5f397d6ad6cac106da7a96717647b236c4a5629dcc604b4b2386f21beb2dbcb3872d092c96c9b7d8f4cd91b503f6f0c931075e2a45c568a1907cdfc00cdb0b32 WHIRLPOOL 86115897300e53bf6822f673867321c810b087077eca1fa5062236ced28458a69c1f928b328588b4ef77c8496129a7d8e9b439c1ff7ad1f57ea23fe8e9d6d592
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTREc2AAoJEAmJmMX429rejmwH/AjUmDE533ZFKY/wWZ3xlkpa
-I30dBJrLnDbeXoTv/E8bNOtZBjvXmwXkkOUJdwtyJCp0xVnCSSXLYYUnQ87Y1uZf
-ettGxcA8kk0zeNrDYfwrLYXO4CTwrJVcNtku2QpqBS2Cursb4OJeAZDOwYQg9CsQ
-KH3y/26J0M7Nbgrn8ts9AKKIqM90albPVo7rbOLXj+99IHlZj/13QfgOPhH5i9ZW
-OH6w5KH87JFbYsvhjSvfuaSQ/sRZ+8NWbAmBMYlmCeh1yb01Nd0gnck6uzHfwrnn
-741xX4ATJYRTwCIRQNaPRFfLcMN9djfeDUmFIjyQOb60DB5LyTGC1fG1vTSoPTc=
-=I/dD
+iQEcBAEBCAAGBQJTW+zMAAoJEAmJmMX429reYrkH/0tQyDkYQapIjFR4ChC8QCTm
+xG2QXeGVDqnTawEsHqSuDJWeerHZ+6cGHYvjsZwi0UMuPwnFK4dssP00/FbY+DYr
+V7KHJG/lUiGMesMbzAGxzlHIfYBB9ezifNO04OGQ1fXuK0H/aMbdiG215u4tlYX8
+vZ2jIEXfUGHRz5l2zBdnl+HsG+puNC6rFTCFzVRrLCgf+joB6YPGedu2iXbpLe84
+HZm/gM+2wjoIKTvJ1kU3kxFVv6OVrOhuAbZdijApm4E7lhOAVOuNX0zHazI3B1or
+tCFjwq3VBvjimJn7fGVR5EFch7cJircYed7F2yw79hixmfSuyyYe3YDgJfLN9yc=
+=cnZM
 -----END PGP SIGNATURE-----
diff --git a/net-news/quiterss/quiterss-0.15.2.ebuild b/net-news/quiterss/quiterss-0.15.2.ebuild
deleted file mode 100644
index 8c5b730f9f86..000000000000
--- a/net-news/quiterss/quiterss-0.15.2.ebuild
+++ /dev/null
@@ -1,54 +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.2.ebuild,v 1.1 2014/04/05 19:21:18 tomwij 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"
-inherit l10n qt4-r2
-
-MY_P="QuiteRSS-${PV}-src"
-
-DESCRIPTION="A Qt4-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-SRC_URI="https://quiterss.org/files/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug phonon"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtwebkit:4
-	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-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')
-}
diff --git a/net-news/quiterss/quiterss-0.15.3.ebuild b/net-news/quiterss/quiterss-0.15.3.ebuild
index 72502a694563..9fc83a4a4918 100644
--- a/net-news/quiterss/quiterss-0.15.3.ebuild
+++ b/net-news/quiterss/quiterss-0.15.3.ebuild
@@ -1,20 +1,25 @@
 # 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.3.ebuild,v 1.1 2014/04/08 19:00:05 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.15.3.ebuild,v 1.2 2014/04/26 17:28:40 maksbotan 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"
-inherit l10n qt4-r2
+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"
 
@@ -30,6 +35,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+[[ ${PV} == *9999* ]] || \
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
@@ -52,3 +58,17 @@ src_configure() {
 		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-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index 9ea3fd562375..57e56b1aa951 100644
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -1,19 +1,26 @@
 # 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-9999.ebuild,v 1.16 2014/04/05 19:21:18 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v 1.17 2014/04/26 17:28:40 maksbotan 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 l10n qt4-r2 mercurial
+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"
-KEYWORDS=""
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug phonon"
 
 RDEPEND="
@@ -28,6 +35,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${MY_P}"
+
 DOCS=( AUTHORS HISTORY_EN HISTORY_RU README )
 
 src_prepare() {
@@ -48,3 +58,17 @@ src_configure() {
 		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
+}