gentoo auto-resync : 20:11:2023 - 11:14:01

4 files changed, 28 insertions, 15 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 01c0281044fe..034e99e0d257 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 1a5c2266ec10..3e29576abdd6 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,5 +1,6 @@
-DIST cvs-fast-export-1.57.tar.gz 503473 BLAKE2B 06d5b03d550be9604a04b4f03cd19d06abbe84efb6fbb424a3ae8c58f2964dff31e1718baf61adf70fe17c2beb6753cdd0fba9e0e1a5ba5e9d8ae7b87721a336 SHA512 bb129d58a66ca8aa9feb6dcdf6d83553ed1099d6023041c4fb8fa9b923461b6eb9e59ec304b3443f754d7710a2655fd2c104cbaa5ac604ee471de727b92fc091
+AUX cvs-fast-export-1.61-Makefile.patch 677 BLAKE2B 8823e5ce499239b6e0aec24b19ba0397ecde368194e735ccf9f4d19f32a9ea823158888e567be2f177d83ed2a53c82ab8d7ed40d8d6fbe440f00f8235763ca36 SHA512 e1d3aa999b4dfe82afe41269c716c124ed2266e543c699d6e20b89dc90dd8319c68072eb364e400e724564222065be872add9ba393283a81c03e6d05a227dcb4
 DIST cvs-fast-export-1.59.tar.gz 514934 BLAKE2B 2e9f42eb948c917785f80596bf176cde8265555c8808fa8c7a297217dba6eb36f8de6cebc192ebb0bd513e3c288beefad01d04cd59a72176377851b00a25419a SHA512 3fd4455c61b9065b784396683bea6ca6fcae8509fabd72531d1dba7d733e1fedeb9307b99d02f03eb3d19e9b024f2c53e2a15062b46d96fe58ab90651ff94bc5
-EBUILD cvs-fast-export-1.57.ebuild 931 BLAKE2B 439b7f5ba4c6bdc8c09dc0f8906db1faba85dc08eaf63a3c3c9859f6d10781bb5857493a7580da3167e7d87c185eb7dff502a98b1335f0b8b19719742b1b64b0 SHA512 d53f87163c8447025b3cb5e3fd7b3474c4cf0bf832f9d027a0b878daf73314cd304652235d33b956e960fe094d4c19683d797c9c48507b6b026deb3949a02960
+DIST cvs-fast-export-1.61.tar.gz 525785 BLAKE2B 64089fe0f99e247505152ad20c618a721917fabcf28e29ede330e89d9ffc3b05e314e09deb85c9c23de95acfa6193a6dd67636374862d58df231e06fd8313f09 SHA512 505a305b3f383a9df0f519ec0bbf92d5fbd2759b5be39b3eced898a00bd06290f2905e6add49c992ff69fdf468f6c83e15e8810bdf12d08eec0289aa7930df4e
 EBUILD cvs-fast-export-1.59.ebuild 931 BLAKE2B e4b6b099b2e570496a696e645618e60916a7d68dd3d94e8ce839bfea15e7ab5948201fdee0a0e63906dbe29b8d6496acbce87d9d8485dfd36f0fd8a36582a58b SHA512 d2e614eba89ba9dbb79ffede1b982089dfdf768230f3179bb5f5f73a64a67f6869a0f0e7308ccc96f12d18592554eee177bc5ed1201348846c00ba901518d137
+EBUILD cvs-fast-export-1.61.ebuild 848 BLAKE2B d374b5e384ea2213f0fc181bf38736659a2c23e3b39c27b1568710ac501bda394e56227944f2d8144d27b0187691842dc71f8f5e898a106e14be1fd068b0eadd SHA512 eabe76b8ad40c852884b4a8c190dbbfacdf21cb4d1fd4872780f735d432d47ac1198594f98168cc195b7265289aea020c72a914c5f30c38a4320f4c0b7479ddd
 MISC metadata.xml 213 BLAKE2B 6036cc110b019327f9dd87b41589f79741c81103107f730c22d93ae87dcf3a53d141e19e6f1021d9b4cfda1d9e3bd541104aab5859b5fb28a5e0c2833f8cdd88 SHA512 7f3e93fdb41d7bbc35f196c2f2cafe0fef3c7b4d4b1746274ce8d131a602b3534d85bd8c1f2db022ed338321a5e65230bcbe8d0471d9826025728d75ae411158
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.61.ebuild
index 54fb82e4114e..29ba3be62c3e 100644
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.61.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,24 +12,16 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+RESTRICT=test # upstream does not ship some tests in tarball
 
 BDEPEND="app-text/asciidoc"
 
-RESTRICT=test # upstream does not ship some tests in tarball
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
 
 src_prepare() {
 	default
-
 	tc-export CC
 	export prefix="${EPREFIX}"/usr
-
-	# respect CC, CFLAGS and LDFLAGS
-	sed \
-		-e 's/cc /$(CC) $(LDFLAGS) /' \
-		-e 's/^CFLAGS += -O/#&/' \
-		-e 's/CFLAGS=/CFLAGS+=/' \
-		-i Makefile || die
 }
 
 src_compile() {
@@ -42,5 +34,5 @@ src_compile() {
 
 src_install() {
 	default
-	dodoc README.adoc
+	dodoc {NEWS,README,TODO,hacking,reporting-bugs}.adoc
 }
diff --git a/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.61-Makefile.patch b/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.61-Makefile.patch
new file mode 100644
index 000000000000..13ceeb3ccc3b
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.61-Makefile.patch
@@ -0,0 +1,20 @@
+--- cvs-fast-export-1.61/Makefile
++++ cvs-fast-export-1.61/Makefile
+@@ -36,7 +36,7 @@
+ GCC_WARNINGS2=-Wmissing-prototypes -Wmissing-declarations
+ GCC_WARNINGS3=-Wno-unused-function -Wno-unused-label -Wno-format-zero-length
+ GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3)
+-CFLAGS += $(GCC_WARNINGS)
++#CFLAGS += $(GCC_WARNINGS)
+ CPPFLAGS += -I. -I$(srcdir)
+ #LIBS=-lrt
+ CPPFLAGS += -DVERSION=\"$(VERSION)\"
+@@ -83,7 +83,7 @@
+ # CFLAGS += -O2
+ # If your toolchain supports link time optimization this is a cheap speedup
+ # CFLAGS += -flto
+-CFLAGS += -g
++# CFLAGS += -g
+ # Test coverage flags
+ # CFLAGS += -ftest-coverage -fprofile-arcs
+ CFLAGS += $(EXTRA_CFLAGS)