summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-01-03 18:22:33 +0100
committerJeroen Roovers <jer@gentoo.org>2020-01-03 18:23:02 +0100
commit6e9c60bfbd378315b88e3aeaffe1d4695f3fc741 (patch)
tree5ba5ead98dbd4e9461d91fb8c563b1ec11d17e6e /sys-block
parentsci-chemistry/gromacs: Fix bashcomp install (diff)
downloadgentoo-6e9c60bfbd378315b88e3aeaffe1d4695f3fc741.tar.gz
gentoo-6e9c60bfbd378315b88e3aeaffe1d4695f3fc741.tar.bz2
gentoo-6e9c60bfbd378315b88e3aeaffe1d4695f3fc741.zip
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@gentoo.org>
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/parted/files/parted-3.3-atari.patch2
-rw-r--r--sys-block/parted/parted-3.3-r1.ebuild (renamed from sys-block/parted/parted-3.3-r2.ebuild)0
2 files changed, 1 insertions, 1 deletions
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
index 4f2c019b732c..4f2c019b732c 100644
--- a/sys-block/parted/parted-3.3-r2.ebuild
+++ b/sys-block/parted/parted-3.3-r1.ebuild