Version bump (bug #497594).

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 94 insertions, 354 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 2cb496534130..c53840951595 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.238 2014/01/15 09:16:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.239 2014/02/02 11:15:30 jer Exp $
+
+*fltk-1.3.2_p10088 (02 Feb 2014)
+
+  02 Feb 2014; Jeroen Roovers <jer@gentoo.org> -fltk-1.3.0-r1.ebuild,
+  -fltk-1.3.1.ebuild, +fltk-1.3.2_p10088.ebuild,
+  -files/fltk-1.3.0-as-needed.patch, -files/fltk-1.3.1-desktop.patch,
+  +files/fltk-1.3.2-conf-tests.patch:
+  Version bump (bug #497594).
 
   15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> fltk-1.3.2.ebuild:
   Stable for ia64, wrt bug #485582
diff --git a/x11-libs/fltk/files/fltk-1.3.0-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.0-as-needed.patch
deleted file mode 100644
index 0c516af616db..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.0-as-needed.patch
+++ /dev/null
@@ -1,163 +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
-@@ -152,7 +152,7 @@ if test x$enable_cairoext = xyes; then
- 	  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"
-@@ -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/files/fltk-1.3.1-desktop.patch b/x11-libs/fltk/files/fltk-1.3.1-desktop.patch
deleted file mode 100644
index 7ba000bce2f3..000000000000
--- a/x11-libs/fltk/files/fltk-1.3.1-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/fluid/x-fluid.desktop
-+++ b/fluid/x-fluid.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=MimeType
--MimeType=application/x-fluid
-+MimeType=application/x-fluid;
- Icon=fluid.png
- Patterns=*.fl
- Name=FLUID
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
new file mode 100644
index 000000000000..74022a72ffb9
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ 	touch config.h
+ 	chmod +x fltk-config
+ 
+-configure: configure.in
+-	autoconf
+-
+ config.guess config.sub:
+ 	-automake --add-missing 2> /dev/null
+ 	if [ ! -e config.sub   ]; then echo NOTE: Using frozen copy of config.sub;   cp misc/config.sub   . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ 	  $(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
+@@ -96,10 +91,6 @@
+ 	$(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
+@@ -108,17 +99,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 --git a/x11-libs/fltk/fltk-1.3.0-r1.ebuild b/x11-libs/fltk/fltk-1.3.0-r1.ebuild
deleted file mode 100644
index c3206930d5a1..000000000000
--- a/x11-libs/fltk/fltk-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0-r1.ebuild,v 1.17 2013/12/26 18:49:18 dilfridge Exp $
-
-EAPI=3
-
-inherit autotools eutils fdo-mime flag-o-matic versionator
-
-MY_P=${P/_}
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV/_}/${P/_}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games opengl pdf static-libs threads xft xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0
-	virtual/jpeg:0
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	cairo? ( x11-libs/cairo )
-	opengl? ( virtual/opengl )
-	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	doc? (
-		app-doc/doxygen
-		pdf? ( dev-texlive/texlive-latex )
-	)
-	xinerama? ( x11-proto/xineramaproto )"
-
-INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
-LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm -rf zlib jpeg png || die
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-share.patch \
-		"${FILESDIR}"/${P}-conf-tests.patch
-	sed \
-		-e 's:@HLINKS@::g' -i FL/Makefile.in || die
-	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:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/$(get_version_component_range 3)/" \
-		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
-	sed -e 's:-Os::g' -i configure.in || die
-	use prefix && append-ldflags -Wl,-rpath "${LIBDIR}"
-	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 cairo) \
-		$(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 html || die "emake doc failed"
-		if use pdf; then
-			emake pdf || die "emake doc failed"
-		fi
-	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 || die
-
-	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}
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk-1/*.a || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	echo
-	ewarn "PLEASE PLEASE take note of this"
-	ewarn "Please make *sure* to run revdep-rebuild now"
-	ewarn "You must recompile everything that depends on fltk!"
-	echo
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.1.ebuild b/x11-libs/fltk/fltk-1.3.2_p10088.ebuild
index 520ac952c84c..b4af3ba16919 100644
--- a/x11-libs/fltk/fltk-1.3.1.ebuild
+++ b/x11-libs/fltk/fltk-1.3.2_p10088.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.1.ebuild,v 1.4 2013/12/26 18:49:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.2_p10088.ebuild,v 1.1 2014/02/02 11:15:30 jer Exp $
 
-EAPI=3
+EAPI=5
 
 inherit autotools eutils fdo-mime flag-o-matic versionator
 
-MY_P=${P/_}
+MY_PV_MAJOR=$( get_version_component_range 1-2 )
+MY_PV_REV=$( get_version_component_range 4 )
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV/_}/${P/_}-source.tar.gz"
+SRC_URI="http://${PN}.org/pub/${PN}/snapshots/${PN}-${MY_PV_MAJOR}.x-${MY_PV_REV/p/r}.tar.bz2 -> ${P}.tar.bz2"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -40,15 +41,15 @@ DEPEND="${RDEPEND}
 INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
 LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${PN}-${MY_PV_MAJOR}.x-${MY_PV_REV/p/r}
 
 src_prepare() {
 	rm -rf zlib jpeg png || die
 	epatch \
 		"${FILESDIR}"/${PN}-1.3.1-as-needed.patch \
-		"${FILESDIR}"/${PN}-1.3.1-desktop.patch \
+		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
 		"${FILESDIR}"/${PN}-1.3.0-share.patch \
-		"${FILESDIR}"/${PN}-1.3.0-conf-tests.patch
+		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
 	sed \
 		-e 's:@HLINKS@::g' -i FL/Makefile.in || die
 	sed -i \
@@ -67,7 +68,11 @@ src_prepare() {
 	sed -e "s/7/$(get_version_component_range 3)/" \
 		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
 	sed -e 's:-Os::g' -i configure.in || die
-	use prefix && append-ldflags -Wl,-rpath "${LIBDIR}"
+	use prefix && append-ldflags -Wl,-rpath -Wl,"${LIBDIR}"
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
 	eautoconf
 }
 
@@ -91,41 +96,45 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	default
 	if use doc; then
 		cd "${S}"/documentation
-		emake html || die "emake doc failed"
+		emake html
 		if use pdf; then
-			emake pdf || die "emake doc failed"
+			emake pdf
 		fi
 	fi
 	if use games; then
 		cd "${S}"/test
-		emake blocks checkers sudoku || die "emake games failed"
+		emake blocks checkers sudoku
 	fi
 }
 
+src_test() {
+	emake -C test
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	emake -C fluid \
-			DESTDIR="${D}" install-linux || die "emake install fluid failed"
+			DESTDIR="${D}" install-linux
 	if use doc; then
 		emake -C documentation \
-			DESTDIR="${D}" install || die "emake install doc failed"
+			DESTDIR="${D}" install
 	fi
 	local apps="fluid"
 	if use games; then
 		emake -C test \
-			DESTDIR="${D}" install-linux || die "emake install games failed"
+			DESTDIR="${D}" install-linux
 		emake -C documentation \
-			DESTDIR="${D}" install-linux || die "emake install doc games failed"
-		apps="${apps} sudoku blocks checkers"
+			DESTDIR="${D}" install-linux
+		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 || die
+	dodoc CHANGES README CREDITS ANNOUNCEMENT
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
@@ -139,9 +148,7 @@ src_install() {
 	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
 	doenvd 99fltk-${SLOT}
 
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk-1/*.a || die
-	fi
+	prune_libtool_files
 }
 
 pkg_postinst() {