From 6a0bda123545efc51aa1336cb20c66049206347a Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 21 Apr 2021 23:32:52 +0300 Subject: [PATCH 1/6] dev-vcs/lazygit: 0.28.1 version bump Signed-off-by: Sergey Torokhov --- dev-vcs/lazygit/Manifest | 1 + dev-vcs/lazygit/lazygit-0.28.1.ebuild | 36 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 dev-vcs/lazygit/lazygit-0.28.1.ebuild diff --git a/dev-vcs/lazygit/Manifest b/dev-vcs/lazygit/Manifest index af7a4c369e..b9ca396a75 100644 --- a/dev-vcs/lazygit/Manifest +++ b/dev-vcs/lazygit/Manifest @@ -3,3 +3,4 @@ DIST lazygit-0.26.1.tar.gz 2192018 BLAKE2B 9c48e6d0ee176ed1a49a684c4ad65ba139329 DIST lazygit-0.27.2.tar.gz 3214004 BLAKE2B fb6cdf0664ae5510c2bcca00f478a76bb3e4e69b6cc8714ab97d0cf1c638fef450e320b3072a8e3971847d55053245ad575466fcdf62942b176c1571d22f1bf1 SHA512 eba628a80465054355750cafc31ed31ea22356c548441c4397a9762efeddb752ce9be6f7a125333ad8d619aff0959226785bdb22b99d918da0f3ce1153fb59bc DIST lazygit-0.27.3.tar.gz 3214304 BLAKE2B 05db27847fb90bd56f81055b55138a4266254aab76c52a95d5b6bd70d45741a1eeb84fe120e8ddd10c0b4f75cccc39c003bba8d5b577952968afd164331cecf4 SHA512 1379edd0c939d4e434a91d9508dd0895851503be06a9b86e9778e5fa27c7062db565d922b78db11b3eec46bf6261445002125dcff2b10e26d3a592c4420f3d16 DIST lazygit-0.27.4.tar.gz 3214405 BLAKE2B 123c2b7ca1bb63fa7d7a40b4c8a56b3f39b651c214ad55179dd07cd81588341589419759207263bbf809da89218e35d2c6185c79bcfd9ee59480ed66d67506dc SHA512 a053d4d3e3458ad33c415a7e9d4286a52b23429babae715afacc61a91185a309d78951cc617ad182cdb59aa53ce48dae9ce38f65c38c8364eaac88d92e478c9d +DIST lazygit-0.28.1.tar.gz 3222346 BLAKE2B 8cfb3cd59c991cefb3de652c49ef8bb0f94f7f1da6af9fa62e4288383ae14e64644a82fb8ca4d2037fa6b39a54b6b716b9851d42e023ea0a81e2b9d865f6df69 SHA512 8e477216f2f93b3e1d9a5d2c771d05a180e5f193a84afb6d8f93b6fa1d91a7efac89e6e43c5c1c0034c19a19f7e6dada6eed69402cabf5ca2860284fb2c6e232 diff --git a/dev-vcs/lazygit/lazygit-0.28.1.ebuild b/dev-vcs/lazygit/lazygit-0.28.1.ebuild new file mode 100644 index 0000000000..233a104b0c --- /dev/null +++ b/dev-vcs/lazygit/lazygit-0.28.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGO_PN="github.com/jesseduffield/lazygit" + +inherit golang-build golang-vcs-snapshot + +DESCRIPTION="Lazygit, a simple terminal UI for git commands" +HOMEPAGE="https://github.com/jesseduffield/lazygit" +SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +DEPEND=( sys-libs/glibc ) +RDEPEND=( + ${DEPEND} + dev-vcs/git +) + +DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md ) + +src_compile() { + GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die +} + +src_install() { + dobin bin/lazygit + + use doc && dodoc -r "src/${EGO_PN}/docs/." + einstalldocs +} From a44fb32a4adc6028b30a28b80d227d04ffb52fb2 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 21 Apr 2021 23:34:07 +0300 Subject: [PATCH 2/6] dev-vcs/lazygit: drop 0.27.2, 0.27.3 Signed-off-by: Sergey Torokhov --- dev-vcs/lazygit/Manifest | 2 -- dev-vcs/lazygit/lazygit-0.27.2.ebuild | 36 --------------------------- dev-vcs/lazygit/lazygit-0.27.3.ebuild | 36 --------------------------- 3 files changed, 74 deletions(-) delete mode 100644 dev-vcs/lazygit/lazygit-0.27.2.ebuild delete mode 100644 dev-vcs/lazygit/lazygit-0.27.3.ebuild diff --git a/dev-vcs/lazygit/Manifest b/dev-vcs/lazygit/Manifest index b9ca396a75..fe8620e719 100644 --- a/dev-vcs/lazygit/Manifest +++ b/dev-vcs/lazygit/Manifest @@ -1,6 +1,4 @@ DIST lazygit-0.25.1.tar.gz 2192584 BLAKE2B e2254ea3998f8be17f0c75d328975b30af21e1eddc070e6e1c2711b54e8a7e1a4f24d91a0eb80451480547d26c9b01ac23e43ea73d59cc4a6bcc158992c73987 SHA512 281a0e67b75c6dc69baf64bbcaeb20844874528564093ae2c64159d1c92eaaaebf73a176730fb80db9a2055cfcdd2c8ba77a12566ef94c182eb5ef16e2d677b9 DIST lazygit-0.26.1.tar.gz 2192018 BLAKE2B 9c48e6d0ee176ed1a49a684c4ad65ba139329c690af654508e866b6213ab3572d7f47915d849a0e65242f57b552568e1a34825a8050cd42e864d6b25f2e36559 SHA512 abdc8cfc509c77e4b7a249a32a000f3f80e9e5c11d26b48c3882fc49e9da1e477573590a16fa9c03ccb81d6342173f4abfa16031392d8180e7ca70071d503b3a -DIST lazygit-0.27.2.tar.gz 3214004 BLAKE2B fb6cdf0664ae5510c2bcca00f478a76bb3e4e69b6cc8714ab97d0cf1c638fef450e320b3072a8e3971847d55053245ad575466fcdf62942b176c1571d22f1bf1 SHA512 eba628a80465054355750cafc31ed31ea22356c548441c4397a9762efeddb752ce9be6f7a125333ad8d619aff0959226785bdb22b99d918da0f3ce1153fb59bc -DIST lazygit-0.27.3.tar.gz 3214304 BLAKE2B 05db27847fb90bd56f81055b55138a4266254aab76c52a95d5b6bd70d45741a1eeb84fe120e8ddd10c0b4f75cccc39c003bba8d5b577952968afd164331cecf4 SHA512 1379edd0c939d4e434a91d9508dd0895851503be06a9b86e9778e5fa27c7062db565d922b78db11b3eec46bf6261445002125dcff2b10e26d3a592c4420f3d16 DIST lazygit-0.27.4.tar.gz 3214405 BLAKE2B 123c2b7ca1bb63fa7d7a40b4c8a56b3f39b651c214ad55179dd07cd81588341589419759207263bbf809da89218e35d2c6185c79bcfd9ee59480ed66d67506dc SHA512 a053d4d3e3458ad33c415a7e9d4286a52b23429babae715afacc61a91185a309d78951cc617ad182cdb59aa53ce48dae9ce38f65c38c8364eaac88d92e478c9d DIST lazygit-0.28.1.tar.gz 3222346 BLAKE2B 8cfb3cd59c991cefb3de652c49ef8bb0f94f7f1da6af9fa62e4288383ae14e64644a82fb8ca4d2037fa6b39a54b6b716b9851d42e023ea0a81e2b9d865f6df69 SHA512 8e477216f2f93b3e1d9a5d2c771d05a180e5f193a84afb6d8f93b6fa1d91a7efac89e6e43c5c1c0034c19a19f7e6dada6eed69402cabf5ca2860284fb2c6e232 diff --git a/dev-vcs/lazygit/lazygit-0.27.2.ebuild b/dev-vcs/lazygit/lazygit-0.27.2.ebuild deleted file mode 100644 index 233a104b0c..0000000000 --- a/dev-vcs/lazygit/lazygit-0.27.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/jesseduffield/lazygit" - -inherit golang-build golang-vcs-snapshot - -DESCRIPTION="Lazygit, a simple terminal UI for git commands" -HOMEPAGE="https://github.com/jesseduffield/lazygit" -SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -DEPEND=( sys-libs/glibc ) -RDEPEND=( - ${DEPEND} - dev-vcs/git -) - -DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md ) - -src_compile() { - GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die -} - -src_install() { - dobin bin/lazygit - - use doc && dodoc -r "src/${EGO_PN}/docs/." - einstalldocs -} diff --git a/dev-vcs/lazygit/lazygit-0.27.3.ebuild b/dev-vcs/lazygit/lazygit-0.27.3.ebuild deleted file mode 100644 index 233a104b0c..0000000000 --- a/dev-vcs/lazygit/lazygit-0.27.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/jesseduffield/lazygit" - -inherit golang-build golang-vcs-snapshot - -DESCRIPTION="Lazygit, a simple terminal UI for git commands" -HOMEPAGE="https://github.com/jesseduffield/lazygit" -SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -DEPEND=( sys-libs/glibc ) -RDEPEND=( - ${DEPEND} - dev-vcs/git -) - -DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md ) - -src_compile() { - GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die -} - -src_install() { - dobin bin/lazygit - - use doc && dodoc -r "src/${EGO_PN}/docs/." - einstalldocs -} From 04597bc97614764b93a267628d0210043c91cae0 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Apr 2021 08:44:53 +0200 Subject: [PATCH 3/6] dev-libs/StringiFor: add missing deps Closes: https://bugs.gentoo.org/784935 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- dev-libs/StringiFor/StringiFor-1.1.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild index 4bd3e3887a..8b223574e0 100644 --- a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild +++ b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,6 +35,7 @@ IUSE="static-libs test" RESTRICT="!test? ( test )" DEPEND="dev-util/FoBiS" +BDEPEND="virtual/fortran" PATCHES=( "${FILESDIR}/stringifor-1.1.1_fobos_soname.patch" From 0ffb53eeefa6bf381d53880806503e27d275c240 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Apr 2021 08:49:05 +0200 Subject: [PATCH 4/6] kde-misc/skanpage: add missing dep Closes: https://bugs.gentoo.org/784947 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- kde-misc/skanpage/skanpage-2021.01.12.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-misc/skanpage/skanpage-2021.01.12.ebuild b/kde-misc/skanpage/skanpage-2021.01.12.ebuild index 46c6aca133..fbfed466e6 100644 --- a/kde-misc/skanpage/skanpage-2021.01.12.ebuild +++ b/kde-misc/skanpage/skanpage-2021.01.12.ebuild @@ -27,6 +27,7 @@ DEPEND=">=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 From 3238d97054d74e37ebc3a0256e508a259cfddd5c Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Apr 2021 09:15:53 +0200 Subject: [PATCH 5/6] www-servers/hinsightd: correctly depend on lua Closes: https://bugs.gentoo.org/784962 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- www-servers/hinsightd/hinsightd-0.9.0.ebuild | 20 +++++++++++--------- www-servers/hinsightd/hinsightd-9999.ebuild | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild index 5f85e2d08d..5bfcd1a68e 100644 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -10,30 +10,32 @@ inherit fcaps DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9" SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v0.9.0/hin9-v0.9.0.tar.gz" + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" + IUSE="" #+openssl +REQUIRED_USE="${LUA_REQUIRED_USE}" S="${WORKDIR}/hin9-v${PV}" BDEPEND=" -dev-util/ninja + dev-util/ninja " -RDEPEND=" -acct-user/hinsightd -acct-group/hinsightd -sys-libs/liburing -dev-lang/lua:* -sys-libs/zlib -dev-libs/openssl +RDEPEND="${LUA_DEPS} + acct-user/hinsightd + acct-group/hinsightd + sys-libs/liburing + sys-libs/zlib + dev-libs/openssl " DEPEND="${RDEPEND}" PATCHES=( -"${FILESDIR}/hinsightd-redefine-directories.patch" + "${FILESDIR}/hinsightd-redefine-directories.patch" ) #src_configure() { diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild index bdb8dbee6b..63a4c04ae0 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-9999.ebuild @@ -10,28 +10,30 @@ inherit git-r3 fcaps DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9" EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git" + LICENSE="BSD" SLOT="0" KEYWORDS="" + IUSE="" #+openssl +REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" -dev-util/ninja + dev-util/ninja " -RDEPEND=" -acct-user/hinsightd -acct-group/hinsightd -sys-libs/liburing -dev-lang/lua:* -sys-libs/zlib -dev-libs/openssl +RDEPEND="${LUA_DEPS} + acct-user/hinsightd + acct-group/hinsightd + sys-libs/liburing + sys-libs/zlib + dev-libs/openssl " DEPEND="${RDEPEND}" PATCHES=( -"${FILESDIR}/hinsightd-redefine-directories.patch" + "${FILESDIR}/hinsightd-redefine-directories.patch" ) #src_configure() { From ca360d58ba921295a28ff7550b7ebf62ba731968 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Apr 2021 09:26:12 +0200 Subject: [PATCH 6/6] app-misc/far2l: fix python dependencies Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- app-misc/far2l/far2l-2.3.20210419_alpha.ebuild | 7 ++++--- app-misc/far2l/far2l-9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild index 92570f24a5..46f3a6551f 100644 --- a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild +++ b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild @@ -3,13 +3,13 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_BUILD_TYPE="Release" WX_GTK_VER="3.0-gtk3" -inherit eutils cmake xdg-utils wxwidgets python-any-r1 +inherit cmake xdg-utils wxwidgets python-r1 DESCRIPTION="Linux port of Far Manager" HOMEPAGE="https://github.com/elfmz/far2l" @@ -30,6 +30,7 @@ fi LICENSE="GPL-2" SLOT="0" IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=">=dev-util/cmake-3.2.2 sys-devel/m4" @@ -92,4 +93,4 @@ pkg_postinst() { pkg_postrm() { xdg_icon_cache_update -} \ No newline at end of file +} diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild index 92570f24a5..46f3a6551f 100644 --- a/app-misc/far2l/far2l-9999.ebuild +++ b/app-misc/far2l/far2l-9999.ebuild @@ -3,13 +3,13 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_BUILD_TYPE="Release" WX_GTK_VER="3.0-gtk3" -inherit eutils cmake xdg-utils wxwidgets python-any-r1 +inherit cmake xdg-utils wxwidgets python-r1 DESCRIPTION="Linux port of Far Manager" HOMEPAGE="https://github.com/elfmz/far2l" @@ -30,6 +30,7 @@ fi LICENSE="GPL-2" SLOT="0" IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=">=dev-util/cmake-3.2.2 sys-devel/m4" @@ -92,4 +93,4 @@ pkg_postinst() { pkg_postrm() { xdg_icon_cache_update -} \ No newline at end of file +}