bump

14 files changed, 21 insertions, 364 deletions

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index e64690717b70..6698362786dd 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,6 +1,6 @@
-MD5 e70ad02c76359a13ae17d26d422c3fcb ChangeLog 4917
+MD5 cfcc1fe2a3e17bd93d18269c95a9f5c9 ChangeLog 5157
 MD5 436b038f507e09f7e83863d24029b909 fltk-1.0.11-r3.ebuild 1219
-MD5 3482fd2b1f1672e6588a654ef9fce271 fltk-1.1.4.ebuild 1968
+MD5 62512e27dcf70312c56e9241bea1bdd5 fltk-1.1.4.ebuild 1962
 MD5 0e1b2b595b371750975973b6ac78f02e fltk-1.1.2-r2.ebuild 1965
 MD5 3482fd2b1f1672e6588a654ef9fce271 fltk-1.1.4_rc2.ebuild 1968
 MD5 66e9fc032d679befebde2ff1709eaa21 files/digest-fltk-1.0.11-r3 71
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.0_rc7 b/x11-libs/fltk/files/digest-fltk-1.1.0_rc7
deleted file mode 100644
index 171a0b352e76..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.0_rc7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 759dcd8bcbbb25f2e30920ab29f32f4c fltk-1.1.0rc7-source.tar.bz2 1273352
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.1 b/x11-libs/fltk/files/digest-fltk-1.1.1
deleted file mode 100644
index 1b7ed8c197f1..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7505489ee6aecc3f3d8036d1482557c5 fltk-1.1.1-source.tar.bz2 1277985
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.2 b/x11-libs/fltk/files/digest-fltk-1.1.2
deleted file mode 100644
index c400d598c94b..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.2
+++ /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.2-r1 b/x11-libs/fltk/files/digest-fltk-1.1.2-r1
deleted file mode 100644
index c400d598c94b..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.2-r1
+++ /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.3 b/x11-libs/fltk/files/digest-fltk-1.1.3
deleted file mode 100644
index 1446878d71af..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f32b4acc456d567a6bd554ac03c24055 fltk-1.1.3-source.tar.bz2 1244465
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.4 b/x11-libs/fltk/files/digest-fltk-1.1.4
new file mode 100644
index 000000000000..22b52a3efd31
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.4
@@ -0,0 +1 @@
+MD5 06ce1d3def2df35525592746faccbf98 fltk-1.1.4-source.tar.bz2 1305766
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.4_rc1 b/x11-libs/fltk/files/digest-fltk-1.1.4_rc1
deleted file mode 100644
index 22dcd20c2c22..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.4_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b78ad450f222d0992b83692af4ba0fd fltk-1.1.4rc1-source.tar.bz2 1249112
diff --git a/x11-libs/fltk/fltk-1.1.0_rc7.ebuild b/x11-libs/fltk/fltk-1.1.0_rc7.ebuild
deleted file mode 100644
index 9adf84d283ae..000000000000
--- a/x11-libs/fltk/fltk-1.1.0_rc7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.0_rc7.ebuild,v 1.9 2003/09/07 00:23:27 msterret Exp $
-
-IUSE="opengl"
-
-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"
-
-SLOT="1.1"
-KEYWORDS="x86 sparc"
-LICENSE="FLTK | GPL-2"
-
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )
-	virtual/x11"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/libs.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-	myconf="--enable-shared --enable-static --enable-threads \
-		--enable-xft --enable-xdbe"
-
-	use opengl || myconf="${myconf} --disable-gl"
-
-	econf \
-		--includedir=/usr/include/fltk-1.1 \
-		--libdir=/usr/lib/fltk-1.1 \
-		${myconf} || die "Configuration Failed"
-
-	emake CXX="g++" || die "Parallel Make Failed"
-
-}
-
-src_install () {
-
-	einstall \
-		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
-
-	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.1.ebuild b/x11-libs/fltk/fltk-1.1.1.ebuild
deleted file mode 100644
index 624a79602200..000000000000
--- a/x11-libs/fltk/fltk-1.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.1.ebuild,v 1.5 2003/09/07 00:23:27 msterret Exp $
-
-IUSE="opengl"
-
-S=${WORKDIR}/${P}
-
-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="media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )
-	virtual/x11"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/libs.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-	myconf="--enable-shared --enable-static --enable-threads \
-		--enable-xft --enable-xdbe"
-
-	use opengl || myconf="${myconf} --disable-gl"
-
-	export CXX="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.2-r1.ebuild b/x11-libs/fltk/fltk-1.1.2-r1.ebuild
deleted file mode 100644
index 68457e6ebf26..000000000000
--- a/x11-libs/fltk/fltk-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.2-r1.ebuild,v 1.6 2003/09/08 03:13:46 msterret 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 | GPL-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"
-	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.2.ebuild b/x11-libs/fltk/fltk-1.1.2.ebuild
deleted file mode 100644
index dfefa1800c9f..000000000000
--- a/x11-libs/fltk/fltk-1.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.2.ebuild,v 1.5 2003/09/07 00:23:27 msterret Exp $
-
-IUSE="opengl"
-
-S=${WORKDIR}/${P}
-
-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="media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )
-	virtual/x11"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/libs.diff || die "patch failed"
-
-}
-
-src_compile() {
-
-	local myconf
-	myconf="--enable-shared --enable-static --enable-threads \
-		--enable-xft --enable-xdbe"
-
-	use opengl || myconf="${myconf} --disable-gl"
-
-	export CXX="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.3.ebuild b/x11-libs/fltk/fltk-1.1.4.ebuild
index f86126a24fbb..941bdb0e8f74 100644
--- a/x11-libs/fltk/fltk-1.1.3.ebuild
+++ b/x11-libs/fltk/fltk-1.1.4.ebuild
@@ -1,17 +1,18 @@
 # 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.3.ebuild,v 1.3 2003/09/08 03:13:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4.ebuild,v 1.1 2003/10/12 18:42:32 lanius Exp $
+
+IUSE="opengl debug nptl"
 
 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"
+SRC_URI="ftp://ftp.easysw.com/pub/fltk/${PV/_/}/${P/_/}-source.tar.bz2"
 
 SLOT="1.1"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 LICENSE="FLTK | GPL-2"
-IUSE="opengl"
 
 DEPEND="virtual/x11
 	virtual/xft
@@ -19,6 +20,8 @@ DEPEND="virtual/x11
 	media-libs/jpeg
 	opengl? ( virtual/opengl )"
 
+S=${WORKDIR}/${P/_/}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -27,21 +30,17 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--enable-shared --enable-static --enable-threads \
-		--enable-xdbe --enable-xft"
-
-	# 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"
-	#fi
+	myconf="--enable-shared --enable-xdbe --enable-xft --enable-static"
+
+	use debug && myconf="${myconf} --enable-debug"
 
 	use opengl || myconf="${myconf} --disable-gl"
 
+	# The fltk threading code doesn't work with nptl
+	# See bug #26569
+	use nptl && myconf="${myconf} --disable-threads" \
+		|| myconf="${myconf} --enable-threads"
+
 	# 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>
@@ -73,4 +72,7 @@ src_install() {
 
 	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
 }
diff --git a/x11-libs/fltk/fltk-1.1.4_rc1.ebuild b/x11-libs/fltk/fltk-1.1.4_rc1.ebuild
deleted file mode 100644
index 826c102a09a8..000000000000
--- a/x11-libs/fltk/fltk-1.1.4_rc1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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_rc1.ebuild,v 1.3 2003/09/08 03:13:46 msterret Exp $
-
-inherit eutils
-
-P=${P/_/}
-PV=${PV/_/}
-
-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"
-IUSE="opengl"
-
-DEPEND="virtual/x11
-	virtual/xft
-	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 --enable-xft"
-
-	# 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"
-	#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++"
-
-	# 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
-}