summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/diffoscope/diffoscope-214.ebuild2
-rw-r--r--dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild4
-rw-r--r--dev-util/pkgconf/pkgconf-9999.ebuild6
-rw-r--r--dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch25
-rw-r--r--dev-util/pkgdev/metadata.xml1
-rw-r--r--dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild68
-rw-r--r--dev-util/shfmt/Manifest8
-rw-r--r--dev-util/shfmt/metadata.xml10
-rw-r--r--dev-util/shfmt/shfmt-3.1.2.ebuild38
-rw-r--r--dev-util/shfmt/shfmt-3.5.0.ebuild50
-rw-r--r--dev-util/shfmt/shfmt-9999.ebuild50
11 files changed, 148 insertions, 114 deletions
diff --git a/dev-util/diffoscope/diffoscope-214.ebuild b/dev-util/diffoscope/diffoscope-214.ebuild
index f1a26fc25a81..04178f9c541a 100644
--- a/dev-util/diffoscope/diffoscope-214.ebuild
+++ b/dev-util/diffoscope/diffoscope-214.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index b4378ac99c5f..09d8dc93242b 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -7,9 +7,9 @@ inherit multilib multilib-minimal
if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
- EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
+ EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
else
- SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+ SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 8ac703ecfd4c..e22b60c8f2ed 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2021 Gentoo Authors
+# Copyright 2012-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,9 +7,9 @@ inherit multilib multilib-minimal
if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/pkgconf/pkgconf.git"
+ EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
else
- SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+ SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
fi
diff --git a/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch b/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
new file mode 100644
index 000000000000..9fddf8a768fb
--- /dev/null
+++ b/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
@@ -0,0 +1,25 @@
+https://github.com/pkgcore/pkgdev/commit/b780cf967804cb532421ef7cced5f1964224d8dd
+
+From: Arthur Zamarin <arthurzam@gentoo.org>
+Date: Mon, 23 May 2022 22:07:43 +0300
+Subject: [PATCH] docs: fix signoff example
+
+Fixes: https://github.com/pkgcore/pkgdev/issues/72
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/doc/man/config.rst
++++ b/doc/man/config.rst
+@@ -34,10 +34,10 @@ related values. To find all possible configuration options, run:
+ push.ask = true
+
+ - Add `Signed-off-by` consenting to the `Certificate of Origin <https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin>`_
+- to all commits for the 'gentoo' repository::
++ to all commits::
+
+- [gentoo]
+- push.signoff = true
++ [DEFAULT]
++ commit.signoff = true
+
+ - When committing, stage all files in current working directory (note that this
+ option doesn't expect value, therefore no value is defined post equal sign)::
+
diff --git a/dev-util/pkgdev/metadata.xml b/dev-util/pkgdev/metadata.xml
index b11f4864cd44..f6b4b97f46bb 100644
--- a/dev-util/pkgdev/metadata.xml
+++ b/dev-util/pkgdev/metadata.xml
@@ -15,4 +15,5 @@
</maintainer>
<origin>gentoo-staging</origin>
+ <stabilize-allarches/>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..d180e8f7224e
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+ # https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+ RDEPEND="
+ ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+ ~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+ ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+ "
+else
+ # https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+ RDEPEND="
+ >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+ >=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+ >=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
+ "
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-signoff-example.patch
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+ # We'll generate man pages ourselves
+ # Revisit when a release is made
+ # to pregenerate them, making USE=doc
+ # for generating the real HTML docs only.
+ if use doc ; then
+ cd doc || die
+ emake man
+ doman _build/man/*
+ fi
+
+ cd .. || die
+
+ # HTML pages only
+ sphinx_compile_all
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest
index 2a1bf631ebc5..418b8f58afae 100644
--- a/dev-util/shfmt/Manifest
+++ b/dev-util/shfmt/Manifest
@@ -1,2 +1,6 @@
-DIST shfmt-3.5.0-deps.tar.xz 3121980 BLAKE2B 411e7df230864d1692899b89c4b5e25f54582752a10bde30a8a5e1ae03da3b325353d9bab71b46795f3d285747fbbcc63dd367ecddc8055d5df45013c5f491ae SHA512 562fc2a58c0c115d132c9107c569f5139d7e1f817c91077b80151d0043601c328b083ce8261301689ce72deecabe3957bc11e4dc4388024234a2791c9f118743
-DIST shfmt-3.5.0.tar.gz 222262 BLAKE2B a54c91afd1da39084637aba43dc9e3af82c2c57dabdd3e24cd80bbfc5fed9632da0e98b5a65169dc439216218a4664afcc8dc77cd409f15a35cd0b505d39dd39 SHA512 9071a015369088dbba8eb7221305893095ebeaa72124e1ca964b7b1e6f34dedc9d11f2daa2f679d24637b04925cbf58427a24cc4885d8e918cb81844e71d3c6b
+DIST github.com-golang-sys-9197077.tar.gz 1540407 BLAKE2B d1ae2fbbbb1aba2db1b3bbab07ce6ca7a8eb43ea1e4fbf690348c9ba3e5bcbc48add0619430a08a273e70b5c0e4380c237108198ccf74a8ac6aa538fc6b6b20a SHA512 9bff781a71306cfe2f8791a309f39e7ad5a904b1b82cca0caab77cea19e517ecc9da97949e44ee24e74dfee9acae20e9f14b069ef7fabd3a1baf4db27b512985
+DIST github.com-golang-term-ad39bd3.tar.gz 3891 BLAKE2B 16c707e5b25296e3f0f700d644ebfc84bb602aaf9f8490110197f1a6e0d7a8ea1eadef497f7e09a7aa751162aefae4ca9343d9a3cf95addd4c1af54bb19b2afe SHA512 c23cd5da67a6734cc8fb8c9bbda7286581cdd7d0182a0a8ddcc999e256c2c41ee3c4aa10cd000e7bc6734c8be61e48c709acee005e4fae02df903f56ba1bb22c
+DIST github.com-google-renameio-f0e3298.tar.gz 9724 BLAKE2B 82e818a97eceb2d6917e5c1f21afe6284cc88d223b1af5992219d03dd6bc1f59a072413b913c3f6ffd2a919a40bf6c6db480bb36d7f15aafca513e156ab1f7fc SHA512 556d6df5328dde7aa46619fbe8cf2f1f00289544d1e96b23c97521d9f8b2773276c628a424f45f8d5720d17a3aec0080a3bbfcd3bcc8203ad30bac6a41a31b39
+DIST github.com-mvdan-editorconfig-e40951b.tar.gz 9303 BLAKE2B 46cefb76c0537c1dba29ed6ece9a8b29f9404c0adac03a08aa254de34a443a21c2302b5c8af6e71784a656cce04305e2085d06b9ac3ec9808cf00185ee84f458 SHA512 48c836caf69d8b751415ccc00b00451cc2aeed132b6f7662c3525bd059d6f231e78db789677e63b5f25637429f6eff4bd63ec7ace1b036293f22648d44038592
+DIST github.com-pkg-diff-5319263.tar.gz 11597 BLAKE2B 5be0365f1a3456710e4ad2e94da6b05b33fae6c8c611c7016568c6d2d3a8257994cc658320e25a8fd5e0ef9b02f9063dc73716ce68f9aba8425f92a0aefcca54 SHA512 63f5b5c1e0df55ceaecdd1988585639c3e5bfc4624e3ae85b419d3e3015a2de6944319636b387298b89ff406878ac26894aff66dd2837a670b1f6f999bafcdc6
+DIST shfmt-3.1.2.tar.gz 193379 BLAKE2B e970ccb34989e3272c9c937917370a1d60d3f19891d8cae1f390e69789755bec46ec6de17d5af77084150dc6c6ab4d6d2f9acb431d5da5dd3adbe5f5cd2b56ff SHA512 6e367a7a05c5e18d6de7f822ef181443b22d05f94a5fe5a0cf4759bc1e4a07dfac0e2704eb3025868e0f44c0e04a9cbd28dfe5a977381b2ba6fe274ac97ef29a
diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml
index c20d3da1c785..7cf1ac1fff23 100644
--- a/dev-util/shfmt/metadata.xml
+++ b/dev-util/shfmt/metadata.xml
@@ -2,12 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>ran.dall@icloud.com</email>
- <name>Randall Vasquez</name>
+ <email>toffanin.mauro@gmail.com</email>
+ <name>Mauro Toffanin</name>
+ <description>Maintainer. Assign bugs to him</description>
</maintainer>
- <longdescription lang="en">
- A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh.
- </longdescription>
- <origin>gentoo-guru-overlay</origin>
+ <origin>go-overlay</origin>
</pkgmetadata> \ No newline at end of file
diff --git a/dev-util/shfmt/shfmt-3.1.2.ebuild b/dev-util/shfmt/shfmt-3.1.2.ebuild
new file mode 100644
index 000000000000..dba936db29bc
--- /dev/null
+++ b/dev-util/shfmt/shfmt-3.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/mvdan"
+GOLANG_PKG_IMPORTPATH_ALIAS="mvdan.cc"
+GOLANG_PKG_NAME="sh"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_BUILDPATH="/cmd/${PN}"
+GOLANG_PKG_LDFLAGS="-X main.version=v${PV} -extldflags=-static"
+GOLANG_PKG_HAVE_TEST=1
+
+GOLANG_PKG_DEPENDENCIES=(
+ "github.com/google/renameio:f0e3298" #v0.1.0
+ "github.com/pkg/diff:5319263"
+ "github.com/mvdan/editorconfig:e40951b" #v0.1.1
+
+ "github.com/golang/sys:9197077 -> golang.org/x"
+ "github.com/golang/term:ad39bd3 -> golang.org/x"
+)
+
+inherit golang-single
+
+HOMEPAGE="https://github.com/mvdan/sh"
+DESCRIPTION="A shell parser and formatter for POSIX shell and bash"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+
+src_prepare() {
+ golang-single_src_prepare
+
+ golang_fix_importpath_alias \
+ "github.com/mvdan/editorconfig" \
+ "mvdan.cc/editorconfig"
+}
diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild b/dev-util/shfmt/shfmt-3.5.0.ebuild
deleted file mode 100644
index 96a20587ac5e..000000000000
--- a/dev-util/shfmt/shfmt-3.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Shell script formatter"
-HOMEPAGE="https://github.com/mvdan/sh"
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mvdan/sh.git"
- RESTRICT="fetch mirror test"
-else
- SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- RESTRICT="mirror test"
- S="${WORKDIR}/${PN//fmt}-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man"
-
-BDEPEND="man? ( app-text/scdoc )"
-
-src_unpack() {
- default
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_compile() {
- ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt"
- if use man; then
- scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed"
- fi
-}
-
-src_install() {
- dobin ${PN}
- if use man; then
- doman shfmt.1
- fi
-}
diff --git a/dev-util/shfmt/shfmt-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild
deleted file mode 100644
index 96a20587ac5e..000000000000
--- a/dev-util/shfmt/shfmt-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Shell script formatter"
-HOMEPAGE="https://github.com/mvdan/sh"
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mvdan/sh.git"
- RESTRICT="fetch mirror test"
-else
- SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- RESTRICT="mirror test"
- S="${WORKDIR}/${PN//fmt}-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man"
-
-BDEPEND="man? ( app-text/scdoc )"
-
-src_unpack() {
- default
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- go-module_live_vendor
- else
- go-module_src_unpack
- fi
-}
-
-src_compile() {
- ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt"
- if use man; then
- scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed"
- fi
-}
-
-src_install() {
- dobin ${PN}
- if use man; then
- doman shfmt.1
- fi
-}
generated by cgit v1.3 (git 2.53.0) at 2026-10-14 00:05:27 +0000