From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1135831-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 4E110138334
for <garchives@archives.gentoo.org>; Fri, 3 Jan 2020 17:23:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90A8BE08AB;
Fri, 3 Jan 2020 17:23:07 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 7AA4BE08AB
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Jan 2020 17:23:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 79F5634DE8B
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Jan 2020 17:23:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1614E42
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Jan 2020 17:23:04 +0000 (UTC)
From: "Jeroen Roovers" <jer@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, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1578072182.6e9c60bfbd378315b88e3aeaffe1d4695f3fc741.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-block/parted/files/parted-3.3-atari.patch sys-block/parted/parted-3.3-r1.ebuild sys-block/parted/parted-3.3-r2.ebuild
X-VCS-Directories: sys-block/parted/files/ sys-block/parted/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 6e9c60bfbd378315b88e3aeaffe1d4695f3fc741
X-VCS-Branch: master
Date: Fri, 3 Jan 2020 17:23:04 +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: 23eec496-ca70-404a-a6f3-f1028f95e0a9
X-Archives-Hash: f5bfa05b17e358b829f3df95f5f67698
commit: 6e9c60bfbd378315b88e3aeaffe1d4695f3fc741
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 3 17:22:33 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 17:23:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9c60bf
Revert "sys-block/parted: Reintroduce PED_ASSERT with correct assertion"
This reverts commit 4bab6569878f89180d50a40524a675712b0cec2a.
Apparently the initial "fix" was better.
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
sys-block/parted/files/parted-3.3-atari.patch | 2 +-
sys-block/parted/{parted-3.3-r2.ebuild => parted-3.3-r1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-block/parted/files/parted-3.3-atari.patch b/sys-block/parted/files/parted-3.3-atari.patch
index af9c488d48d..41771d02d4e 100644
--- a/sys-block/parted/files/parted-3.3-atari.patch
+++ b/sys-block/parted/files/parted-3.3-atari.patch
@@ -5,7 +5,7 @@
PED_ASSERT (sizeof (AtariRawTable) == 512);
/* GNU Libc doesn't support NULL instead of the locale name */
- PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL)) != NULL);
-+ PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", (locale_t) 0)) != (locale_t) 0);
++ atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL);
ped_disk_type_register (&atari_disk_type);
}
diff --git a/sys-block/parted/parted-3.3-r2.ebuild b/sys-block/parted/parted-3.3-r1.ebuild
similarity index 100%
rename from sys-block/parted/parted-3.3-r2.ebuild
rename to sys-block/parted/parted-3.3-r1.ebuild