Version bump to 3.15.2

Package-Manager: portage-2.1.10.49/cvs/Linux i686

4 files changed, 406 insertions, 5 deletions

diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog
index e932bfcfccbd..e9145d2631bd 100644
--- a/media-libs/freeimage/ChangeLog
+++ b/media-libs/freeimage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freeimage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.12 2012/02/12 13:55:19 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.13 2012/03/06 08:09:16 tupone Exp $
+
+*freeimage-3.15.2 (06 Mar 2012)
+
+  06 Mar 2012; Tupone Alfredo <tupone@gentoo.org> +freeimage-3.15.2.ebuild,
+  +files/freeimage-3.15.2-unbundling.patch:
+  Version bump to 3.15.2
 
 *freeimage-3.15.1 (12 Feb 2012)
 
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index ed80681f172d..4c5ead63eaf9 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX freeimage-3.15.2-unbundling.patch 9329 RMD160 165a8528a3031588b0e4455ecb58fddea319359b SHA1 5011e786441188af1b5fc8b1ecacd5090e4c0d42 SHA256 b42a4f6f1c4ef6fc34d92694b93a8820646cfb6b7a7b415e1877a333e9a414c0
 DIST FreeImage3151.pdf 1004230 RMD160 b8d9715e5a249df7f05287f77052d8b7012a76d2 SHA1 8ad213d33e9b2218d386c9e19d3a299e8c7901ed SHA256 01397a103a64032754490553236470871cf4c225d7b0be67b4eee7e7d97817f3
 DIST FreeImage3151.zip 5068002 RMD160 3551e972617435772340655b3973810793b3a84d SHA1 02ae98007fc64d72a8f15ec3ff24c36ac745fbc8 SHA256 e0f0dd980b16ca2904e01896cd7a1f64a38ddf1896a91c5659de2816fd0bbaed
+DIST FreeImage3152.pdf 1004354 RMD160 58c92ba45848b39abc3de63501181cdc1fc9dfc3 SHA1 832a6d190b389cc39a2859e81e794cb1678ab2e1 SHA256 94c111ec4d14cab30b152c0049ab081e36ed7ffead9f3001209342c3599dfa30
+DIST FreeImage3152.zip 4618626 RMD160 bb90daff4ba8fb0dfadc7f634043614b340b93d9 SHA1 f9cd3cbbc506424939cdc6b344e3f2d4bf8efe1c SHA256 b55d9e4d6cc6a229aaf0c06d49f7001ec3a7df5d7bc4e30bb284fa92f47f4ee7
 DIST freeimage-3.15.1-unbundling.patch.gz 16253 RMD160 67a6559f2ef11a4cea5143eee2c40e0fba006f16 SHA1 f1941f99c6e1d6902639b6b84906d2efd0829d13 SHA256 1c7d88e7b12c7bf6293d65c9431adb1849b9c3d87592c3247e41e47e21c7473f
 EBUILD freeimage-3.15.1.ebuild 1962 RMD160 c41706b54243e5a713b145d6051d95893f1923a7 SHA1 174babe2f2c799ff3cea4d8af46d6da2606442fe SHA256 e9be4e1b6d10159e12185599d192d2f4d1f80631566e6ecdf507a6e8b65c55a4
