Version bump. Should work with xft2 now. Also installing html docs into the correct location

3 files changed, 76 insertions, 2 deletions

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 42e1d5613944..34b73423aa6d 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,13 +1,13 @@
 MD5 f00591dea2bd2aa68ac8dde6892db899 fltk-1.1.1.ebuild 1300
 MD5 80af2d99e9922762e5f3f693f6b5139f fltk-1.1.2-r2.ebuild 1975
 MD5 89a2d657da5a9c4d704d420d09ea9aab fltk-1.0.11-r3.ebuild 1221
-MD5 f1562bc632cd90e31260470992dab1fe fltk-1.1.4_rc2.ebuild 2027
+MD5 492f6374b46a73d8445085a71aa349c3 fltk-1.1.4_rc2.ebuild 1814
 MD5 f1baef02e4f14acab5f70184ff509d07 fltk-1.1.3.ebuild 2006
 MD5 57759ff97f81f83e675ed84ec57ed774 fltk-1.1.2-r1.ebuild 1818
 MD5 793e017a3d16dbb10585a62625eea81b fltk-1.1.4_rc1.ebuild 2033
 MD5 01f86150585510c9774a559ef8a74ab0 fltk-1.1.2.ebuild 1299
 MD5 7741b5bb78c150bdb17298433b54d185 fltk-1.1.0_rc7.ebuild 1313
-MD5 51a1dba8285f72f739739c0d8f60cf6c ChangeLog 4458
+MD5 d88bfba6da2fd096c82ad8654e416a06 ChangeLog 4674
 MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
 MD5 66e9fc032d679befebde2ff1709eaa21 files/digest-fltk-1.0.11-r3 71
 MD5 74fc94981d92895e653f46d93575b4a0 files/digest-fltk-1.1.0_rc7 74
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.4_rc2 b/x11-libs/fltk/files/digest-fltk-1.1.4_rc2
new file mode 100644
index 000000000000..8c49d815b990
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.4_rc2
@@ -0,0 +1 @@
+MD5 01ee09a920902591c0472e7198f1840e fltk-1.1.4rc2-source.tar.bz2 1305984
diff --git a/x11-libs/fltk/fltk-1.1.4_rc2.ebuild b/x11-libs/fltk/fltk-1.1.4_rc2.ebuild
new file mode 100644
index 000000000000..e480193887a9
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.4_rc2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4_rc2.ebuild,v 1.1 2003/08/14 20:13:32 g2boojum Exp $
+
+IUSE="opengl debug"
+
+inherit eutils
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+HOMEPAGE="http://www.fltk.org"
+SRC_URI="ftp://ftp.easysw.com/pub/fltk/${PV/_/}/${P/_/}-source.tar.bz2"
+
+SLOT="1.1"
+KEYWORDS="~x86 ~ppc ~sparc"
+LICENSE="FLTK | GPL-2"
+
+DEPEND="virtual/x11
+	virtual/xft
+	media-libs/libpng
+	media-libs/jpeg
+	opengl? ( virtual/opengl )"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libs.diff || die "patch failed"
+}
+
+src_compile() {
+	local myconf="--enable-shared --enable-threads \
+		--enable-xdbe --enable-xft --enable-static"
+
+	use debug && myconf="${myconf} --enable-debug"
+
+	use opengl || myconf="${myconf} --disable-gl"
+
+	# needed for glibc-2.3.1 (as far as i can test)
+	# otherwise libstdc++ won't be linked. #17894 and #15572
+	# doesn't happen for glibc-2.3.2 - <liquidx@gentoo.org>
+	export CXX="g++"
+	export CC="g++"
+	
+	# bug #19894
+	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
+	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"	
+    
+	econf \
+		--includedir=/usr/include/fltk-1.1 \
+		--libdir=/usr/lib/fltk-1.1 \
+		${myconf} || die "Configuration Failed"
+
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	einstall \
+		includedir=${D}/usr/include/fltk-1.1 \
+		libdir=${D}/usr/lib/fltk-1.1 || die "Installation Failed"
+
+	ranlib ${D}/usr/lib/fltk-1.1/*.a
+
+	dodoc CHANGES COPYING README
+	
+	echo "LDPATH=/usr/lib/fltk-1.1" > 99fltk-1.1
+
+	insinto /etc/env.d
+	doins 99fltk-1.1
+
+	dodir /usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${P}/html
+}