Merge updates from master

2026-07-17 19:13:13 -04:00 · 2020-10-14 17:05:05 +00:00
parent 459475c193 9d28221113
commit f3e8824c22
10 changed files with 128 additions and 58 deletions
--- a/dev-vcs/gitqlient/Manifest
+++ b/dev-vcs/gitqlient/Manifest
@@ -0,0 +1,2 @@
+DIST QLogger-d33cb64.tar.gz 15378 BLAKE2B adb5bed0c9cc3692b384542306466046242ff50d0c7dd176f439172047991ce4252e315e8289524a9e346abc225aeb9ca89b958f00cd11710294b2885ca0f69d SHA512 bec4785dcdb4cf3434621f68830628c737ee0664223228ec68f09991b5a2090eac024fbce86d6d0614d8a709efd55e0f126c1bbf8451c1c100080df3b8cdd17f
+DIST gitqlient-1.2.0.tar.gz 3768498 BLAKE2B 0daa49b79c6390e367b24d8843f37c6a633d1e12c8e3d2b7d3245fb06ea0f89c6fb3b360fdc3dfaae13568d36a413353c67fbb29e60f19221341dcb71469491a SHA512 4dd4a21a7b222c6d7586bcbf5eec26f321fc18dd6ef52507a4eb4004675b04f437f8801c817a12f16f5b5ea9b3c2e2930f445e8bb09e64d33b89f69dbf310c74
--- a/dev-vcs/gitqlient/gitqlient-1.2.0.ebuild
+++ b/dev-vcs/gitqlient/gitqlient-1.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PN="GitQlient"
+QLogger_sha="d33cb645bb6ffc4dd929c348ca011c007351d605"
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+SRC_URI="
+	https://github.com/francescmm/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/francescmm/QLogger/archive/d33cb645bb6ffc4dd929c348ca011c007351d605.tar.gz -> QLogger-d33cb64.tar.gz
+"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtgui:5
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+
+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:" \
+	-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}:" \
+	"${S}/AppImage/${MY_PN}/usr/share/applications/${MY_PN}.desktop" || die
+}
+
+src_configure() {
+	eqmake5 "${MY_PN}".pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	domenu "${S}/AppImage/${MY_PN}/usr/share/applications/${MY_PN}.desktop" || die
+	doicon -s 48 "${S}/AppImage/${MY_PN}/usr/share/icons/hicolor/48x48/apps/${MY_PN}.png" || die
+}
--- a/dev-vcs/gitqlient/gitqlient-9999.ebuild
+++ b/dev-vcs/gitqlient/gitqlient-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 qmake-utils xdg
+
+MY_PN="GitQlient"
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+EGIT_BRANCH="develop"
+EGIT_SUBMODULES=( QLogger )
+EGIT_REPO_URI="https://github.com/francescmm/${MY_PN}.git"
+SRC_URI=""
+KEYWORDS=""
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtgui:5
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+
+src_prepare() {
+	default
+	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop"
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr "${MY_PN}".pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
--- a/dev-vcs/gitqlient/metadata.xml
+++ b/dev-vcs/gitqlient/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+<longdescription lang="en">
+	GitQlient, pronounced as git+client is a multi-platform Git client originally forked from QGit.
+	Nowadays it goes beyond of just a fork and adds a lot of new functionality.
+</longdescription>
+<upstream>
+	<remote-id type="github">francescmm/GitQlient</remote-id>
+</upstream>
+</pkgmetadata>
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1 +1 @@
-DIST syncplay-1.6.6_beta1.tar.gz 1843061 BLAKE2B 2b940596d96ac6ea859bb27bfc3f987ef52b2be7f1d50976d6c205d3a4d0fed92f29dc530336bb92c0d67bd9661719720e0181331e549af648868104c2b21c63 SHA512 0d75d9505adfa50aaa56bd4e99f62ee5fa77a7085dd3933a5a4a886d8e898eddac887ae42ac8d133bda048ef14ae22402ced368f75fdf234e35a697ea2cb4443
+DIST syncplay-1.6.6_beta2.tar.gz 1843024 BLAKE2B d5c1e9e4c7b220722fef263f96749af22965bd26b82d41b913660d8b5c70bb6fe82727d7b16492408db661cf77eed4602c201cf90b05b3ee01a51dbfb7f3ee10 SHA512 c9ec87632418dd18b62fe392458a56a23c6eb2bae33c5a6be6daa94bfc30153fb371b9fa524452bdf2329442eb073f8f77418da823eac49273e8611d404d2f8e
--- a/media-video/syncplay/syncplay-1.6.6_beta2.ebuild
+++ b/media-video/syncplay/syncplay-1.6.6_beta2.ebuild
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1,3 +1 @@
-DIST iotop-c-0_pre20140824.tar.gz 16154 BLAKE2B ccd5a1d0901ce7d6c554f9b4a2102e7eab9f9bb456f7f2289b0c7b158c8f220339bc018aeb9295f89b717a711b69cb7f1c144d0c84dce093309e6897ac22a67d SHA512 3dac84abff82f1ec6c14a0dae14c11a2260ebe0a6ec112cda06ecfe2cf8535536c92f432fc03cc2baee6b7326eb4dda4fc2fe08a15c41a78641822daea5726d0
-DIST iotop-c-1.10.tar.gz 29813 BLAKE2B 20016f8f2d8866738b17624ac555fd51df12f157269b4c38ce900b99ba1cd42bdd1a5e2713b1ff7bc18f762f8e66c60095a2824a8cb18761d68731c87d003d6e SHA512 b548073f26133c2b06f1a3e946510d808331b95c12ab78f747acfa16f0bcde0202d3b01c756688c0e0c69aa18c8273e14509b10a49d19fb6fa1d7f5bdfc1cadd
-DIST iotop-c-1.9.tar.gz 28680 BLAKE2B 7e30ca3cec2694afeb2bead7f97eb7ee0dcb3066cf4d1643771b04b724789b9b09836998f6f693bc0a3332b4bb06fb36c46c6ae9b37f0b8088c212136d5bd9f3 SHA512 99a1b9bcae13dbcead1e1c9df8618164be0f9c81e7220d2d4b1e0b8d1528b6a4f6845763a6c04a38510a4174bcaf21abb216f582f49729820cd579e0ca2856f9
+DIST iotop-c-1.15.tar.gz 32454 BLAKE2B 465b43e7661c901f8a9f66973cf25a4af6dcac9e92cbb988240e454c52e1cce1359c57d2386f9773b19202fdbf2ccb2d177ee2a8587faa13e7f69bc8b29b0299 SHA512 feb1d2674b2407f3c9011aca1e4e00b68264b955939be94e45434519ecb8bfc0290ceb17a3db5dafb5a7fd38ccbe5522851439b4437edcf13d0864bc6b8c4364
--- a/sys-process/iotop-c/iotop-c-0_pre20140824.ebuild
+++ b/sys-process/iotop-c/iotop-c-0_pre20140824.ebuild
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_COMMIT="cadd9675822cc02eace137eb918a4362c69bec9e"
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/iotop-${MY_COMMIT}"
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-}
--- a/sys-process/iotop-c/iotop-c-1.15.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.15.ebuild
@@ -18,6 +18,10 @@ BDEPEND="virtual/pkgconfig"

 S="${WORKDIR}/iotop-${PV}"

+src_compile() {
+	emake V=1
+}
+
 src_install() {
 	dobin iotop
 	dodoc README.md
--- a/sys-process/iotop-c/iotop-c-1.9.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.9.ebuild
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/iotop-${PV}"
-
-src_prepare() {
-	default
-	sed -i Makefile -e "s/-lncursesw/$(pkg-config --libs ncursesw)/"
-}
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-}