From 313a5260c63b62e168953402b6cfc4921f428c0e Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Fri, 16 Oct 2020 00:55:12 +0300 Subject: [PATCH] dev-vcs/lazygit: remove '-Werror' compiler flag; sort DEPEND Closes: https://github.com/gentoo/guru/issues/22 Signed-off-by: Sergey Torokhov --- dev-vcs/gitqlient/gitqlient-1.2.0.ebuild | 7 ++++--- dev-vcs/gitqlient/gitqlient-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-vcs/gitqlient/gitqlient-1.2.0.ebuild b/dev-vcs/gitqlient/gitqlient-1.2.0.ebuild index 276fda5dd9..f8eba9847c 100644 --- a/dev-vcs/gitqlient/gitqlient-1.2.0.ebuild +++ b/dev-vcs/gitqlient/gitqlient-1.2.0.ebuild @@ -23,11 +23,11 @@ SLOT="0" IUSE="" DEPEND=" - dev-qt/qtwidgets:5 dev-qt/qtcore:5 + dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 - dev-qt/qtgui:5 + dev-qt/qtwidgets:5 " RDEPEND=" @@ -39,7 +39,8 @@ src_prepare() { default mv -T "${WORKDIR}"/QLogger-"${QLogger_sha}" "${S}"/QLogger || die - sed -i -e "s:target.path = /\$\$(HOME)/\$\${TARGET}/bin:target.path = /usr/bin:" \ + sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" \ + -i -e "s:target.path = /\$\$(HOME)/\$\${TARGET}/bin:target.path = /usr/bin:" \ -i -e "s:TARGET = ${MY_PN}:TARGET = ${PN}:" "${MY_PN}".pro || die sed -i -e "s:Office:Development:" -i -e "s:Exec=${MY_PN}:Exec=${PN}:" \ diff --git a/dev-vcs/gitqlient/gitqlient-9999.ebuild b/dev-vcs/gitqlient/gitqlient-9999.ebuild index 5ee0e3c965..747e15db3d 100644 --- a/dev-vcs/gitqlient/gitqlient-9999.ebuild +++ b/dev-vcs/gitqlient/gitqlient-9999.ebuild @@ -21,11 +21,11 @@ SLOT="0" IUSE="" DEPEND=" - dev-qt/qtwidgets:5 dev-qt/qtcore:5 + dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 - dev-qt/qtgui:5 + dev-qt/qtwidgets:5 " RDEPEND=" @@ -35,6 +35,8 @@ RDEPEND=" src_prepare() { default + sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" "${MY_PN}".pro || die + sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" }