Fix building with -Wl,--as-needed wrt #247731. Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

6 files changed, 59 insertions, 132 deletions

diff --git a/media-gfx/greycstoration/ChangeLog b/media-gfx/greycstoration/ChangeLog
index bf67acb82890..62615f7821f4 100644
--- a/media-gfx/greycstoration/ChangeLog
+++ b/media-gfx/greycstoration/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/greycstoration
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.5 2009/12/15 14:41:02 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.6 2010/03/10 15:18:00 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  greycstoration-2.9.ebuild, +files/greycstoration-2.9-libpng14.patch:
+  Fix building with -Wl,--as-needed wrt #247731. Fix building with libpng14.
 
   15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
   metadata.xml: put required herd tag.
diff --git a/media-gfx/greycstoration/Manifest b/media-gfx/greycstoration/Manifest
index 97dfff6758c3..2fa010df541e 100644
--- a/media-gfx/greycstoration/Manifest
+++ b/media-gfx/greycstoration/Manifest
@@ -1,8 +1,5 @@
-DIST CImg-1.2.7.tar.gz 5945505 RMD160 6f6cb6c05d126c5408807c8eac5b620dea010cee SHA1 40efd983a7d95cc5dc9b08a04620211f08f29a28 SHA256 ae562feae3b6d900cc959c3bc6742485828ca6f55321e8e94a8df7be041b18f3
-DIST GREYCstoration-2.8.zip 3524726 RMD160 93e7f505d33315b421c4edefe00d181b16d9576c SHA1 bace29d745cbcad4e7eb983c1a611cb72f454405 SHA256 59cdfed273cb82d89f88b2a09eabc237a53db117d8bfdf426d20b3938e8e8969
+AUX greycstoration-2.9-libpng14.patch 839 RMD160 28f49c33e620135f0f722690d745b60859126e3c SHA1 2388447347ef1d3c5545fcc0ab6c340755016c3b SHA256 2fe78bf4b6b82d15c7f7965694614b376574e1fcbc7043ab046229de88f2fcfe
 DIST GREYCstoration-2.9.zip 3639412 RMD160 36aa8b2c261ff101a590dde2a136adebc0e56060 SHA1 afacea96db9cda6bd565055aff2a235572533d1a SHA256 dfc867bffd38fc204b5fe6a3952d7aa4ac53c2b75aabf45102ed7f6022c1c7be
-EBUILD greycstoration-1.2.7.ebuild 1533 RMD160 6220e18d99d19d57f5ee4a2cc5d47773d75f6830 SHA1 439843fc599751dfae788fe91f1d146e320b01a5 SHA256 1db6572303bdb43e148b499526f718b6b5e765f8f668e3aa425a5839a19a105c
-EBUILD greycstoration-2.8.ebuild 1690 RMD160 64b90ec1451e11fac1b1af1022565908b101a49e SHA1 36775cb51fcb9248a8d4db63c042aa7440242af5 SHA256 7a85d936e1c41ada7a47f981ff452ee0e0f740a26b5640f41318997d18a477d0
-EBUILD greycstoration-2.9.ebuild 1704 RMD160 6fbe3044143f23cf6371ca1366496f4d2edbe9f7 SHA1 2447c673d0528edf65d0a976f60fdcde0b704b50 SHA256 4949ec75f10c5897d11b20e98a18788de17fc98f3cfea648beff5ecf56620cec
-MISC ChangeLog 898 RMD160 3e4a0323600a2ea3474c3cb70761e114b98074b3 SHA1 3807df25aac3e68511896506f97305e5470d7511 SHA256 3e4bd718ab825e819f34e4379cf1ba8ae9608c1d7fa94d5b878cf8d3fc1eefb8
+EBUILD greycstoration-2.9.ebuild 1684 RMD160 7afaa4f80e56517032af3d74c9d8998ae24b461a SHA1 f7aaaff138196afbbac8d6707898b941b6d5af4f SHA256 a98f14611da3edaa31ea45e21624685b558f8ee4210d7fa2a7a1d6843e34d5a2
+MISC ChangeLog 1107 RMD160 b57aa2a00171d440c838df2184b5d2660f05eeb1 SHA1 bcff568e90c80f6a19fc5b4b488f8aec7cec060a SHA256 0ede9b86da852108e1191d33a6d6d13089b99fb4e716220a72ce54011fa6aa4b
 MISC metadata.xml 253 RMD160 c8950662719d03599d036e3eb69d051f3bd510ef SHA1 e2917bed8b1a88dc1c08e5448eda832233343182 SHA256 979ef9baba638b0dea7e0604553bd3eb5c1192a1849b989860525b6243a463a8
