[gentoo-commits] repo/gentoo:master commit in: dev-vcs/reposurgeon/, dev-vcs/reposurgeon/files/

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/reposurgeon/, dev-vcs/reposurgeon/files/

[Arthur Zamarin]

commit:     041d982bf5e8d9a59b6125cec44eb873e8e66262
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri Jul  5 06:44:18 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 12:37:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041d982b

dev-vcs/reposurgeon: add 5.3

Closes: https://bugs.gentoo.org/344261
Closes: https://bugs.gentoo.org/835749
Closes: https://bugs.gentoo.org/844466
Closes: https://bugs.gentoo.org/912430
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37442
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-vcs/reposurgeon/Manifest                       |  2 +
 .../reposurgeon-5.3-disable-obsolete-golint.patch  | 12 ++++
 dev-vcs/reposurgeon/metadata.xml                   |  2 +-
 dev-vcs/reposurgeon/reposurgeon-5.3.ebuild         | 66 ++++++++++++++++++++++
 4 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/reposurgeon/Manifest b/dev-vcs/reposurgeon/Manifest
index 8a2dd6f7b26b..201c58dd89f8 100644
--- a/dev-vcs/reposurgeon/Manifest
+++ b/dev-vcs/reposurgeon/Manifest
@@ -277,4 +277,6 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST reposurgeon-4.27.tar.xz 792132 BLAKE2B e51db1f4f0b8d666238c7f6f2b523e9c26028d140ce63ebccbec1ad22a9fb8597f33e56320b7a1b30b0fbd8e85360d858fe1913b787b2a2ddc501bd7f7bd3e73 SHA512 10b692aebb7d16f24ad30dc1923056e78da4c10734524005df3a5cc97128818c95979e20fb55231a29710248e5093988ab070f5213076f9cf578139b737833db
+DIST reposurgeon-5.3-vendor.tar.xz 843120 BLAKE2B c41a8da5b3f763eff50f625e4bc274bbde206c77eb99105bcc450cb9580719ea0da86546c8c5780526d9c5a5060b395ad20474070fd177908e5f0515f3cdb1db SHA512 bfa790766d30ed1cb886093f286e249768dbfde648aebef08cfd44de83e3450d2fda126656bb6a0c286807afcad07189e5e9e100ccdaefe191d2792ba37a4048
+DIST reposurgeon-5.3.tar.xz 833136 BLAKE2B 1410b7e1798d390b8cc43f9d9dacf3a58b50e64b1654ad1178857bfc900baf786d7e3d4854d80cd1811431c522eed41674900aa2c184bdd07fda235d47fad2a8 SHA512 fbce630f0d07406179ee1d8849164aa2f286feb292fcada8f0a063d86522fb1de4a6c233ac28f9d69bfd3971b0ec2bc3419f37bbfb2366efeed3948406692d45
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f

