Version bump (bug #497594).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 101 insertions, 374 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/Manifest b/x11-libs/fltk/Manifest
index 69590ea65ff5..594261243c53 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -2,34 +2,21 @@
 Hash: SHA256
 
 AUX FLTKConfig.cmake 1217 SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e SHA512 11fab963f33db7a7c86a10f9f5ddbfa99e718603e9338c23bc078ebdcc4e82f8fc4869a664f9eba9648ee22e5874471f9e7b45c92c8a1b7b72b8ce8ca084941e WHIRLPOOL bf2254205286f34196b3a26a4e8f2b06fe9f159beaa8303aa54325f97a8cd5110dd04347febee4efc00d26ac87af1b0deb9f6982fecc72e0e609ccd44990e68b
-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
+AUX fltk-1.3.2-conf-tests.patch 2259 SHA256 f309d0871780ebb830ede6dfc99c660eb48878c830aada0d8264aae3d9abbde6 SHA512 35d0ae931ef055066f71e674c2efe57b7f8d000a05632842e70c9dbf6736fe28810be25eb7a0a06ad739e72c758f60391373ce43be81ae4638e67f4d20852459 WHIRLPOOL c56189507b1b81aa87c520de4ac01915c5de9a12412b54ca7d5ab8f30f7f4ae3270171fdb66e3608ce514328958cef820d4271d9570037d77512286205e3c697
 AUX fltk-1.3.2-desktop.patch 456 SHA256 6e519612de37f4cea83bded50dc3bf856c13af53da108def188a5edcbf3d506f SHA512 405b604471f86d2eb013b1e7ee2d73574cb322ee3e519092c984bbb0fe46cf2438762c63ff6a1c31467e92257dc84fa4d1725ff50238379273ca28c687f1bc13 WHIRLPOOL 613bd7ae2ba18f3d68fedb9bd32a771a8b242395d494ac139c26da9175ccb454f24baad1d4715fed7f369a3e0ae73f1ab1d7811e270d0fe3061df8dd3bf6ca11
-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
 DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781
-EBUILD fltk-1.3.0-r1.ebuild 4079 SHA256 6985168980d4122bf698b398c821e3e248879289400e2c2f5623b04222b80463 SHA512 af6e5b111d3ca98fd9ae8214e2121311c8f1ae78709ad427fa9a496e811e786d6ca5fe4dd2e90746d8903bb6f3274356054a0361b4b88b2880219059c830220d WHIRLPOOL eb00a0deb5abf2a4b53092e9eb5bf6b4b0cdf0129692fa11b36f8d449c4e533f768e2f5ddb4d09c1b2eebb66e87b6ba2d20cdd9e7728593c47b7a67b5b85526e
-EBUILD fltk-1.3.1.ebuild 3981 SHA256 82a9e917319de2ac967e263101687ed882ec416c00353b9b55b1deb054aa4e31 SHA512 92e82f10a03562683e3ad59d758d7c2b6a3bee3132c07f6651de13d6d315631442d6e7a2e444758f35090a4bba8ec794da826a2882b44fdbd3fbd7082a387b69 WHIRLPOOL c0531231a1200059b488a5e7fb7affc177f784c4fdf48a8728d6f34aba716ffd84b04b63028b48f6a8b611475176d8a4e878fa48b29dd910238503a54fe1c00e
+DIST fltk-1.3.2_p10088.tar.bz2 3679398 SHA256 76fc7a63adfdc7c20fd4779d4d02adb4c8fb74913af3b52a38f07954d8ff439d SHA512 c27b9a50ab0bf5fb4c7e4e502de90a39008805833846a98460b1fac771018b234100e6168d95da2ac3168b8f3c9a42dbc03cc451773ed83e8371e72128f2d690 WHIRLPOOL ef788f3dc5b78bd3586637fedc2678003c0d66bde35ca6b596e973019c232db51d3a416823b1a71eda857f88c3435365e061dbd33de57a6b367e1077342ff07f
 EBUILD fltk-1.3.2.ebuild 3667 SHA256 2f6dafa4899ec2c5512925f09a8cbe2fcc70fb4086aef380d8a3b7958eefa77b SHA512 0725a2cf279f964295e16b29d1eab5d8653553d6499ac4f8a8e970e4a75f701b1593df8a1c271456e8e66d27506a30c1d9949f8cf0c33c7140d8ea0f54f49bfb WHIRLPOOL cb605e2d62a4980110402f6f2d212e60ee4f017d3eb0da998cebb5e8f71f086d5bd7a41aa7bb9f5c9d1ad01b35d2c3623c8c6bdf118e6267ed217ac317b22a23
-MISC ChangeLog 32931 SHA256 a14c3841fdbfd8be9c0318d196d229e2dac7505923e62e91beb76d3293eb1a22 SHA512 43ad8f5786d4bf42ec732b5707639fe56154deea6f7e50fb1eed5a2b9c885725a7b9baae33a51bdbf51171137afe292b619e348e15424fa656b1ecd4f0dc15cd WHIRLPOOL 28f7703d309863d8e1be5c0f4a1dcea41513f80eac69f24a606488932b5ddcc5fc5725756b13fd01782ee1f5d03a19ff51ec28a1406367d15f58bef6a357ecaf
+EBUILD fltk-1.3.2_p10088.ebuild 3900 SHA256 46af83efa46bf0f53a7c686bd7b059d161bfcd8b8842b5ade87a73e6f4b4cfd9 SHA512 16f253ae9ca41498b7cdc20bffdccf7ea1441ee84ae6ab02c570d7cc6557f428660ad9753003399667eeee45252d8b26e5002f52c7292c07176403f4fe762f6c WHIRLPOOL 87c889bc71615cad71f7be36a6c91671bf739b706d8717c9dc77d1520c26a1679a90eff3f22be0e53a38f9c0989c52f8245b3801fd530e33c0e113424750f9e9
+MISC ChangeLog 33223 SHA256 840387035c8768096e49b22c26814bbf416bf1239d9ed80b35596644630cac12 SHA512 d1dc46e57b24980efef8acc54fdf17abc54784192963aad44335e6f54d475506186be805c48293ff77f7bc8ac95210db317ce1a8f6df6cb231b9a74d4b4e9bf1 WHIRLPOOL efbfae4e8a165b8219d9a0a4949e19f0a973d6ebcf8ffe30b268c0543e3378ee7304d9aa6270702300524d32fa5edf16a0e35c769548126eaade45e98d8973d9
 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1lHbAAoJELp701BxlEWfzegP/js2Sega0gBIf+K4UXRRd7xB
-yTUSeWxDgpM/gL+Jh4IE0NZzspKBDDkXHv2e5Taee4hi0AxGWrPCvE9yD5ifhSQ4
-HVjN2JyZrGRp7RHDp3SbofkZbJItRU3wfxnEj1c7nfYYWjGPPY23IwhDnIjiTfdf
-Hia2YtfBBXeICjYUoqMjTq+/qsIgla4sjOe/aPxBeXozbIlcHo0oXek0G5GyDwXN
-L3K4cIxZj7Kk4sV6QuQzSWskCkwqj4p1ujDkHCK+EzxOvXB4Ky6qzEulmpbE8bDO
-tuaduA6pogNezhrC349gU1Jeu5ikIGTTz3FW2C9UZneT6mfdd2XE19HDtR1+J/P3
-0iWSHieZk716/xDm/zKhZyuo9GYx4oi5S258zOXjbTFvWyCemMqyvU8iPwK1qTDF
-M9mA1fOjMl9zz77GltMGMo6R2IJp3r+Cbfbl/+bPah49rGxIW3qk3kGVWzOIRCPO
-KIaPHzauBjGCkhCzD071CCuB6tf2kPGcUOV9s3Y1J4zOwfpwAUW/2hP39sczTdyU
-4T7ARmyvdzdYzMh2FsKUf+5am2v0dZ6ay2l0Pss87gqM6jjmJ4cfW9R79iBq6BKV
-G+GJNfTfaskdNcT+pOIJbsBuDXzyeSej6txzvFEPoiq0SxbdwEUQO3tfOCfUdsig
-oD1PIFbQitVd88j5211h
-=3wCA
+iEYEAREIAAYFAlLuKNcACgkQVWmRsqeSphPtWQCbBoVtT0K9RoRGlpV+f4VADZAa
+GcoAn03DtMP0r2RwGLqCsmlfpfgvcclM
+=cCKM
 -----END PGP SIGNATURE-----
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() {