maksbotan 15/03/31 19:13:24 Modified: quiterss-9999.ebuild ChangeLog Log: Ebuild update by Nikoli: fix docs install, bring back epatch_user, add missing qtnetwork dependency, fix qtsingleapplication dependency. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Revision Changes Path 1.22 net-news/quiterss/quiterss-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild?r1=1.21&r2=1.22 Index: quiterss-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- quiterss-9999.ebuild 3 Feb 2015 10:56:23 -0000 1.21 +++ quiterss-9999.ebuild 31 Mar 2015 19:13:24 -0000 1.22 @@ -1,50 +1,57 @@ # 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.21 2015/02/03 10:56:23 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v 1.22 2015/03/31 19:13:24 maksbotan 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 +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 -inherit fdo-mime gnome2-utils l10n qmake-utils +[[ ${PV} == *9999* ]] || \ +MY_P="QuiteRSS-${PV}-src" 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 +qt4 qt5" REQUIRED_USE="^^ ( qt4 qt5 )" RDEPEND=" - qt4? ( dev-qt/qtcore: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 + 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/qtsingleapplication[X,qt5] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 - dev-qt/qtxml:5 ) - dev-db/sqlite:3" + dev-qt/qtxml:5 + ) + dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] + dev-db/sqlite:3 +" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" + +[[ ${PV} == *9999* ]] || \ +S="${WORKDIR}/${MY_P}" DOCS=( AUTHORS HISTORY_EN HISTORY_RU README ) @@ -52,6 +59,9 @@ 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 @@ -60,13 +70,16 @@ } 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() { emake INSTALL_ROOT="${D}" install + einstalldocs } pkg_preinst() { 1.55 net-news/quiterss/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/quiterss/ChangeLog?rev=1.55&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/quiterss/ChangeLog?rev=1.55&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/quiterss/ChangeLog?r1=1.54&r2=1.55 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 26 Mar 2015 12:48:29 -0000 1.54 +++ ChangeLog 31 Mar 2015 19:13:24 -0000 1.55 @@ -1,6 +1,10 @@ # 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.54 2015/03/26 12:48:29 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.55 2015/03/31 19:13:24 maksbotan Exp $ + + 31 Mar 2015; Maxim Koltsov <[email protected]> quiterss-9999.ebuild: + Ebuild update by Nikoli: fix docs install, bring back epatch_user, add missing + qtnetwork dependency, fix qtsingleapplication dependency. *quiterss-0.17.6 (26 Mar 2015)