diff --git a/dev-vcs/reposurgeon/files/reposurgeon-5.3-disable-obsolete-golint.patch b/dev-vcs/reposurgeon/files/reposurgeon-5.3-disable-obsolete-golint.patch
new file mode 100644
index 000000000000..8840d0762ebd
--- /dev/null
+++ b/dev-vcs/reposurgeon/files/reposurgeon-5.3-disable-obsolete-golint.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 8ada038e..c0b6ea57 100644
+--- a/Makefile
++++ b/Makefile
+@@ -257,7 +257,6 @@ test:
+ 	go test $(TESTOPTS) ./cutter
+ 
+ lint:
+-	golint -set_exit_status ./...
+ 	shellcheck -f gcc repobench test/fi-to-fi test/liftcheck test/singlelift test/svn-to-git test/svn-to-svn test/delver test/*.sh test/*test test/mvtest
+ 
+ fmt:

diff --git a/dev-vcs/reposurgeon/metadata.xml b/dev-vcs/reposurgeon/metadata.xml
index 501e3f40383b..17433fe18a6e 100644
--- a/dev-vcs/reposurgeon/metadata.xml
+++ b/dev-vcs/reposurgeon/metadata.xml
@@ -5,6 +5,6 @@
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://gitlab.com/esr/reposurgeon/issues</bugs-to>
+		<bugs-to>https://gitlab.com/esr/reposurgeon/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild b/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild
new file mode 100644
index 000000000000..196284ef04ce
--- /dev/null
+++ b/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool for editing VCS repositories and translating among different systems"
+HOMEPAGE="http://www.catb.org/~esr/reposurgeon/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://gitlab.com/esr/reposurgeon.git"
+	inherit git-r3
+else
+	SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.xz"
+# This server is not accessible from the Internet. Delete this comment
+# and line below it, and follow the directions in the next comment
+#	SRC_URI+=" http://ardvarc.coronya.com/~salahx/${P}-vendor.tar.xz"
+# Fill the URL in with the generated Go depenency tarball.
+	SRC_URI+=" http://dev.gentoo.org/~whoever/../${P}-vendor.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit go-module
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xmlto
+	app-text/asciidoc
+	dev-ruby/asciidoctor"
+
+BDEPEND="test? ( dev-vcs/subversion
+		|| (	dev-util/shellcheck-bin
+			dev-util/shellcheck )
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.3-disable-obsolete-golint.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -e 's/GOFLAGS/MY_GOFLAGS/g' \
+	    -i "${S}/Makefile" || die
+}
+
+src_compile() {
+	GOFLAGS="-mod=vendor" emake all
+}
+
+src_install() {
+	emake DESTDIR="${ED}" prefix="/usr" docdir="share/doc/${P}" install
+}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/reposurgeon/, dev-vcs/reposurgeon/files/

[Arthur Zamarin]

commit:     ffacaf1529faaef55f48ed2a13f6acf8d8a34536
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 12:35:08 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 12:37:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffacaf15

dev-vcs/reposurgeon: refactor after merge

- remove golint patch and shellcheck dep, by callind directly make test
- move all DEPEND to BDEPEND - they are needed as build tool to be
  called during compile
- make tests verbose
- upload vendor tarball to my devspace (regenerated again by me)
- organize declares

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-vcs/reposurgeon/Manifest                       |  2 +-
 .../reposurgeon-5.3-disable-obsolete-golint.patch  | 12 -----
 dev-vcs/reposurgeon/reposurgeon-5.3.ebuild         | 61 +++++++---------------
 3 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/dev-vcs/reposurgeon/Manifest b/dev-vcs/reposurgeon/Manifest
index 201c58dd89f8..a6a7bd8eccf9 100644
--- a/dev-vcs/reposurgeon/Manifest
+++ b/dev-vcs/reposurgeon/Manifest
@@ -277,6 +277,6 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST reposurgeon-4.27.tar.xz 792132 BLAKE2B e51db1f4f0b8d666238c7f6f2b523e9c26028d140ce63ebccbec1ad22a9fb8597f33e56320b7a1b30b0fbd8e85360d858fe1913b787b2a2ddc501bd7f7bd3e73 SHA512 10b692aebb7d16f24ad30dc1923056e78da4c10734524005df3a5cc97128818c95979e20fb55231a29710248e5093988ab070f5213076f9cf578139b737833db
-DIST reposurgeon-5.3-vendor.tar.xz 843120 BLAKE2B c41a8da5b3f763eff50f625e4bc274bbde206c77eb99105bcc450cb9580719ea0da86546c8c5780526d9c5a5060b395ad20474070fd177908e5f0515f3cdb1db SHA512 bfa790766d30ed1cb886093f286e249768dbfde648aebef08cfd44de83e3450d2fda126656bb6a0c286807afcad07189e5e9e100ccdaefe191d2792ba37a4048
+DIST reposurgeon-5.3-deps.tar.xz 6322060 BLAKE2B 0471e4cf314c2343c329ebe7d56e688017dc9a463f42c56846f392d6248801fadaa5cc053de8df23b1d294d51a7b0b0559a243a37a30b7c4a85687785255265f SHA512 e4d4beb55d64d2ed9ae4e93a36b084cb9ec6d69b1454eed253a20fd74afacd0b045637c92444c946ee2da0838e7bc142f264788208a0f3ad8ec4eeed230728f4
 DIST reposurgeon-5.3.tar.xz 833136 BLAKE2B 1410b7e1798d390b8cc43f9d9dacf3a58b50e64b1654ad1178857bfc900baf786d7e3d4854d80cd1811431c522eed41674900aa2c184bdd07fda235d47fad2a8 SHA512 fbce630f0d07406179ee1d8849164aa2f286feb292fcada8f0a063d86522fb1de4a6c233ac28f9d69bfd3971b0ec2bc3419f37bbfb2366efeed3948406692d45
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f

diff --git a/dev-vcs/reposurgeon/files/reposurgeon-5.3-disable-obsolete-golint.patch b/dev-vcs/reposurgeon/files/reposurgeon-5.3-disable-obsolete-golint.patch
deleted file mode 100644
index 8840d0762ebd..000000000000
--- a/dev-vcs/reposurgeon/files/reposurgeon-5.3-disable-obsolete-golint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 8ada038e..c0b6ea57 100644
---- a/Makefile
-+++ b/Makefile
-@@ -257,7 +257,6 @@ test:
- 	go test $(TESTOPTS) ./cutter
- 
- lint:
--	golint -set_exit_status ./...
- 	shellcheck -f gcc repobench test/fi-to-fi test/liftcheck test/singlelift test/svn-to-git test/svn-to-svn test/delver test/*.sh test/*test test/mvtest
- 
- fmt:

diff --git a/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild b/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild
index 196284ef04ce..6849230d5d1d 100644
--- a/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild
+++ b/dev-vcs/reposurgeon/reposurgeon-5.3.ebuild
@@ -3,64 +3,39 @@
 
 EAPI=8
 
+inherit go-module
+
 DESCRIPTION="Tool for editing VCS repositories and translating among different systems"
 HOMEPAGE="http://www.catb.org/~esr/reposurgeon/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://gitlab.com/esr/reposurgeon.git"
-	inherit git-r3
-else
-	SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.xz"
-# This server is not accessible from the Internet. Delete this comment
-# and line below it, and follow the directions in the next comment
-#	SRC_URI+=" http://ardvarc.coronya.com/~salahx/${P}-vendor.tar.xz"
-# Fill the URL in with the generated Go depenency tarball.
-	SRC_URI+=" http://dev.gentoo.org/~whoever/../${P}-vendor.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit go-module
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-vcs/${PN}/${P}-deps.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xmlto
-	app-text/asciidoc
-	dev-ruby/asciidoctor"
-
-BDEPEND="test? ( dev-vcs/subversion
-		|| (	dev-util/shellcheck-bin
-			dev-util/shellcheck )
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.3-disable-obsolete-golint.patch"
-)
-
 RESTRICT="!test? ( test )"
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		default
-	fi
-}
+BDEPEND="
+	app-text/xmlto
+	dev-ruby/asciidoctor
+	virtual/pkgconfig
+	test? ( dev-vcs/subversion )
+"
 
 src_prepare() {
 	default
-	sed -e 's/GOFLAGS/MY_GOFLAGS/g' \
-	    -i "${S}/Makefile" || die
+	sed -e 's/GOFLAGS/MY_GOFLAGS/g' -i "${S}/Makefile" || die
 }
 
 src_compile() {
-	GOFLAGS="-mod=vendor" emake all
+	emake all
+}
+
+src_test() {
+	emake TESTOPTS="-v" test
 }
 
 src_install() {
-	emake DESTDIR="${ED}" prefix="/usr" docdir="share/doc/${P}" install
+	emake DESTDIR="${ED}" prefix="/usr" docdir="share/doc/${PF}" install
 }