From 6ab4d92086b911f6e503f379846cfa37f7982b86 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 20 Apr 2016 21:27:57 +0000
Subject: [PATCH] libcdio: fix versions of devel:lib{cdio,iso9660} in
 PROVIDES_devel.

* libcdio and libiso9660 had had their versions bumped in PROVIDES
  but not in PROVIDES_devel.
* Do not ship documentation and runtimes for secondary arch builds.
* Use a mirror redirector for SOURCE_URI.
* Update COPYRIGHT years.
---
 dev-libs/libcdio/libcdio-0.93.recipe | 77 +++++++++++++++-------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/dev-libs/libcdio/libcdio-0.93.recipe b/dev-libs/libcdio/libcdio-0.93.recipe
index 97ef3b260..0491ff7e0 100644
--- a/dev-libs/libcdio/libcdio-0.93.recipe
+++ b/dev-libs/libcdio/libcdio-0.93.recipe
@@ -1,52 +1,67 @@
 SUMMARY="A library to encapsulate CD-ROM reading and control"
-DESCRIPTION="
-The libcdio package contains a library for CD-ROM and CD image \
-access. Applications wishing to be oblivious of the OS- and \
-device-dependent properties of a CD-ROM or of the specific details of \
-various CD-image formats may benefit from using this library.
-"
+DESCRIPTION="The libcdio package contains a library for CD-ROM and CD image \
+access. Applications wishing to be oblivious of the OS- and device-dependent \
+properties of a CD-ROM or of the specific details of various CD-image formats \
+may benefit from using this library."
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+COPYRIGHT="2002-2014 Rocky Bernstein and Herbert Valerio Riedel"
 LICENSE="GNU GPL v3"
-COPYRIGHT="2002-2008,2010,2012, Rocky Bernstein and Herbert Valerio Riedel."
-HOMEPAGE="http://www.gnu.org/software/libcdio"
-SOURCE_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.gz"
+REVISION="3"
+SOURCE_URI="http://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz"
 CHECKSUM_SHA256="4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975"
-REVISION="2"
+PATCHES="libcdio-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libcdio-$portVersion.patchset"
 
 PROVIDES="
 	libcdio$secondaryArchSuffix = $portVersion
-	cmd:cdda_player$secondaryArchSuffix
-	cmd:cd_drive$secondaryArchSuffix
-	cmd:cd_info$secondaryArchSuffix
-	cmd:cd_read$secondaryArchSuffix
-	cmd:iso_info$secondaryArchSuffix
-	cmd:iso_read$secondaryArchSuffix
-	cmd:mmc_tool$secondaryArchSuffix
 	lib:libcdio$secondaryArchSuffix = 16.0.0 compat >= 16
 	lib:libcdio++$secondaryArchSuffix = 0.0.2 compat >= 0
 	lib:libiso9660$secondaryArchSuffix = 10.0.0 compat >= 10
 	lib:libiso9660++$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:libudf$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
-
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:cdda_player
+		cmd:cd_drive
+		cmd:cd_info
+		cmd:cd_read
+		cmd:iso_info
+		cmd:iso_read
+		cmd:mmc_tool
+		"
+fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libcdio${secondaryArchSuffix}_devel = $portVersion
+	devel:libcdio${secondaryArchSuffix} = 16.0.0 compat >= 16
+	devel:libcdio++${secondaryArchSuffix} = 0.0.2 compat >= 0
+	devel:libiso9660${secondaryArchSuffix} = 10.0.0 compat >= 10
+	devel:libiso9660++${secondaryArchSuffix} = 0.0.0 compat >= 0
+	devel:libudf${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libcdio${secondaryArchSuffix} == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:autoconf
 	cmd:automake
 	"
@@ -58,13 +73,17 @@ BUILD()
 	autoconf
 	automake
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $documentationDir $binDir
+	fi
+
 	# set up the develop directory correctly
 	prepareInstalledDevelLibs libcdio libcdio++ libudf libiso9660 libiso9660++
 	fixPkgconfig
@@ -78,17 +97,3 @@ TEST()
 {
 	make check
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libcdio${secondaryArchSuffix}_devel = $portVersion
-	devel:libcdio${secondaryArchSuffix} = 15.0.0 compat >= 15
-	devel:libcdio++${secondaryArchSuffix} = 0.0.2 compat >= 0
-	devel:libiso9660${secondaryArchSuffix} = 9.0.0 compat >= 9
-	devel:libiso9660++${secondaryArchSuffix} = 0.0.0 compat >= 0
-	devel:libudf${secondaryArchSuffix} = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libcdio${secondaryArchSuffix} == $portVersion base
-	"