version bump for #72556

(Portage version: 2.0.51.22-r1)

10 files changed, 134 insertions, 144 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 2cd0afdd7355..1cbd2ab47b63 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2005/05/17 12:37:05 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.45 2005/06/17 17:47:02 smithj Exp $
+
+*fltk-1.1.6 (17 Jun 2005)
+
+  17 Jun 2005; Jonathan Smith <smithj@gentoo.org> +files/libs-1.6.diff,
+  +files/Fl_Help_View.cxx.patch, -fltk-1.0.11-r3.ebuild,
+  -fltk-1.1.2-r2.ebuild, +fltk-1.1.6.ebuild:
+  version bump for #72556
 
   17 May 2005; Heinrich Wendel <lanius@gentoo.org> fltk-1.0.11-r3.ebuild,
   fltk-1.1.2-r2.ebuild, fltk-1.1.4.ebuild:
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 897c6d0d900f..ab33c97c53ae 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7fd4f515edc5c1d0c8b88798d1ce33b5 fltk-1.1.2-r2.ebuild 1953
-MD5 efc2cf3d8720e83a12daf0559b685702 fltk-1.0.11-r3.ebuild 1189
-MD5 206c5f0fd3e7cd9cf72aed0ee593ed4b fltk-1.1.4.ebuild 2167
 MD5 ee9c14c418fa969cb27413ef58e38521 ChangeLog 6617
+MD5 206c5f0fd3e7cd9cf72aed0ee593ed4b fltk-1.1.4.ebuild 2167
 MD5 aeb16984ffc07732d37c5974c14f28de metadata.xml 314
-MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
-MD5 66e9fc032d679befebde2ff1709eaa21 files/digest-fltk-1.0.11-r3 71
-MD5 4c9db40eed236d8e93e19cf01ebf2166 files/digest-fltk-1.1.2-r2 71
+MD5 15be2a1c978dbe0d23404be99da0ac06 fltk-1.1.6.ebuild 2164
 MD5 ba10847b90993b77dbe8e22c03fb4881 files/digest-fltk-1.1.4 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCieXpevY57Fted3ERAk9FAKC+BfZ5xM8lHTb6NCleNDJ89IdwEQCgnFH4
