From 4499968f08e5725f1343fe0745929fb93264299e Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 2 Aug 2016 19:28:14 +0000
Subject: [PATCH] lcms: bump to 2.8, drop liblcms2.la, reorder sections, add
 TEST. (#749)

* Don't use $secondaryArchSuffix for cmd:{jpg,link,ps,tif,trans}icc
  and install them in $prefix/bin (instead of $binDir) for x86 2ndary
  arch. This is safe (and needs no external changes) because no other
  recipe references any cmd: provided by this one.
* Use {aclocal,automake} from automake (instead of automake113) since
  upstream now uses that version. Thanks Jerome for the hint!
---
 .../lcms/{lcms-2.7.recipe => lcms-2.8.recipe} | 80 +++++++++++--------
 1 file changed, 46 insertions(+), 34 deletions(-)
 rename media-libs/lcms/{lcms-2.7.recipe => lcms-2.8.recipe} (54%)

diff --git a/media-libs/lcms/lcms-2.7.recipe b/media-libs/lcms/lcms-2.8.recipe
similarity index 54%
rename from media-libs/lcms/lcms-2.7.recipe
rename to media-libs/lcms/lcms-2.8.recipe
index a5575f610..9ae88418d 100644
--- a/media-libs/lcms/lcms-2.7.recipe
+++ b/media-libs/lcms/lcms-2.8.recipe
@@ -1,31 +1,35 @@
 SUMMARY="A small-footprint, speed optimized color management engine"
-DESCRIPTION="
-Little CMS intends to be an open source small-footprint color management \
-engine, with special focus on accuracy and performance. It uses the \
+DESCRIPTION="Little CMS intends to be an open source small-footprint color \
+management engine, with special focus on accuracy and performance. It uses the \
 International Color Consortium standard (ICC), which is the modern standard \
 when regarding to color management. The ICC specification is widely used and \
 is referred to in many International and other de-facto standards. It was \
-approved as an International Standard, ISO 15076-1, in 2005.
-"
+approved as an International Standard, ISO 15076-1, in 2005."
 HOMEPAGE="http://littlecms.com/"
-SOURCE_URI="http://downloads.sourceforge.net/project/lcms/lcms/$portVersion/lcms2-$portVersion.tar.gz"
-CHECKSUM_SHA256="4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53"
-REVISION="2"
+COPYRIGHT="1998-2016 Marti Maria"
 LICENSE="MIT"
-COPYRIGHT="2007 Marti Maria"
+REVISION="1"
+SOURCE_URI="http://downloads.sourceforge.net/lcms/lcms2-$portVersion.tar.gz"
+CHECKSUM_SHA256="66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"
+SOURCE_DIR="lcms2-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandBinDir=$binDir
+else
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
 	lcms$secondaryArchSuffix = $portVersion compat >= 2
-	lib:liblcms2$secondaryArchSuffix = 2.0.7 compat >= 2
-	cmd:jpgicc$secondaryArchSuffix
-	cmd:linkicc$secondaryArchSuffix
-	cmd:psicc$secondaryArchSuffix
-	cmd:tificc$secondaryArchSuffix
-	cmd:transicc$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix = 2.0.8 compat >= 2
+	cmd:jpgicc
+	cmd:linkicc
+	cmd:psicc
+	cmd:tificc
+	cmd:transicc
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,6 +38,19 @@ REQUIRES="
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	lcms${secondaryArchSuffix}_devel = $portVersion
+	devel:liblcms2$secondaryArchSuffix = 2.0.8 compat >= 2
+	"
+REQUIRES_devel="
+	lcms$secondaryArchSuffix == $portVersion base
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
@@ -42,25 +59,23 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
-	cmd:libtoolize
-	cmd:aclocal_1.13
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:aclocal
 	cmd:autoconf
-	cmd:automake_1.13
+	cmd:automake
 	cmd:make
 	"
 
-SOURCE_DIR="lcms2-$portVersion"
-
 BUILD()
 {
 	libtoolize --force --copy --install
-	aclocal-1.13
-	automake-1.13
+	aclocal
+	automake
 	autoconf
 
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }
 
@@ -68,6 +83,8 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/liblcms2.la
+
 	# prepare develop/lib
 	prepareInstalledDevelLibs liblcms2
 
@@ -78,12 +95,7 @@ INSTALL()
 		$developDir
 }
 
-# ----- devel package ---------------------------------------
-
-PROVIDES_devel="
-	lcms${secondaryArchSuffix}_devel = $portVersion
-	devel:liblcms2$secondaryArchSuffix = 2.0.7 compat >= 2
-	"
-REQUIRES_devel="
-	lcms$secondaryArchSuffix == $portVersion base
-	"
+TEST()
+{
+	make check
+}