From 55982b8a1798045afac9f152320393b15f049fc0 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 21 Apr 2015 16:34:40 +0000 Subject: [PATCH] Bump to 0.17.7, update live, bug #547312. Thanks to Nikoli. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xF8DBDADE --- net-news/quiterss/ChangeLog | 9 ++- net-news/quiterss/Manifest | 27 +++---- net-news/quiterss/quiterss-0.15.4.ebuild | 74 ------------------ net-news/quiterss/quiterss-0.17.1.ebuild | 75 ------------------- ...s-0.17.5.ebuild => quiterss-0.17.7.ebuild} | 66 ++++++++++------ net-news/quiterss/quiterss-9999.ebuild | 10 +-- 6 files changed, 63 insertions(+), 198 deletions(-) delete mode 100644 net-news/quiterss/quiterss-0.15.4.ebuild delete mode 100644 net-news/quiterss/quiterss-0.17.1.ebuild rename net-news/quiterss/{quiterss-0.17.5.ebuild => quiterss-0.17.7.ebuild} (50%) diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog index 87e382b51191..461a2d12a237 100644 --- a/net-news/quiterss/ChangeLog +++ b/net-news/quiterss/ChangeLog @@ -1,6 +1,13 @@ # 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.55 2015/03/31 19:13:24 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.56 2015/04/21 16:34:29 maksbotan Exp $ + +*quiterss-0.17.7 (21 Apr 2015) + + 21 Apr 2015; Maxim Koltsov +quiterss-0.17.7.ebuild, + -quiterss-0.15.4.ebuild, -quiterss-0.17.1.ebuild, -quiterss-0.17.5.ebuild, + quiterss-9999.ebuild: + Bump to 0.17.7, update live, bug #547312. Thanks to Nikoli. 31 Mar 2015; Maxim Koltsov quiterss-9999.ebuild: Ebuild update by Nikoli: fix docs install, bring back epatch_user, add missing diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest index 6a8b226d03f4..e966c34f1b1a 100644 --- a/net-news/quiterss/Manifest +++ b/net-news/quiterss/Manifest @@ -1,28 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 DIST QuiteRSS-0.17.6-src.tar.bz2 3832771 SHA256 b14c715755ff6a1a4fa39b1d3efae893835fde07a23e69275fc12fa742cc8e7d SHA512 c6b16bfd7003e343768793a2d972ca9dfa9402c3ce923f0db501249b9f0826707763652ff6f7a37882e9151215245803b0dd6a25781ba5fa166c4594d59d847f WHIRLPOOL 1ae970d36c76f54bf92afd422fc33b5248f4b828c04df2b5705853ded45790ef1bb56711fdb1feec9eee3749abfaea4f569a1ae5ca6bbec1eb8238fd396800fe -EBUILD quiterss-0.15.4.ebuild 1822 SHA256 1d94b1a6943d5b7cfeed1644da76c5f8392801d4d95df4863163c05c48443db6 SHA512 c92de0ed625f9591198de29e2565ae3c63fb4d957a128bd0ffa0c833cd1e0c4f253f27fd94aa1955ec683bb7aaf58f47de3cece82c924b1c809fcacedeab241b WHIRLPOOL 766ea31e9096e1e3986efe6e77bf200b3e0ddb799a59dbc499d30b15fb043440dadc3f6e16efc21e2788615710f6cca43456ef3d2117d978beb66bfa8bf3605b +DIST quiterss-0.17.7.tar.gz 5356077 SHA256 5deeeb3fffba57dcc4d9f98d3be15b605549301462388107c45aba222889896c SHA512 ddee530789890fa4462f42fec139fd2dab3cff2f32f27dd49f8b8873ecf2f187731c92adc7804955e6f27cc7f399823f1847b62286aa12268deb8a5192977797 WHIRLPOOL bc7cd42f38a8d7c505af8abb566717bf66d0beef7a5cb709b78b27bce9ac048f5be66705df2eaf426b6669c46c87fbc61aea88b539314cec57226e194bee40fd 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-0.17.5.ebuild 1741 SHA256 6a7933bdf38049a2a07577b397b84bd0c83404076b4883b249f22ef54ad62be4 SHA512 16003f8090e4da14270c2a2d278037459b276836c95a9ccb0e7b0aa80d95ff98e9fb42b97ccd3b04dc08866a3767354f7b6d31cebe11074bb174384649f9e5ff WHIRLPOOL 54335b4d94ac9b3be986e87afe2819ae59106224c98628df52ce000af9f9a6df643dc24be7d40d388daabea068106de571ae74ddab8456c9c702c70fa9fc564b EBUILD quiterss-0.17.6.ebuild 1741 SHA256 f3550b98c0164aabb2fa48e76b980bc85143e29cb828310bc474915845abf7f5 SHA512 597c708b77e624d45403c81feb5bda03fd4aed78d8aa40584bfa45161206a6b49af735e62233671367935341d711daca4bc20469369c7895a6b7b4cfedc21677 WHIRLPOOL 79facdcdc0fa260843b5ba6a3ac248573b7c12d5a93ff733b15046c6781355a0f9dd3be4630a4dc6489218010fd7850e01de9e743bc05946e60a9b3357d2ce3d -EBUILD quiterss-9999.ebuild 2203 SHA256 efbfeb52864304553728e6c620907db57d1780839f412fe1c37ba49aab16cf3f SHA512 3bc8e16151ff29fb1641c4406e13356bda9ba47cb24fa70e22d301a42d3429bf0d0a34ba1ad76408f224259dc0a3f46093d27ffec5797b457d2fae69f781fcf1 WHIRLPOOL 4752af9f3cb8b3266a8035d32c6ea3ba8b118bf595362af6f42754ac826ea94b3586e1c21f70da7327fce4e3a48d23d4a7bffdd91f5593414504f49b882b910c -MISC ChangeLog 9474 SHA256 22a833767891171a09da8a8e6a8083fdb477268aa857127704186e4bdece1b5f SHA512 835013891bb04bebb3d86cd3d6ed8f21586bdd8964d34a4b695f1253ce71a186bb369698b3bdd26811e1908d2af1955bfee73e060f1ddae5ffc28081e58639b4 WHIRLPOOL 4dd16cab8a439fea32c09df9f378989c4e7423be7203808508b999cbebaadb4a589e3d31cc114ea87ab0b10229a3af532343e919762b7e66b97a45a2b37ca043 +EBUILD quiterss-0.17.7.ebuild 2123 SHA256 8543873fbaca8505919844cf0d56aeddbb099f33fad2dc2dd6df284f72eecd22 SHA512 afbedde410ebc157fad560047f6a0b3529b03c58110b81058673ce156e01c6072e53a45ca22ceb366a7bacbf58605a1885e1b11740abd9a7224dd6e5923496f9 WHIRLPOOL b0a92424aa440352bb2a7a81a56649e66327f8614c1d2804ca241e84a42b12a3f3333e2418e62898ee044071547c674516c4c9b5f4577779917f1e5ba6614fad +EBUILD quiterss-9999.ebuild 2122 SHA256 2bc29ee7feb9e7d5411657f5b3ae30850b61a65d61b1e44e59a7f6700b47d0df SHA512 5ebd9e3b9ea718ab8d191ccaecbf9f05530be6dbf7a3eca43d0c60c54e1238bc66a9ca66c96f21553d05dc8b8aebc046a401aa2b70ce6c4753e989a3342fe3f5 WHIRLPOOL b479534ae5bc3c3b2d0e586a47f916149e0a9942e7759bd7047b1ac8b75f47f5de78a500ae656a37ceec8184bb640d71f659150fd3a572858f8abd5cd49a17d6 +MISC ChangeLog 9747 SHA256 0f1ba0281c66e6681198bf2daa8cb6750ca94d465ba16ed2e261fcabf64bce4d SHA512 1b103065a2b66d403b857ea05015bc2f93776c164a948f87f5e59ca13596986c662d547f6f2db1df076538af4d487e1fee3dbc4ac7321f8c8b53a0539afe5d48 WHIRLPOOL 114445111b6919cfe340756757f3e3d172c02f326ae911b94f08c6d51b715bf589e8bbe12ffc35474da1c59e2a3662188e7f109dfabbfc750fb18a96140d7de2 MISC metadata.xml 541 SHA256 69ce34fc9d6b9fe9c90aec5987d73272cc0b5a1e47a231fdc8fb062ff70c7d3b SHA512 5f397d6ad6cac106da7a96717647b236c4a5629dcc604b4b2386f21beb2dbcb3872d092c96c9b7d8f4cd91b503f6f0c931075e2a45c568a1907cdfc00cdb0b32 WHIRLPOOL 86115897300e53bf6822f673867321c810b087077eca1fa5062236ced28458a69c1f928b328588b4ef77c8496129a7d8e9b439c1ff7ad1f57ea23fe8e9d6d592 -MISC quiterss-9999.ebuild.orig 2073 SHA256 d98af5128e9c0876d324e87e335ade29663f8fc609684e61c09f716dbbf25060 SHA512 bc0c7e6a0b85c2770396acf060f849e71fa7ca0e750d178b6ed4c564183eb18f90868b0322711a1403763d1b14e485df9af826085e6aedfb46e4d6ea97c158cc WHIRLPOOL 7884fbd101c7a7387700a3be543412fd2cb4dcdce00944b3ade87d28d71de85e54048d1ec20be12608d97172aad00e3a7797b221f50a3e2fcb4040b79d5805c1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVGvHBAAoJEAmJmMX429reSvcIALk0+tz9V6/VlsVg13RkJ+WE -LM39QSbi8SvkqVrpf9J/bFugPp6nYPAPNxAjGNQefNdpwv+h8GJU6POWs0LPFsQa -F+kSUTeATJX7wVlPBL0wAfW2VBtt40KIi6dxnwCPHW0OFltb0G5heGt05ITFyT6i -wDQcL9C9wLbIex5nWM5Dud8Toy0JeQ+u+Cy0/OThDEWvyttAgVk4tycwjfYNoxI1 -UpH0NLBTP4X/zTXaDubFxGzsEF5pAMxQ4accFtY1l+CUlKmzFWBBf5XzLsth+fI+ -3ssnFwm06QwVEXmKdqZx1W/OhZDbBrhL5sdhe5L9/s9lxx8dUFQtwZw3j1y/nZ0= -=MKX6 +iQEcBAEBCAAGBQJVNnwNAAoJEAmJmMX429rebVYH/2NhQzVVw2uqnxJzUxMbPaiR +88YbmJU7MtZKBvun+9FswWppg2NiuZj7bRMqr0oN9ae80rVORqiPyEs1v5YY1CzM +PFtT+UTih5h9NjdsAYwRLU8XsfRD0qxTwnHm8YsPTnXE9ccuxCatdQaJGy2+UvF/ +sGuQNMVXyjVR9CFEJYuHz1XhdxtsTithifFzbA7perd6Y0TbTsALaurrr6ksgtOI +dVAHUfLDut9lOYvxwW9Vj0FJPuJb6hqpiGtQxwttiuJNnj0kQuwnc9W2k4HgrotF +0T7OftNelU6gF5E5yJtWtjrqk/i2ywNCxPJSNMsIowRvaAfwh99sShJbgEYCCqw= +=oFUx -----END PGP SIGNATURE----- diff --git a/net-news/quiterss/quiterss-0.15.4.ebuild b/net-news/quiterss/quiterss-0.15.4.ebuild deleted file mode 100644 index 2030fb01cd64..000000000000 --- a/net-news/quiterss/quiterss-0.15.4.ebuild +++ /dev/null @@ -1,74 +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.4.ebuild,v 1.5 2014/12/31 13:42:24 kensington 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 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" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsingleapplication[X] - dev-qt/qtsql:4[sqlite] - dev-qt/qtwebkit:4 - phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] || \ -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') -} - -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-0.17.1.ebuild b/net-news/quiterss/quiterss-0.17.1.ebuild deleted file mode 100644 index 3719dea5c55a..000000000000 --- a/net-news/quiterss/quiterss-0.17.1.ebuild +++ /dev/null @@ -1,75 +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.17.1.ebuild,v 1.2 2014/12/31 13:42:24 kensington 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 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" - -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 ) ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] || \ -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 - } - # 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 - - qt4-r2_src_prepare -} - -src_configure() { - eqmake4 PREFIX="${EPREFIX}/usr" \ - 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-0.17.5.ebuild b/net-news/quiterss/quiterss-0.17.7.ebuild similarity index 50% rename from net-news/quiterss/quiterss-0.17.5.ebuild rename to net-news/quiterss/quiterss-0.17.7.ebuild index 6427f02aab3e..fd986c6a2cbb 100644 --- a/net-news/quiterss/quiterss-0.17.5.ebuild +++ b/net-news/quiterss/quiterss-0.17.7.ebuild @@ -1,40 +1,51 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.17.7.ebuild,v 1.1 2015/04/21 16:34:29 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 -inherit fdo-mime gnome2-utils l10n qmake-utils +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 DESCRIPTION="A Qt-based RSS/Atom feed reader" HOMEPAGE="https://quiterss.org" +[[ ${PV} == *9999* ]] || \ +SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -IUSE="debug phonon" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="debug phonon +qt4 qt5" +REQUIRED_USE="^^ ( qt4 qt5 )" 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" + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + 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/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] + dev-db/sqlite:3 +" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( AUTHORS HISTORY_EN HISTORY_RU README ) @@ -42,6 +53,9 @@ src_prepare() { 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 @@ -50,12 +64,16 @@ 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 + einstalldocs } pkg_preinst() { diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild index b7d783894429..3d32eb697b0f 100644 --- a/net-news/quiterss/quiterss-9999.ebuild +++ b/net-news/quiterss/quiterss-9999.ebuild @@ -1,6 +1,6 @@ # 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.22 2015/03/31 19:13:24 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-9999.ebuild,v 1.23 2015/04/21 16:34:29 maksbotan Exp $ EAPI=5 @@ -9,13 +9,10 @@ EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git" inherit eutils l10n fdo-mime gnome2-utils qmake-utils [[ ${PV} == *9999* ]] && inherit git-r3 -[[ ${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" +SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -50,9 +47,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -[[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/${MY_P}" - DOCS=( AUTHORS HISTORY_EN HISTORY_RU README ) src_prepare() { -- 2.26.2