diff --git a/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch
new file mode 100644
index 000000000000..e8c0276f8917
--- /dev/null
+++ b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch
@@ -0,0 +1,22 @@
+http://repos.archlinux.org/wsvn/community/greycstoration/trunk/libpng14.patch
+
+--- CImg.h
++++ CImg.h
+@@ -25671,7 +25671,7 @@
+       png_read_info(png_ptr,info_ptr);
+       png_uint_32 W, H;
+       int bit_depth, color_type, interlace_type;
+-      png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL);
++      png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,NULL,NULL);
+       int new_bit_depth = bit_depth;
+       int new_color_type = color_type;
+ 
+@@ -25682,7 +25682,7 @@
+         new_bit_depth = 8;
+       }
+       if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         new_bit_depth = 8;
+       }
+       if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/media-gfx/greycstoration/greycstoration-1.2.7.ebuild b/media-gfx/greycstoration/greycstoration-1.2.7.ebuild
deleted file mode 100644
index 1585c8687d40..000000000000
--- a/media-gfx/greycstoration/greycstoration-1.2.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-1.2.7.ebuild,v 1.1 2008/02/25 23:18:31 calchan Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
-HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
-SRC_URI="mirror://sourceforge/cimg/CImg-${PV}.tar.gz"
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw imagemagick jpeg lapack png tiff X"
-
-DEPEND="fftw? ( >=sci-libs/fftw-3 )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	lapack? ( virtual/lapack )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr )"
-
-S="${WORKDIR}/CImg-${PV}/examples"
-
-src_compile() {
-	local MY_CONF
-
-	use X && MY_CONF+=" -lX11 -Dcimg_use_xshm -lXext -Dcimg_use_xrandr -lXrandr"
-	use png && MY_CONF+=" -Dcimg_use_png -lpng -lz"
-	use jpeg && MY_CONF+=" -Dcimg_use_jpeg -ljpeg"
-	use tiff && MY_CONF+=" -Dcimg_use_tiff -ltiff"
-	use imagemagick && MY_CONF+=" -Dcimg_use_magick $(Magick++-config --cppflags) \
-		$(Magick++-config --ldflags) $(Magick++-config --libs)"
-	use fftw && MY_CONF+=" -Dcimg_use_fftw3 -lfftw3"
-	use lapack && MY_CONF+=" -Dcimg_use_lapack -llapack"
-
-	$(tc-getCXX) -o greycstoration greycstoration.cpp \
-		${MY_CONF} -lm -lpthread \
-		${CXXFLAGS} ${LDFLAGS} \
-		|| die "Compilation failed"
-}
-
-src_install() {
-	dobin greycstoration
-}
diff --git a/media-gfx/greycstoration/greycstoration-2.8.ebuild b/media-gfx/greycstoration/greycstoration-2.8.ebuild
deleted file mode 100644
index 08645cf4cbb0..000000000000
--- a/media-gfx/greycstoration/greycstoration-2.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.8.ebuild,v 1.2 2008/05/30 11:13:08 calchan Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
-HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
-SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw imagemagick jpeg lapack png tiff X"
-
-RDEPEND="fftw? ( >=sci-libs/fftw-3 )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	lapack? ( virtual/lapack )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/GREYCstoration-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:../CImg.h:CImg.h:" "${S}"/greycstoration.cpp || die "sed failed"
-}
-
-src_compile() {
-	local MY_CONF
-
-	use X && MY_CONF+=" -lX11 -Dcimg_use_xshm -lXext -Dcimg_use_xrandr -lXrandr"
-	use png && MY_CONF+=" -Dcimg_use_png -lpng -lz"
-	use jpeg && MY_CONF+=" -Dcimg_use_jpeg -ljpeg"
-	use tiff && MY_CONF+=" -Dcimg_use_tiff -ltiff"
-	use imagemagick && MY_CONF+=" -Dcimg_use_magick $(Magick++-config --cppflags) \
-		$(Magick++-config --ldflags) $(Magick++-config --libs)"
-	use fftw && MY_CONF+=" -Dcimg_use_fftw3 -lfftw3"
-	use lapack && MY_CONF+=" -Dcimg_use_lapack -llapack"
-
-	$(tc-getCXX) -o greycstoration greycstoration.cpp \
-		${MY_CONF} -lm -lpthread \
-		${CXXFLAGS} ${LDFLAGS} \
-		|| die "Compilation failed"
-}
-
-src_install() {
-	dobin greycstoration
-}
diff --git a/media-gfx/greycstoration/greycstoration-2.9.ebuild b/media-gfx/greycstoration/greycstoration-2.9.ebuild
index 0e537639245a..2b1d621b464a 100644
--- a/media-gfx/greycstoration/greycstoration-2.9.ebuild
+++ b/media-gfx/greycstoration/greycstoration-2.9.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.9.ebuild,v 1.1 2008/08/30 22:28:00 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.9.ebuild,v 1.2 2010/03/10 15:18:00 ssuominen Exp $
 
