[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2024-02-04 Thread Ulrich Müller 
commit: a3c9292758e421425376bcdd100c78994c3c8a29
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb  4 16:15:15 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb  4 20:12:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3c92927

dev-vcs/git-merge-changelog: drop 20221207

Signed-off-by: Ulrich Müller  gentoo.org>

 dev-vcs/git-merge-changelog/Manifest   |  1 -
 .../git-merge-changelog-20221207.ebuild| 24 --
 2 files changed, 25 deletions(-)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index 672883b18b68..64b8c150dd26 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1,2 +1 @@
-DIST git-merge-changelog-20221207.tar.xz 387656 BLAKE2B 
0003c204bad0f0f99127a6c651cf7a03ffbcce0feda33c4be63fae4cc00405cfbb843c1b38512a226497944ce33b7025da8d8526db929b819b3715534975a708
 SHA512 
00cc855742f23adb109f7edb57be2dbb1a90dd549e46b165064aaaf6ba94470ffa16bb4aa05dbec6bbd2de9a61a77bb9c150a3447328ea0fea78b92c61b96004
 DIST git-merge-changelog-20231121.tar.xz 405840 BLAKE2B 
ec8bcb49c287af9c96301bf1bbc30a885a65c0864420cc76237f5d53e9c49a348f4450f42ddaaa33a260afe6b5d8fe25b9ace6d9ee2a2f47b7b044513c4a0512
 SHA512 
fcfb171e17cb4f0c0c37289167ceb0af1d32220947f8a1a00b5bce1d8f4ba8f9c626cd864ca5901f915a5f5a398fdf6af7ce3681dbc29a39c5df429324d40c84

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..
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2024-02-04 Thread Ulrich Müller 
commit: 5d32577342372fc47f2f40025d86af9378f4125b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb  4 16:14:29 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb  4 20:12:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d325773

dev-vcs/git-merge-changelog: Suppress false positive QA warnings

Bug: https://bugs.gentoo.org/923767
Signed-off-by: Ulrich Müller  gentoo.org>

 dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

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*$//;\

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2023-11-22 Thread Ulrich Müller 
commit: bc2dbae34890bbedff0add76cc4dc2e6d4434e46
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Nov 22 19:50:49 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Nov 22 19:50:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2dbae3

dev-vcs/git-merge-changelog: add 20231121

Signed-off-by: Ulrich Müller  gentoo.org>

 dev-vcs/git-merge-changelog/Manifest   |  1 +
 .../git-merge-changelog-20231121.ebuild| 24 ++
 2 files changed, 25 insertions(+)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index dc8ec2ac092b..672883b18b68 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1 +1,2 @@
 DIST git-merge-changelog-20221207.tar.xz 387656 BLAKE2B 
0003c204bad0f0f99127a6c651cf7a03ffbcce0feda33c4be63fae4cc00405cfbb843c1b38512a226497944ce33b7025da8d8526db929b819b3715534975a708
 SHA512 
00cc855742f23adb109f7edb57be2dbb1a90dd549e46b165064aaaf6ba94470ffa16bb4aa05dbec6bbd2de9a61a77bb9c150a3447328ea0fea78b92c61b96004
+DIST git-merge-changelog-20231121.tar.xz 405840 BLAKE2B 
ec8bcb49c287af9c96301bf1bbc30a885a65c0864420cc76237f5d53e9c49a348f4450f42ddaaa33a260afe6b5d8fe25b9ace6d9ee2a2f47b7b044513c4a0512
 SHA512 
fcfb171e17cb4f0c0c37289167ceb0af1d32220947f8a1a00b5bce1d8f4ba8f9c626cd864ca5901f915a5f5a398fdf6af7ce3681dbc29a39c5df429324d40c84

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild
new file mode 100644
index ..b1c438ea05d8
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20231121.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2023-11-22 Thread Ulrich Müller 
commit: 7cf483480fa29646001bd130ed4a13679f423908
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Nov 22 19:41:08 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Nov 22 19:42:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf48348

dev-vcs/git-merge-changelog: drop 20170131

Signed-off-by: Ulrich Müller  gentoo.org>

 dev-vcs/git-merge-changelog/Manifest   |  1 -
 .../git-merge-changelog-20170131.ebuild| 25 --
 2 files changed, 26 deletions(-)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index 34df048efd2a..dc8ec2ac092b 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1,2 +1 @@
-DIST git-merge-changelog-20170131.tar.xz 315000 BLAKE2B 
a2a9e35d5973b43ebe1ae481cb59b0a8a43d517f82d5eb69f33c0a10ee1c32c1df3b25c93629dccc15f8d5bf28d9849dba1986f8443d6c4c0079314335d7de42
 SHA512 
4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786
 DIST git-merge-changelog-20221207.tar.xz 387656 BLAKE2B 
0003c204bad0f0f99127a6c651cf7a03ffbcce0feda33c4be63fae4cc00405cfbb843c1b38512a226497944ce33b7025da8d8526db929b819b3715534975a708
 SHA512 
00cc855742f23adb109f7edb57be2dbb1a90dd549e46b165064aaaf6ba94470ffa16bb4aa05dbec6bbd2de9a61a77bb9c150a3447328ea0fea78b92c61b96004

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
deleted file mode 100644
index 1a583c9fb379..
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=6
-
-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;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2022-12-07 Thread Ulrich Müller 
commit: 3c34f4a8e373256f2ea06e8f0e899ec108e36326
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Dec  8 07:32:05 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Dec  8 07:35:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c34f4a8

dev-vcs/git-merge-changelog: add 20221207

Closes: https://bugs.gentoo.org/884723
Signed-off-by: Ulrich Müller  gentoo.org>

 dev-vcs/git-merge-changelog/Manifest   |  1 +
 .../git-merge-changelog-20221207.ebuild| 24 ++
 2 files changed, 25 insertions(+)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index 4a3fe9cb454e..34df048efd2a 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1 +1,2 @@
 DIST git-merge-changelog-20170131.tar.xz 315000 BLAKE2B 
a2a9e35d5973b43ebe1ae481cb59b0a8a43d517f82d5eb69f33c0a10ee1c32c1df3b25c93629dccc15f8d5bf28d9849dba1986f8443d6c4c0079314335d7de42
 SHA512 
4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786
+DIST git-merge-changelog-20221207.tar.xz 387656 BLAKE2B 
0003c204bad0f0f99127a6c651cf7a03ffbcce0feda33c4be63fae4cc00405cfbb843c1b38512a226497944ce33b7025da8d8526db929b819b3715534975a708
 SHA512 
00cc855742f23adb109f7edb57be2dbb1a90dd549e46b165064aaaf6ba94470ffa16bb4aa05dbec6bbd2de9a61a77bb9c150a3447328ea0fea78b92c61b96004

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild
new file mode 100644
index ..46bde6e2626b
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20221207.ebuild
@@ -0,0 +1,24 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2019-09-08 Thread Ulrich Müller 
commit: 7a3869dbddb8c15b9e42b659cdb15819297c6a91
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Sep  8 16:48:49 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Sep  8 17:31:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3869db

dev-vcs/git-merge-changelog: Remove old.

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Ulrich Müller  gentoo.org>

 dev-vcs/git-merge-changelog/Manifest   |  1 -
 .../git-merge-changelog-20140223.ebuild| 24 --
 2 files changed, 25 deletions(-)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index 3c855d32774..4a3fe9cb454 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1,2 +1 @@
-DIST git-merge-changelog-20140223.tar.xz 298332 BLAKE2B 
25a16f5b5b29c6a7eee0a53e37628968d528338870e270a1ad34ba4fbf358ef5ed3347f40c720b8d38c05042940ec48f0ee84877e75e67fdb480e44eba23c6df
 SHA512 
ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638
 DIST git-merge-changelog-20170131.tar.xz 315000 BLAKE2B 
a2a9e35d5973b43ebe1ae481cb59b0a8a43d517f82d5eb69f33c0a10ee1c32c1df3b25c93629dccc15f8d5bf28d9849dba1986f8443d6c4c0079314335d7de42
 SHA512 
4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
deleted file mode 100644
index 8567ded85f7..000
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# 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=5
-
-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;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-   sed -n 
"/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:${EPREFIX}/usr:g;p;q}" \
-   gllib/git-merge-changelog.c >README || die
-}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2017-02-09 Thread Ulrich Müller 
commit: 8520dc5d2fa64b217cbb71de0c4b4ad21eda9ca2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Feb  9 12:34:45 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Feb  9 12:34:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8520dc5d

