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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

5 files changed, 150 insertions, 18 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/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