[gentoo-commits] repo/proj/guru:dev commit in: dev-vcs/gitqlient/

[Sergey Torokhov]

commit:     379ce8f75a4896a24cbc2a97887809689c91012e
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Oct 29 23:07:57 2022 +0000
Commit:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sat Oct 29 23:07:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=379ce8f7

dev-vcs/gitqlient: 1.5.0 update tarball with containing all submodules

After release of 1.5.0 on 25 June 2022 the upstream
prepare tarball of GitQlient that contains all required
submodules within (on 04 July 2022).

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 dev-vcs/gitqlient/Manifest                  |  6 +--
 dev-vcs/gitqlient/gitqlient-1.5.0-r1.ebuild | 49 ++++++++++++++++++++++
 dev-vcs/gitqlient/gitqlient-1.5.0.ebuild    | 65 -----------------------------
 3 files changed, 50 insertions(+), 70 deletions(-)

diff --git a/dev-vcs/gitqlient/Manifest b/dev-vcs/gitqlient/Manifest
index 76df10480..9c7aa605c 100644
--- a/dev-vcs/gitqlient/Manifest
+++ b/dev-vcs/gitqlient/Manifest
@@ -1,5 +1 @@
-DIST gitqlient-1.5.0.tar.gz 4452568 BLAKE2B fcbe8f9f9f176d4c68ddc89796d6362264734d0f30ae4a82f494dfd96d5bbb121f74e9ea0aa54b7aacb8aec0d948ce5a1d5240b0c60ed7976092eaa30dcc9aea SHA512 3e8573d16b346c45b3026d8c5cc0e2f25b9ec42d43120c56ac5e57417119724dd0c949a582ced218e8cb0775957494cb82a27b15a36f9c2e111d56acafc4f13e
-DIST gitqlient-1.5.0_AuxiliarCustomWidgets.tar.gz 438731 BLAKE2B 2b5b9dcd700a92e13cc9655183da2472c77dbf4bc68d9fe30cf615bae57f827296a33d223e7477a5dabc9e973a8afa97ecf8f416e5c7825add87c18222851a9a SHA512 5937a52ab6c3d023c39d7ef64b02e7f2870538076b63ef9bf77ceecd87d3eb1334940de2d8086a25070307e26424c262994298d87ae16ff1bf8c7dad69d7ffa2
-DIST gitqlient-1.5.0_QLogger.tar.gz 20307 BLAKE2B 0c5f4cc8a19ec6ca2508d80d02b5fd6ba759049116bad4883d0bc62ed06a6d1278eea9864a4001312d54f5ec2813c5348c3c2a91a80547fb27224d70dce46b21 SHA512 be6a0a5a2c334ac798eea2f2dfd3154b06e17040883b8309de2158fd118bc2a3cab20276d6a36a21018f850c43bd5bd834744f5911aabd771c2f43530a0a3553
-DIST gitqlient-1.5.0_QPinnableTabWidget.tar.gz 13299 BLAKE2B 9c8fce7c955963b97c5337bacfa8032f761bc763bb56a56ad34ff68cc3ece1aad75f279edec78e6770a7598caa5372049ffbe8d16b5ade07350166893035656a SHA512 ea0bc7c023fdf792c0aaab5feb10eb2551581a0fcd32ebac779e358f198057d282a1f9de7004cde8eaa6aa2b0e0028966f948362b335e3288b650a4830cee1db
-DIST gitqlient-1.5.0_git.tar.gz 28824 BLAKE2B 302aede313f1c2be044854089fc80c004df9660c527addafc984f514eb57c676d2fef15f1ed5d9443fc239242ec196d81e12b253db47f4882de8df661c0ee2ff SHA512 94d1a267cd49f0a2ea68a5cdc014a1b63b1ae659e27f21d2104cd689ede8fab7b85de6a6e3af514f7ec28ac468264126c076b0dce84c77f62472fd6b120eda38
+DIST gitqlient-1.5.0.tar.gz 4969914 BLAKE2B 9739e333fa20fee724f948cf7a8109b932b7ac8ebfe8465cdc374774f21c105d6467078322012eec8ce82c1b92f9b5e4f32b24885d5ab218b64544a2c2ad6504 SHA512 32f838c75314aca67880354127f2cdc00ed6ce0c6b315dd9571d00dbebca4896e975d73ef779dae5c1953f62387992e573ee95f32545e41e59f5066ae8f11662

