From 85786abe77be7c3a5e96c99436925d9a8b698de5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:47:46 +0300
Subject: [PATCH 1/2] zlib: add alternatives for zlib-ng compatibility

---
 srcpkgs/zlib/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a02a77828202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,21 +1,27 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.${version}"
 
 do_configure() {
 	LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared
 }
 
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
 zlib-devel_package() {
+	conflicts="zlib-ng-devel"
 	depends="zlib>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From dc7fdf575400b9c59c4705e89964ed22c42c0d16 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 17 Mar 2021 17:48:51 +0300
Subject: [PATCH 2/2] New package: zlib-ng-2.0.1

---
 common/shlibs            |  1 +
 srcpkgs/zlib-ng-devel    |  1 +
 srcpkgs/zlib-ng/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/zlib-ng-devel
 create mode 100644 srcpkgs/zlib-ng/template

diff --git a/common/shlibs b/common/shlibs
index bba9a0eb1939..0b2ce3e9b3d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -48,6 +48,7 @@ libpcprofile.so glibc-2.32_1
 libcidn.so.1 glibc-2.32_1
 libmvec.so.1 glibc-2.32_1
 libz.so.1 zlib-1.2.3_1
+# libz.so.1 zlib-ng-2.0.1_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
diff --git a/srcpkgs/zlib-ng-devel b/srcpkgs/zlib-ng-devel
new file mode 120000
index 000000000000..65f4ecb07e5b
--- /dev/null
+++ b/srcpkgs/zlib-ng-devel
@@ -0,0 +1 @@
+zlib-ng
\ No newline at end of file
diff --git a/srcpkgs/zlib-ng/template b/srcpkgs/zlib-ng/template
new file mode 100644
index 000000000000..881aebc1109f
--- /dev/null
+++ b/srcpkgs/zlib-ng/template
@@ -0,0 +1,29 @@
+# Template file for 'zlib-ng'
+pkgname=zlib-ng
+version=2.0.1
+revision=1
+build_style=cmake
+configure_args="-DZLIB_COMPAT=ON"
+short_desc="Zlib replacement with optimizations for 'next generation' systems"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="Zlib"
+homepage="https://github.com/zlib-ng/zlib-ng"
+distfiles="https://github.com/zlib-ng/zlib-ng/archive/${version}.tar.gz"
+checksum=8599893f9b78bf979c1a1d6549b730367c9186560c6879590354998cc55428cf
+alternatives="zlib:libz.so.1:/usr/lib/libz.so.1.2.11.zlib-ng"
+
+post_install() {
+	rm "${DESTDIR}/usr/lib/libz.so.1"
+}
+
+zlib-ng-devel_package() {
+	conflicts="zlib-devel"
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}