From bdf70b175cce627e82765940dc82b60570e575ff Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 15 Aug 2018 15:20:26 +0000
Subject: [PATCH] expat: bump to 2.2.6, add debuginfo, enable x86_gcc2.

---
 ...{expat-2.2.5.recipe => expat-2.2.6.recipe} | 37 ++++++++++++-------
 dev-libs/expat/patches/expat-2.2.6.patchset   | 22 +++++++++++
 2 files changed, 46 insertions(+), 13 deletions(-)
 rename dev-libs/expat/{expat-2.2.5.recipe => expat-2.2.6.recipe} (58%)
 create mode 100644 dev-libs/expat/patches/expat-2.2.6.patchset

diff --git a/dev-libs/expat/expat-2.2.5.recipe b/dev-libs/expat/expat-2.2.6.recipe
similarity index 58%
rename from dev-libs/expat/expat-2.2.5.recipe
rename to dev-libs/expat/expat-2.2.6.recipe
index df04e3db1..2cba92c8b 100644
--- a/dev-libs/expat/expat-2.2.5.recipe
+++ b/dev-libs/expat/expat-2.2.6.recipe
@@ -4,23 +4,28 @@ stream-oriented parser in which an application registers handlers for things \
 the parser might find in the XML document (like start tags)."
 HOMEPAGE="http://expat.sourceforge.net/"
 COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-	2001-2017 Expat maintainers."
+	2001-2018 Expat maintainers."
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="http://downloads.sf.net/expat/expat-$portVersion.tar.bz2"
-CHECKSUM_SHA256="d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"
+SOURCE_URI="https://downloads.sourceforge.net/expat/expat-$portVersion.tar.bz2"
+CHECKSUM_SHA256="17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2"
+PATCHES="expat-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion=1.6.8
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 2.2"
 
 PROVIDES="
-	expat$secondaryArchSuffix = $portVersion compat >= 2.2
-	lib:libexpat$secondaryArchSuffix = 1.6.7 compat >= 1
+	expat$secondaryArchSuffix = $portVersionCompat
+	lib:libexpat$secondaryArchSuffix = $libVersionCompat
 	"
 if [ -z "$secondaryArchSuffix" ]; then
-	PROVIDES="$PROVIDES
-		cmd:xmlwf = $portVersion compat >= 2.2
-		"
+PROVIDES="$PROVIDES
+	cmd:xmlwf = $portVersionCompat
+	"
 fi
 
 REQUIRES="
@@ -29,7 +34,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	expat${secondaryArchSuffix}_devel = $portVersion
-	devel:libexpat$secondaryArchSuffix = 1.6.7 compat >= 1
+	devel:libexpat$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	expat$secondaryArchSuffix == $portVersion base
@@ -44,13 +49,19 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
+debugList=(
+	"$libDir"/libexpat.so.$libVersion
+	)
+if [ -z "$secondaryArchSuffix" ]; then
+	debugList+=("$binDir"/xmlwf)
+fi
+defineDebugInfoPackage expat$secondaryArchSuffix "${debugList[@]}"
+
 BUILD()
 {
-	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/dev-libs/expat/patches/expat-2.2.6.patchset b/dev-libs/expat/patches/expat-2.2.6.patchset
new file mode 100644
index 000000000..fa8b51036
--- /dev/null
+++ b/dev-libs/expat/patches/expat-2.2.6.patchset
@@ -0,0 +1,22 @@
+From da46f5dd038f637854a72276e90b081d1456189b Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Wed, 15 Aug 2018 14:31:29 +0000
+Subject: Do not use __attribute__((__unused__)) with gcc2.
+
+
+diff --git a/lib/internal.h b/lib/internal.h
+index e33fdcb..b52dbea 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -102,7 +102,7 @@
+ #endif
+ 
+ #ifndef UNUSED_P
+-# ifdef __GNUC__
++# if defined(__GNUC__) && __GNUC__ >= 3
+ #  define UNUSED_P(p) UNUSED_ ## p __attribute__((__unused__))
+ # else
+ #  define UNUSED_P(p) UNUSED_ ## p
+-- 
+2.18.0
+