-inherit toolchain-funcs
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
 HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
 SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
+
 LICENSE="CeCILL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -24,31 +26,34 @@ RDEPEND="fftw? ( >=sci-libs/fftw-3 )
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S="${WORKDIR}/GREYCstoration-${PV}/src"
+S=${WORKDIR}/GREYCstoration-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:../CImg.h:CImg.h:" "${S}"/greycstoration.cpp || die "sed failed"
+	sed -i \
+		-e "s:../CImg.h:CImg.h:" \
+		greycstoration.cpp || die
 }
 
 src_compile() {
-	local MY_CONF
-
-	use X && MY_CONF+=" -lX11 -Dcimg_use_xshm -lXext -Dcimg_use_xrandr -lXrandr"
-	use png && MY_CONF+=" -Dcimg_use_png -lpng -lz"
-	use jpeg && MY_CONF+=" -Dcimg_use_jpeg -ljpeg"
-	use tiff && MY_CONF+=" -Dcimg_use_tiff -ltiff"
-	use imagemagick && MY_CONF+=" -Dcimg_use_magick $(Magick++-config --cppflags) \
-		$(Magick++-config --ldflags) $(Magick++-config --libs)"
-	use fftw && MY_CONF+=" -Dcimg_use_fftw3 -lfftw3"
-	use lapack && MY_CONF+=" -Dcimg_use_lapack -llapack"
-
-	$(tc-getCXX) -o greycstoration greycstoration.cpp \
-		${MY_CONF} -lm -lpthread \
-		${CXXFLAGS} ${LDFLAGS} -fno-tree-pre \
-		|| die "Compilation failed"
+	local myconf
+
+	use X && myconf+=" -Dcimg_use_xshm -Dcimg_use_xrandr -lX11 -lXext -lXrandr"
+	use png && myconf+=" -Dcimg_use_png -lpng -lz"
+	use jpeg && myconf+=" -Dcimg_use_jpeg -ljpeg"
+	use tiff && myconf+=" -Dcimg_use_tiff -ltiff"
+	use imagemagick && myconf+=" -Dcimg_use_magick $(Magick++-config --cppflags)
+		$(Magick++-config --libs)"
+	use fftw && myconf+=" -Dcimg_use_fftw3 -lfftw3"
+	use lapack && myconf+=" -Dcimg_use_lapack -llapack"
+
+	$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -fno-tree-pre \
+		-o greycstoration greycstoration.cpp \
+		${myconf} -lm -lpthread \
+		|| die
 }
 
 src_install() {
-	dobin greycstoration
+	dobin greycstoration || die
 }