From fa77bac4335417dbc09684e2459bd23d1bb52c5c Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Mon, 2 May 2016 08:22:04 +0000
Subject: [PATCH] libcddb: do not ship the command line tool for 2nd arch.
 (#581)

* No need to ship the cddb_check command line tool for secondary
  archies since the recipe builds on all primary architectures.
* Also do not ship (nor build) the static lib.
---
 media-libs/libcddb/libcddb-1.3.2.recipe | 28 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe
index 8b2b4eee0..2d2a946be 100644
--- a/media-libs/libcddb/libcddb-1.3.2.recipe
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -1,21 +1,25 @@
 SUMMARY="CDDB access library"
 DESCRIPTION="A library for accessing a CDDB server"
-HOMEPAGE="http://libcddb.sourceforge.net"
-COPYRIGHT="2003-2005 Kris Verbeeck"
+HOMEPAGE="http://libcddb.sourceforge.net/"
+COPYRIGHT="2003-2009 Kris Verbeeck"
 LICENSE="GNU LGPL v2"
-REVISION="1"
-SOURCE_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2"
+REVISION="2"
+SOURCE_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-$portVersion.tar.bz2"
 CHECKSUM_SHA256="35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
 PATCHES="libcddb-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libcddb$secondaryArchSuffix = $portVersion
-	cmd:cddb_query$secondaryArchSuffix
-	lib:libcddb$secondaryArchSuffix
+	lib:libcddb$secondaryArchSuffix = 2.2.3
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:cddb_query
+		"
+fi
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libintl$secondaryArchSuffix
@@ -40,8 +44,8 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:gettext
-	cmd:libtool
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
@@ -57,15 +61,19 @@ BUILD()
 	aclocal
 	automake --add-missing
 	autoconf
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+	rm $libDir/libcddb.la
 	prepareInstalledDevelLibs libcddb
 	fixPkgconfig
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+	fi
 	packageEntries devel $developDir
 }