media-libs/lcms: revbump, rebase to upstream implementation

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 179 insertions, 134 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 16ec1a4..ac5f52f 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,63 @@
 # ChangeLog for media-libs/lcms
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.159 2013/11/16 12:34:47 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.175 2014/06/19 03:13:11 tetromino Exp $
+
+  19 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> lcms-1.19-r2.ebuild:
+  Fix file collision with emul-linux-x86-baselibs
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> lcms-1.19-r2.ebuild,
+  lcms-2.5-r1.ebuild, lcms-2.6.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
+
+*lcms-1.19-r2 (18 Jun 2014)
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> +lcms-1.19-r2.ebuild:
+  Backport multilib support to lcms:0, as required by older versions of wine.
+
+  10 Jun 2014; Mike Frysinger <vapier@gentoo.org> lcms-1.19-r1.ebuild,
+  lcms-1.19.ebuild, lcms-2.3.ebuild, lcms-2.4.ebuild, lcms-2.5-r1.ebuild,
+  lcms-2.5.ebuild, lcms-2.6.ebuild:
+  Add arm64/m68k love.
+
+  09 Jun 2014; Mike Frysinger <vapier@gentoo.org> lcms-2.5.ebuild:
+  Mark s390/sh stable.
+
+  03 May 2014; Mike Gilbert <floppym@gentoo.org> lcms-1.19-r1.ebuild:
+  Add python3.4.
+
+*lcms-2.6 (03 May 2014)
+
+  03 May 2014; Tim Harder <radhermit@gentoo.org> +lcms-2.6.ebuild:
+  Version bump, add default enabled threads use flag.
+
+  26 Apr 2014; Chema Alonso <nimiux@gentoo.org> lcms-1.19-r1.ebuild:
+  Stable for amd64 wrt bug #504214
+
+  28 Mar 2014; Jeroen Roovers <jer@gentoo.org> lcms-1.19-r1.ebuild,
+  lcms-2.5-r1.ebuild:
+  Stable for HPPA (bug #504214).
+
+  05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> lcms-2.5.ebuild:
+  Stable for alpha, wrt bug #488806
+
+  29 Dec 2013; Akinori Hattori <hattya@gentoo.org> lcms-2.5.ebuild:
+  ia64 stable wrt bug #488806
+
+  23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> lcms-2.5.ebuild:
+  Stable for sparc, wrt bug #488806
+
+  22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> lcms-2.5.ebuild:
+  Stable for ppc64, wrt bug #488806
+
+  21 Dec 2013; Agostino Sarubbo <ago@gentoo.org> lcms-2.5.ebuild:
+  Stable for ppc, wrt bug #488806
+
+  07 Dec 2013; Pacho Ramos <pacho@gentoo.org> lcms-2.5.ebuild:
+  x86 stable, bug #488806
+
+  29 Nov 2013; Markus Meier <maekke@gentoo.org> lcms-2.5.ebuild:
+  arm stable, bug #488806
 
   16 Nov 2013; Pacho Ramos <pacho@gentoo.org> lcms-2.5.ebuild:
   amd64 stable, bug #488806
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 891d310..79da5d8 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,6 +3,6 @@ AUX lcms-1.19-fix-python3.2.patch 1098 SHA256 aee8200bdb7106b5aaa0df92590de5c857
 AUX lcms-1.19-fix-swig-destructor.patch 345 SHA256 ac8ade0b3e45fd934b88925256fe6e729bb4b6b38f3ad896dfef3dc11e8b52a7 SHA512 00d1b2dd2ed32d4848c726e6616a4cb9caccc9ad410c796d400bd8566938854100c0c94e8db6446ab00a3dfef610406b6eca1f7a288a37b7249f3f98e9653a91 WHIRLPOOL 4247ffa55abdec48e98926ee174101bf440d00e81cf7c3fe2940693de04697d692b2538ca5b5d3917a5f1ea8ba72f2d964bcc7b7b49bc484bd18e6e260332484
 AUX lcms-1.19-implicit.patch 1308 SHA256 327eb96faafac582362f57800727896bd5c2206a7bb150f12ef7787e84f3ddd9 SHA512 120db0ea4c5a77563dffef55507a8e7fa172ee73ad3943b6ba55c4a01f4a0a2ae21794f4775d58f0d8ba6b5fbdc28c461622416981683063ff746db9a38c724b WHIRLPOOL df45ecfc6fe36db90c676e25f053b370af466648e36e752acfd9f5c0d5acc25a445bf0a8a476f0913ca5c7f0304940c3af35bf56c021fa34045cfdb1e52419bc
 DIST lcms-1.19.tar.gz 927752 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 SHA512 85a55ad0673f0df2aaa80d18caa50314319f8da5ee4d84eed919059d0dad9861d684ef6353ce0ec6f9892a4603ce8e8e12f84d46858e23f52846b8aefd3cf449 WHIRLPOOL cb6bcb5497798ff2fa86ff433eae6afea38408306345156da6103aa8af6fc0d48fa1d730c5958c027ba06ea023236328bcb00be60f600d987d060625385c820b
-EBUILD lcms-1.19-r2.ebuild 3154 SHA256 63ddae254cb83170afece04f6ad2309473f18f79411ca970d2564b57b008f270 SHA512 ec99f51a8af0b690603a41f0fd7f0b010bd47a0da2bd7223c3110486b4c154057b656c938f3ca8d9528052eafce495cb0d34cff7df982edbe7e9a41e9b2b79fa WHIRLPOOL 47f6a8f2ad025f70b79ea801655f1b07a9782a6ed3c0446b99eae807b5b9c2653f642f2dfe1fb1a08a0f62fdcadc039eee4aec1b38e644680e8acb750ccd52f1
-MISC ChangeLog 19908 SHA256 19cbffc7cfb4cceb02c2513e8d8ff6335685dd7bb3d1d3c0613a909c98fa12a8 SHA512 c39938fa796f9e43e17825e889c42a20c36452d818b6a3c000c5b0cb0b66889fa56f1369209907f1b094a547cd723f5d7592123c5168fb07c702a96f88a657b7 WHIRLPOOL 932ac158c8f2fdf432599425f80cb41b1f1897c3c5c0a87dc4c42af64edff44a84decb8e8c0430ab48752c658056fb1fbe75cd5047904d8f08fe88d7c5a82fbd
+EBUILD lcms-1.19-r3.ebuild 2884 SHA256 0755c0a436d740f6c31b96d4893d0dc07104d53862d362415b78981270eeeeb5 SHA512 16bd1dc8862cbeb1c868a0c5236da26e032b5fef5b47b45c53b62c38b024159a3fa4ac56dd224ef8498dd92b90c89b3e67593d68572deec0353cecc605f8c873 WHIRLPOOL 52b146d2696b8d2bd9cb900f531c6fbebbc5a1c16608cf2009f59541401348a6e840c3e1eb244537d1ea4ae5163ddb71552294d7f4c9e29f79b2179c758e4b4d
+MISC ChangeLog 21872 SHA256 2bf4f26b62e7428b02bce4a3cf734fb307d990b23ef94991a11e56d232daf107 SHA512 10cc75878aa6533643790fd0757640cd980dda3a1167cbccb453d67dffd22873f239ccfa2f848288e63002b556921cac3eb7a24ae549b9769e398504177bb173 WHIRLPOOL 74daf416c9e9bb333d2f96cda67c92d5b3d17548287b338f8722b05f46a4a54f1bafa5fec2f6789b6a17c766ad270e07119325472e3916e145a7530566ad34d6
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild
deleted file mode 100644
index 69ab7f6..0000000
--- a/media-libs/lcms/lcms-1.19-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-# autoreconf needs to update python macros for py3 support.
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-inherit autotools-multilib python-r1
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="jpeg python static-libs tiff zlib"
-
-RDEPEND="
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.31 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable_static_modules.patch"
-	"${FILESDIR}/${P}-implicit.patch"
-	"${FILESDIR}/${P}-fix-swig-destructor.patch"
-	"${FILESDIR}/${P}-fix-python3.2.patch"
-)
-
-src_prepare() {
-	# Breaks out-of-source build, only corresponding .in file is needed
-	rm include/icc34.h || die 'rm failed'
-
-	autotools-multilib_src_prepare
-
-	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
-	if use python; then
-		cd python || die
-		bash swig_lcms || die
-	fi
-}
-
-_pywrap() {
-	local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
-	local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
-	export CFLAGS CXXFLAGS
-	[[ -d "${BUILD_DIR}" ]] || { mkdir -p "${BUILD_DIR}" || die ; }
-	multilib-build_run_in_build_dir "$@"
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with jpeg)
-		$(use_with tiff)
-		$(use_with zlib)
-	)
-
-	autotools-multilib_src_configure --without-python
-}
-
-ehook autotools-multilib-best-abi-post_src_configure bestabi_pyconfigure
-bestabi_pyconfigure() {
-	local othereconfargs=(
-		$(
-			for othereconfarg in "${othereconfargs[@]}" ; do
-				[[ ${othereconfarg} == --without-python ]] || \
-					echo "${othereconfarg}"
-			done
-		)
-	)
-	use python && \
-		python_foreach_impl \
-			_pywrap \
-				econf "${myeconfargs[@]}" "${othereconfargs[@]}" --with-python
-}
-
-ehook autotools-multilib-best-abi-post_src_compile bestabi_pycompile
-bestabi_pycompile() {
-	use python && \
-		python_foreach_impl \
-			_pywrap \
-				emake "${myemakeargs[@]}" "${otheremakeargs[@]}" -C python \
-					top_builddir="${BUILD_DIR}"
-}
-
-ehook autotools-multilib-per-abi-pre_src_test cptestbed
-cptestbed() {
-	cp "${S}"/testbed/*icm ${BUILD_DIR}/testbed/ || die
-	return 0
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		BINDIR="${ED}"/usr/bin
-
-	dodoc AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT
-
-	insinto /usr/share/lcms/profiles
-	doins testbed/*.icm
-}
-
-ehook autotools-multilib-best-abi-post_src_install bestabi_pyinstall
-bestabi_pyinstall() {
-	if use python; then
-		python_foreach_impl \
-			_pywrap \
-				emake "${myemakeinstallargs[@]}" "${otheremakeinstallargs[@]}" \
-					-C python top_builddir="${BUILD_DIR}"
-
-		python_foreach_impl \
-			_pywrap \
-				python_optimize
-	fi
-}
diff --git a/media-libs/lcms/lcms-1.19-r3.ebuild b/media-libs/lcms/lcms-1.19-r3.ebuild
new file mode 100644
index 0000000..e3dc5c6
--- /dev/null
+++ b/media-libs/lcms/lcms-1.19-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+# autoreconf needs to update python macros for py3 support.
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-multilib python-r1
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="http://www.littlecms.com/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jpeg python static-libs tiff zlib"
+
+RDEPEND="
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r11
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-1.3.31 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable_static_modules.patch"
+	"${FILESDIR}/${P}-implicit.patch"
+	"${FILESDIR}/${P}-fix-swig-destructor.patch"
+	"${FILESDIR}/${P}-fix-python3.2.patch"
+)
+
+_pywrap() {
+	local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
+	local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+	export CFLAGS CXXFLAGS
+	[[ -d "${BUILD_DIR}" ]] || { mkdir -p "${BUILD_DIR}" || die ; }
+	multilib-build_run_in_build_dir "$@"
+}
+
+src_prepare() {
+	# Breaks out-of-source build, only corresponding .in file is needed
+	rm include/icc34.h || die 'rm failed'
+
+	autotools-utils_src_prepare
+
+	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
+	if use python; then
+		cd python || die
+		bash swig_lcms || die
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with jpeg)
+		$(use_with tiff)
+		$(use_with zlib)
+	)
+	autotools-utils_src_configure --without-python
+
+	if multilib_is_native_abi && use python; then
+		python_parallel_foreach_impl _pywrap \
+			autotools-utils_src_configure --with-python
+	fi
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python; then
+		# Note: it intentionally passes evaluated 'parent' dir.
+		python_parallel_foreach_impl _pywrap \
+			autotools-utils_src_compile -C python \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
+
+multilib_src_test() {
+	cp "${S}"/testbed/*icm testbed/ || die
+
+	default
+}
+
+multilib_src_install() {
+	emake DESTDIR="${ED}" BINDIR="${ED}"/usr/bin install
+
+	if multilib_is_native_abi && use python; then
+		# Note: it intentionally passes evaluated 'parent' dir.
+		python_foreach_impl _pywrap \
+			autotools-utils_src_install -C python \
+			top_builddir="${BUILD_DIR}"
+
+		python_parallel_foreach_impl _pywrap python_optimize
+	fi
+
+	insinto /usr/share/lcms/profiles
+	doins "${S}"/testbed/*.icm
+}
+
+multilib_src_install_all() {
+	DOCS=( AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT )
+
+	einstalldocs
+	prune_libtool_files --modules
+}