From 2fae58fcddaa3663dd19b4d3acb44899fb1e5bed Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 8 Jul 2016 06:22:58 +0000
Subject: [PATCH] libxcb: fix 2nd arch, create _devel (split), drop libtool
 files. (#677)

---
 x11-libs/libxcb/libxcb-1.6.recipe | 52 +++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe
index 5333a192c..adb1a0c1b 100644
--- a/x11-libs/libxcb/libxcb-1.6.recipe
+++ b/x11-libs/libxcb/libxcb-1.6.recipe
@@ -10,18 +10,17 @@ for one or the other."
 HOMEPAGE="http://xcb.freedesktop.org/"
 COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett"
 LICENSE="MIT (no promotion)"
-REVISION="2"
-SOURCE_URI="http://xcb.freedesktop.org/dist/libxcb-1.6.tar.gz"
+REVISION="3"
+SOURCE_URI="http://xcb.freedesktop.org/dist/libxcb-$portVersion.tar.gz"
 CHECKSUM_SHA256="df93b7d5afb0f970c73294636dc8cbc08f59bd39239cac4e6e0a46792ae7b759"
-PATCHES="libxcb-1.6.patch"
+PATCHES="libxcb-$portVersion.patch"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libxcb$secondaryArchSuffix = $portVersion
 	lib:libxcb$secondaryArchSuffix = $portVersion
-	devel:libxcb$secondaryArchSuffix = $portVersion
 	lib:libxcb_composite$secondaryArchSuffix
 	lib:libxcb_damage$secondaryArchSuffix
 	lib:libxcb_dpms$secondaryArchSuffix
@@ -43,6 +42,16 @@ PROVIDES="
 	lib:libxcb_xtest$secondaryArchSuffix
 	lib:libxcb_xv$secondaryArchSuffix
 	lib:libxcb_xvmc$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix >= 1.1.26
+	lib:libxau$secondaryArchSuffix >= 1.0.5
+	"
+
+PROVIDES_devel="
+	libxcb${secondaryArchSuffix}_devel = $portVersion
+	devel:libxcb$secondaryArchSuffix = $portVersion
 	devel:libxcb_composite$secondaryArchSuffix
 	devel:libxcb_damage$secondaryArchSuffix
 	devel:libxcb_dpms$secondaryArchSuffix
@@ -65,16 +74,16 @@ PROVIDES="
 	devel:libxcb_xv$secondaryArchSuffix
 	devel:libxcb_xvmc$secondaryArchSuffix
 	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libxslt >= 1.1.26
-	lib:libxau$secondaryArchSuffix >= 1.0.5
+REQUIRES_devel="
+	libxcb$secondaryArchSuffix == $portVersion base
+	devel:libxslt$secondaryArchSuffix >= 1.1.26
+	devel:libxau$secondaryArchSuffix >= 1.0.5
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libxslt >= 1.1.26
-	devel:xcb_proto >= 1.6
+	devel:libxslt$secondaryArchSuffix >= 1.1.26
+	devel:xcb_proto$secondaryArchSuffix >= 1.6
 	devel:libpthread_stubs$secondaryArchSuffix >= 0.3
 	devel:libxau$secondaryArchSuffix >= 1.0.5
 	"
@@ -82,7 +91,7 @@ BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:doxygen
-	cmd:libtool
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:aclocal
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
@@ -101,6 +110,10 @@ BUILD()
 INSTALL()
 {
 	make install
+
+	# remove libtool library files
+	rm $libDir/libxcb*.la
+
 	prepareInstalledDevelLibs libxcb \
 		libxcb-composite \
 		libxcb-damage \
@@ -124,4 +137,17 @@ INSTALL()
 		libxcb-xv \
 		libxcb-xvmc
 	fixPkgconfig
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $documentationDir
+	fi
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
 }