Adding fltk-2.0 pre-release snapshot, needed for dillo-2. See bug 242774.

(Portage version: 2.2_rc12_p11688/cvs/Linux 2.6.26-hh3 i686)

5 files changed, 164 insertions, 13 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index bdd4434211b1..41cacfa95fe1 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.97 2008/08/16 03:20:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.98 2008/10/21 13:50:51 yngwin Exp $
+
+*fltk-2.0_pre6403 (21 Oct 2008)
+
+  21 Oct 2008; Ben de Groot <yngwin@gentoo.org> +files/fltk2-config.patch,
+  +files/fltk2-nogl.patch, +fltk-2.0_pre6403.ebuild, metadata.xml:
+  Adding 2.0 snapshot, needed for dillo-2
 
   16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
@@ -256,7 +262,7 @@
 *fltk-1.1.4_rc1 (26 Jul 2003)
 
   26 Jul 2003; Jared Hudson <jhhudso@gentoo.org> : Version bump.
-	
+
 *fltk-1.1.3 (16 May 2003)
 
   16 May 2003; Alastair Tse <liquidx@gentoo.org> fltk-1.1.3.ebuild:
@@ -281,19 +287,19 @@
 
   18 Dec 2002; Nick Hadaway <raker@gentoo.org> fltk-1.1.2.ebuild :
   Marked stable.
-                                                                                                   
-  09 Dec 2002; Jack Morgan <jmorgan@gentoo.org> fltk-1.1.*.ebuild : 
+
+  09 Dec 2002; Jack Morgan <jmorgan@gentoo.org> fltk-1.1.*.ebuild :
   Removed ~sparc64/sparc64 keywords
 
   09 Dec 2002; Nick Hadaway <raker@gentoo.org> fltk-1.1.2.ebuild,
   files/digest-fltk-1.1.2 :
-  Version bump.  Lots of fluid bug fixes.  Also fixes for compatibility 
+  Version bump.  Lots of fluid bug fixes.  Also fixes for compatibility
   with Xft-2.0.
 
 *fltk-1.1.1 (30 Oct 2002)
 
   23 Nov 2002; Sascha Schwabbauer <cybersystem@gentoo.org> fltk-1.1.1.ebuild :
-  Added ~ppc to keywords.  
+  Added ~ppc to keywords.
 
   30 Oct 2002; Nick Hadaway <raker@gentoo.org> fltk-1.1.1.ebuild,
   files/digest-fltk-1.1.1 :
@@ -309,7 +315,7 @@
 
   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... 
+  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)
@@ -332,7 +338,7 @@
 *fltk-1.1.0_rc5 (12 Aug 2002)
 
   20 Sep 2002; Nick Hadaway <raker@gentoo.org> fltk-1.0.11-r3.ebuild :
-  Changed 'emake' to 'emake CXX="g++"' so libsupc++ is referenced 
+  Changed 'emake' to 'emake CXX="g++"' so libsupc++ is referenced
   properly on gcc3 systems.
 
   12 Aug 2002; Seemant Kulleen <seemant@gentoo.org> fltk-1.0.11-r3.ebuild
@@ -341,11 +347,11 @@
   SLOTified them again.  And made them install into different locations.
 
 *fltk-1.1.0_rc4 (16 Jul 2002)
