x11-libs/fltk: Depend on virtual/glu by Robert Pearce (bug #591634).

Package-Manager: portage-2.3.0

4 files changed, 45 insertions, 273 deletions

diff --git a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch
deleted file mode 100644
index f5e2a1fdbfe2..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile b/Makefile
-index ccec15c..747625e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@
- 
- include makeinclude
- 
--DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid
- 
- all: makeinclude fltk-config
- 	for dir in $(DIRS); do\
-@@ -35,6 +35,10 @@ all: makeinclude fltk-config
- 		(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
-@@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in
- 	touch config.h
- 	chmod +x fltk-config
- 
--configure: configure.in
--	autoconf
--
- portable-dist:
- 	epm -v -s fltk.xpm fltk
- 
-diff --git a/documentation/Makefile b/documentation/Makefile
-index 1742cfa..8102c43 100644
---- a/documentation/Makefile
-+++ b/documentation/Makefile
-@@ -92,11 +92,6 @@ install: $(MANPAGES)
- 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
- 	fi
- 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
-@@ -104,10 +99,6 @@ install: $(MANPAGES)
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
- 
- install-linux install-osx:
--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
--	$(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
- 	$(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
-@@ -116,17 +107,11 @@ install-linux install-osx:
- 
- 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 --git a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
deleted file mode 100644
index c6539fc7ec21..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
+++ /dev/null
@@ -1,154 +0,0 @@
- cairo/Makefile |    4 ++--
- configure.in   |    9 +++------
- src/Makefile   |   24 ++++++++++++------------
- 3 files changed, 17 insertions(+), 20 deletions(-)
-
-diff --git a/cairo/Makefile b/cairo/Makefile
-index 3cefc9f..445cd9c 100644
---- a/cairo/Makefile
-+++ b/cairo/Makefile
-@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
- 
- libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
-+	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
- 	$(RM) libfltk_cairo.so
- 	$(LN) $(CAIRODSONAME) libfltk_cairo.so
- 
- libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
-+	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
- 	$(RM) libfltk_cairo.sl
- 	$(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl
- 
-diff --git a/configure.in b/configure.in
-index 762d3f9..56a5d97 100644
---- a/configure.in
-+++ b/configure.in
-@@ -166,7 +166,7 @@ else
- 	  dnl we do not rely on pkg-config .
- 	  CAIRODIR="cairo"
-           CAIROFLAGS="`pkg-config --cflags cairo`"
--          CAIROLIBS="-lcairo -lpixman-1"
-+          CAIROLIBS="`pkg-config --libs cairo pixman-1`"
-           CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
- 	  LINKFLTKCAIRO="../lib/libfltk_cairo.a"
- 	  FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX"
-@@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
-             CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
--	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
--		    DSOLINK="-Wl,-rpath,$libdir"
--            fi
-+            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
- 	    ;;
- 	AIX*)
-             DSONAME="libfltk_s.a"
-diff --git a/src/Makefile b/src/Makefile
-index 7806854..a43106e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS)
- 
- libfltk.so.1.3: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.so
- 	$(LN) libfltk.so.1.3 libfltk.so
- 
- libfltk.sl.1.3: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.sl
- 	$(LN) libfltk.sl.1.3 libfltk.sl
- 
-@@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS)
- 
- 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
-@@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS)
- 
- libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.so
- 	$(LN) libfltk_forms.so.1.3 libfltk_forms.so
- 
- libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.sl
- 	$(LN) libfltk_forms.sl.1.3 libfltk_forms.sl
- 
-@@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib
- 
- 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
-@@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS)
- 
- libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB)
- 	$(RM) libfltk_gl.so
- 	$(LN) libfltk_gl.so.1.3 libfltk_gl.so
- 
- libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_gl.sl
- 	$(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
- 
-@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib
- 
- libfltk_gl_s.a: $(GLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_gl_s.o ...
--	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
-+	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB)
- 	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
-@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
- 
- libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.so
- 	$(LN) libfltk_images.so.1.3 libfltk_images.so
- 
- libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.sl
- 	$(LN) libfltk_images.sl.1.3 libfltk_images.sl
- 
-@@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib
- 
- 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/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index bdef642e7784..a40c23327a4a 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,23 +17,23 @@ IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama
 
 RDEPEND="
 	>=media-libs/libpng-1.2:0
-	virtual/jpeg:0
 	sys-libs/zlib
+	virtual/jpeg:0
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXext
 	x11-libs/libXt
 	cairo? ( x11-libs/cairo )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
+	xft? ( x11-libs/libXft )
 	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/xextproto
 	doc? ( app-doc/doxygen )
-	xinerama? ( x11-proto/xineramaproto )"
-
-FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	xinerama? ( x11-proto/xineramaproto )
+"
 
 src_prepare() {
 	rm -rf zlib jpeg png || die
@@ -72,22 +72,25 @@ src_prepare() {
 }
 
 src_configure() {
+	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
 	econf \
-		--includedir=${FLTK_INCDIR}\
-		--libdir=${FLTK_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 cairo) \
+		$(use_enable debug) \
 		$(use_enable opengl gl) \
 		$(use_enable threads) \
 		$(use_enable xft) \
-		$(use_enable xinerama)
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
 }
 
 src_compile() {
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 3c620a6587bf..3f16affaed52 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-
 inherit autotools eutils fdo-mime flag-o-matic subversion
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -26,16 +25,16 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	cairo? ( x11-libs/cairo )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
 	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/xextproto
 	doc? ( app-doc/doxygen )
-	xinerama? ( x11-proto/xineramaproto )"
-
-FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	xinerama? ( x11-proto/xineramaproto )
+"
 
 src_prepare() {
 	rm -rf zlib jpeg png || die
@@ -75,22 +74,25 @@ src_prepare() {
 }
 
 src_configure() {
+	FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
 	econf \
-		--includedir=${FLTK_INCDIR}\
-		--libdir=${FLTK_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 cairo) \
+		$(use_enable debug) \
 		$(use_enable opengl gl) \
 		$(use_enable threads) \
 		$(use_enable xft) \
-		$(use_enable xinerama)
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xdbe \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
 }
 
 src_compile() {