-MISC ChangeLog 1720 RMD160 67b60671e9b5576eaecb0106f334f2913c6f5652 SHA1 71a08d7476d5c01d8f2d25901fa6ff4d1742a1ef SHA256 f96206999fca7f3fafa78bcf97f9cbcebf3416bb2444ffc12238c009a69b73bf
+EBUILD freeimage-3.15.2.ebuild 2505 RMD160 08f9b39e1b3e3c89f7d1c873e4f30f16820a93e6 SHA1 ff9c699d2f9128342b615865472aa5b8e0a62048 SHA256 617d1b7829de33a207f8d632cea580e094ccbd72f9ccec6fa6dd07cbbb6a89e5
+MISC ChangeLog 1899 RMD160 2285126ebd8f12666bc0318777036441ed15fb3a SHA1 2a0f3dbaf90ffb17696d7cc5681a1ba52a6600f0 SHA256 2599a73b7c1bac797b9c13d8dff4a8d47fbfb049eeae57a392405bb95552ba16
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk83xNMACgkQIY77eQFFFC1YzACgiligOo2W+EfWx1PWjQlVfFVq
-vqgAnRWyTnsAWwjkHw5M6dj/ePSE8mqN
-=EuMz
+iEYEARECAAYFAk9Vxj8ACgkQIY77eQFFFC0kmQCfZrOCu9qYfEerfeyF4k9A3xps
+YvsAoOhoMgW4RzHV7Tm9N4OIpGlNeZRG
+=SWRO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freeimage/files/freeimage-3.15.2-unbundling.patch b/media-libs/freeimage/files/freeimage-3.15.2-unbundling.patch
new file mode 100644
index 000000000000..51f7d2653ce0
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.15.2-unbundling.patch
@@ -0,0 +1,293 @@
+--- Makefile.gnu.old	2010-12-06 23:37:20.000000000 +0100
++++ Makefile.gnu	2012-02-07 16:25:00.274896402 +0100
+@@ -11,7 +11,13 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++LIBRARIES = -lstdc++ -lmng -ljpeg \
++	$(shell pkg-config --libs libpng) \
++	$(shell pkg-config --libs libtiff-4) \
++	$(shell pkg-config --libs zlib) \
++	$(shell pkg-config --libs libopenjpeg) \
++	$(shell pkg-config --libs OpenEXR) \
++	$(shell pkg-config --libs libraw)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -64,7 +64,7 @@
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+@@ -67,7 +67,6 @@
+ 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+-	ldconfig
+ 
+ clean:
+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+--- Source/FreeImage/J2KHelper.cpp.old	2012-02-07 16:32:41.814898596 +0100
++++ Source/FreeImage/J2KHelper.cpp	2012-02-07 16:33:06.914898715 +0100
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ 
+ /**
+ Divide an integer by a power of 2 and round upwards
+--- Source/FreeImage/PluginEXR.cpp.old	2012-02-07 16:34:01.224898974 +0100
++++ Source/FreeImage/PluginEXR.cpp	2012-02-07 16:35:34.124899415 +0100
+@@ -22,16 +22,16 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../OpenEXR/IlmImf/ImfIO.h"
+-#include "../OpenEXR/Iex/Iex.h"
+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
+-#include "../OpenEXR/IlmImf/ImfInputFile.h"
+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
+-#include "../OpenEXR/IlmImf/ImfChannelList.h"
+-#include "../OpenEXR/IlmImf/ImfRgba.h"
+-#include "../OpenEXR/IlmImf/ImfArray.h"
+-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
+-#include "../OpenEXR/Half/half.h"
++#include <ImfIO.h>
++#include <Iex.h>
++#include <ImfOutputFile.h>
++#include <ImfInputFile.h>
++#include <ImfRgbaFile.h>
++#include <ImfChannelList.h>
++#include <ImfRgba.h>
++#include <ImfArray.h>
++#include <ImfPreviewImage.h>
++#include <half.h>
+ 
+ 
+ // ==========================================================
+--- Source/FreeImage/PluginJ2K.cpp.old	2012-02-07 16:41:39.814901153 +0100
++++ Source/FreeImage/PluginJ2K.cpp	2012-02-07 16:41:59.314901245 +0100
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ 
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginJP2.cpp.old	2012-02-07 16:42:44.034901460 +0100
++++ Source/FreeImage/PluginJP2.cpp	2012-02-07 16:43:08.214901573 +0100
+@@ -21,7 +21,7 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include <openjpeg.h>
+ 
+ // ==========================================================
+ // Plugin Interface
+--- Source/FreeImage/PluginPNG.cpp.old	2012-02-07 16:48:30.874903106 +0100
++++ Source/FreeImage/PluginPNG.cpp	2012-02-07 16:49:07.354903280 +0100
+@@ -37,8 +37,8 @@
+ 
+ // ----------------------------------------------------------
+ 
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include <zlib.h>
++#include <png.h>
+ 
+ // ----------------------------------------------------------
+ 
+--- Source/transupp.c.old	2012-02-08 12:37:51.605242277 +0100
++++ Source/transupp.c	2012-02-08 12:36:30.055241889 +0100
+@@ -15,8 +15,7 @@
+ /* Although this file really shouldn't have access to the library internals,
+  * it's helpful to let it call jround_up() and jcopy_block_row().
+  */
+-#define JPEG_INTERNALS
+-
++#include <jerror.h>
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h"		/* My own external interface */
+--- Source/FreeImage/ZLibInterface.cpp.old	2012-02-08 16:01:24.195300325 +0100
++++ Source/FreeImage/ZLibInterface.cpp	2012-02-08 16:01:46.845300430 +0100
+@@ -19,10 +19,10 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../ZLib/zlib.h"
++#include <zlib.h>
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
++#define OS_CODE 0x03
+ 
+ /**
+ Compresses a source buffer into a target buffer, using the ZLib library. 
+--- Source/FreeImage/PluginG3.cpp.old	2012-02-10 12:20:04.396058511 +0100
++++ Source/FreeImage/PluginG3.cpp	2012-02-10 13:00:43.486070102 +0100
+@@ -20,7 +20,7 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginJPEG.cpp.old	2012-02-10 13:21:03.816075904 +0100
++++ Source/FreeImage/PluginJPEG.cpp	2012-02-10 13:30:13.236078514 +0100
+@@ -35,11 +35,15 @@
+ #undef FAR
+ #include <setjmp.h>
+ 
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include <string.h>
++#include <stdio.h>
++#include <jconfig.h>
++#include <jpeglib.h>
++#include <jerror.h>
+ }
+ 
++#define SIZEOF(object)        ((size_t) sizeof(object))
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+ 
+--- Source/FreeImageToolkit/JPEGTransform.cpp.old	2012-02-10 13:29:17.546078251 +0100
++++ Source/FreeImageToolkit/JPEGTransform.cpp	2012-02-10 13:30:20.576078553 +0100
+@@ -25,10 +25,11 @@
+ #undef FAR
+ #include <setjmp.h>
+ 
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
+-#include "../LibJPEG/transupp.h"
++#include <string.h>
++#include <stdio.h>
++#include <jpeglib.h>
++#include <jerror.h>
++#include "transupp.h"
+ }
+ 
+ #include "FreeImage.h"
+--- Makefile.fip.old	2012-02-12 12:21:36.573897004 +0100
++++ Makefile.fip	2012-02-12 12:23:50.612449982 +0100
+@@ -11,7 +11,13 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++LIBRARIES = -lstdc++ -lmng -ljpeg \
++	    $(shell pkg-config --libs libpng) \
++	    $(shell pkg-config --libs libtiff-4) \
++	    $(shell pkg-config --libs zlib) \
++	    $(shell pkg-config --libs libopenjpeg) \
++	    $(shell pkg-config --libs OpenEXR) \
++	    $(shell pkg-config --libs libraw)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -65,7 +65,7 @@
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+--- Makefile.srcs.old	2012-03-05 21:39:31.927571124 +0100
++++ Makefile.srcs	2012-03-05 21:42:25.724317503 +0100
+@@ -88,6 +88,7 @@
+ 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ 	Source/FreeImageToolkit/Rescale.cpp \
+ 	Source/FreeImageToolkit/Resize.cpp \
++	Source/transupp.c
+ INCLS = \
+ 	Source/FreeImage.h \
+ 	Source/CacheFile.h \
+@@ -116,3 +117,9 @@
+ 	-ISource \
+ 	-ISource/Metadata \
+ 	-ISource/FreeImageToolkit \
++	$(shell pkg-config --cflags-only-I libpng) \
++	$(shell pkg-config --cflags-only-I libtiff-4) \
++	$(shell pkg-config --cflags-only-I zlib) \
++	$(shell pkg-config --cflags-only-I libopenjpeg) \
++	$(shell pkg-config --cflags-only-I OpenEXR) \
++	$(shell pkg-config --cflags-only-I libraw)
+--- Source/FreeImage/PluginRAW.cpp.old	2012-03-05 21:51:38.538302182 +0100
++++ Source/FreeImage/PluginRAW.cpp	2012-03-05 21:53:47.384165909 +0100
+@@ -19,7 +19,7 @@
+ // Use at your own risk!
+ // ==========================================================
+ 
+-#include "../LibRawLite/libraw/libraw.h"
++#include <libraw.h>
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/Metadata/XTIFF.cpp.old	2012-03-05 22:13:31.139297475 +0100
++++ Source/Metadata/XTIFF.cpp	2012-03-05 22:15:39.778190233 +0100
+@@ -29,7 +29,7 @@
+ #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
+ #endif
+ 
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+--- Source/FreeImage/PluginTIFF.cpp.old	2012-03-05 22:26:45.056274217 +0100
++++ Source/FreeImage/PluginTIFF.cpp	2012-03-05 22:27:21.506763949 +0100
+@@ -37,9 +37,9 @@
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include "../OpenEXR/Half/half.h"
++#include <half.h>
+ 
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+--- Source/tiffiop.h.old	2012-03-05 22:30:17.667627310 +0100
++++ Source/tiffiop.h	2012-03-05 22:30:51.815273794 +0100
+@@ -30,7 +30,9 @@
+  * ``Library-private'' definitions.
+  */
+ 
+-#include "tif_config.h"
++#include <tiffconf.h>
++#define HAVE_SEARCH_H
++#define HAVE_FCNTL_H
+ 
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+--- fipMakefile.srcs.old	2012-03-06 08:45:25.895324156 +0100
++++ fipMakefile.srcs	2012-03-06 08:46:47.895534606 +0100
+@@ -94,7 +94,8 @@
+ 	Wrapper/FreeImagePlus/src/fipMultiPage.cpp \
+ 	Wrapper/FreeImagePlus/src/fipTag.cpp \
+ 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+-	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
++	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp \
++	Source/transupp.c
+ INCLUDE = -I. \
+ 	-ISource \
+ 	-ISource/Metadata \
diff --git a/media-libs/freeimage/freeimage-3.15.2.ebuild b/media-libs/freeimage/freeimage-3.15.2.ebuild
new file mode 100644
index 000000000000..49f01885b734
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.15.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.2.ebuild,v 1.1 2012/03/06 08:09:16 tupone Exp $
+
+EAPI=3
+
+inherit toolchain-funcs eutils
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	media-libs/libpng
+	media-libs/libmng
+	virtual/jpeg
+	media-libs/openjpeg
+	media-libs/tiff
+	media-libs/libraw
+	media-libs/openexr"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"/${MY_PN}
+
+src_prepare() {
+	cd Source
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . \
+		|| die "Failed copying jpeg utility files"
+	cp LibTIFF4/{tiffiop,tif_dir}.h . \
+		|| die "Failed copying private libtiff files"
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG \
+		|| die "Removing bundled libraries"
+	edos2unix *.h *.c */*.cpp
+	cd ..
+	edos2unix Makefile.{gnu,fip}
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		Makefile.srcs \
+		fipMakefile.srcs \
+		|| die "sed 1 Failed"
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		Makefile.srcs \
+		fipMakefile.srcs \
+		|| die "sed 1 Failed"
+	epatch "${FILESDIR}"/${P}-unbundling.patch
+}
+
+src_compile() {
+	emake -f Makefile.gnu \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN} \
+		|| die "emake gnu failed"
+	emake -f Makefile.fip \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN} \
+		|| die "emake fip failed"
+}
+
+src_install() {
+	emake -f Makefile.gnu \
+		install DESTDIR="${D}" INSTALLDIR="${D}"/usr/$(get_libdir) \
+		|| die "emake install failed"
+	emake -f Makefile.fip \
+		install DESTDIR="${D}" INSTALLDIR="${D}"/usr/$(get_libdir) \
+		|| die "emake install failed"
+	dosym lib${PN}plus-${PV}.so /usr/$(get_libdir)/lib${PN}plus.so.3
+	dosym lib${PN}plus.so.3 /usr/$(get_libdir)/lib${PN}plus.so
+
+	dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf
+}