[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/

["Jeroen Roovers" <jer@gentoo.org>]

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