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

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

4 files changed, 55 insertions, 60 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/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
+}