Bump to latest snapshot, adding patches for ldflags issues (bugs 255494 and 251233)

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

6 files changed, 155 insertions, 22 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 707a8d351976..f628f71389ab 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/fltk
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.113 2009/04/10 15:09:02 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.114 2009/05/08 14:33:26 yngwin Exp $
+
+*fltk-2.0_pre6786 (08 May 2009)
+
+  08 May 2009; Ben de Groot <yngwin@gentoo.org> +files/fltk2-asneeded.patch,
+  +fltk-2.0_pre6786.ebuild, -files/fltk2-config.patch,
+  +files/fltk2-ldflags.patch, -fltk-2.0_pre6671.ebuild:
+  Bump to latest snapshot, adding patches for ldflags issues (bugs 255494
+  and 251233)
 
 *fltk-2.0_pre6671 (10 Apr 2009)
 
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 4c97ef9dda41..cf5724e1289e 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -7,17 +7,18 @@ AUX fltk-1.1.7-xft-and-misc.patch 17885 RMD160 f148ed556859ff45880a1d9eaa36d6cf2
 AUX fltk-1.1.9-as-needed.patch 4176 RMD160 a4aa9a3e985a77b1355ef0653f603ac9ec2ab35f SHA1 b28366c4721a6406968594ff33fe72dfe5a72b18 SHA256 63168426ee87d57b7105934c2a0f4655403d6c6d0657b8448f32cfc40131b16d
 AUX fltk-1.1.9-conf-tests.patch 3086 RMD160 7fe5307dfe6b771dffdd28f87751a1529ca37ff8 SHA1 91403efd58b94bf2928a3ebed1e052f2b249f656 SHA256 24aaa8187f3218b9b6c8f16756b3167c8107a6022d312aabec666ead96e4b211
 AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 SHA1 44fd58b743698b97c38eea4bc1580a14d1c60916 SHA256 d1e073793cab3c5d7c88a95ae7e3e0e8e0014524bb53a1ae76f6526c41e4c191
-AUX fltk2-config.patch 351 RMD160 0283816a6ff89e0f87f5388cd68bc1a366839541 SHA1 69a4e2d772c1c62eb51eca67f3cd7404550b796c SHA256 5a98befbe4a7d10e66cb3d3d9d5d4bf7b22e5110c72c6bf42f7d5497c6793942
+AUX fltk2-asneeded.patch 1902 RMD160 750e9ca9a57237f2c693d29422352778abf6135f SHA1 d7273b03085d69b35ae332cf2e2e215480ec4ad7 SHA256 aa532cba342f7315efd08578431acab746bb3a499eada984b35a44fe6b30580f
 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
 AUX libs-1.7.diff 960 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 SHA1 136301dbfa9b9a3dc5cad303b53b79c019c942c8 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330
 DIST fltk-1.1.7-source.tar.bz2 2060757 RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 SHA1 16b174522920403af1e4ccddd36daaefda3765c8 SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
 DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91 SHA1 6f21903dc53c829ec71e8e49655eb19e624c8247 SHA256 facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
-DIST fltk-2.0.x-r6671.tar.bz2 2527397 RMD160 b51b2a3afecda3df28f0d34f66b083d38df399b1 SHA1 8d9f950ae905e583bdab644c5ebd74c0fcd119a6 SHA256 4c9a67f0d32c05af92bf95d5feec8eb4a8d56bfbfe2cd4364b32009cfd609b54
+DIST fltk-2.0.x-r6786.tar.bz2 2527307 RMD160 aa9199bd7ed15b4b2fc2da976d88f7396f2fcb96 SHA1 b3bfcff643b4b6a05ed377ad87bc4b8487ee1a37 SHA256 4eed467300ae06a005d94f463a15340d9d23600846ae8821cdb2c2f64a6ac37c
 EBUILD fltk-1.1.7-r2.ebuild 2901 RMD160 637647ff6a3e959c2dee49895e6b476c8fa1de6e SHA1 64687d0490d0553dda3270bd9ba6099d37f9b73f SHA256 4a14d52cba8be1b3697f872458344cbb4dad2f515afffb044ba7490e76053d62
 EBUILD fltk-1.1.7-r3.ebuild 2954 RMD160 900b727c7202c9eb89e628ac0c3ee758fff36abe SHA1 611faa54932813fe6a72ba4f0619efe325a70473 SHA256 ff944088c8017b3d4fc219f66de21f783964df58c68c745c5fbc70d0caf398ad
 EBUILD fltk-1.1.7.ebuild 2595 RMD160 845d77b4bd8c64eeeed12327b77641c42c6bc6a7 SHA1 db3865396cc13bc10ec7d5d61ccdeb727290c8fb SHA256 d04a6c8737169dd7d93bce548b7006f88770f49f15f7875fb80f35e71b0ab4bd
 EBUILD fltk-1.1.9.ebuild 3458 RMD160 03e2ec05849ddd4abaacd2e936b0e18a36522ee5 SHA1 0439621acc682670af0ecc4db1e6d5920e0c47eb SHA256 45e4fe06286c3186c2b4db5594c8cac924543cb11d055ca1704fbeceb2df6378