dev-vcs/git-merge-changelog: Fix sed expression.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
index 0e5a437ef6..3c4f829a05 100644
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}"
 
 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 
\
+   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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2017-02-04 Thread Ulrich Müller 
commit: 5f47479d39fc628def49531b9f9eb534d1c92329
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb  4 22:02:25 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb  4 22:02:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f47479d

dev-vcs/git-merge-changelog: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-vcs/git-merge-changelog/Manifest   |  1 +
 .../git-merge-changelog-20170131.ebuild| 26 ++
 2 files changed, 27 insertions(+)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index 5450bc1..870e426 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1 +1,2 @@
 DIST git-merge-changelog-20140223.tar.xz 298332 SHA256 
75a584cee054cafcb1ab7b71dc3beee33b39ea30b50dace48f044ee788560482 SHA512 
ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638
 WHIRLPOOL 
41182891e268e0ade060cac261d230fda2534fa53aebb40ea2b44e62cef1d5bef69ba9d7a7f6839c4b24135b1012d29f43886b9729fdd801173c2a8c240b3809
+DIST git-merge-changelog-20170131.tar.xz 315000 SHA256 
7d72cc6f66cae1b2ff9db36716af16a2ea34987d503ed12315cfceb61489ba71 SHA512 
4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786
 WHIRLPOOL 
