Version bump for 1.1, with ebuild modernization and added games. Dropping ppc64 and hppa until htmldoc is keyworded.

(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 221 insertions, 0 deletions

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
new file mode 100644
index 000000000000..d5d0ee006228
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.9-as-needed.patch
@@ -0,0 +1,118 @@
+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
new file mode 100644
index 000000000000..5b76116c3235
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch
@@ -0,0 +1,89 @@
+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
new file mode 100644
index 000000000000..99ac7f21a5d2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.9-desktop.patch
@@ -0,0 +1,14 @@
+--- 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;