diff --git a/dev-vcs/gitqlient/gitqlient-1.5.0-r1.ebuild b/dev-vcs/gitqlient/gitqlient-1.5.0-r1.ebuild
new file mode 100644
index 000000000..456f30fd7
--- /dev/null
+++ b/dev-vcs/gitqlient/gitqlient-1.5.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature qmake-utils xdg
+
+MY_PN="GitQlient"
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+SRC_URI="https://github.com/francescmm/${MY_PN}/releases/download/v${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${PN}_${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+
+src_prepare() {
+	default
+	sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" -e "/^GQ_SHA/d" "${MY_PN}".pro || die
+	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" || die
+	# Drop 'fatal' warning on version detection via git command:
+	sed -i -e "/VERSION =/s: \$\$system(git rev-parse --short HEAD)::" "${MY_PN}".pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr "${MY_PN}".pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	optfeature "Jenkins and/or GitServer plugins support" dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets]
+}

diff --git a/dev-vcs/gitqlient/gitqlient-1.5.0.ebuild b/dev-vcs/gitqlient/gitqlient-1.5.0.ebuild
deleted file mode 100644
index 6dd457f67..000000000
--- a/dev-vcs/gitqlient/gitqlient-1.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature qmake-utils xdg
-
-MY_PN="GitQlient"
-MY_PV=$(ver_rs 3 -)
-
-# subprojects on GitQlient 1.5 release:
-AuxiliarCustomWidgets_SHA="835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"
-QLogger_SHA="d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"
-QPinnableTabWidget_SHA="cc937794e910d0452f0c07b4961c6014a7358831"
-git_SHA="b62750f4da4b133faff49e6f53950d659b18c948"
-
-DESCRIPTION="Multi-platform Git client written with Qt"
-HOMEPAGE="https://github.com/francescmm/GitQlient"
-
-SRC_URI="
-	https://github.com/francescmm/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/francescmm/AuxiliarCustomWidgets/archive/${AuxiliarCustomWidgets_SHA}.tar.gz -> ${P}_AuxiliarCustomWidgets.tar.gz
-	https://github.com/francescmm/QLogger/archive/${QLogger_SHA}.tar.gz -> ${P}_QLogger.tar.gz
-	https://github.com/francescmm/QPinnableTabWidget/archive/${QPinnableTabWidget_SHA}.tar.gz -> ${P}_QPinnableTabWidget.tar.gz
-	https://github.com/francescmm/git/archive/${git_SHA}.tar.gz -> ${P}_git.tar.gz
-	"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-	dev-vcs/git
-"
-
-src_prepare() {
-	mv -T "${WORKDIR}"/AuxiliarCustomWidgets-"${AuxiliarCustomWidgets_SHA}" "${S}"/src/AuxiliarCustomWidgets || die
-	mv -T "${WORKDIR}"/QLogger-"${QLogger_SHA}" "${S}"/src/QLogger || die
-	mv -T "${WORKDIR}"/QPinnableTabWidget-"${QPinnableTabWidget_SHA}" "${S}"/src/QPinnableTabWidget || die
-	mv -T "${WORKDIR}"/git-"${git_SHA}" "${S}"/src/git || die
-
-	default
-	sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" -e "/^GQ_SHA/d" "${MY_PN}".pro || die
-	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" || die
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr "${MY_PN}".pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	optfeature "Jenkins and/or GitServer plugins support" dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets]
-}