old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 8 insertions, 1436 deletions

diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog
index 9cda08b78dcc..67423beab087 100644
--- a/media-libs/freeimage/ChangeLog
+++ b/media-libs/freeimage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/freeimage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.33 2014/08/09 18:36:35 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.34 2014/08/28 19:18:14 mr_bones_ Exp $
+
+  28 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/freeimage-3.15.3-r1-unbundling.patch,
+  -files/freeimage-3.15.3-r2-unbundling.patch,
+  -files/freeimage-3.15.3-unbundling.patch, -freeimage-3.15.3-r2.ebuild,
+  -freeimage-3.15.3.ebuild:
+  old
 
   09 Aug 2014; Andreas Schuerch <nativemad@gentoo.org> freeimage-3.15.4.ebuild:
   x86 stable, see bug 479136
diff --git a/media-libs/freeimage/files/freeimage-3.15.3-r1-unbundling.patch b/media-libs/freeimage/files/freeimage-3.15.3-r1-unbundling.patch
deleted file mode 100644
index f0a4ef887871..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.3-r1-unbundling.patch
+++ /dev/null
@@ -1,313 +0,0 @@
---- Makefile.gnu
-+++ Makefile.gnu
-@@ -11,7 +11,14 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= $(PKG_CONFIG)
-+LIBRARIES = -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,13 +71,15 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- #	ldconfig
---- Source/FreeImage/J2KHelper.cpp
-+++ Source/FreeImage/J2KHelper.cpp
-@@ -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
-+++ Source/FreeImage/PluginEXR.cpp
-@@ -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
-+++ Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- Source/FreeImage/PluginJP2.cpp
-+++ Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- Source/FreeImage/PluginPNG.cpp
-+++ Source/FreeImage/PluginPNG.cpp
-@@ -37,8 +37,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
---- Source/transupp.c
-+++ Source/transupp.c
-@@ -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
-+++ Source/FreeImage/ZLibInterface.cpp
-@@ -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
-+++ Source/FreeImage/PluginG3.cpp
-@@ -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
-+++ Source/FreeImage/PluginJPEG.cpp
-@@ -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
-+++ Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -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
-+++ Makefile.fip
-@@ -11,7 +11,14 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+LIBRARIES = -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,14 +72,18 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
-+	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-+	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
---- Makefile.srcs
-+++ Makefile.srcs
-@@ -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
-+++ Source/FreeImage/PluginRAW.cpp
-@@ -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
-+++ Source/Metadata/XTIFF.cpp
-@@ -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
-+++ Source/FreeImage/PluginTIFF.cpp
-@@ -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
-+++ Source/tiffiop.h
-@@ -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
-+++ fipMakefile.srcs
-@@ -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/files/freeimage-3.15.3-r2-unbundling.patch b/media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch
deleted file mode 100644
index f83d87f5ae51..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.3-r2-unbundling.patch
+++ /dev/null
@@ -1,639 +0,0 @@
-lots of fixes here:
-	- use system graphics libraries
-	- make all of them optional
-	- drop root users from install (fix user installs)
-	- make static lib build optional
-	- link with CXX and CXXFLAGS (since this is C++ code)
-
---- Makefile.gnu
-+++ Makefile.gnu
-@@ -11,7 +11,24 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -64,13 +81,15 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- #	ldconfig
---- Source/FreeImage/J2KHelper.cpp
-+++ Source/FreeImage/J2KHelper.cpp
-@@ -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
-+++ Source/FreeImage/PluginEXR.cpp
-@@ -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
-+++ Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- Source/FreeImage/PluginJP2.cpp
-+++ Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- Source/FreeImage/PluginPNG.cpp
-+++ Source/FreeImage/PluginPNG.cpp
-@@ -37,8 +37,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
---- Source/transupp.c
-+++ Source/transupp.c
-@@ -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
-+++ Source/FreeImage/ZLibInterface.cpp
-@@ -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
-+++ Source/FreeImage/PluginG3.cpp
-@@ -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
-+++ Source/FreeImage/PluginJPEG.cpp
-@@ -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
-+++ Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -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
-+++ Makefile.fip
-@@ -11,7 +11,24 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -65,14 +82,18 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
-+	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-+	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
---- Makefile.srcs
-+++ Makefile.srcs
-@@ -1,6 +1,14 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 15.3
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/FreeImage.cpp \
-@@ -17,36 +25,74 @@ SRCS = \
- 	Source/FreeImage/GetType.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
-@@ -83,7 +129,11 @@ SRCS = \
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -92,10 +142,18 @@ SRCS = \
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+SRCS = $(SRCS-yes)
- INCLS = \
- 	Examples/OpenGL/TextureManager/TextureManager.h \
- 	Examples/Plugin/PluginCradle.h \
-@@ -116,7 +174,17 @@
- 	Wrapper/FreeImagePlus/test/fipTest.h \
- 	TestAPI/TestSuite.h
- 
--INCLUDE = -I. \
-+INCLUDE-yes = -I. \
- 	-ISource \
- 	-ISource/Metadata \
- 	-ISource/FreeImageToolkit \
-+
-+INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
-+INCLUDE-$(USE_EXR)    += -DUSE_EXR    $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
-+INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
-+INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjpeg)
-+INCLUDE-$(USE_MNG)    += -DUSE_MNG
-+INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
-+INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
-+INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
-+INCLUDE = $(INCLUDE-yes)
---- fipMakefile.srcs
-+++ fipMakefile.srcs
-@@ -1,6 +1,14 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 15.3
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/FreeImage.cpp \
-@@ -9,36 +17,74 @@
- 	Source/FreeImage/GetType.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
-@@ -75,7 +121,11 @@
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -84,7 +134,11 @@
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-@@ -95,6 +149,11 @@
- 	Wrapper/FreeImagePlus/src/fipTag.cpp \
- 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
- 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+
-+SRCS = $(SRCS-yes)
- INCLUDE = -I. \
- 	-ISource \
- 	-ISource/Metadata \
---- Source/FreeImage/PluginRAW.cpp
-+++ Source/FreeImage/PluginRAW.cpp
-@@ -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
-+++ Source/Metadata/XTIFF.cpp
-@@ -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
-+++ Source/FreeImage/PluginTIFF.cpp
-@@ -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
-+++ Source/tiffiop.h
-@@ -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>
---- Source/FreeImage/Plugin.cpp
-+++ Source/FreeImage/Plugin.cpp
-@@ -223,23 +223,33 @@
- 			*/
- 			s_plugins->AddNode(InitBMP);
- 			s_plugins->AddNode(InitICO);
-+#ifdef USE_JPEG
- 			s_plugins->AddNode(InitJPEG);
-+#endif
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitJNG);
-+#endif
- 			s_plugins->AddNode(InitKOALA);
- 			s_plugins->AddNode(InitIFF);
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitMNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
- 			s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
- 			s_plugins->AddNode(InitPCD);
- 			s_plugins->AddNode(InitPCX);
- 			s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
- 			s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
-+#ifdef USE_PNG
- 			s_plugins->AddNode(InitPNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
- 			s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
- 			s_plugins->AddNode(InitRAS);
- 			s_plugins->AddNode(InitTARGA);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitTIFF);
-+#endif
- 			s_plugins->AddNode(InitWBMP);
- 			s_plugins->AddNode(InitPSD);
- 			s_plugins->AddNode(InitCUT);
-@@ -248,14 +258,22 @@
- 			s_plugins->AddNode(InitDDS);
- 	        s_plugins->AddNode(InitGIF);
- 	        s_plugins->AddNode(InitHDR);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitG3);
-+#endif
- 			s_plugins->AddNode(InitSGI);
-+#ifdef USE_EXR
- 			s_plugins->AddNode(InitEXR);
-+#endif
-+#ifdef USE_JPEG2K
- 			s_plugins->AddNode(InitJ2K);
- 			s_plugins->AddNode(InitJP2);
-+#endif
- 			s_plugins->AddNode(InitPFM);
- 			s_plugins->AddNode(InitPICT);
-+#ifdef USE_RAW
- 			s_plugins->AddNode(InitRAW);
-+#endif
- 			
- 			// external plugin initialization
- 
diff --git a/media-libs/freeimage/files/freeimage-3.15.3-unbundling.patch b/media-libs/freeimage/files/freeimage-3.15.3-unbundling.patch
deleted file mode 100644
index 84c7f19bf29e..000000000000
--- a/media-libs/freeimage/files/freeimage-3.15.3-unbundling.patch
+++ /dev/null
@@ -1,285 +0,0 @@
---- 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)
---- 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.3-r2.ebuild b/media-libs/freeimage/freeimage-3.15.3-r2.ebuild
deleted file mode 100644
index 0d8047535b13..000000000000
--- a/media-libs/freeimage/freeimage-3.15.3-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.3-r2.ebuild,v 1.4 2013/06/13 12:29:48 xmw Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils multilib
-
-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="jpeg jpeg2k mng openexr png raw static-libs tiff"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	mng? ( media-libs/libmng )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	raw? ( media-libs/libraw )
-	tiff? (
-		media-libs/ilmbase
-		media-libs/tiff
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	cd Source
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
-	cd ..
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	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 -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
-	epatch "${FILESDIR}"/${PF}-unbundling.patch
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf
-}
diff --git a/media-libs/freeimage/freeimage-3.15.3.ebuild b/media-libs/freeimage/freeimage-3.15.3.ebuild
deleted file mode 100644
index 9f73ab8f2055..000000000000
--- a/media-libs/freeimage/freeimage-3.15.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.3.ebuild,v 1.6 2013/06/13 12:29:47 xmw Exp $
-
-EAPI=3
-
-inherit toolchain-funcs eutils multilib
-
-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:0
-	media-libs/tiff
-	media-libs/libraw
-	media-libs/openexr"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	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 */*.cpp
-	cd ..
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs
-	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
-}