Version bump, bug #213969

(Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64)

2 files changed, 0 insertions, 231 deletions

diff --git a/media-libs/freeimage/files/freeimage-3.9.3-build.patch b/media-libs/freeimage/files/freeimage-3.9.3-build.patch
deleted file mode 100644
index 4dfe8928f28d..000000000000
--- a/media-libs/freeimage/files/freeimage-3.9.3-build.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- genfipsrclist.sh
-+++ genfipsrclist.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh

- 

--DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibMNG Source/LibPNG Source/LibTIFF Source/ZLib Wrapper/FreeImagePlus"

-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Wrapper/FreeImagePlus"

- 

- echo "VER_MAJOR = 3" > fipMakefile.srcs

- echo "VER_MINOR = 9.3" >> fipMakefile.srcs

-@@ -12,7 +12,7 @@
- 		egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' '  ' | tr -s ' ' >> fipMakefile.srcs

- 	fi

- done

--echo >> fipMakefile.srcs

-+echo Source/LibJPEG/transupp.c >> fipMakefile.srcs

- 

- echo -n "INCLUDE =" >> fipMakefile.srcs

- for DIR in $DIRLIST; do

---- gensrclist.sh
-+++ gensrclist.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh

- 

--DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibMNG Source/LibPNG Source/LibTIFF Source/ZLib"

-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"

- 

- echo "VER_MAJOR = 3" > Makefile.srcs

- echo "VER_MINOR = 9.3" >> Makefile.srcs

-@@ -12,7 +12,7 @@
- 		egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' '  ' | tr -s ' ' >> Makefile.srcs

- 	fi

- done

--echo >> Makefile.srcs

-+echo Source/LibJPEG/transupp.c >> Makefile.srcs

- 

- echo -n "INCLS = " >> Makefile.srcs

- find . -name "*.h" -print | xargs echo >> Makefile.srcs

---- Makefile
-+++ Makefile
-@@ -14,8 +14,11 @@
-     MAKEFILE = solaris

- endif

- 

-+FLAGS = -Wall -fPIC

-+LIBS = -lstdc++ -lpng -lmng -ltiff -ljpeg

- default:

--	$(MAKE) -f Makefile.$(MAKEFILE) 

-+	$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" LIBRARIES="$(LIBS)" -f Makefile.gnu

-+	$(MAKE) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" COMPILERFLAGS="$(FLAGS)" LIBRARIES="$(LIBS)" -f Makefile.fip

- 

- all:

- 	$(MAKE) -f Makefile.$(MAKEFILE) all 

-@@ -24,7 +27,8 @@
- 	$(MAKE) -f Makefile.$(MAKEFILE) dist 

- 

- install:

--	$(MAKE) -f Makefile.$(MAKEFILE) install 

-+	$(MAKE) -f Makefile.gnu install

-+	$(MAKE) -f Makefile.fip install

- 

- clean:

- 	$(MAKE) -f Makefile.$(MAKEFILE) clean 

---- Makefile.fip
-+++ Makefile.fip
-@@ -19,8 +19,8 @@
- 

- MODULES = $(SRCS:.c=.o)

- MODULES := $(MODULES:.cpp=.o)

--CFLAGS = $(COMPILERFLAGS) $(INCLUDE)

--CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)

-+CFLAGS += $(COMPILERFLAGS) $(INCLUDE)

-+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)

- 

- TARGET  = freeimageplus

- STATICLIB = lib$(TARGET).a

-@@ -56,16 +56,15 @@
- 	$(AR) r $@ $(MODULES)

- 

- $(SHAREDLIB): $(MODULES)

--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

- 

- install:

--	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)

--	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)

--	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)

--	ldconfig

-+	install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)

-+	install -m 644 $(HEADERFIP) $(DESTDIR)/$(INCDIR)

-+	install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR)

-+	install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)

-+	ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME)

-+	ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME)

- 

- clean:

- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

---- Makefile.gnu
-+++ Makefile.gnu
-@@ -19,8 +19,8 @@
- 

- MODULES = $(SRCS:.c=.o)

- MODULES := $(MODULES:.cpp=.o)

--CFLAGS = $(COMPILERFLAGS) $(INCLUDE)

--CXXFLAGS = $(COMPILERFLAGS)  -Wno-ctor-dtor-privacy $(INCLUDE)