-EBUILD fltk-2.0_pre6671.ebuild 2230 RMD160 f8ed9111faab9474781dd5d4a4147a3c6911125e SHA1 31a012ebe16c40336b7716443a150db1cad44c9f SHA256 20a3321626b54633433c148f4837256a01235dc40291435cdc3ada1b11674646
-MISC ChangeLog 15450 RMD160 063588f83796938c68b0bd2b642925ec741b8aa9 SHA1 a2c323bcd79b1bbbc7d1ead79a2aa5602e8d5b5f SHA256 af378a63cc90ee02be7985cf06d6e89a38a36f193be532b00d7634b8ed3c08f4
+EBUILD fltk-2.0_pre6786.ebuild 2302 RMD160 f648d146d5e1b12852fd0976018ebc0d74109017 SHA1 388aba1f32ab68fff924ebafcbeb5bc29aa4ae9b SHA256 2eef820b78d597c7ddd591dfa2bf20be21fd0e9907c05753509a89813d402808
+MISC ChangeLog 15760 RMD160 e7514b5b87f48297f1dbee694898d5b18de3eabc SHA1 b4838ae6c2dc0b2820d49b4a5f7eed175c646a20 SHA256 174c729c9eccfb1914f57d70f9bd417e3d959c121a3c1c030ec2072ac87072b1
 MISC metadata.xml 730 RMD160 b71c483e2f90c8328a31e814ef7bf1cb62a75611 SHA1 4e5669b499c22fb4059161a0e8dd62735d460f06 SHA256 5695a1eced035e0f5c8d4160c855f68e85ad3b15978b9bf88d2df16a24e79e82
diff --git a/x11-libs/fltk/files/fltk2-asneeded.patch b/x11-libs/fltk/files/fltk2-asneeded.patch
new file mode 100644
index 000000000000..40a08f5c5a2b
--- /dev/null
+++ b/x11-libs/fltk/files/fltk2-asneeded.patch
@@ -0,0 +1,46 @@
+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-config.patch b/x11-libs/fltk/files/fltk2-config.patch
deleted file mode 100644
index 67f7034569b1..000000000000
--- a/x11-libs/fltk/files/fltk2-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./fltk2-config.in.orig	2006-04-15 20:43:12.000000000 +0300
-+++ ./fltk2-config.in	2007-10-01 23:22:36.000000000 +0300
-@@ -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@"
diff --git a/x11-libs/fltk/files/fltk2-ldflags.patch b/x11-libs/fltk/files/fltk2-ldflags.patch
new file mode 100644
index 000000000000..244cc7f07e6f
--- /dev/null
+++ b/x11-libs/fltk/files/fltk2-ldflags.patch
@@ -0,0 +1,91 @@
+--- 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/fltk-2.0_pre6671.ebuild b/x11-libs/fltk/fltk-2.0_pre6786.ebuild
index ee30abdfc7f2..117c12ea445f 100644
--- a/x11-libs/fltk/fltk-2.0_pre6671.ebuild
+++ b/x11-libs/fltk/fltk-2.0_pre6786.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6671.ebuild,v 1.1 2009/04/10 15:09:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6786.ebuild,v 1.1 2009/05/08 14:33:26 yngwin Exp $
 
 EAPI="2"
 inherit multilib autotools flag-o-matic
@@ -35,8 +35,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/fltk2-config.patch
+	epatch "${FILESDIR}"/fltk2-asneeded.patch  # bug 255494
 	epatch "${FILESDIR}"/fltk2-gcc43.patch
+	epatch "${FILESDIR}"/fltk2-ldflags.patch  # bug 251233
 	sed -i "/STRIP/d" fluid/Makefile  # don't pre-strip, bug 246694
 	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
 	eautoreconf