From 3c86f23250ae422e0a7db1dffe6ab9f8ef2fff5c Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 9 Feb 2018 00:29:50 +0000
Subject: [PATCH] gcab: bump to 0.8, drop libtool file, add debuginfo. (#2199)

---
 .../gcab/{gcab-0.7.recipe => gcab-0.8.recipe} | 24 ++++++++++++++-----
 .../{gcab-0.7.patchset => gcab-0.8.patchset}  |  6 ++---
 2 files changed, 21 insertions(+), 9 deletions(-)
 rename app-arch/gcab/{gcab-0.7.recipe => gcab-0.8.recipe} (80%)
 rename app-arch/gcab/patches/{gcab-0.7.patchset => gcab-0.8.patchset} (87%)

diff --git a/app-arch/gcab/gcab-0.7.recipe b/app-arch/gcab/gcab-0.8.recipe
similarity index 80%
rename from app-arch/gcab/gcab-0.7.recipe
rename to app-arch/gcab/gcab-0.8.recipe
index cdf807252..36d53c80e 100644
--- a/app-arch/gcab/gcab-0.7.recipe
+++ b/app-arch/gcab/gcab-0.8.recipe
@@ -7,15 +7,22 @@ and extract cabinet archives, gcab can also create them.
 gcab also includes a GObject shared library, libgcab, which provides all the \
 functionality available to the command line tool."
 HOMEPAGE="https://wiki.gnome.org/msitools"
-COPYRIGHT="2012-2016 Marc-André Lureau"
+COPYRIGHT="2000-2002 Stuart Caie
+	2002 Patrik Stridvall
+	2003 Greg Turner
+	2012 Marc-André Lureau
+	2017 Richard Hughes"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.gnome.org/sources/gcab/$portVersion/gcab-$portVersion.tar.xz"
-CHECKSUM_SHA256="a16e5ef88f1c547c6c8c05962f684ec127e078d302549f3dfd2291e167d4adef"
+CHECKSUM_SHA256="0c5f602ca4a89904e045b97762b470726383e399d34a161d0ba26cc6023c7086"
 PATCHES="gcab-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
@@ -28,7 +35,7 @@ fi
 PROVIDES="
 	gcab$secondaryArchSuffix = $portVersion
 	cmd:gcab$commandSuffix = $portVersion
-	lib:libgcab_1.0$secondaryArchSuffix = 0.0.0 compat >= 0
+	lib:libgcab_1.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -39,7 +46,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	gcab${secondaryArchSuffix}_devel = $portVersion
-	devel:libgcab_1.0$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:libgcab_1.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	gcab$secondaryArchSuffix == $portVersion base
@@ -69,6 +76,9 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage gcab$secondaryArchSuffix \
+	"$libDir"/libgcab-1.0.so.$libVersion
+
 BUILD()
 {
 	autoreconf
@@ -81,6 +91,8 @@ INSTALL()
 {
 	make install
 
+	rm -f "$libDir"/libgcab*.la
+
 	prepareInstalledDevelLibs \
 		libgcab-1.0
 
diff --git a/app-arch/gcab/patches/gcab-0.7.patchset b/app-arch/gcab/patches/gcab-0.8.patchset
similarity index 87%
rename from app-arch/gcab/patches/gcab-0.7.patchset
rename to app-arch/gcab/patches/gcab-0.8.patchset
index fb67b8d57..7ccb08716 100644
--- a/app-arch/gcab/patches/gcab-0.7.patchset
+++ b/app-arch/gcab/patches/gcab-0.8.patchset
@@ -5,10 +5,10 @@ Subject: Skip GOBJECT_INTROSPECTION_CHECK.
 
 
 diff --git a/configure.ac b/configure.ac
-index 2b6f2b6..dcbfcdb 100644
+index b8b8a91..cc5027e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -16,7 +16,7 @@ AC_PROG_INSTALL
+@@ -17,7 +17,7 @@ AC_PROG_INSTALL
  LT_INIT([win32-dll])
  GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
  PKG_PROG_PKG_CONFIG
@@ -18,5 +18,5 @@ index 2b6f2b6..dcbfcdb 100644
  
  IT_PROG_INTLTOOL([0.40.0])
 -- 
-2.7.0
+2.16.1