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)

6 files changed, 369 insertions, 3 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 75100bcef89e..79990000069e 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.106 2009/01/09 13:45:51 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.107 2009/01/09 23:31:31 bicatali Exp $
+
+*fltk-1.1.9 (09 Jan 2009)
+
+  09 Jan 2009; Sébastien Fabbro <bicatali@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, metadata.xml, +fltk-1.1.9.ebuild:
+  Version bump for 1.1, with ebuild modernization and added games. Dropping
+  ppc64 and hppa until htmldoc is keyworded.
 
   09 Jan 2009; Rémi Cardona <remi@gentoo.org> fltk-1.1.7.ebuild,
   fltk-1.1.7-r2.ebuild, fltk-1.1.7-r3.ebuild, fltk-2.0_pre6525.ebuild:
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;
diff --git a/x11-libs/fltk/fltk-1.1.9.ebuild b/x11-libs/fltk/fltk-1.1.9.ebuild
new file mode 100644
index 000000000000..1b6598ff514c
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.9.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9.ebuild,v 1.1 2009/01/09 23:31:31 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools versionator fdo-mime
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+HOMEPAGE="http://www.fltk.org"
+SRC_URI="http://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
+LICENSE="FLTK LGPL-2"
+
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE="doc examples games opengl threads xft xinerama"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	opengl? ( virtual/opengl virtual/glu )
+	xinerama? ( x11-libs/libXinerama )
+	xft? ( x11-libs/libXft )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	doc? ( app-text/htmldoc )
+	xinerama? ( x11-proto/xineramaproto )"
+
+INCDIR=/usr/include/fltk-${SLOT}
+LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
+
+src_prepare() {
+	#epatch "${FILESDIR}"/${P}-fromdebian.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	# prevent to run twice configure (needs eautoconf), to compile tests,
+	# remove forced -Os compile
+	epatch "${FILESDIR}"/${P}-conf-tests.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=/usr/share/doc/${PF}/html \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		$(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=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
+	doenvd 99fltk-${SLOT}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index 8c3f973adf2f..5cb126b0128a 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -5,8 +5,15 @@
 <maintainer>
   <email>desktop-misc@gentoo.org</email>
 </maintainer>
-<longdescription>C++ user interface toolkit for X and OpenGL.</longdescription>
+<longdescription>
+  The Fast Light ToolKit is a cross-platform C++ user interface
+  toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
+  functionality and supports 3D graphics via OpenGL and its built-in
+  GLUT emulation. FLTK also includes a UI builder called FLUID that
+  can be used to create applications.
+</longdescription>
 <use>
-	<flag name='noxft'>Disables xft; use for non-english characters</flag>
+  <flag name='noxft'>Disables xft; use for non-english characters</flag>
+  <flag name='games'>Builds and installs some extra games</flag>
 </use>
 </pkgmetadata>