Version bump.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 337 insertions, 5 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index af000b7e7053..306aad79eab6 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.222 2012/10/02 23:16:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.223 2012/11/13 01:43:10 jer Exp $
+
+*fltk-1.3.1 (13 Nov 2012)
+
+  13 Nov 2012; Jeroen Roovers <jer@gentoo.org> +fltk-1.3.1.ebuild,
+  +files/fltk-1.3.1-as-needed.patch, +files/fltk-1.3.1-desktop.patch:
+  Version bump.
 
   02 Oct 2012; Jeroen Roovers <jer@gentoo.org> -fltk-1.3.0.ebuild:
   Old.
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index a58b079a0095..45f08ae1ba30 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -5,14 +5,18 @@ AUX FLTKConfig.cmake 1217 SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633
 AUX fltk-1.3.0-as-needed.patch 6090 SHA256 88944dc4e88c312dd84adaaa392bf4aedeb3e8ed0bb14ef8f0b2a5c8eac23158 SHA512 3084090f0b72a95c77f69943f5aa18ee7499bb7962f3350cba07e5d09e7b06f3f6d38844686782b50458a9898412df20407bbd735b4fc0b766833406aa9e1937 WHIRLPOOL f6d880a5f28c67042a1fb75ec4a902039d769aaec6874d5c7abfd620743120d823d9b8a0f50f8b4cdedc4fca284e035d494998ee872be0ab13c64d86d0d0df4e
 AUX fltk-1.3.0-conf-tests.patch 2862 SHA256 880037a60db7d120a87d9d90557cad4f0298de3e994621d00706d29b48585512 SHA512 72034e155a225aac29ac605c98b1265a9ec16e8e443db1fc67930fcd105130a3833bf2f7181e9728a255c0a6c22d26c5fb77bdc3755467bd40f4bcce5fd06611 WHIRLPOOL fff0792c380a340089bf15f8467cfccb5edde71f0a854afd246268473a7f7e2e58d8bb6ae4a62a760e470a54c2d3d3ddcc26f299ffb33e78a4f69f2b2ed2d62e
 AUX fltk-1.3.0-share.patch 2015 SHA256 9d756497b7c880b8eac8ab4a60de279cad36ef0a932e6a4d6364117d5003502a SHA512 41693b7f7cd288aa12172a71a2c46a639f0121a238687696a0a77a7e7dafb994dc53e7597c70239400fcfd80c071a53db481d799467fe6a392e8a14d6548a3fc WHIRLPOOL b742366ef869afa90cb8f86132628bbecd103729854424919601ad411e80b1cc6d91c463df0715ccf0b32a2037d1bef1163ba90a4effa52776f14afd6965cef2
+AUX fltk-1.3.1-as-needed.patch 5672 SHA256 46931bde1b60bbc82d12b638d9e1dddaf98e671c74b13154e05a79ebe877e1f1 SHA512 710051e55183eaa212ff9480a6e4c68a1c5331d80cbaff366cd362fc9d8b5ad10521c38ce684abe2a2f48ae0df448eb0c87f0b0db88a1f46a91f9650aa09a0fa WHIRLPOOL ee97f40e8bc48608c088a23b97ab3d80ce0317575bb51d5c4ef1c300ef7362484ed607a7d25f0ebfc7e50e33fe75335f47406d3c40ab8f257133366baf6071f3
+AUX fltk-1.3.1-desktop.patch 208 SHA256 1888fc817b1a248c66efff7d2627ba022201df32673a13b3b85593990d025f29 SHA512 0b783c17017f41a423513255135ebae253181b3ad237db7ee13f387e92fb41786e6495835f52976ef70de28bc2181a895b3b334ef2552c02a0a14ed444b97711 WHIRLPOOL 748e90f34338f7eb01c596f8a72d81b0da21efdd21057fdfd1bd2aecc72f10a83c0a7bc8c17f54abeb0132f6c67f615502fb0d0320e0ff4bc2b5bdf955b6e0f9
 DIST fltk-1.3.0-source.tar.gz 4111004 SHA256 990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c SHA512 a7adf9def90b143bc7ff54ac82fe9f6812b49209ab4145aada45210a3c314f9d91ae413240a8c57492826eca011aa147c68a131a9fe20bf221e7bc70c6c908ee WHIRLPOOL 99906609fb8cb1d1a7bbaaddea735dc6ae986bafb3210aeb7727858951f8117771dd7f92d977e841daf7ce42eaac8d9353129674e8f28aaa7cabc78f6a2f8ddc
