From ad97b8719a35ca7e1daab59ee8eff42c39938f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 18 Dec 2022 17:00:48 +0700
Subject: [PATCH 1/2] libtool: fix autoconf mismatch

---
 srcpkgs/libtool/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index aebad9294eef..769220f2243f 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,9 +1,9 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="texinfo perl automake help2man xz"
+hostmakedepends="texinfo perl automake help2man xz gnulib"
 depends="tar sed"
 short_desc="Generic library support script"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,9 +17,14 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args="lt_cv_shlibpath_overrides_runpath=yes"
 fi
 
+post_extract() {
+	chmod -R +rw .
+}
+
 pre_configure() {
-	touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in
-	./bootstrap --force
+	# touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in
+	./bootstrap --force --no-git --skip-po \
+		--gnulib-srcdir=/usr/share/gnulib/ --copy
 }
 
 post_install() {

From 8691b85a5dcc30ff0a68cab592d522fe94b3b085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 18 Dec 2022 17:01:14 +0700
Subject: [PATCH 2/2] New package: gnulib-20220829~828413b

---
 srcpkgs/git-merge-changelog |  1 +
 srcpkgs/gnulib/template     | 51 +++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 120000 srcpkgs/git-merge-changelog
 create mode 100644 srcpkgs/gnulib/template

diff --git a/srcpkgs/git-merge-changelog b/srcpkgs/git-merge-changelog
new file mode 120000
index 000000000000..acfd814db2ff
--- /dev/null
+++ b/srcpkgs/git-merge-changelog
@@ -0,0 +1 @@
+gnulib
\ No newline at end of file
diff --git a/srcpkgs/gnulib/template b/srcpkgs/gnulib/template
new file mode 100644
index 000000000000..68bae03db4d4
--- /dev/null
+++ b/srcpkgs/gnulib/template
@@ -0,0 +1,51 @@
+# Template file for 'gnulib'
+pkgname=gnulib
+version=20220829~828413b
+revision=1
+create_wrksrc=yes
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake"
+makedepends=""
+depends=""
+short_desc="Gnulib - The GNU Portability Library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/gnulib/"
+distfiles="${DEBIAN_SITE}/main/g/gnulib/gnulib_${version}.orig.tar.gz"
+checksum=8bf9ac42ebc7d6ec1afc9d50bfe823a212b06f0d40e738b0e9e468be60a858fe
+
+post_extract() {
+	mv gnulib-* gnulib
+	chmod -R +w gnulib
+	chmod -R a+r gnulib
+	chmod 0755 gnulib/build-aux/config.guess
+}
+
+do_configure() {
+	rm -rf build
+	./gnulib/gnulib-tool --create-testdir --with-tests -S \
+		--dir=build git-merge-changelog
+	cd build
+	./configure ${configure_args}
+}
+
+do_build() {
+	make -C build ${makejobs}
+}
+
+do_install() {
+	vmkdir usr/share
+	vcopy gnulib /usr/share
+}
+
+git-merge-changelog_package() {
+	short_desc="Tool for merging changelog with git"
+	pkg_install() {
+		vbin build/gllib/git-merge-changelog
+	}
+}