Version bump. See http://www.fltk.org/news.php?V87 for the list of

fixes.

4 files changed, 29 insertions, 12 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 692eb9660b7f..f3288ed2d39d 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.10 2002/09/20 16:27:08 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.11 2002/09/21 02:07:45 raker Exp $
+
+*fltk-1.1.0_rc7 (20 Sep 2002)
+
+  20 Sep 2002; Nick Hadaway <raker@gentoo.org> fltk-1.1.0_rc7.ebuild,
+  files/digest-fltk-1.1.0_rc7 :
+  Version bump.  Lots of bug fixes. See... 
+  http://www.fltk.org/news.php?V87 for info on the fixes.
 
 *fltk-1.1.0_rc6 (22 Aug 2002)
 
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.0_rc5 b/x11-libs/fltk/files/digest-fltk-1.1.0_rc5
deleted file mode 100644
index 240c1cf4e37c..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.0_rc5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d1f7ef15261ca466da80871bcbd0a84 fltk-1.1.0rc5-source.tar.bz2 1271676
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.0_rc7 b/x11-libs/fltk/files/digest-fltk-1.1.0_rc7
new file mode 100644
index 000000000000..171a0b352e76
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.0_rc7
@@ -0,0 +1 @@
+MD5 759dcd8bcbbb25f2e30920ab29f32f4c fltk-1.1.0rc7-source.tar.bz2 1273352
diff --git a/x11-libs/fltk/fltk-1.1.0_rc5.ebuild b/x11-libs/fltk/fltk-1.1.0_rc7.ebuild
index 10490b09403e..8a917b5938b4 100644
--- a/x11-libs/fltk/fltk-1.1.0_rc5.ebuild
+++ b/x11-libs/fltk/fltk-1.1.0_rc7.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.0_rc5.ebuild,v 1.3 2002/08/14 13:05:59 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.0_rc7.ebuild,v 1.1 2002/09/21 02:07:45 raker Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="C++ user interface toolkit for X and OpenGL."
 HOMEPAGE="http://www.fltk.org"
 SRC_URI="ftp://ftp.easysw.com/pub/fltk/${PV/_/}/${MY_P}-source.tar.bz2"
@@ -13,21 +14,32 @@ KEYWORDS="x86 sparc sparc64"
 LICENSE="FLTK | GPL-2"
 
 DEPEND="media-libs/libpng
+	media-libs/jpeg
 	opengl? ( virtual/opengl )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/libs.diff || die "patch failed"
+
+}
 
 src_compile() {
 
 	local myconf
-	myconf="--enable-shared"
+	myconf="--enable-shared --enable-static --enable-threads \
+		--enable-xft --enable-xdbe"
 
 	use opengl || myconf="${myconf} --disable-gl"
-	
+
 	econf \
-		--includedir=/usr/include/${PN}-1.1 \
+		--includedir=/usr/include/fltk-1.1 \
 		--libdir=/usr/lib/fltk-1.1 \
 		${myconf} || die "Configuration Failed"
 
-	emake || die "Parallel Make Failed"
+	emake CXX="g++" || die "Parallel Make Failed"
 
 }
 
@@ -37,14 +49,12 @@ src_install () {
 		includedir=${D}/usr/include/${PN}-1.1 \
 		libdir=${D}/usr/lib/fltk-1.1 || die "Installation Failed"
 		
+	ranlib ${D}/usr/lib/fltk-1.1/*.a
+
 	dodoc CHANGES COPYING README
 	
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
-	rmdir ${D}/usr/share/doc/fltk
-
 	echo "LDPATH=/usr/lib/fltk-1.1" > 99fltk-1.1
 
 	insinto /etc/env.d
-	doinst 99fltk-1.1
+	doins 99fltk-1.1
 }