old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

10 files changed, 9 insertions, 526 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index f027cad9c098..a57c7c90da83 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.202 2012/02/04 18:51:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.203 2012/02/04 20:34:36 ssuominen Exp $
+
+  04 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/fltk-1.1.9-as-needed.patch, -files/fltk-1.1.9-conf-tests.patch,
+  -files/fltk-1.1.9-desktop.patch, -files/fltk-1.1.9-glibc2.10-scandir.patch,
+  -files/fltk-1.1.9-share.patch, -fltk-1.1.10-r2.ebuild,
+  -files/fltk-1.1.10-includedir.patch, -files/fltk2-glibc2.10-scandir.patch,
+  -files/fltk-1.1.10-libpng15.patch:
+  old
 
   04 Feb 2012; Raúl Porcel <armin76@gentoo.org> fltk-1.3.0.ebuild:
   alpha/ia64/sparc stable wrt #395739
diff --git a/x11-libs/fltk/files/fltk-1.1.10-includedir.patch b/x11-libs/fltk/files/fltk-1.1.10-includedir.patch
deleted file mode 100644
index dac9e755ed45..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.10-includedir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- fltk-config.in |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/fltk-config.in b/fltk-config.in
-index b716d35..2251734 100755
---- a/fltk-config.in
-+++ b/fltk-config.in
-@@ -118,6 +118,8 @@ Options telling what information we request:
- 	[--ldstaticflags] return flags to link against static FLTK library
-                                           even if there are DSOs installed
- 	[--libs]          return FLTK libraries full path for dependencies
-+	[--prefix]        return FLTK install time --prefix directory
-+	[--includedir]    return FLTK install time include directory
- 
- Option to compile and link an application:
- 	[-g]              compile the program with debugging information
-@@ -189,6 +191,12 @@ do
- 	--libs)
- 	    echo_libs=yes
- 	    ;;
-+	--prefix)
-+	    echo_prefix=yes
-+	    ;;
-+	--includedir)
-+	    echo_includedir=yes
-+	    ;;
- 	-g)
- 	    debug=-g
- 	    ;;
-@@ -337,6 +345,15 @@ if test "$echo_libs" = "yes"; then
-             fi
- 	done
-     fi
-+    echo $USELIBS
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+    echo $prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+    echo $includedir
- fi
- 
- #
diff --git a/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch b/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch
deleted file mode 100644
index a240be99efb6..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Fl_PNG_Image.cxx
-+++ src/Fl_PNG_Image.cxx
-@@ -66,7 +66,8 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
-   png_structp	pp;			// PNG read pointer
-   png_infop	info;			// PNG info pointers
-   png_bytep	*rows;			// PNG row pointers
--
-+  png_byte     color_type;             // PNG color type
-+  png_byte     bit_depth;              // PNG bit depth
- 
-   // Open the PNG file...
-   if ((fp = fopen(png, "rb")) == NULL) return;
-@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
-   pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-   info = png_create_info_struct(pp);
- 
--  if (setjmp(pp->jmpbuf))
-+  if (setjmp(png_jmpbuf(pp)))
-   {
-     Fl::warning("PNG file \"%s\" contains errors!\n", png);
-     return;
-@@ -86,28 +87,24 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
- 
-   // Get the image dimensions and convert to grayscale or RGB...
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE)
-     png_set_expand(pp);
- 
--  if (info->color_type & PNG_COLOR_MASK_COLOR)
--    channels = 3;
--  else
--    channels = 1;
--
--  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
--    channels ++;
-+  channels = png_get_channels(pp, info);
- 
--  w((int)(info->width));
--  h((int)(info->height));
-+  w((int)(png_get_image_width(pp, info)));
-+  h((int)(png_get_image_height(pp, info)));
-   d(channels);
- 
--  if (info->bit_depth < 8)
-+  bit_depth = png_get_bit_depth(pp, info);
-+  if (bit_depth < 8)
-   {
-     png_set_packing(pp);
-     png_set_expand(pp);
-   }
--  else if (info->bit_depth == 16)
-+  else if (bit_depth == 16)
-     png_set_strip_16(pp);
- 
- #  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)
diff --git a/x11-libs/fltk/files/fltk-1.1.9-as-needed.patch b/x11-libs/fltk/files/fltk-1.1.9-as-needed.patch
deleted file mode 100644
index d5d0ee006228..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-as-needed.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in
---- fltk-1.1.9.orig/configure.in	2009-01-08 17:53:52.000000000 +0000
-+++ fltk-1.1.9/configure.in	2009-01-09 14:11:39.000000000 +0000
-@@ -179,10 +179,7 @@
-             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
--	    if test "x$libdir" != "x/usr/lib"; then
--		    DSOLINK="-Wl,-rpath,$libdir"
--            fi
-+            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
- 	    ;;
- 	AIX*)
-             DSONAME="libfltk_s.a"
-diff -Nur fltk-1.1.9.orig/src/Makefile fltk-1.1.9/src/Makefile
---- fltk-1.1.9.orig/src/Makefile	2009-01-08 17:53:51.000000000 +0000
-+++ fltk-1.1.9/src/Makefile	2009-01-09 14:08:53.000000000 +0000
-@@ -210,13 +210,13 @@
- 
- libfltk.so.1.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.so
- 	$(LN) libfltk.so.1.1 libfltk.so
- 
- libfltk.sl.1.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.sl
- 	$(LN) libfltk.sl.1.1 libfltk.sl
- 
-@@ -232,7 +232,7 @@
- 
- libfltk_s.a: $(OBJECTS)
- 	echo $(DSOCOMMAND) libfltk_s.o ...
--	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
-+	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_s.a libfltk_s.o
-@@ -246,13 +246,13 @@
- 
- libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.so
- 	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
- 
- libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.sl
- 	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
- 
-@@ -268,7 +268,7 @@
- 
- libfltk_forms_s.a: $(FLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_forms_s.o ...
--	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
-+	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
-@@ -282,13 +282,13 @@
- 
- libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_gl.so
- 	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
- 
- libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_gl.sl
- 	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
- 
-@@ -304,7 +304,7 @@
- 
- libfltk_gl_s.a: $(GLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_gl_s.o ...
--	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
-+	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
-@@ -318,13 +318,13 @@
- 
- libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.so
- 	$(LN) libfltk_images.so.1.1 libfltk_images.so
- 
- libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.sl
- 	$(LN) libfltk_images.sl.1.1 libfltk_images.sl
- 
-@@ -340,7 +340,7 @@
- 
- libfltk_images_s.a: $(IMGOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_images_s.o ...
--	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
-+	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
diff --git a/x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch b/x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch
deleted file mode 100644
index 5b76116c3235..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in
---- fltk-1.1.9.orig/configure.in	2009-01-08 17:53:52.000000000 +0000
-+++ fltk-1.1.9/configure.in	2009-01-09 17:23:38.000000000 +0000
-@@ -919,7 +916,7 @@
-         if test "x$with_optim" != x; then
- 	    OPTIM="$with_optim $OPTIM"
- 	else
--            OPTIM="-Os $OPTIM"
-+            OPTIM="$OPTIM"
- 	fi
-     fi
- 
-diff -Nur fltk-1.1.9.orig/documentation/Makefile fltk-1.1.9/documentation/Makefile
---- fltk-1.1.9.orig/documentation/Makefile	2009-01-08 17:53:51.000000000 +0000
-+++ fltk-1.1.9/documentation/Makefile	2009-01-09 17:22:19.000000000 +0000
-@@ -237,11 +237,6 @@
- 		$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
- 	done
- 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
--	$(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -249,10 +244,6 @@
- 	$(INSTALL_MAN) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
- 
- install-linux install-osx:
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
- 	$(INSTALL_MAN) blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(INSTALL_MAN) checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
-@@ -261,17 +252,11 @@
- 
- uninstall:
- 	$(RMDIR) $(DESTDIR)$(docdir)
--	$(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fluid.1
--	$(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
--	$(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man3/fltk.3
- 
- uninstall-linux uninstall-osx:
--	$(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
--	$(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
- 	$(RM) $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/checkers.6
- 	$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
-diff -Nur fltk-1.1.9.orig/Makefile fltk-1.1.9/Makefile
---- fltk-1.1.9.orig/Makefile	2009-01-08 17:53:52.000000000 +0000
-+++ fltk-1.1.9/Makefile	2009-01-09 17:20:49.000000000 +0000
-@@ -27,7 +27,7 @@
- 
- include makeinclude
- 
--DIRS	=	$(IMAGEDIRS) src fluid test documentation
-+DIRS	=	$(IMAGEDIRS) src fluid
- 
- all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
-@@ -35,6 +35,10 @@
- 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
- 	done
- 
-+check: all	
-+	$(MAKE) $(MFLAGS) -C test || exit 1
-+
-+
- install: makeinclude
- 	-mkdir -p $(DESTDIR)$(bindir)
- 	$(RM) $(DESTDIR)$(bindir)/fltk-config
-@@ -110,9 +114,6 @@
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.in
--	autoconf
--
- portable-dist:
- 	epm -v -s fltk.xpm fltk
- 
diff --git a/x11-libs/fltk/files/fltk-1.1.9-desktop.patch b/x11-libs/fltk/files/fltk-1.1.9-desktop.patch
deleted file mode 100644
index 99ac7f21a5d2..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fltk-1.1.9.orig/fluid/fluid.desktop	2009-01-08 17:53:51.000000000 +0000
-+++ fltk-1.1.9/fluid/fluid.desktop	2009-01-09 18:46:27.000000000 +0000
-@@ -2,9 +2,9 @@
- Name=FLUID
- Comment=FLTK GUI Designer
- TryExec=fluid
--Exec=cd %D && fluid %F
-+Exec=fluid %F
- Icon=fluid
- Terminal=false
- Type=Application
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Categories=Development;GUIDesigner;
diff --git a/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch b/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch
deleted file mode 100644
index 0051306ebc2a..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx
---- fltk-1.1.9/src/filename_list.cxx.gcc44	2006-06-09 11:16:34.000000000 -0500
-+++ fltk-1.1.9/src/filename_list.cxx	2009-05-13 09:46:42.372917879 -0500
-@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
-   // The vast majority of UNIX systems want the sort function to have this
-   // prototype, most likely so that it can be passed to qsort without any
-   // changes:
--  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
-+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
- #else
-   // This version is when we define our own scandir (WIN32 and perhaps
-   // some Unix systems) and apparently on IRIX:
diff --git a/x11-libs/fltk/files/fltk-1.1.9-share.patch b/x11-libs/fltk/files/fltk-1.1.9-share.patch
deleted file mode 100644
index 60980bb9e50c..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-share.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- fluid/Makefile.orig	2010-03-29 22:41:01.828043805 -0500
-+++ fluid/Makefile	2010-03-29 22:43:57.973828814 -0500
-@@ -84,16 +84,16 @@
- 	$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
- 
- install-linux:
--	-$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
--	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)/usr/share/applications
-+	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
-+	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)$(datadir)/applications
- 	for size in 16 32 48 64 128; do \
--		if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
--			$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
-+		if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \
-+			$(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
- 		fi; \
--		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
-+		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
- 	done
--	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
--	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
-+	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application
-+	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)$(datadir)/mimelnk/application
- 
- install-osx:
- 	echo Installing Fluid in $(DESTDIR)/Applications...
-@@ -111,9 +111,9 @@
- 	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
- 
- uninstall-linux:
--	$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
--	$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
--	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
-+	$(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop
-+	$(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png
-+	$(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop
- 
- uninstall-osx:
- 	$(RM) -r $(DESTDIR)/Applications/fluid.app
diff --git a/x11-libs/fltk/files/fltk2-glibc2.10-scandir.patch b/x11-libs/fltk/files/fltk2-glibc2.10-scandir.patch
deleted file mode 100644
index ee3829a0a07a..000000000000
--- a/x11-libs/fltk/files/fltk2-glibc2.10-scandir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/filename_list.cxx	2009-06-17 09:47:57.000000000 +0200
-+++ src/filename_list.cxx	2007-06-01 15:13:08.000000000 +0200
-@@ -63,7 +63,7 @@ int fltk::filename_list(const char *d, d
-   // some Unix systems):
-   int n = scandir(d, list, 0, sort);
- #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__)
--  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
-+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
- #elif defined(__hpux) || defined(__CYGWIN__)
-   // HP-UX, Cygwin define the comparison function like this:
-   int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
diff --git a/x11-libs/fltk/fltk-1.1.10-r2.ebuild b/x11-libs/fltk/fltk-1.1.10-r2.ebuild
deleted file mode 100644
index 1ab50d618436..000000000000
--- a/x11-libs/fltk/fltk-1.1.10-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10-r2.ebuild,v 1.9 2011/10/23 15:37:37 armin76 Exp $
-
-EAPI=3
-
-inherit eutils autotools versionator fdo-mime
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
-
-LICENSE="FLTK LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples games opengl threads xft xinerama"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )
-	!prefix? ( >=sys-libs/glibc-2.10 )"   # glibc-2.10 patch breaks with 2.9, bug 276695
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	doc? ( app-text/htmldoc )
-	xinerama? ( x11-proto/xineramaproto )"
-
-INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
-LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	# backported from 1.3.0
-	epatch "${FILESDIR}"/${P}-includedir.patch
-	epatch "${FILESDIR}"/fltk-1.1.9-share.patch
-	#epatch "${FILESDIR}"/${P}-fromdebian.patch
-	epatch "${FILESDIR}"/${PN}-1.1.9-desktop.patch
-	epatch "${FILESDIR}"/${PN}-1.1.9-as-needed.patch
-	# prevent to run twice configure (needs eautoconf), to compile tests,
-	# remove forced -Os compile
-	epatch "${FILESDIR}"/${PN}-1.1.9-conf-tests.patch
-	# fix stricter c++ handling in glibc-2.10/gcc-4.4 (bug 270487)
-	epatch "${FILESDIR}"/${PN}-1.1.9-glibc2.10-scandir.patch
-	# remove forced flags from fltk-config
-	sed -i \
-		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
-		-e '/^LDFLAGS=/d' \
-		"${S}/fltk-config.in" || die
-	# some fixes introduced because slotting
-	sed -i \
-		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
-		src/Makefile || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		makeinclude.in || die
-	sed -e "s/7/$(get_version_component_range 3)/" \
-		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--includedir=${INCDIR}\
-		--libdir=${LIBDIR} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd "${S}"/documentation
-		emake alldocs || die "emake doc failed"
-	fi
-	if use games; then
-		cd "${S}"/test
-		emake blocks checkers sudoku || die "emake games failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake -C fluid \
-			DESTDIR="${D}" install-linux || die "emake install fluid failed"
-	if use doc; then
-		emake -C documentation \
-			DESTDIR="${D}" install || die "emake install doc failed"
-	fi
-	local apps="fluid"
-	if use games; then
-		emake -C test \
-			DESTDIR="${D}" install-linux || die "emake install games failed"
-		emake -C documentation \
-			DESTDIR="${D}" install-linux || die "emake install doc games failed"
-		apps="${apps} sudoku blocks checkers"
-	fi
-	for app in ${apps}; do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-	dodoc CHANGES README CREDITS ANNOUNCEMENT
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-	doenvd 99fltk-${SLOT}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}