summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2015-02-03 10:56:23 +0000
committerBen de Groot <yngwin@gentoo.org>2015-02-03 10:56:23 +0000
commitd4102815948b8574636bcded92f3b0b099418734 (patch)
tree7d35c8d8a5749c98d35fd879a3c4043352a7934d /net-news/quiterss
parentMarked ~hppa too. (diff)
downloadgentoo-2-d4102815948b8574636bcded92f3b0b099418734.tar.gz
gentoo-2-d4102815948b8574636bcded92f3b0b099418734.tar.bz2
gentoo-2-d4102815948b8574636bcded92f3b0b099418734.zip
Version bump. Added preliminary Qt5 support to live ebuild, but this does not compile yet. Migrate to qmake-utils.eclass and rearrange some lines.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
Diffstat (limited to 'net-news/quiterss')
-rw-r--r--net-news/quiterss/ChangeLog11
-rw-r--r--net-news/quiterss/quiterss-0.17.5.ebuild73
-rw-r--r--net-news/quiterss/quiterss-9999.ebuild71
3 files changed, 122 insertions, 33 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/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() {