-  
+
   22 Jul 2002; Owen Stampflee <owen@gentoo.org> :
   Reverted SLOT's back to "0" as the problem is with POSE, not fltk
   and they seem to overright each other :(
-  
+
   Did some SLOT-fu so we don't break POSE.
 
   16 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fltk-1.1.0_rc4.ebuild
@@ -363,14 +369,14 @@
 *fltk-1.0.11-r2 (1 Feb 2002)
 
   28 Mar 2002; Tod Neidt <tod@gentoo.org> fltk-1.0.11-r2.ebuild :
-  
+
   Added missing ${myconf} to ./configure. Also fixed up SRC_URI.
   Bug# 1325, thanks for the catch R. Strusberg.
 
 *fltk-1.1.0_beta10 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/x11-libs/fltk/files/fltk2-config.patch b/x11-libs/fltk/files/fltk2-config.patch
new file mode 100644
index 000000000000..67f7034569b1
--- /dev/null
+++ b/x11-libs/fltk/files/fltk2-config.patch
@@ -0,0 +1,14 @@
+--- ./fltk2-config.in.orig	2006-04-15 20:43:12.000000000 +0300
++++ ./fltk2-config.in	2007-10-01 23:22:36.000000000 +0300
+@@ -69,10 +69,7 @@
+ POSTBUILD="@POSTBUILD@"
+ 
+ # flags for C++ compiler:
+-CFLAGS="@CFLAGS@"
+-CXXFLAGS="@CXXFLAGS@"
+-LDFLAGS="@LDFLAGS@"
+-LDLIBS="@LDFLAGS@ @LIBS@"
++LDLIBS="@LIBS@"
+ 
+ # libraries to link with:
+ LIBNAME="@LIBNAME@"
diff --git a/x11-libs/fltk/files/fltk2-nogl.patch b/x11-libs/fltk/files/fltk2-nogl.patch
new file mode 100644
index 000000000000..b985945f618d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk2-nogl.patch
@@ -0,0 +1,52 @@
+--- ./test/Makefile.orig	2007-06-07 15:36:39.000000000 +0300
++++ ./test/Makefile	2007-06-16 20:27:39.000000000 +0300
+@@ -128,8 +128,6 @@
+ 	button$(EXEEXT) \
+ 	buttons$(EXEEXT) \
+ 	color_chooser$(EXEEXT) \
+-	cube$(EXEEXT) \
+-	CubeView$(EXEEXT) \
+ 	cursor$(EXEEXT) \
+ 	curve$(EXEEXT) \
+ 	demo$(EXEEXT) \
+@@ -140,9 +138,6 @@
+ 	exception$(EXEEXT) \
+ 	file_chooser$(EXEEXT) \
+ 	fonts$(EXEEXT) \
+-	fractals$(EXEEXT) \
+-	glpuzzle$(EXEEXT) \
+-	gl_overlay$(EXEEXT) \
+ 	hello$(EXEEXT) \
+ 	image$(EXEEXT) \
+ 	inactive$(EXEEXT) \
+@@ -161,11 +156,9 @@
+ 	pixmap$(EXEEXT) \
+ 	progress$(EXEEXT) \
+ 	radio$(EXEEXT) \
+-	qubix$(EXEEXT) \
+ 	resizable$(EXEEXT) \
+ 	resizealign$(EXEEXT) \
+ 	scroll$(EXEEXT) \
+-	shape$(EXEEXT) \
+ 	sizes$(EXEEXT) \
+ 	symbols$(EXEEXT) \
+ 	threads$(EXEEXT) \
+@@ -173,7 +166,6 @@
+ 	tile$(EXEEXT) \
+ 	timer$(EXEEXT) \
+ 	utf$(EXEEXT) \
+-	fullscreen$(EXEEXT) \
+ 	valuators$(EXEEXT) \
+ 	list$(EXEEXT) \
+ 	wizard$(EXEEXT)
+--- ./Makefile.orig	2006-07-11 12:32:27.000000000 +0300
++++ ./Makefile	2007-06-16 20:22:34.000000000 +0300
+@@ -25,7 +25,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
++DIRS = src $(LOCALIMAGES) images fluid test
+ 
+ all: makeinclude
+ 	for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/fltk-2.0_pre6403.ebuild b/x11-libs/fltk/fltk-2.0_pre6403.ebuild
new file mode 100644
index 000000000000..7c434f2d340a
--- /dev/null
+++ b/x11-libs/fltk/fltk-2.0_pre6403.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6403.ebuild,v 1.1 2008/10/21 13:50:51 yngwin Exp $
+
+EAPI="1"
+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="~amd64 ~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? ( virtual/xft )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	cairo? ( x11-libs/cairo )
+	xinerama? ( x11-libs/libXinerama )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/fltk2-config.patch
+	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
+	eautoreconf
+}
+
+src_compile() {
+	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) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+	use doc && make -C documentation
+}
+
+src_install() {
+	einstall includedir="${D}/usr/include" \
+		libdir="${D}/usr/$(get_libdir)/fltk" || die "install failed"
+
+	if use doc; then
+		emake -C documentation install || die "install documentation failed"
+		dohtml documentation/html
+	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}
+}
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index 13b8db1812fa..49a8dab43a27 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -5,8 +5,10 @@
 <maintainer>
   <email>desktop-misc@gentoo.org</email>
 </maintainer>
-<longdescription>C++ user interface toolkit for X and OpenGL.</longdescription> 
+<longdescription>C++ user interface toolkit for X and OpenGL.</longdescription>
 <use>
 	<flag name='noxft'>Disables xft; use for non-english characters</flag>
+	<flag name='xft'>Build with support for XFT font renderer
+		(<pkg>x11-libs/libXft</pkg>)</flag>
 </use>
 </pkgmetadata>