From b0c3c4da232bca79f4aaa22e9538522091fda135 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 14:45:18 +0800 Subject: [PATCH 01/11] sci-electronics/kactus2: improve ebuilds Make it fit the standards of gentoo GLEPs. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- sci-electronics/kactus2/kactus2-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild index 31f8ea4bcb..9841a91147 100644 --- a/sci-electronics/kactus2/kactus2-9999.ebuild +++ b/sci-electronics/kactus2/kactus2-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit xdg @@ -11,7 +11,7 @@ HOMEPAGE=" https://github.com/kactus2/kactus2dev " -if [[ ${PV} == "9999" ]] ; then +if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git" else From 059189ff0808d44b3e16fedff37022f156c206f1 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 14:46:09 +0800 Subject: [PATCH 02/11] sci-electronics/kactus2: improve ebuilds Make it fit the standards of gentoo GLEPs. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- sci-electronics/kactus2/kactus2-3.8.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/kactus2/kactus2-3.8.0.ebuild b/sci-electronics/kactus2/kactus2-3.8.0.ebuild index bc90e1b2a5..6e4e36c020 100644 --- a/sci-electronics/kactus2/kactus2-3.8.0.ebuild +++ b/sci-electronics/kactus2/kactus2-3.8.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit xdg @@ -11,7 +11,7 @@ HOMEPAGE=" https://github.com/kactus2/kactus2dev " -if [[ ${PV} == "9999" ]] ; then +if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git" else From 52b39a04b4c21dfe0c8e383990ad7f2d387fb1d3 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 14:47:10 +0800 Subject: [PATCH 03/11] sci-electronics/verilator: improve ebuilds Make it fit the standards of gentoo GLEPs. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- sci-electronics/verilator/verilator-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/verilator/verilator-9999.ebuild b/sci-electronics/verilator/verilator-9999.ebuild index 7d157a4e4f..10df06610e 100644 --- a/sci-electronics/verilator/verilator-9999.ebuild +++ b/sci-electronics/verilator/verilator-9999.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit autotools DESCRIPTION="The fast free Verilog/SystemVerilog simulator" HOMEPAGE="https://www.veripool.org/wiki/verilator" -if [[ ${PV} == "9999" ]] ; then +if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.veripool.org/git/${PN}" else From 1e837779e64f240ae77883a7988da56f3ce2f381 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 14:47:54 +0800 Subject: [PATCH 04/11] sci-electronics/verilator: improve ebuilds Make it fit the standards of gentoo GLEPs. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- sci-electronics/verilator/verilator-4.032.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/verilator/verilator-4.032.ebuild b/sci-electronics/verilator/verilator-4.032.ebuild index 7d157a4e4f..10df06610e 100644 --- a/sci-electronics/verilator/verilator-4.032.ebuild +++ b/sci-electronics/verilator/verilator-4.032.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit autotools DESCRIPTION="The fast free Verilog/SystemVerilog simulator" HOMEPAGE="https://www.veripool.org/wiki/verilator" -if [[ ${PV} == "9999" ]] ; then +if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.veripool.org/git/${PN}" else From 67687f28350e23d05961e0acb9367be73c7132fa Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 15:19:55 +0800 Subject: [PATCH 05/11] media-video/kikoplay: fix broken package https://github.com/gentoo/guru/issues/9 https://github.com/gentoo/guru/commit/3f02df8d445c5e5a9a6c24f6782ff4aadec12475 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- media-video/kikoplay/kikoplay-0.6.1.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/media-video/kikoplay/kikoplay-0.6.1.ebuild b/media-video/kikoplay/kikoplay-0.6.1.ebuild index 12ed8d4e08..cb5eda871d 100644 --- a/media-video/kikoplay/kikoplay-0.6.1.ebuild +++ b/media-video/kikoplay/kikoplay-0.6.1.ebuild @@ -25,9 +25,12 @@ fi LICENSE="GPL-3" SLOT="0" -#not available -# dev-lang/lua:5.3 +# Please unmask dev-lang/lua:5.3 in /etc/portage/package.unmask/lua +# Waiting for dev-lang/lua:5.3 unmasked in ::gentoo +# With out dev-lang/lua:5.3, this package can't work +# See also: https://github.com/gentoo/guru/issues/9 RDEPEND=" + dev-lang/lua:5.3 dev-libs/qhttpengine:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -55,3 +58,4 @@ src_install() { # Can't use default, set INSTALL_ROOT emake INSTALL_ROOT="${D}" install } + From be15bef7b8c30cce0099c2ee01a1f61e0df6addd Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 15:21:12 +0800 Subject: [PATCH 06/11] media-video/kikoplay: fix broken package https://github.com/gentoo/guru/issues/9 https://github.com/gentoo/guru/commit/3f02df8d445c5e5a9a6c24f6782ff4aadec12475 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- media-video/kikoplay/kikoplay-9999.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/media-video/kikoplay/kikoplay-9999.ebuild b/media-video/kikoplay/kikoplay-9999.ebuild index 68d32c6109..f720f986a6 100644 --- a/media-video/kikoplay/kikoplay-9999.ebuild +++ b/media-video/kikoplay/kikoplay-9999.ebuild @@ -18,16 +18,19 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git" else SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86" S="${WORKDIR}/${GIT_PN}-${PV}" fi LICENSE="GPL-3" SLOT="0" -#not available -# dev-lang/lua:5.3 +# Please unmask dev-lang/lua:5.3 in /etc/portage/package.unmask/lua +# Waiting for dev-lang/lua:5.3 unmasked in ::gentoo +# With out dev-lang/lua:5.3, this package can't work +# See also: https://github.com/gentoo/guru/issues/9 RDEPEND=" + dev-lang/lua:5.3 dev-libs/qhttpengine:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 From 45e2cad77e43c74dbe58daa5720f2e381c189878 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 15:27:20 +0800 Subject: [PATCH 07/11] media-video/kikoplay: improve ebuilds Make it fit the standards of gentoo GLEPs. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- media-video/kikoplay/kikoplay-0.6.1.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-video/kikoplay/kikoplay-0.6.1.ebuild b/media-video/kikoplay/kikoplay-0.6.1.ebuild index cb5eda871d..05c327c60d 100644 --- a/media-video/kikoplay/kikoplay-0.6.1.ebuild +++ b/media-video/kikoplay/kikoplay-0.6.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" GIT_PN="KikoPlay" @@ -13,7 +13,7 @@ HOMEPAGE=" https://github.com/Protostars/KikoPlay " -if [[ ${PV} == "9999" ]] ; then +if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git" else @@ -58,4 +58,3 @@ src_install() { # Can't use default, set INSTALL_ROOT emake INSTALL_ROOT="${D}" install } - From 5d4e6f975f08f7aded9f68c31bbada734bf98d6c Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 15:30:33 +0800 Subject: [PATCH 08/11] media-video/kikoplay: improve ebuilds Make it fit the standards of gentoo GLEPs. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- media-video/kikoplay/kikoplay-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/kikoplay/kikoplay-9999.ebuild b/media-video/kikoplay/kikoplay-9999.ebuild index f720f986a6..05c327c60d 100644 --- a/media-video/kikoplay/kikoplay-9999.ebuild +++ b/media-video/kikoplay/kikoplay-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" GIT_PN="KikoPlay" @@ -13,7 +13,7 @@ HOMEPAGE=" https://github.com/Protostars/KikoPlay " -if [[ ${PV} == "9999" ]] ; then +if [[ "${PV}" == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git" else From 7f3fa9f16cb354eaee973bd2a04f56eefd776cbb Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 15:33:12 +0800 Subject: [PATCH 09/11] guru/profiles/package.mask: after full test kikoplay works We can't simply and roughly mask a software that depends on slotted lua without detailed investigation, because even in ::gentoo there are still many softwares that depend on lua:5.1, lua:5.2, lua:5.3, now lua5.4 is released. This is the discussion: https://github.com/gentoo/guru/issues/9 This is extremely strange and unreasonable for blocking lua:5.1, lua:5.2, lua:5.3 in ::gentoo, Many excellent software which using latest lua may blocked. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- profiles/package.mask | 2 -- 1 file changed, 2 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index e7631a9c36..e69de29bb2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,2 +0,0 @@ -#depend on lua5.3 that is not available -media-video/kikoplay From d48028bb7b02dda0aced9d3588482b222e77176c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 27 Apr 2020 10:17:30 +0200 Subject: [PATCH 10/11] app-misc/cheat: override src_test function default `make check` will run a formatting command using an external command (not available yet on Guru overlay) Package-Manager: Portage-2.3.89, Repoman 2.3.20 Signed-off-by: Mathieu Tortuyaux --- app-misc/cheat/cheat-3.9.0-r1.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app-misc/cheat/cheat-3.9.0-r1.ebuild b/app-misc/cheat/cheat-3.9.0-r1.ebuild index 5644e85494..ab71b1786c 100644 --- a/app-misc/cheat/cheat-3.9.0-r1.ebuild +++ b/app-misc/cheat/cheat-3.9.0-r1.ebuild @@ -99,6 +99,13 @@ BDEPEND=" " RDEPEND="zsh-completion? ( !app-shells/zsh-completions )" +src_test() { + # we can't use the default behavior + # since the check rule performs formatting + # with a non-standard go tool + emake test +} + src_install() { dobin "dist/${PN}" if use zsh-completion; then From 2db2900e7ce0cb53498d7063abc7dfa91805514c Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 27 Apr 2020 17:15:36 +0800 Subject: [PATCH 11/11] guru/profiles/package.mask: kikoplay works, but masked for repoman check Even in ::gentoo there are still many softwares that depend on lua:5.1, lua:5.2, lua:5.3, now lua5.4 is released. This is the discussion: https://github.com/gentoo/guru/issues/9 This is extremely strange and unreasonable for blocking lua:5.1, lua:5.2, lua:5.3 in ::gentoo, Many excellent software which using latest lua may blocked. This package should unmask when lua:5.3 unmasked. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Huang Rui --- profiles/package.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index e69de29bb2..1c7ef8267b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -0,0 +1,4 @@ +# Huang Rui (2020-04-27) +# Requires >=dev-lang/lua-5.3 which is masked +# User should unmask dev-lang/lua-5.3 and media-video/kikoplay to install +media-video/kikoplay