Ebuild update by Nikoli: fix docs install, bring back epatch_user, add missing qtnetw...

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

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 53e4734bf0f42d388a6e4025efa31b57990d7020..87e382b511911c0379724337b14bc7c81d963ae0 100644 (file)
--- a/net-news/quiterss/ChangeLog
+++ b/net-news/quiterss/ChangeLog
@@ -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 <maksbotan@gentoo.org> 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)
 

diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 9fef8358fbda47cb843ff7f49aecb248703416b3..6a8b226d03f4a91e634ce73b4737f36a97d5efd8 100644 (file)
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -11,25 +11,18 @@ EBUILD quiterss-0.16.2.ebuild 1778 SHA256 861219449c2b18895cc0f05b05074a65828e7b
 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 2073 SHA256 d98af5128e9c0876d324e87e335ade29663f8fc609684e61c09f716dbbf25060 SHA512 bc0c7e6a0b85c2770396acf060f849e71fa7ca0e750d178b6ed4c564183eb18f90868b0322711a1403763d1b14e485df9af826085e6aedfb46e4d6ea97c158cc WHIRLPOOL 7884fbd101c7a7387700a3be543412fd2cb4dcdce00944b3ade87d28d71de85e54048d1ec20be12608d97172aad00e3a7797b221f50a3e2fcb4040b79d5805c1
-MISC ChangeLog 9255 SHA256 119a51945a02b0e9d1ceade705f59c6d114759fed5337bedff4051e704d80b7e SHA512 1ab276e25159e5e4586e466324facbd51a597ce81a6af0e0691ddfaf9727261fee30ebfe46d5641e1c7ec9f67e2141136e6d93d051987ef2d3f909bcbbbfff88 WHIRLPOOL 526d229774a06416e4436a3d832279864a1c6d6e48f7b34095ba0daff012360f7be4eb4cce9bd9a1b32576910fd232f3d923fcb3b1e89e139ffa30271c33e592
+EBUILD quiterss-9999.ebuild 2203 SHA256 efbfeb52864304553728e6c620907db57d1780839f412fe1c37ba49aab16cf3f SHA512 3bc8e16151ff29fb1641c4406e13356bda9ba47cb24fa70e22d301a42d3429bf0d0a34ba1ad76408f224259dc0a3f46093d27ffec5797b457d2fae69f781fcf1 WHIRLPOOL 4752af9f3cb8b3266a8035d32c6ea3ba8b118bf595362af6f42754ac826ea94b3586e1c21f70da7327fce4e3a48d23d4a7bffdd91f5593414504f49b882b910c
+MISC ChangeLog 9474 SHA256 22a833767891171a09da8a8e6a8083fdb477268aa857127704186e4bdece1b5f SHA512 835013891bb04bebb3d86cd3d6ed8f21586bdd8964d34a4b695f1253ce71a186bb369698b3bdd26811e1908d2af1955bfee73e060f1ddae5ffc28081e58639b4 WHIRLPOOL 4dd16cab8a439fea32c09df9f378989c4e7423be7203808508b999cbebaadb4a589e3d31cc114ea87ab0b10229a3af532343e919762b7e66b97a45a2b37ca043
 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.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVFAAeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOVKoQAJPn1Gf9xtsR/Wuk/wFX4Q5D
-GSz91C5EqVj451yyJPXcFrPjcQZjP8f6fazp5/H1Ujgcvl5OktW5cwxwcmSE2Gtq
-4GYeETTX7/Pc+yEi9kBag6uv8x3NzO7/7rGDFn/aUaBfoGu9xAlsteBm5Q4eP13T
-0OlQn4kF0XvXXnlunCyFSHbonEq4W/hQYeUCHV6OwmHyPVmOleIrz7Jw17D9DgCh
-Ig4/DITQqb/kJ5paQgcNsmTJzgK74O0gToAoB6kYGrQV0AhcvpquHQ/Y/NTZOfON
-u/6K04B8bpYDkA2sPI6ACzAWNqVFClT/KuzwRmbgg8qUTkBCpwDLIZpPKgrYjxfX
-XYnI+GThEmyKMcQjxOsf5q74lYoe0B3PyFuHuJJXKEBBnnLRtwiD+orzJHzu1suT
-dyAqpVrqDd3bUYYR16b9F4JMQQbTFz/r+Zy38EYgaUNYiNUbR48rNTnMBde9iGIH
-6viPs608GhO5POvBgWrCMn2GjrIPcVrJeShyyWRSWvg4Z94YSjGIvabmGvzLC0aj
-3IDYgdzhGoWaLwlLInGFdt4ru2pL2BnfQTUc/2MGEV6C+4KvzcmNxw25sitABSWB
-8XidJYWiMAymGxuXGvyQz5J1irAOSVd56W356RLsP1VBdzMQQR0s2Ej80DXAojQq
-HTC1tlnMPGxYvlfd+dXI
-=p+bk
+iQEcBAEBCAAGBQJVGvHBAAoJEAmJmMX429reSvcIALk0+tz9V6/VlsVg13RkJ+WE
+LM39QSbi8SvkqVrpf9J/bFugPp6nYPAPNxAjGNQefNdpwv+h8GJU6POWs0LPFsQa
+F+kSUTeATJX7wVlPBL0wAfW2VBtt40KIi6dxnwCPHW0OFltb0G5heGt05ITFyT6i
+wDQcL9C9wLbIex5nWM5Dud8Toy0JeQ+u+Cy0/OThDEWvyttAgVk4tycwjfYNoxI1
+UpH0NLBTP4X/zTXaDubFxGzsEF5pAMxQ4accFtY1l+CUlKmzFWBBf5XzLsth+fI+
+3ssnFwm06QwVEXmKdqZx1W/OhZDbBrhL5sdhe5L9/s9lxx8dUFQtwZw3j1y/nZ0=
+=MKX6
 -----END PGP SIGNATURE-----

diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index 2ae2ce71c93c0f3732355a14cc14eae09a6d8e87..b7d78389442982ccf0080974f130102ece16c4f3 100644 (file)
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -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 @@ 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
 
@@ -60,13 +70,16 @@ src_prepare() {
 }
 
 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() {