summaryrefslogtreecommitdiff
path: root/dev-vcs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-02-04 23:42:56 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-02-04 23:42:56 +0000
commit7b43cd44c0c26cd9e0ae1dcd94596667cb119ee6 (patch)
tree9715703a1ec2185bfa303bd2d2b04e560654f72a /dev-vcs
parent27ad6a285576ce16e4c74d806efee77166f0c3c6 (diff)
gentoo auto-resync : 04:02:2024 - 23:42:56
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/Manifest.gzbin11514 -> 11512 bytes
-rw-r--r--dev-vcs/git-merge-changelog/Manifest4
-rw-r--r--dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild24
-rw-r--r--dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild5
4 files changed, 5 insertions, 28 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 8838a18042a0..1b619494055b 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
Binary files differ
diff --git a/dev-vcs/git-merge-changelog/Manifest b/dev-vcs/git-merge-changelog/Manifest
index 994405f5e9fa..59c6ed87a966 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1,5 +1,3 @@
-DIST git-merge-changelog-20221207.tar.xz 387656 BLAKE2B 0003c204bad0f0f99127a6c651cf7a03ffbcce0feda33c4be63fae4cc00405cfbb843c1b38512a226497944ce33b7025da8d8526db929b819b3715534975a708 SHA512 00cc855742f23adb109f7edb57be2dbb1a90dd549e46b165064aaaf6ba94470ffa16bb4aa05dbec6bbd2de9a61a77bb9c150a3447328ea0fea78b92c61b96004
DIST git-merge-changelog-20231121.tar.xz 405840 BLAKE2B ec8bcb49c287af9c96301bf1bbc30a885a65c0864420cc76237f5d53e9c49a348f4450f42ddaaa33a260afe6b5d8fe25b9ace6d9ee2a2f47b7b044513c4a0512 SHA512 fcfb171e17cb4f0c0c37289167ceb0af1d32220947f8a1a00b5bce1d8f4ba8f9c626cd864ca5901f915a5f5a398fdf6af7ce3681dbc29a39c5df429324d40c84
-EBUILD git-merge-changelog-20221207.ebuild 736 BLAKE2B 77430e11ff7d4cfc3f994738d0fd6148817fe5928642fb1b9cc1e0770fd1f43f0916e05faeb128e70c6aa083a574bd6969a4a779a6474213f43196f1f9c4eb1c SHA512 380827b0448f1bc5b2036e281d4fd09c2608e71f5210473b37e4da0ee5d244c253d6bdb82c3620f608189e4140d6e3f97bf5a37a54683a2e65416c6daac4ab81
-EBUILD git-merge-changelog-20231121.ebuild 736 BLAKE2B cac2470cff7a7741ee98878dea8deb00afdffb43e7196cb7caa3634f915802203b265262440354a6b1499ac786fb71dbf6aef2402d8c855bd46a5bfde086ca3c SHA512 515167132b2c1042d09c22baf20bc3af0555bcdcba7ad12a2408c0ebbac5ce62c58c93bdd704168a78a2e66fd472aabc8b66ff541a819527ce33557e40d8c8ac
+EBUILD git-merge-changelog-20231121.ebuild 842 BLAKE2B 1e3dc81212e4569f8bac7f8b7911ba9156bc5f3246ae3582a42ddde18f136afe37b23487a84626d7064503a3668b39f8596f993009616b4802e9b1a8a6d84800 SHA512 b6c52e3accb4d18106579c52ab2a2a5ead91dbd415ba7e2ab933f7b1569bb4bbb7e42b1ed9f2a7128a6c88283fb352e2f0a5e4743ed710744a2b15bffa469e3d
MISC metadata.xml 213 BLAKE2B 6036cc110b019327f9dd87b41589f79741c81103107f730c22d93ae87dcf3a53d141e19e6f1021d9b4cfda1d9e3bd541104aab5859b5fb28a5e0c2833f8cdd88 SHA512 7f3e93fdb41d7bbc35f196c2f2cafe0fef3c7b4d4b1746274ce8d131a602b3534d85bd8c1f2db022ed338321a5e65230bcbe8d0471d9826025728d75ae411158
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild
deleted file mode 100644
index 46bde6e2626b..000000000000
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
-# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
-# cd ${PN}; ./configure; make maintainer-clean
-
-EAPI=8
-
-DESCRIPTION="Git merge driver for GNU style ChangeLog files"
-HOMEPAGE="https://www.gnu.org/software/gnulib/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_install() {
- emake DESTDIR="${D}" install
- sed -n "/README/{h;:x;n;/^#/!{H;bx;};g;s/\n*$//;\
- s:/usr/local:${EPREFIX}/usr:g;p;q;}" gllib/git-merge-changelog.c \
- | newdoc - README; assert
-}
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild
index b1c438ea05d8..15f624ddc9e9 100644
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
@@ -16,6 +16,9 @@ LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+# Suppress false positive QA warnings #923767
+QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert unreachable )
+
src_install() {
emake DESTDIR="${D}" install
sed -n "/README/{h;:x;n;/^#/!{H;bx;};g;s/\n*$//;\