-EuYvbncCfl8tgfr0FXK6kTA=
-=EV6d
------END PGP SIGNATURE-----
+MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
+MD5 29c93504c8cba00eee5622ecbf61f134 files/libs-1.6.diff 960
+MD5 d46e89cec4e12c094443c21f8a8c0d94 files/digest-fltk-1.1.6 71
diff --git a/x11-libs/fltk/files/Fl_Help_View.cxx.patch b/x11-libs/fltk/files/Fl_Help_View.cxx.patch
new file mode 100644
index 000000000000..0780f98d2cfa
--- /dev/null
+++ b/x11-libs/fltk/files/Fl_Help_View.cxx.patch
@@ -0,0 +1,10 @@
+--- src/Fl_Help_View.cxx	2004-09-24 18:00:10.000000000 +0200
++++ src.modified/Fl_Help_View.cxx	2004-12-06 22:32:06.546340216 +0100
+@@ -2597,7 +2597,6 @@
+ 
+   scrollbar_.value(topline_, h() - 24, 0, size_);
+ 
+-  set_changed();
+   do_callback();
+ 
+   redraw();
diff --git a/x11-libs/fltk/files/digest-fltk-1.0.11-r3 b/x11-libs/fltk/files/digest-fltk-1.0.11-r3
deleted file mode 100644
index cbb63778e7b2..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.0.11-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e917767d012bcd8953a5d811e68134ff fltk-1.0.11-source.tar.bz2 999099
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.2-r2 b/x11-libs/fltk/files/digest-fltk-1.1.2-r2
deleted file mode 100644
index c400d598c94b..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d3e96f253c737332cb6d45b6d7d9384 fltk-1.1.2-source.tar.bz2 1287828
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.6 b/x11-libs/fltk/files/digest-fltk-1.1.6
new file mode 100644
index 000000000000..7a8b69dd8d78
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.6
@@ -0,0 +1 @@
+MD5 95d340977d13edea12e98d787a668b32 fltk-1.1.6-source.tar.bz2 1898966
diff --git a/x11-libs/fltk/files/libs-1.6.diff b/x11-libs/fltk/files/libs-1.6.diff
new file mode 100644
index 000000000000..7c0b41cb8a78
--- /dev/null
+++ b/x11-libs/fltk/files/libs-1.6.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.0.11-r3.ebuild b/x11-libs/fltk/fltk-1.0.11-r3.ebuild
deleted file mode 100644
index c39738e03837..000000000000
--- a/x11-libs/fltk/fltk-1.0.11-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.11-r3.ebuild,v 1.14 2005/05/17 12:37:05 lanius Exp $
-
-IUSE="opengl"
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
-SRC_URI="ftp://ftp.fltk.org/pub/fltk/${PV}/${P}-source.tar.bz2"
-HOMEPAGE="http://www.fltk.org"
-
-SLOT="1.0"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="x86 sparc"
-
-DEPEND="virtual/x11
-	opengl? ( virtual/opengl )"
-
-
-src_compile() {
-
-	local myconf
-	myconf="--enable-shared"
-
-	use opengl || myconf="${myconf} --disable-gl" #default enabled
-
-	econf \
-		--includedir=/usr/include/fltk-1.0 \
-		--libdir=/usr/lib/fltk-1.0 \
-		--program-suffix=-old \
-		${myconf} || die "Configuration Failed"
-
-	emake CXX="g++" || die "Parallel Make Failed"
-
-}
-
-src_install () {
-
-	einstall \
-		includedir=${D}/usr/include/fltk-1.0 \
-		libdir=${D}/usr/lib/fltk-1.0 || die "Installation Failed"
-
-	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.0" > 99fltk1.0
-	insinto /etc/env.d
-	doins 99fltk1.0
-}
diff --git a/x11-libs/fltk/fltk-1.1.2-r2.ebuild b/x11-libs/fltk/fltk-1.1.2-r2.ebuild
deleted file mode 100644
index 86ef26cea075..000000000000
--- a/x11-libs/fltk/fltk-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.2-r2.ebuild,v 1.7 2005/05/17 12:37:05 lanius Exp $
-
-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 LGPL-2"
-IUSE="opengl"
-
-DEPEND="virtual/x11
-	media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libs.diff || die "patch failed"
-}
-
-src_compile() {
-	local myconf
-	myconf="--enable-shared --enable-static --enable-threads \
-		--enable-xdbe"
-
-	# If you still have problems and you just uninstalled
-	# xft and didn't re-install xfree to get the right headers
-	# back the xft enabled build still wont work. :) I hope to fix
-	# this eventually but for the 1.4 release...
-	if [ -d ${ROOT}var/db/pkg/x11-libs/xft* ]; then
-		myconf="${myconf} --disable-xft"
-	else
-		myconf="${myconf} --enable-xft"
-		# bug #19894
-		export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-		export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-	fi
-
-	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++"
-
-	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
-}
diff --git a/x11-libs/fltk/fltk-1.1.6.ebuild b/x11-libs/fltk/fltk-1.1.6.ebuild
new file mode 100644
index 000000000000..d2887a238796
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.1.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.6.ebuild,v 1.1 2005/06/17 17:47:02 smithj Exp $
+
+IUSE="X opengl debug"
+
+inherit eutils toolchain-funcs
+
+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="~x86 ~ppc ~sparc ~alpha ~amd64 ~mips ~ppc64"
+LICENSE="FLTK GPL-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/lib/fltk-${SLOT}
+
+DEPEND="virtual/x11
+	X? ( virtual/xft )
+	media-libs/libpng
+	media-libs/jpeg
+	opengl? ( virtual/opengl )"
+
+src_unpack() {
+	unpack ${A}
+	# Upstream fix from cvs to fix the 'back' button in the help window
+	cd ${S}
+	epatch ${FILESDIR}/Fl_Help_View.cxx.patch || die "Patch failed!"
+	epatch ${FILESDIR}/libs-1.6.diff || die "patch failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-shared --enable-xdbe --enable-static --enable-threads"
+
+	if use X; 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 COPYING 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
+}