58eaa2a965fa2f6c07321d0dbf1308644cbe96ad4fa69d3839fdea6fcdf1bf34003c8a16303be3c5ca944110bd3accb0d53349ce98596ba54197274a7e2678d5

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
new file mode 100644
index ..0e5a437
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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=6
+
+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;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-merge-changelog/

2015-08-09 Thread Ulrich Müller 
commit: 8ac4567328425134b26ce81c907442b8923751c3
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Mon Aug 10 02:28:17 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Mon Aug 10 02:28:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac45673

dev-vcs/git-merge-changelog: Remove old.

Package-Manager: portage-2.2.20

 dev-vcs/git-merge-changelog/Manifest   |  1 -
 .../git-merge-changelog-20140103.ebuild| 23 --
 2 files changed, 24 deletions(-)

diff --git a/dev-vcs/git-merge-changelog/Manifest 
b/dev-vcs/git-merge-changelog/Manifest
index 0c0b8e7..5450bc1 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1,2 +1 @@
-DIST git-merge-changelog-20140103.tar.xz 299628 SHA256 
d3f0694ca65c765a39b5d2381a2c9d735d16d29bef1737fdf38e9d44bcd3ef29 SHA512 
cc3287424313f3c3590bbc67ac2615c69154001019915163b59d4600b320abeaf1e72baac7fd53dd2906be16149ce9a325db0b8966bb024db18f4d11b86fd405
 WHIRLPOOL 
1689456ebc076bbc3e97beb6f63f91bf857a5493ce29b2fd3dea5667891cd6db01f5b30dbdbea510701c153949f1f0287e966af419846be1df06f493523d8fe5
 DIST git-merge-changelog-20140223.tar.xz 298332 SHA256 
75a584cee054cafcb1ab7b71dc3beee33b39ea30b50dace48f044ee788560482 SHA512 
ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638
 WHIRLPOOL 
41182891e268e0ade060cac261d230fda2534fa53aebb40ea2b44e62cef1d5bef69ba9d7a7f6839c4b24135b1012d29f43886b9729fdd801173c2a8c240b3809

diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20140103.ebuild 
b/dev-vcs/git-merge-changelog/git-merge-changelog-20140103.ebuild
deleted file mode 100644
index 042ff97..000
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20140103.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION=Git merge driver for GNU style ChangeLog files
-HOMEPAGE=http://www.gnu.org/software/gnulib/;
-# 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
-SRC_URI=http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz;
-
-LICENSE=GPL-3+
-SLOT=0
-KEYWORDS=~amd64 ~x86
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-   sed -n 
'/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:/usr:g;p;q}' \
-   gllib/git-merge-changelog.c README || die
-}