From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1263325-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 4D7571382C5
for <garchives@archives.gentoo.org>; Mon, 22 Mar 2021 08:59:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7B23CE0828;
Mon, 22 Mar 2021 08:59:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1CBF5E0828
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 08:59:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EF49633BDE4
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 08:59:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ECF95CF
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Mar 2021 08:59:11 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1616403464.d3669bc09318c3108d9a5d4581ce84f0aa32bd2b.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib-ng/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-libs/zlib-ng/metadata.xml sys-libs/zlib-ng/zlib-ng-2.0.1-r1.ebuild sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
X-VCS-Directories: sys-libs/zlib-ng/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: d3669bc09318c3108d9a5d4581ce84f0aa32bd2b
X-VCS-Branch: master
Date: Mon, 22 Mar 2021 08:59:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5a997512-a6c7-4fd6-9d00-a2706a88dfa2
X-Archives-Hash: 4238f6fe3cf57cdde5d00fd3cdb8f586
commit: d3669bc09318c3108d9a5d4581ce84f0aa32bd2b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 23:27:11 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 08:57:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3669bc0
sys-libs/zlib-ng: revbump for forthcoming changes, cosmetic bits
We're about to make several fixes including a blocker. Revbumping ensures
that everybody has these fixes but also makes subsequent commits
have easier-to-review diffs.
Also:
* Adjust ebuild layout
* Update DESCRIPTION to indicate fork
* Add bug reference to libdir workaround
* Adjust metadata indentation
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-libs/zlib-ng/metadata.xml | 20 ++++++++++----------
...{zlib-ng-2.0.1.ebuild => zlib-ng-2.0.1-r1.ebuild} | 7 ++++---
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/sys-libs/zlib-ng/metadata.xml b/sys-libs/zlib-ng/metadata.xml
index 44db40fcc5e..af26df0fdf9 100644
--- a/sys-libs/zlib-ng/metadata.xml
+++ b/sys-libs/zlib-ng/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="compat">Enable compatibility to <pkg>sys-libs/zlib</pkg></flag>
-</use>
-<upstream>
- <remote-id type="github">zlib-ng/zlib-ng</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <use>
+ <flag name="compat">Enable compatibility to <pkg>sys-libs/zlib</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">zlib-ng/zlib-ng</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.1-r1.ebuild
similarity index 85%
rename from sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
rename to sys-libs/zlib-ng/zlib-ng-2.0.1-r1.ebuild
index 6c9d4fdc34f..bb16ca91c10 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.1-r1.ebuild
@@ -1,17 +1,16 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Id: 688f948c5f3067e775bfab5057e8047f467a9ca9 $
EAPI=7
inherit cmake
-DESCRIPTION="zlib data compression library"
+DESCRIPTION="Fork of the zlib data compression library"
HOMEPAGE="https://github.com/zlib-ng/zlib-ng"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
LICENSE="ZLIB"
SLOT="0"
-
#KEYWORDS="~amd64 ~x86"
IUSE="compat test"
@@ -19,6 +18,8 @@ RESTRICT="!test? ( test )"
src_prepare() {
cmake_src_prepare
+
+ # https://github.com/zlib-ng/zlib-ng/issues/881
sed "/LIB_INSTALL_DIR/s@/lib\"@/$(get_libdir)\"@" \
-i CMakeLists.txt || die
}