Respect LDFLAGS when linking fluid2 too thanks to Arfrever Frehtes Taifersar Arahesis (bug #282472).

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 117 insertions, 2 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 1975dfc49c05..07cb41305246 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.147 2010/02/08 20:12:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.148 2010/02/08 20:29:12 jer Exp $
+
+*fltk-2.0_pre6786-r2 (08 Feb 2010)
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> +files/fltk2-fluid2.patch,
+  +fltk-2.0_pre6786-r2.ebuild:
+  Respect LDFLAGS when linking fluid2 too thanks to Arfrever Frehtes
+  Taifersar Arahesis (bug #282472).
 
 *fltk-1.1.10 (08 Feb 2010)
 
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 367729c695f4..dcb50fe17396 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -10,6 +10,7 @@ AUX fltk-1.1.9-consts.patch 920 RMD160 efde1c9cefc08dd2829aadc536f55822f3ffd147
 AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 SHA1 44fd58b743698b97c38eea4bc1580a14d1c60916 SHA256 d1e073793cab3c5d7c88a95ae7e3e0e8e0014524bb53a1ae76f6526c41e4c191
 AUX fltk-1.1.9-glibc2.10-scandir.patch 736 RMD160 d2d28d50a5704bc64639a82ab2d7910220efd2b2 SHA1 72460b2d9e6e049b5e37fbe73930712e9ded8051 SHA256 bc7ba1695141ccd35908656e310577f10ac0a8866d8bdea6225e38970c82c7c7
 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-glibc2.10-scandir.patch 658 RMD160 119477a7733bd295c017bd320811c928a08f1602 SHA1 3207978e27cdac4ef3653cebe3581c562e82b5f5 SHA256 2bade21157390f81a95e820630a197fa953f981746b5991777f747323d6ee801
 AUX fltk2-ldflags.patch 2692 RMD160 97682c8e9f6c84d881edadff92349fad7ff0d52a SHA1 150096fb9e5fefbcf7bf4cc3ffd3c27ce4be1985 SHA256 d7308e596c00a5848c1fb1c8c3f606b1838ecd1a9477a1e438afb8f74d586e3a
@@ -26,6 +27,7 @@ EBUILD fltk-1.1.7.ebuild 2595 RMD160 845d77b4bd8c64eeeed12327b77641c42c6bc6a7 SH
 EBUILD fltk-1.1.9-r1.ebuild 3660 RMD160 609891fc64a6887a8a1fa6b9a1e2329255acd187 SHA1 6d8468c3ffa28c1687dd1f926cc4490ddfe307d3 SHA256 04fe6647d6fc90281c84e142599cacd102a1431ce26f32da4e894b3cc3746c96
 EBUILD fltk-1.1.9.ebuild 3523 RMD160 828c6ef5cef73549e9c6b25ff12958d2f96e4f2c SHA1 89992abf0eea159088d8dd07ba2ce85e70599b22 SHA256 0f0cb18cebb37c100b9304837d7597856b772e04048ffd981c28a3beacb29482
 EBUILD fltk-2.0_pre6786-r1.ebuild 2450 RMD160 c75cd879f6c2ffe9afb1be44cce3091954bfecb7 SHA1 7b41522acb9718ddea49beecec32255b8c7a23d1 SHA256 7f9fdc758d13f5da5159d50bc2861485e348478e441a49addec67f6a4986baa6
+EBUILD fltk-2.0_pre6786-r2.ebuild 2511 RMD160 3812fc8227172e1cbd825abf905d40ce54826a46 SHA1 8a6235ab73d5c8be8561624ac7ec1ac953f85305 SHA256 71ab61a96646438dbee57b39732d2ce2d6970d8a1277816656c08acddb223523
 EBUILD fltk-2.0_pre6786.ebuild 2365 RMD160 5059444d13b972e3b4b6ab16eba0216f5149a32b SHA1 b76e516c4fe58eb8cd252fee880f26fb99e53827 SHA256 b460a491ca0d123b4b627f76f827f62a06e2667d5ffb5bbef159a4294821ea6e
-MISC ChangeLog 19881 RMD160 f58411a5b06f1ae82b84f6866cfb7c45d38f7237 SHA1 b973b0a8d05d91737751379245c329238780725d SHA256 4db2cda3ba003c0fc92263ef190a66ac333c41e6eceee8962321d13c5ac63510
+MISC ChangeLog 20128 RMD160 b23cb3d71ea4ed42724bfbe6b2a3355c73364f21 SHA1 595499426cb62e29f058d1671282c98c084674a3 SHA256 0e99d7fa051d7ae877c11689b5ef8a987c62c5a6c595cfa8c0a1e86171f091be
 MISC metadata.xml 730 RMD160 b71c483e2f90c8328a31e814ef7bf1cb62a75611 SHA1 4e5669b499c22fb4059161a0e8dd62735d460f06 SHA256 5695a1eced035e0f5c8d4160c855f68e85ad3b15978b9bf88d2df16a24e79e82
diff --git a/x11-libs/fltk/files/fltk2-fluid2.patch b/x11-libs/fltk/files/fltk2-fluid2.patch
new file mode 100644
index 000000000000..a787b612973f
--- /dev/null
+++ b/x11-libs/fltk/files/fltk2-fluid2.patch
@@ -0,0 +1,20 @@
+--- 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/fltk-2.0_pre6786-r2.ebuild b/x11-libs/fltk/fltk-2.0_pre6786-r2.ebuild
new file mode 100644
index 000000000000..610482a510fe
--- /dev/null
+++ b/x11-libs/fltk/fltk-2.0_pre6786-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6786-r2.ebuild,v 1.1 2010/02/08 20:29:12 jer 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"
+
+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 )
+	jpeg? ( media-libs/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-proto/xextproto
+	x11-libs/libXi
+	xinerama? ( x11-proto/xineramaproto )
+	cairo? ( dev-util/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-glibc2.10-scandir.patch  # bug 270487
+	epatch "${FILESDIR}"/fltk2-ldflags.patch  # bug 251233
+	epatch "${FILESDIR}"/fltk2-fluid2.patch  # bug 282472
+	sed -i "/STRIP/d" fluid/Makefile  # don't pre-strip, bug 246694
+	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	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)
+}
+
+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"
+}