-+CFLAGS += $(COMPILERFLAGS) $(INCLUDE)

-+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)

- 

- TARGET  = freeimage

- STATICLIB = lib$(TARGET).a

-@@ -55,15 +55,15 @@
- 	$(AR) r $@ $(MODULES)

- 

- $(SHAREDLIB): $(MODULES)

--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)

- 

- install:

--	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)

--	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)

--	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	

--	ldconfig

-+	install -d $(DESTDIR)/$(INCDIR) $(DESTDIR)/$(LIBDIR)

-+	install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)

-+	install -m 644 $(STATICLIB) $(DESTDIR)/$(LIBDIR)

-+	install -m 755 $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)

-+	ln -sf $(SHAREDLIB) $(DESTDIR)/$(LIBDIR)/$(VERLIBNAME)

-+	ln -sf $(VERLIBNAME) $(DESTDIR)/$(LIBDIR)/$(LIBNAME)

- 

- clean:

- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

diff --git a/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch b/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch
deleted file mode 100644
index 2fcdbb43ade2..000000000000
--- a/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- Source/FreeImage/PluginJPEG.cpp
-+++ Source/FreeImage/PluginJPEG.cpp
-@@ -35,8 +35,8 @@
- #include <setjmp.h>

- 

- #include "../LibJPEG/jinclude.h"

--#include "../LibJPEG/jpeglib.h"

--#include "../LibJPEG/jerror.h"

-+#include <jpeglib.h>

-+#include <jerror.h>

- }

- 

- #include "FreeImage.h"

---- Source/FreeImage/PluginMNG.cpp
-+++ Source/FreeImage/PluginMNG.cpp
-@@ -22,7 +22,7 @@
- #include "FreeImage.h"

- #include "Utilities.h"

- 

--#include "../LibMNG/libmng.h"

-+#include <libmng.h>

- 

- // ----------------------------------------------------------

- //   Constants + headers

---- Source/FreeImage/PluginPNG.cpp
-+++ Source/FreeImage/PluginPNG.cpp
-@@ -37,7 +37,10 @@
- 

- // ----------------------------------------------------------

- 

--#include "../LibPNG/png.h"

-+#define PNG_iTXt_SUPPORTED

-+#define PNG_READ_iTXt_SUPPORTED

-+#define PNG_WRITE_iTXt_SUPPORTED

-+#include <png.h>

- 

- // ----------------------------------------------------------

- 

---- Source/FreeImage/ZLibInterface.cpp
-+++ Source/FreeImage/ZLibInterface.cpp
-@@ -19,7 +19,7 @@
- // Use at your own risk!

- // ==========================================================

- 

--#include "../ZLib/zlib.h"

-+#include <zlib.h>

- #include "../ZLib/zutil.h"

- #include "FreeImage.h"

- #include "Utilities.h"

---- Source/FreeImageToolkit/JPEGTransform.cpp
-+++ Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -26,8 +26,8 @@
- #include <setjmp.h>

- 

- #include "../LibJPEG/jinclude.h"

--#include "../LibJPEG/jpeglib.h"

--#include "../LibJPEG/jerror.h"

-+#include <jpeglib.h>

-+#include <jerror.h>

- #include "../LibJPEG/transupp.h"

- }

- 

---- Source/LibJPEG/jinclude.h
-+++ Source/LibJPEG/jinclude.h
-@@ -17,7 +17,7 @@
- 

- /* Include auto-config file to find out which system include files we need. */

- 

--#include "jconfig.h"		/* auto configuration options */

-+#include <jconfig.h>

- #define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */

- 

- /*

---- Source/LibJPEG/transupp.c
-+++ Source/LibJPEG/transupp.c
-@@ -18,7 +18,7 @@
- #define JPEG_INTERNALS

- 

- #include "jinclude.h"

--#include "jpeglib.h"

-+#include <jpeglib.h>

- #include "transupp.h"		/* My own external interface */

- #include <ctype.h>		/* to declare isdigit() */

- 

---- Source/ZLib/zutil.h
-+++ Source/ZLib/zutil.h
-@@ -14,7 +14,7 @@
- #define ZUTIL_H

- 

- #define ZLIB_INTERNAL

--#include "zlib.h"

-+#include <zlib.h>

- 

- #ifdef STDC

- #  ifndef _WIN32_WCE