Link to xorg-x11 opengl libraries wrt #256115 by Charles Green. Run eautoconf instead of eautoreconf to avoid eautoheader failure wrt #253253 by Jeroen Roovers.

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

3 files changed, 100 insertions, 2 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 5a95542a3cd1..7d5f93a10c5a 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.160 2010/06/02 06:45:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.161 2010/06/10 13:39:24 ssuominen Exp $
+
+*fltk-2.0_pre6970-r1 (10 Jun 2010)
+
+  10 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +fltk-2.0_pre6970-r1.ebuild:
+  Link to xorg-x11 opengl libraries wrt #256115 by Charles Green. Run
+  eautoconf instead of eautoreconf to avoid eautoheader failure wrt #253253
+  by Jeroen Roovers.
 
   02 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   fltk-2.0_pre6970.ebuild:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 201927d9714d..95033b7d835a 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -30,6 +30,7 @@ EBUILD fltk-1.1.9.ebuild 3520 RMD160 346b6a158a2ce1acbc948edeb115d19681fd94d4 SH
 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
+EBUILD fltk-2.0_pre6970-r1.ebuild 2607 RMD160 95a6f14b256a913472c4e6ae8b725b1785a14a51 SHA1 6fbd290f2ecdc0b7c43755b91beeb3d9dbcbd114 SHA256 2a730f0e3f2ddfe92fdb2721c07c32cee4649cf04f2fe7dfaedb13ed7420faf7
 EBUILD fltk-2.0_pre6970.ebuild 2508 RMD160 2cd242b057442ccc00f11094cd46366ca2a776d8 SHA1 ce519306dd6d7f0f7baa64df3e02c8e2a80d6ac5 SHA256 71958d66f06645b1a08226aa33c5ac8bae8e2804dbde43b9c4d72f1ffb21aab4
-MISC ChangeLog 21824 RMD160 c0f70514cb6774849c66b2e101ba7dacfad439db SHA1 b6b0a6bbe30f1cebf686442456846bdb06a4642a SHA256 37a70033fdf8574684f5d1a4eceae5cc74eda5117c0bcee3cfc9f7d133d169e5
+MISC ChangeLog 22112 RMD160 68b4997623156c29983228d0e6bc46e488938141 SHA1 00fd013b713bf917abdaf8d0a7f9a969d1dab1d7 SHA256 535c9043c82d086c25ecbfe13a50d67db21681e07ed540c5223a62dad4f511ec
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
diff --git a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
new file mode 100644
index 000000000000..3711aea1d338
--- /dev/null
+++ b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
@@ -0,0 +1,89 @@
+# 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_pre6970-r1.ebuild,v 1.1 2010/06/10 13:39:24 ssuominen 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-misc/makedepend
+	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-ldflags.patch  # bug 251233
+	epatch "${FILESDIR}"/fltk2-fluid2.patch  # bug 282472
+	epatch "${FILESDIR}"/${P}-libpng14.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"
+}