version bump

8 files changed, 24 insertions, 115 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 51173c14b88e..2e11550d61aa 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.2 2002/03/28 17:52:25 tod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.3 2002/07/16 23:02:16 seemant Exp $
+
+*fltk-1.1.0_rc4 (16 Jul 2002)
+
+  16 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fltk-1.1.0_rc4.ebuild
+  files/digest-fltk-1.1.0_rc4 :
+
+  Version bump.
 
 *fltk-1.1.0_beta10-r1 (28 Mar 2002)
 
diff --git a/x11-libs/fltk/files/digest-fltk-1.0.11 b/x11-libs/fltk/files/digest-fltk-1.0.11
deleted file mode 100644
index cbb63778e7b2..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.0.11
+++ /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.0.11-r1 b/x11-libs/fltk/files/digest-fltk-1.0.11-r1
deleted file mode 100644
index cbb63778e7b2..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.0.11-r1
+++ /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.0_beta10 b/x11-libs/fltk/files/digest-fltk-1.1.0_beta10
deleted file mode 100644
index f9dacf6cf45e..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.0_beta10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58cbcab46f925e74ec978803d4064381 fltk-1.1.0b10-source.tar.bz2 1087535
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.0_rc4 b/x11-libs/fltk/files/digest-fltk-1.1.0_rc4
new file mode 100644
index 000000000000..2b7415ee78f4
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.0_rc4
@@ -0,0 +1 @@
+MD5 50ed494074f5e9ea10a9541a3a824813 fltk-1.1.0rc4-source.tar.bz2 1141343
diff --git a/x11-libs/fltk/fltk-1.0.11-r1.ebuild b/x11-libs/fltk/fltk-1.0.11-r1.ebuild
deleted file mode 100644
index 38de0c6121fc..000000000000
--- a/x11-libs/fltk/fltk-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.11-r1.ebuild,v 1.4 2002/07/11 06:30:56 drobbins Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
-
-SRC_URI="ftp://ftp.fltk.org/pub/fltk/${MYVER}/${P}-source.tar.bz2"
-LICENSE="FLTK | GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-
-HOMEPAGE="http://www.fltk.org"
-
-DEPEND="virtual/glibc 
-	virtual/x11 
-	opengl? ( virtual/opengl )"
-
-
-src_compile() {
-
-	local myconf
-	#shared libraries diabled by default
-	myconf="--enable-shared"
-
-	use opengl || myconf="$myconf --disable-gl" #default enabled
-	
-#Learned '${prefix}' trick from studying python ebuild
-#There are no info files 
-    ./configure \
-		--prefix=/usr \
-		--mandir='${prefix}'/share/man \
-		--host=${CHOST} || die "Configuration Failed"
-		
-    emake || die "Parallel Make Failed"
-
-}
-
-src_install () {
-
-    make prefix=${D}/usr/ \
-		install || 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
-
-}
-
diff --git a/x11-libs/fltk/fltk-1.0.11.ebuild b/x11-libs/fltk/fltk-1.0.11.ebuild
deleted file mode 100644
index 16ed93116f85..000000000000
--- a/x11-libs/fltk/fltk-1.0.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.11.ebuild,v 1.4 2002/07/11 06:30:56 drobbins Exp $
-
-S=${WORKDIR}/${P}
-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"
-DEPEND="virtual/glibc virtual/x11 opengl? ( virtual/opengl virtual/glu )"
-RDEPEND="virtual/glibc virtual/x11 opengl? ( virtual/opengl virtual/glu )"
-LICENSE="FLTK | GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-src_compile() {
-
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-shared
-    if [ -z "`use opengl`" ]
-    then
-      cp config.h config.orig
-      sed -e "s:#define HAVE_GL.*:#define HAVE_GL 0:" \
-	config.orig > config.h
-    fi   
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr/X11R6 install
-    dodoc CHANGES COPYING README*
-    mv ${D}/usr/X11R6/share/doc/fltk ${D}/usr/share/doc/${PF}/html
-
-}
-
diff --git a/x11-libs/fltk/fltk-1.1.0_beta10.ebuild b/x11-libs/fltk/fltk-1.1.0_rc4.ebuild
index 64ab16aed1e5..01b457c47f53 100644
--- a/x11-libs/fltk/fltk-1.1.0_beta10.ebuild
+++ b/x11-libs/fltk/fltk-1.1.0_rc4.ebuild
@@ -1,52 +1,44 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.0_beta10.ebuild,v 1.4 2002/07/11 06:30:56 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.0_rc4.ebuild,v 1.1 2002/07/16 23:02:17 seemant Exp $
 
-MYVER=${PV/_beta/b}
+MYVER=${PV/_/}
 S=${WORKDIR}/${PN}-${MYVER}
-
 DESCRIPTION="C++ user interface toolkit for X and OpenGL."
-LICENSE="FLTK | GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-SRC_URI="ftp://ftp.easysw.com/pub/fltk/${MYVER}/${PN}-${MYVER}-source.tar.bz2"
-
 HOMEPAGE="http://www.fltk.org"
+SRC_URI="ftp://ftp.easysw.com/pub/fltk/${MYVER}/${PN}-${MYVER}-source.tar.bz2"
 
-DEPEND="virtual/glibc 
-	virtual/x11 
+DEPEND="media-libs/libpng
 	opengl? ( virtual/opengl )"
 
+LICENSE="FLTK | GPL-2"
+SLOT="0"
+KEYWORDS="x86"
 
 src_compile() {
 
 	local myconf
-	#shared libraries diabled by default
+	#shared libraries are disabled by default, so we enable them here
 	myconf="--enable-shared"
 
 	use opengl || myconf="$myconf --disable-gl" #default enabled
 	
-#Learned '${prefix}' trick from studying python ebuild
-#There are no info files 
-    ./configure \
-		--prefix=/usr \
-		--mandir='${prefix}'/share/man \
-		--host=${CHOST} || die "Configuration Failed"
+	econf \
+		${myconf} || die "Configuration Failed"
 		
-    emake || die "Parallel Make Failed"
+	emake || die "Parallel Make Failed"
 
 }
 
 src_install () {
 
-    make prefix=${D}/usr/ \
-		install || die "Installation Failed"
+	#make prefix=${D}/usr/ \
+	einstall || die "Installation Failed"
 		
-    dodoc CHANGES COPYING README
+	dodoc CHANGES COPYING README
 	
 	dodir /usr/share/doc/${PF}/html
-    mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
+	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
 	rmdir ${D}/usr/share/doc/fltk
 
 }