From: Jeroen Roovers Date: Fri, 3 Jan 2020 17:22:33 +0000 (+0100) Subject: Revert "sys-block/parted: Reintroduce PED_ASSERT with correct assertion" X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6e9c60bfbd378315b88e3aeaffe1d4695f3fc741;p=gentoo.git 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 --- diff --git a/sys-block/parted/files/parted-3.3-atari.patch b/sys-block/parted/files/parted-3.3-atari.patch index af9c488d48d1..41771d02d4ee 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