From 239b7a55b96f674c43e6e79358f4b6c9016a06a7 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 7 Apr 2023 11:50:14 +0200
Subject: [PATCH] id3lib, cleanup, use libVersionCompat (#8299)

---
 media-libs/id3lib/id3lib-3.8.3.recipe | 29 +++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/media-libs/id3lib/id3lib-3.8.3.recipe b/media-libs/id3lib/id3lib-3.8.3.recipe
index 80c2a4eee..455b3d528 100644
--- a/media-libs/id3lib/id3lib-3.8.3.recipe
+++ b/media-libs/id3lib/id3lib-3.8.3.recipe
@@ -5,7 +5,7 @@ some basic mp3 header information like bitrate etc."
 HOMEPAGE="https://sourceforge.net/projects/id3lib/"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://sourceforge.net/projects/id3lib/files/id3lib/$portVersion/id3lib-$portVersion.tar.gz"
 CHECKSUM_SHA256="2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079"
 PATCHES="id3lib-$portVersion.patchset"
@@ -13,10 +13,22 @@ PATCHES="id3lib-$portVersion.patchset"
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="3.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	id3lib$secondaryArchSuffix = $portVersion
-	lib:libid3$secondaryArchSuffix = 3.0.0 compat >= 0
+	lib:libid3_3.8$secondaryArchSuffix = $libVersionCompat
 	"
+# we only want the binaries for primary architecture
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
+	cmd:id3convert
+	cmd:id3cp
+	cmd:id3info
+	cmd:id3tag
+	"
+fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -25,7 +37,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	id3lib${secondaryArchSuffix}_devel = $portVersion
-	devel:libid3$secondaryArchSuffix = 3.0.0 compat >= 0
+	devel:libid3$secondaryArchSuffix = $libVersionCompat
+	devel:libid3_3.8$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	$portName == $portVersion base
@@ -39,6 +52,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
+	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
@@ -54,6 +68,7 @@ BUILD()
 {
 	libtoolize -fci
 	aclocal --force --install -I acinclude
+	automake --add-missing
 	autoconf
 	./configure --prefix=$prefix \
 		--bindir=$binDir \
@@ -62,6 +77,7 @@ BUILD()
 		--includedir=$includeDir \
 		--datadir=$dataDir \
 		--mandir=$manDir \
+		--disable-static \
 		--disable-dependency-tracking
 	make
 }
@@ -70,9 +86,14 @@ INSTALL()
 {
 	make install
 
+	# we only want the binaries for primary architecture
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+	fi
+
 	rm $libDir/libid3.la
 
-	prepareInstalledDevelLib libid3
+	prepareInstalledDevelLibs libid3 libid3-3.8
 	fixPkgconfig
 
 	packageEntries devel \