summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-02 11:51:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-02 11:51:40 +0000
commit31470b1f1081d1e06bd0f1fa705811b9eb3e8d4f (patch)
treeed99391db1b8ead1ba5e445fae7287524f6084b8 /x11-libs/fltk
parentStable for amd64, wrt bug #419295 (diff)
downloadhistorical-31470b1f1081d1e06bd0f1fa705811b9eb3e8d4f.tar.gz
historical-31470b1f1081d1e06bd0f1fa705811b9eb3e8d4f.tar.bz2
historical-31470b1f1081d1e06bd0f1fa705811b9eb3e8d4f.zip
old
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/fltk')
-rw-r--r--x11-libs/fltk/ChangeLog9
-rw-r--r--x11-libs/fltk/Manifest24
-rw-r--r--x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch13
-rw-r--r--x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch11
-rw-r--r--x11-libs/fltk/files/fltk2-asneeded.patch46
-rw-r--r--x11-libs/fltk/files/fltk2-fluid2.patch20
-rw-r--r--x11-libs/fltk/files/fltk2-gcc43.patch20
-rw-r--r--x11-libs/fltk/files/fltk2-ldflags.patch91
-rw-r--r--x11-libs/fltk/files/fltk2-nogl.patch52
-rw-r--r--x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild92
10 files changed, 17 insertions, 361 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index abfce253c7dc..9f54ad1b6eac 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,13 @@
# 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.213 2012/05/30 08:04:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.214 2012/06/02 11:51:40 ssuominen Exp $
+
+ 02 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+ -files/fltk-2.0_pre6970-libpng14.patch, -files/fltk2-asneeded.patch,
+ -files/fltk2-fluid2.patch, -files/fltk2-gcc43.patch,
+ -files/fltk2-ldflags.patch, -files/fltk-2.0_pre6970-libpng15.patch,
+ -files/fltk2-nogl.patch, -fltk-2.0_pre6970-r1.ebuild:
+ old
30 May 2012; Justin Lecher <jlec@gentoo.org> fltk-1.3.0-r1.ebuild:
Add rpath on prefix
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index c6991ed52370..5b7357972e29 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,29 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX FLTKConfig.cmake 1217 RMD160 5dd0903afe144b63c17dfb50b318b9d994787697 SHA1 2b09f60de6ae8ba1c1d625240e734b0413e643ca SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e
AUX fltk-1.3.0-as-needed.patch 6090 RMD160 e3c1f74cf8c3cc61a0dfb15c1eec8ae7e7d0abe1 SHA1 c982a609c0b4086d242d2db1d7ea69d241cd9e37 SHA256 88944dc4e88c312dd84adaaa392bf4aedeb3e8ed0bb14ef8f0b2a5c8eac23158
AUX fltk-1.3.0-conf-tests.patch 2862 RMD160 73f7318207cd8f6dc7f61ac85c6f27319d7c25cd SHA1 8a02cac9aeff7def4c459121b9f4488f2bdc05b5 SHA256 880037a60db7d120a87d9d90557cad4f0298de3e994621d00706d29b48585512
AUX fltk-1.3.0-share.patch 2015 RMD160 7bd89b2b3dc35a80349b0ad71b378ebc2bb0eb1d SHA1 f1001ec8da36cc5e2f46ecafeff7ea2a35439179 SHA256 9d756497b7c880b8eac8ab4a60de279cad36ef0a932e6a4d6364117d5003502a
-AUX fltk-2.0_pre6970-libpng14.patch 339 RMD160 a6fe78f6518b31fd93410df1859832681945e7a3 SHA1 7dc0edee28c336e6ee6ddf4a6a4a45c086e39912 SHA256 ff4b1a7da84cbf1dc3a974a2461a5e1c02965a61b13e6b2a34904f731854a4a6
-AUX fltk-2.0_pre6970-libpng15.patch 254 RMD160 951de43594f76efcb166538acf0b0f3b7c904ce3 SHA1 c42c60474a0c48a33a7b087316b9ce6ade0b4c52 SHA256 ea5f3e8b17ecfc5662fa965a386b0db8fe821faa885d49489ead6046039aaa6d
-AUX fltk2-asneeded.patch 1902 RMD160 750e9ca9a57237f2c693d29422352778abf6135f SHA1 d7273b03085d69b35ae332cf2e2e215480ec4ad7 SHA256 aa532cba342f7315efd08578431acab746bb3a499eada984b35a44fe6b30580f
-AUX fltk2-fluid2.patch 948 RMD160 943d7843f7258ed9e26ca9ce281c226f75a30580 SHA1 44f94f7c823749f33feb11d8b93b85ee5ec33a3d SHA256 a5c5d7f2b24bb19ee5d4d03ccead551da4b668e35a21f9761983085ae0faa2c1
-AUX fltk2-gcc43.patch 726 RMD160 65670e4e9e8e05572a002319d6ecef1d046d416c SHA1 dc5a50b48cd2316a533adc14b621d56624fdef8d SHA256 4f975ac172ae0cfd4e2fc1d3edbacac7ad9eedfb3c1825fd390ec03444add6fa
-AUX fltk2-ldflags.patch 2692 RMD160 97682c8e9f6c84d881edadff92349fad7ff0d52a SHA1 150096fb9e5fefbcf7bf4cc3ffd3c27ce4be1985 SHA256 d7308e596c00a5848c1fb1c8c3f606b1838ecd1a9477a1e438afb8f74d586e3a
-AUX fltk2-nogl.patch 1222 RMD160 18ae618fb0b70678bd811b0c1871bac11230515a SHA1 0e9774c5df1721e468f21a96b5861dcf632c39ff SHA256 97757338e8a8dd9e75efd7b20520696e2b1e588cddb96b710315ddc1acc50faf
DIST fltk-1.3.0-source.tar.gz 4111004 RMD160 dea1eb42ae1b81efa22a54198956211367e2945a SHA1 720f2804be6132ebae9909d4e74dedcc00b39d25 SHA256 990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
-DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
EBUILD fltk-1.3.0-r1.ebuild 4076 RMD160 6c8344cdcdb3d7aa807082ff3d04ba79a0b2d573 SHA1 ae0dfc45d6bb36700af4a9edae1b684c47189460 SHA256 88c5ec5bd9086c2687b5bbbb9b1e6bfbb88aecaedd12bf61534a5a7462eb06f0
EBUILD fltk-1.3.0.ebuild 3881 RMD160 d768294c9b0c2af7443d3ef7557f0beb99601073 SHA1 5dde91cb2413fccd2bc700dfd6c8b561d2e0ad5c SHA256 fd3cb29a977777dc883b934a2b31edac76b6d74189aca0d8953ac0d8faa044e4
-EBUILD fltk-2.0_pre6970-r1.ebuild 2757 RMD160 1ac96b77c66df8bf5c8e2327aa1f1ec9afe7e5f3 SHA1 bef2afdfb83e3aca6e46695f031609c6a5f72623 SHA256 277148f5f91ac4db5d95fc34f9fa38fbd34b469ea0a17417fcb44601a95679d4
-MISC ChangeLog 29905 RMD160 d9b658c291c37aee8ecb5d3a73acaaa6959078cd SHA1 1a6bed13a8350804563fa211fc7f1a3c72e733ee SHA256 744f1fbb52a4afa8da22f9b31aaabffa576770f31fa5c32a728080a29b9c2da7
+MISC ChangeLog 30223 RMD160 e1779a951dda5f37ca4f1fb46f7577de0e59a0ee SHA1 5cc45a7bb1558389473d3b943426ca2a409bdd96 SHA256 89e76167ff6a8346fb2578082954f3400b792619c3f76c8054be5a63fc6890a8
MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
-iEYEAREKAAYFAk/F1HYACgkQgAnW8HDreRY//wCgzo44WD3YqXL7UVYuQckvdrl+
-TZEAoJA4nZRgL1OAFpDq+lEdK9pMlHJA
-=osdE
+iQEcBAEBAgAGBQJPyf11AAoJEEdUh39IaPFNwJEIAI72ZX5FavwnCIbfSRoTBWqL
+0sIk9HX1KGMV7Z1gtkSt94+/Qa8fYYuZ/eBjRF3gUtYkfMzXZdKVDv2D80A8mJ/Z
+rdQofajwG+H8bFyNFVdoAX+riKf3ck/a4hjdoptScOWeqTi+ni2YAD4Ywl7Y9LTl
+94Jgs7NKMF6Q1AJ3toIOD7r2iEIyqwfn5enWZQAG0ihciD+gxeLjT8/VB1dOw4ap
+a+ft2l6hPF54yIthqX0DFRromMPd2Du+nRxNYBc6hFD+Rs/cY6bceXAyVz8qu6xO
+7zmMQKzrs2QwYPbdJv3tUpwSB/LEPHvV5QGRl2UIpdw7hXjLhhewmj+wdHCaRjc=
+=qeoT
-----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch
deleted file mode 100644
index bef3f7ae9008..000000000000
--- a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://repos.archlinux.org/wsvn/community/fltk2/trunk/libpng14.patch
-
---- images/fl_png.cxx
-+++ images/fl_png.cxx
-@@ -62,7 +62,7 @@ bool pngImage::test(const uchar* datas,
- #if !HAVE_LIBPNG
- return 0;
- #else
-- return png_check_sig((png_byte*)datas, (int)size)!=0;
-+ return png_sig_cmp((png_byte*)datas, 0, (int)size)==0;
- #endif
- }
-
diff --git a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch
deleted file mode 100644
index b4b171858af9..000000000000
--- a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- images/fl_png.cxx
-+++ images/fl_png.cxx
-@@ -111,7 +111,7 @@ bool pngImage::fetch()
- png_set_sig_bytes(png_ptr, 8);
- }
-
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- goto error;
-
- png_read_info(png_ptr, info_ptr);
diff --git a/x11-libs/fltk/files/fltk2-asneeded.patch b/x11-libs/fltk/files/fltk2-asneeded.patch
deleted file mode 100644
index 40a08f5c5a2b..000000000000
--- a/x11-libs/fltk/files/fltk2-asneeded.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naurp -Naurp fltk-2.0.x-r6671.old/configure.in fltk-2.0.x-r6671/configure.in
---- fltk-2.0.x-r6671.old/configure.in 2008-08-05 00:53:30.000000000 +0200
-+++ fltk-2.0.x-r6671/configure.in 2009-04-11 00:47:36.883659022 +0200
-@@ -185,7 +185,7 @@ if test x$enable_shared = xyes; then
- ;;
- Linux* | *BSD*)
- # DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-- DSOCOMMAND="\$(CXX) \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+ DSOCOMMAND="\$(CXX) \$(LDFLAGS) -shared -fPIC $DEBUGFLAG -o"
- if test "$libdir" != "/usr/lib"; then
- DSOLINK="-Wl,-rpath,$libdir"
- fi
-@@ -611,7 +611,7 @@ case $uname in
- LIBS="$LIBS -lXext $X_EXTRA_LIBS"
- CFLAGS="$CFLAGS$X_CFLAGS"
- CXXFLAGS="$CXXFLAGS$X_CFLAGS"
-- LDFLAGS="$X_LIBS $LDFLAGS"
-+ LDFLAGS="$LDFLAGS"
-
- if test "x$x_includes" != x; then
- ac_cpp="$ac_cpp -I$x_includes"
-diff -Naurp -Naurp fltk-2.0.x-r6671.old/makeinclude.in fltk-2.0.x-r6671/makeinclude.in
---- fltk-2.0.x-r6671.old/makeinclude.in 2006-04-11 00:06:06.000000000 +0200
-+++ fltk-2.0.x-r6671/makeinclude.in 2009-04-11 00:47:04.965513756 +0200
-@@ -77,8 +77,8 @@ LOCALIMAGES = @LOCAL_IMAGETARGETS@
- ZLIBINC = @ZLIBINC@
-
- # libraries to link with:
--LDLIBS = @LDFLAGS@ @LIBS@
--GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@
-+LDLIBS = @LIBS@
-+GLDLIBS = @GLLIB@ @LIBS@
- LINKFLTK = -L../lib @LINKFLTK@
- LINKFLTKGL = -L../lib @LINKFLTKGL@ @LINKFLTK@
- LINKFLTKFORMS = -L../lib -lfltk2_forms @LINKFLTK@
---- fltk-2.0.x-r6671.old/images/Makefile 2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r6671/images/Makefile 2009-04-11 01:13:04.325621387 +0200
-@@ -109,7 +109,7 @@ include makedepend
-
- ../lib/$(DSONAME): $(OBJECTS)
- echo $(DSOCOMMAND) $@ ...
-- $(DSOCOMMAND) $@ $(OBJECTS)
-+ $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS) $(LOCAL_IMAGELIBS) $(LINKFLTK) $(LDLIBS)
- $(RM) ../lib/$(DSOLINK)
- $(LN) $(DSONAME) ../lib/$(DSOLINK)
- \ No newline at end of file
diff --git a/x11-libs/fltk/files/fltk2-fluid2.patch b/x11-libs/fltk/files/fltk2-fluid2.patch
deleted file mode 100644
index a787b612973f..000000000000
--- a/x11-libs/fltk/files/fltk2-fluid2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r6786/fluid/Makefile.org 2010-02-08 21:16:20.000000000 +0100
-+++ fltk-2.0.x-r6786/fluid/Makefile 2010-02-08 21:21:20.000000000 +0100
-@@ -110,7 +110,7 @@
- fluid2$(EXEEXT): $(OBJECTS) ../lib/$(LIBPREFIX)fltk2$(LIBSUFFIX) \
- ../lib/$(LIBPREFIX)fltk2_images$(LIBSUFFIX)
- echo Linking $@...
-- $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LIBS) $(LDLIBS) $(LOCAL_IMAGELIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LIBS) $(LDLIBS) $(LOCAL_IMAGELIBS)
- $(POSTBUILD) $@ ../fltk/mac.r
-
-
-@@ -121,7 +121,7 @@
- fluid2-shared$(EXEEXT): $(OBJECTS) ../src/$(DSOPREFIX)fltk2$(DSOSUFFIX) \
- ../images/$(DSOPREFIX)fltk2_images$(DSOSUFFIX)
- echo Linking $@...
-- $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(IMAGELIBS) $(LOCAL_IMAGELIBS) $(LIBS) $(LDLIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(IMAGELIBS) $(LOCAL_IMAGELIBS) $(LIBS) $(LDLIBS)
- $(POSTBUILD) $@ ../fltk/mac.r
-
-
diff --git a/x11-libs/fltk/files/fltk2-gcc43.patch b/x11-libs/fltk/files/fltk2-gcc43.patch
deleted file mode 100644
index 1165828be193..000000000000
--- a/x11-libs/fltk/files/fltk2-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r6671.orig/src/Image.cxx 2009-04-10 16:07:34.000000000 +0200
-+++ fltk-2.0.x-r6671/src/Image.cxx 2009-04-10 16:03:22.000000000 +0200
-@@ -20,6 +20,7 @@
- // Please report all bugs and problems to "fltk-bugs@fltk.org".
-
- #include <config.h>
-+#include <cstring>
- #include <fltk/Image.h>
- #include <fltk/Widget.h>
- #include <fltk/events.h>
---- fltk-2.0.x-r6671.orig/src/setcolor.cxx 2009-04-10 16:07:19.000000000 +0200
-+++ fltk-2.0.x-r6671/src/setcolor.cxx 2009-04-10 16:08:27.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <fltk/Color.h>
- #include <fltk/draw.h>
- #include <config.h>
-+#include <cstring>
- #if defined(_WIN32) && USE_STOCK_BRUSH && _WIN32_WINNT<0x0500
- # undef _WIN32_WINNT
- # define _WIN32_WINNT 0x0500
diff --git a/x11-libs/fltk/files/fltk2-ldflags.patch b/x11-libs/fltk/files/fltk2-ldflags.patch
deleted file mode 100644
index 244cc7f07e6f..000000000000
--- a/x11-libs/fltk/files/fltk2-ldflags.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- fltk2-config.in.orig 2006-04-15 19:43:12.000000000 +0200
-+++ fltk2-config.in 2009-04-21 09:58:30.000000000 +0200
-@@ -58,7 +58,7 @@
- exec_prefix_set=no
- bindir=@bindir@
- includedir=@includedir@
--libdir=@libdir@
-+libdir=@libdir@/fltk
- srcdir=@srcdir@
-
- # compiler names
-@@ -69,10 +69,7 @@
- POSTBUILD="@POSTBUILD@"
-
- # flags for C++ compiler:
--CFLAGS="@CFLAGS@"
--CXXFLAGS="@CXXFLAGS@"
--LDFLAGS="@LDFLAGS@"
--LDLIBS="@LDFLAGS@ @LIBS@"
-+LDLIBS="@LIBS@"
-
- # libraries to link with:
- LIBNAME="@LIBNAME@"
-@@ -167,8 +164,8 @@
- # This fixes --prefix=<path> bug - fltk2-config didn't return proper stuff
- bindir=${exec_prefix}
- includedir=${prefix}/include
-- libdir=${prefix}/lib
-- DSOLINK="-Wl,-rpath,${prefix}/lib"
-+ libdir=${prefix}/lib/fltk
-+ DSOLINK="-Wl,-rpath,${prefix}/lib/fltk"
- ;;
- --prefix)
- echo_prefix=yes
---- configure.in.orig 2009-05-08 16:14:28.000000000 +0200
-+++ configure.in 2009-05-08 16:15:23.000000000 +0200
-@@ -152,43 +152,25 @@
- DSOSYMLINK=".dylib"
- DSOSUFFIX=".$FL_API_VERSION.dylib"
- DSOCOMMAND="ld $DSOFLAGS -dylib /usr/lib/dylib1.o -lc"
-- if test "$libdir" != "/usr/lib"; then
-- DSOLINK="-Wl,-rpath,$libdir"
-- fi
- ;;
-
- SunOS* | UNIX_S*)
- DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o"
-- if test "$libdir" != "/usr/lib"; then
-- DSOLINK="-R$libdir"
-- fi
- ;;
- HP-UX*)
- DSOSUFFIX=".sl.$FL_API_VERSION"
- DSOSYMLINK=".sl"
- DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o"
-- if test "$libdir" != "/usr/lib"; then
-- DSOLINK="-Wl,-rpath,$libdir"
-- fi
- ;;
- IRIX*)
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
-- if test "$libdir" != "/usr/lib" - a "$libdir" != "/usr/lib32"; then
-- DSOLINK="-Wl,-rpath,$libdir"
-- fi
- ;;
- OSF1*)
- DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
-- if test "$libdir" != "/usr/lib" - a "$libdir" != "/usr/lib32"; then
-- DSOLINK="-Wl,-rpath,$libdir"
-- fi
- ;;
- Linux* | *BSD*)
- # DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
- DSOCOMMAND="\$(CXX) \$(LDFLAGS) -shared -fPIC $DEBUGFLAG -o"
-- if test "$libdir" != "/usr/lib"; then
-- DSOLINK="-Wl,-rpath,$libdir"
-- fi
- ;;
- AIX*)
- DSOSUFFIX="_s.a"
---- fltk.list.in.orig 2009-04-21 10:01:07.000000000 +0200
-+++ fltk.list.in 2009-04-21 10:01:18.000000000 +0200
-@@ -38,7 +38,7 @@
- $bindir=@bindir@
- $datadir=@datadir@
- $includedir=@includedir@
--$libdir=@libdir@
-+$libdir=@libdir@/fltk
- $mandir=@mandir@
-
- $CAT1EXT=@CAT1EXT@
diff --git a/x11-libs/fltk/files/fltk2-nogl.patch b/x11-libs/fltk/files/fltk2-nogl.patch
deleted file mode 100644
index b985945f618d..000000000000
--- a/x11-libs/fltk/files/fltk2-nogl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./test/Makefile.orig 2007-06-07 15:36:39.000000000 +0300
-+++ ./test/Makefile 2007-06-16 20:27:39.000000000 +0300
-@@ -128,8 +128,6 @@
- button$(EXEEXT) \
- buttons$(EXEEXT) \
- color_chooser$(EXEEXT) \
-- cube$(EXEEXT) \
-- CubeView$(EXEEXT) \
- cursor$(EXEEXT) \
- curve$(EXEEXT) \
- demo$(EXEEXT) \
-@@ -140,9 +138,6 @@
- exception$(EXEEXT) \
- file_chooser$(EXEEXT) \
- fonts$(EXEEXT) \
-- fractals$(EXEEXT) \
-- glpuzzle$(EXEEXT) \
-- gl_overlay$(EXEEXT) \
- hello$(EXEEXT) \
- image$(EXEEXT) \
- inactive$(EXEEXT) \
-@@ -161,11 +156,9 @@
- pixmap$(EXEEXT) \
- progress$(EXEEXT) \
- radio$(EXEEXT) \
-- qubix$(EXEEXT) \
- resizable$(EXEEXT) \
- resizealign$(EXEEXT) \
- scroll$(EXEEXT) \
-- shape$(EXEEXT) \
- sizes$(EXEEXT) \
- symbols$(EXEEXT) \
- threads$(EXEEXT) \
-@@ -173,7 +166,6 @@
- tile$(EXEEXT) \
- timer$(EXEEXT) \
- utf$(EXEEXT) \
-- fullscreen$(EXEEXT) \
- valuators$(EXEEXT) \
- list$(EXEEXT) \
- wizard$(EXEEXT)
---- ./Makefile.orig 2006-07-11 12:32:27.000000000 +0300
-+++ ./Makefile 2007-06-16 20:22:34.000000000 +0300
-@@ -25,7 +25,7 @@
-
- include makeinclude
-
--DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
-+DIRS = src $(LOCALIMAGES) images fluid test
-
- all: makeinclude
- for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
deleted file mode 100644
index 624ae6631b26..000000000000
--- a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-2.0_pre6970-r1.ebuild,v 1.11 2012/05/05 03:52:30 jdhore Exp $
-
-EAPI=2
-inherit multilib autotools flag-o-matic
-
-MY_P=${P/_pre/.x-r}
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="mirror://easysw/fltk/snapshots/${MY_P}.tar.bz2"
-
-# NOTE: KEYWORDS removed in purpose since everything from gentoo-x86 is using
-# FLTK 1.3.0 series from SLOT="1" now
-#KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-LICENSE="FLTK LGPL-2"
-SLOT="2"
-IUSE="cairo debug doc +jpeg +png opengl +xft xinerama zlib"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXt
- xft? ( x11-libs/libXft )
- png? ( media-libs/libpng:0 )
- jpeg? ( virtual/jpeg )
- opengl? ( virtual/opengl )
- cairo? ( x11-libs/cairo )
- xinerama? ( x11-libs/libXinerama )
- zlib? ( sys-libs/zlib )
- >=sys-libs/glibc-2.10" # glibc-2.10 patch breaks with 2.9, bug 276695
-DEPEND="${RDEPEND}
- x11-misc/makedepend
- x11-proto/xextproto
- x11-libs/libXi
- xinerama? ( x11-proto/xineramaproto )
- cairo? ( virtual/pkgconfig )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fltk2-asneeded.patch # bug 255494
- epatch "${FILESDIR}"/fltk2-gcc43.patch
- epatch "${FILESDIR}"/fltk2-ldflags.patch # bug 251233
- epatch "${FILESDIR}"/fltk2-fluid2.patch # bug 282472
- epatch "${FILESDIR}"/${P}-libpng14.patch
- epatch "${FILESDIR}"/${P}-libpng15.patch
- sed -i "/STRIP/d" fluid/Makefile # don't pre-strip, bug 246694
- use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
- eautoconf # bug 253253
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # --x-libraries, bug 256115
- CPPFLAGS="${CPPFLAGS} -DFLTK_DOCDIR=\"/usr/share/doc/${PF}\"" \
- econf --enable-shared --enable-threads \
- $(use_enable debug) \
- $(use_enable xft) \
- $(use_enable opengl gl) \
- $(use_enable cairo) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable xinerama) \
- $(use_enable zlib) \
- --x-libraries=/usr/$(get_libdir)/opengl/xorg-x11
-}
-
-src_compile() {
- emake || die "make failed"
-
- if use doc; then
- make -C documentation || die "make documentation failed"
- fi
-}
-
-src_install() {
- einstall includedir="${D}/usr/include" libdir="${D}/usr/$(get_libdir)/fltk"
-
- if use doc; then
- emake -C documentation install || die "install documentation failed"
- dohtml -r documentation/html/* || die "install html documentation failed"
- fi
- dodoc CHANGES CREDITS README* TODO
-
- echo "LDPATH=/usr/$(get_libdir)/fltk" > 99fltk-${SLOT}
- echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-
- doenvd 99fltk-${SLOT} || die "installing env.d file failed"
-}