From dc3c1288242dcc4b1d9246b2b67092f9ea7c45fe Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Mon, 28 May 2018 08:00:26 +0000
Subject: [PATCH] parted: select the libuuid from util-linux. (#2615)

* Also build with libblkid, also from util-linux.
* Pass -Wimplicit-fallthrough=0 to make gcc >= 7 happy.
---
 sys-block/parted/parted-3.2.recipe | 31 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/sys-block/parted/parted-3.2.recipe b/sys-block/parted/parted-3.2.recipe
index 8e82a1dac..73b04d5d0 100644
--- a/sys-block/parted/parted-3.2.recipe
+++ b/sys-block/parted/parted-3.2.recipe
@@ -5,12 +5,13 @@ data on hard disks and disk imaging."
 HOMEPAGE="https://www.gnu.org/software/parted/"
 COPYRIGHT="1999-2014 Free Software Foundation Inc."
 LICENSE="GNU GPL v3"
-REVISION="3"
-SOURCE_URI="https://ftpmirror.gnu.org/parted/parted-$portVersion.tar.xz"
+REVISION="4"
+SOURCE_URI="https://ftpmirror.gnu.org/parted/parted-$portVersion.tar.xz
+	https://ftp.gnu.org/gnu/parted/parted-$portVersion.tar.xz"
 CHECKSUM_SHA256="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
 PATCHES="parted-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -39,11 +40,12 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libblkid$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
-	lib:libuuid$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix >= 1.3
 	"
 
 PROVIDES_devel="
@@ -53,22 +55,23 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	parted$secondaryArchSuffix == $portVersion base
+	devel:libblkid$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
-	devel:libuuid$secondaryArchSuffix
+	devel:libuuid$secondaryArchSuffix >= 1.3
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libblkid$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
-	devel:libuuid$secondaryArchSuffix
+	devel:libuuid$secondaryArchSuffix >= 1.3
 	"
-
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
@@ -77,18 +80,21 @@ BUILD_PREREQUIRES="
 	cmd:autoreconf
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:gettext
+	cmd:gettext$secondaryArchSuffix
 	cmd:gperf
 	cmd:grep
 	cmd:iconv
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:makeinfo
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
 	"
 
+TEST_REQUIRES="
+	cmd:dd
+	"
+
 defineDebugInfoPackage parted$secondaryArchSuffix \
 	"$libDir"/libparted.so.$libVersion \
 	"$libDir"/libparted-fs-resize.so.$libFsResizeVersion
@@ -96,9 +102,13 @@ defineDebugInfoPackage parted$secondaryArchSuffix \
 BUILD()
 {
 	autoreconf
+	MAKEINFO=true \
 	runConfigure --omit-dirs sbinDir ./configure --sbindir=$commandBinDir \
 		--disable-device-mapper
-	make $jobArgs
+	make $jobArgs \
+		CPPFLAGS="-Wimplicit-fallthrough=0" \
+		LDFLAGS="-lblkid -luuid -lintl" \
+
 }
 
 INSTALL()
@@ -106,7 +116,6 @@ INSTALL()
 	make install
 
 	rm -f "$libDir"/libparted*.la
-	rm -f "$infoDir"/dir
 
 	prepareInstalledDevelLibs \
 		libparted \