x86

5 files changed, 12 insertions, 89 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 28a02f791b93..08c4ab7e7838 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.27 2003/10/12 18:42:32 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.28 2003/10/31 13:53:42 lanius Exp $
+
+  31 Oct 2003; Heinrich Wendel <lanius@gentoo.org> fltk-1.1.4.ebuild,
+  fltk-1.1.4_rc2.ebuild:
+  x86
 
 *fltk-1.1.4 (12 Oct 2003)
 
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 6698362786dd..cb6170a15518 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,10 +1,8 @@
-MD5 cfcc1fe2a3e17bd93d18269c95a9f5c9 ChangeLog 5157
-MD5 436b038f507e09f7e83863d24029b909 fltk-1.0.11-r3.ebuild 1219
-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 436b038f507e09f7e83863d24029b909 fltk-1.0.11-r3.ebuild 1219
+MD5 da4db09360fb8c20a72b66e61d74452c fltk-1.1.4.ebuild 1961
+MD5 cb23ee85e5ea6df2320be9dc6b912a59 ChangeLog 5259
+MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
 MD5 66e9fc032d679befebde2ff1709eaa21 files/digest-fltk-1.0.11-r3 71
-MD5 ba10847b90993b77dbe8e22c03fb4881 files/digest-fltk-1.1.4 71
 MD5 4c9db40eed236d8e93e19cf01ebf2166 files/digest-fltk-1.1.2-r2 71
-MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
-MD5 a2b81140ae99af343c66586b2f42bac7 files/digest-fltk-1.1.4_rc2 74
+MD5 ba10847b90993b77dbe8e22c03fb4881 files/digest-fltk-1.1.4 71
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.4_rc2 b/x11-libs/fltk/files/digest-fltk-1.1.4_rc2
deleted file mode 100644
index 8c49d815b990..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.4_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01ee09a920902591c0472e7198f1840e fltk-1.1.4rc2-source.tar.bz2 1305984
diff --git a/x11-libs/fltk/fltk-1.1.4.ebuild b/x11-libs/fltk/fltk-1.1.4.ebuild
index 941bdb0e8f74..c88d226c355d 100644
--- a/x11-libs/fltk/fltk-1.1.4.ebuild
+++ b/x11-libs/fltk/fltk-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2003/10/12 18:42:32 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4.ebuild,v 1.2 2003/10/31 13:53:42 lanius Exp $
 
 IUSE="opengl debug nptl"
 
@@ -11,7 +11,7 @@ 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 ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 LICENSE="FLTK | GPL-2"
 
 DEPEND="virtual/x11
diff --git a/x11-libs/fltk/fltk-1.1.4_rc2.ebuild b/x11-libs/fltk/fltk-1.1.4_rc2.ebuild
deleted file mode 100644
index f45e1d9c94f3..000000000000
--- a/x11-libs/fltk/fltk-1.1.4_rc2.ebuild
+++ /dev/null
@@ -1,78 +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_rc2.ebuild,v 1.4 2003/09/15 21:12:58 agriffis 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"
-
-SLOT="1.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="FLTK | GPL-2"
-
-DEPEND="virtual/x11
-	virtual/xft
-	media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libs.diff || die "patch failed"
-}
-
-src_compile() {
-	local myconf
-	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>
-	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
-
-	dodir /usr/share/doc/${P}/html
-	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${P}/html
-}