Version bump.

(Portage version: 2.1_pre3-r1)

5 files changed, 131 insertions, 2 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index c18d619d6666..a7fce06b366e 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.60 2005/12/29 20:27:26 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.61 2006/01/21 20:02:23 nelchael Exp $
+
+*fltk-1.1.7 (21 Jan 2006)
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> +files/libs-1.7.diff,
+  +fltk-1.1.7.ebuild:
+  Version bump.
 
   29 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org> fltk-1.1.6.ebuild:
   Added back ~ia64 that got lost.
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index d9976b64c31e..80c75767b912 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -2,8 +2,10 @@ MD5 4dc0b042e0a5d2c4bbc009a2d1c2c257 ChangeLog 8390
 MD5 7f2d4df6d519e58f7265fcdb0e178bc3 files/Fl_Help_View.cxx.patch 259
 MD5 ba10847b90993b77dbe8e22c03fb4881 files/digest-fltk-1.1.4 71
 MD5 d46e89cec4e12c094443c21f8a8c0d94 files/digest-fltk-1.1.6 71
+MD5 157398f795a1a797a45d55c877447473 files/digest-fltk-1.1.7 71
 MD5 29c93504c8cba00eee5622ecbf61f134 files/libs-1.6.diff 960
 MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
 MD5 78c77e59b92b82521f1a62e496161dbb fltk-1.1.4.ebuild 2165
 MD5 47e902c2d54504e71f6dec130d372a02 fltk-1.1.6.ebuild 2606
+MD5 153b40bb7ea3d1546731d3b7185234d2 fltk-1.1.7.ebuild 2465
 MD5 aeb16984ffc07732d37c5974c14f28de metadata.xml 314
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.7 b/x11-libs/fltk/files/digest-fltk-1.1.7
new file mode 100644
index 000000000000..a97a9afb2237
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.7
@@ -0,0 +1 @@
+MD5 2e29319119adc9d63b2f26b72cae0a88 fltk-1.1.7-source.tar.bz2 2060757
diff --git a/x11-libs/fltk/files/libs-1.7.diff b/x11-libs/fltk/files/libs-1.7.diff
new file mode 100644
index 000000000000..7c0b41cb8a78
--- /dev/null
+++ b/x11-libs/fltk/files/libs-1.7.diff
@@ -0,0 +1,22 @@
+diff -urN fltk-1.1.0rc6/src/Makefile fltk-1.1.0rc6-modified/src/Makefile
+--- fltk-1.1.0rc6/src/Makefile	Thu Aug  8 20:09:49 2002
++++ fltk-1.1.0rc6-modified/src/Makefile	Thu Aug 22 15:16:20 2002
+@@ -405,12 +405,12 @@
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+ 	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
+ 	-$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(DESTDIR)$(libdir)
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
+-	if test x$(GLLIBNAME) != x; then \
+-		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+-	fi
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
++	#$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
++	#$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
++	#if test x$(GLLIBNAME) != x; then \
++	#	$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
++	#fi
++	#$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+ 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+ 		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
diff --git a/x11-libs/fltk/fltk-1.1.7.ebuild b/x11-libs/fltk/fltk-1.1.7.ebuild
new file mode 100644
index 000000000000..113d17abfd22
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.1 2006/01/21 20:02:23 nelchael Exp $
+
+IUSE="noxft opengl debug"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+HOMEPAGE="http://www.fltk.org"
+SRC_URI="http://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="FLTK LGPL-2"
+
+PV_MAJOR=${PV/.*/}
+PV_MINOR=${PV#${PV_MAJOR}.}
+PV_MINOR=${PV_MINOR/.*}
+SLOT="${PV_MAJOR}.${PV_MINOR}"
+
+INCDIR=/usr/include/fltk-${SLOT}
+LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
+
+DEPEND="|| ( (
+		x11-libs/libXext
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXt
+		x11-proto/xextproto )
+	virtual/x11 )
+	!noxft? ( virtual/xft )
+	media-libs/libpng
+	media-libs/jpeg
+	opengl? ( virtual/opengl )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libs-1.7.diff || die "patch failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-shared --enable-xdbe --enable-static --enable-threads"
+
+	if ! use noxft; then
+		myconf="${myconf} --enable-xft"
+	else
+		myconf="${myconf} --disable-xft"
+	fi
+
+	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=$(tc-getCXX)
+	export CC=$(tc-getCC)
+
+	# bug #19894
+	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
+	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
+
+	econf \
+		--includedir=${INCDIR}\
+		--libdir=${LIBDIR} \
+		${myconf} || die "Configuration Failed"
+
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	einstall \
+		includedir=${D}${INCDIR} \
+		libdir=${D}${LIBDIR} || die "Installation Failed"
+
+	ranlib ${D}${LIBDIR}/*.a
+
+	dodoc CHANGES README
+
+	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
+	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
+
+	insinto /etc/env.d
+	doins 99fltk-${SLOT}
+
+	dodir /usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
+	rmdir ${D}/usr/share/doc/fltk
+	rm -rf ${D}/usr/share/man/cat{1,3}
+}
+
+pkg_postinst() {
+	ewarn "the xft USE flag has been changed to noxft. this was because most"
+	ewarn "users want xft, but if you do not, be sure to change the flag"
+}