+DIST fltk-1.3.1-source.tar.gz 4257291 SHA256 49006c148fad8c31a3a961c74486fb485c7878b9d0d084e597f30e354d7cf549 SHA512 f0f5ed1127f30cccb6a9f06f5ec1618c379a9e40376f79971f5fe91c554c4efd5c8c4eafaa2640db39b87a07fba33a411aa88061bb8bab91541d7c11fab3e465 WHIRLPOOL 48e2da7e34054f5e54c09e9666e8a101fc1b17ea4490bd6b6a4b82e7f838e08966245cc2f3b9499f5bb372560aa57afbc1e8910dda10400fcd7ecd83b10edb0b
 EBUILD fltk-1.3.0-r1.ebuild 4071 SHA256 94a463ad88aa4addbe248cb4598f8719dec21a9c06e0a47128da31653b46dd40 SHA512 5146d36916e18df8206b29aede9c2f7d3f28abe0357465be5c7d8ffe4eaef03c4e29e7a0572c9f6263a54c6b17499c57ae83af9da6f6e89c342007acfe7d7dd6 WHIRLPOOL 254aed407a8624be7a7f9ed74c05009321a9a0faffc49ad67595189926dcea07618f552d2c1c1f801977b72d374a30f7ccbd4238d3988d07b38bbe3f3931fdaa
-MISC ChangeLog 31038 SHA256 42d835a8cf3222099efd33ef025b977dbb6117e5cfacf9ba5adb5b09b8109157 SHA512 3630369e2044e45aa2fc5aa343e32d27d4eddc591e2b83d1c62e839a3816695bf031726b97013eece321784adf4520bc24a9a6ad7e32b1abd6b011b6e4c04662 WHIRLPOOL c109093413e2560691f859b2d1ca9d1d3b6ab468641ba2ac2ef5aef00a4ef43933517401f80e8cedc00893c83c7938cbca76719940232dae0ed1d1bab18b1ed7
+EBUILD fltk-1.3.1.ebuild 4137 SHA256 73a72c90828210ee5fa31b5ea6f5557f822a58a8b449fc80941d85b747e00c5c SHA512 9d2458b230b32d56bb76a85658e2c743201bc51a10025d28ec96cee567c78f51fbc793d0e3c986679ee16f6b59b586b802e922ac8f30ed055ce0ab711a47a791 WHIRLPOOL 90f067649b566d391ddd13a9c04d533a6d2022b00df517af63c92add2baedb8951e12100c671b27df6d855bc99d9735f08f8e9a59d014e5050fb13a13f124fc5
+MISC ChangeLog 31219 SHA256 4cda10e35b4a59e5c92d1fd36becc60ce959e1ce68bfffd9f0fb6e0c31a6b83b SHA512 7b52875a5f5e57b724c6054dd7c30c9c23b0b97bbf56588675f7c9e3466d768aeecd4a081651668da50e3ba65ccfebb4a7bf91ed3dc7da5385edab616e965042 WHIRLPOOL ee9e6e5a84ed602a4514a8dfb45e1a72ba75991e7034d7124fb66835e097dafd9c33d9eb18e091166fd617b72e00df31b7a696a56e4b85dd8c87f8782985fcb4
 MISC metadata.xml 657 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1 SHA512 0b9f3823afb9e0e4723066a70c2aa30f64b3cb854024e337b712249fcdad133eebb3aec9efa963f3cc2d5bc1ccf9440f64d6dbd197c78befd3bad04d19a8a466 WHIRLPOOL 9787427789256d7fca86512fa8c939c3729d1ca60b5058def5dddbcf9a578ba8e45662b9c100a1e7ad6db16e5bc675603dabc01314d814ed9b4e84139984fba7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBrdbEACgkQVWmRsqeSphN5aQCcDJEIL5f9EJm1klQfCtdIdn6I
-pNsAnjtDWdRJNNBLo6C6ehrhZMwDVRRT
-=xiKD
+iEYEAREIAAYFAlChpbAACgkQVWmRsqeSphOPRQCeLLbZ2HfVMY/6PUqzG2/nFy2q
+/9IAoICtQ3iWYncul2StrNUeOM2ElCzF
+=N6NA
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..c6539fc7ec21
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
@@ -0,0 +1,154 @@
+ 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/files/fltk-1.3.1-desktop.patch b/x11-libs/fltk/files/fltk-1.3.1-desktop.patch
new file mode 100644
index 000000000000..7ba000bce2f3
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.1-desktop.patch
@@ -0,0 +1,10 @@
+--- 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/fltk-1.3.1.ebuild b/x11-libs/fltk/fltk-1.3.1.ebuild
new file mode 100644
index 000000000000..50bb58b1b7e6
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2012 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.1 2012/11/13 01:43:10 jer 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="mirror://easysw/${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
+	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}"/${PN}-1.3.1-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.3.1-desktop.patch \
+		"${FILESDIR}"/${PN}-1.3.0-share.patch \
+		"${FILESDIR}"/${PN}-1.3.0-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
+}