9 files changed, 69 insertions, 125 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index be2ebf47b1b6..4206e2c14ca0 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.5 2002/07/22 19:31:50 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.6 2002/08/12 14:33:14 seemant Exp $
+
+*fltk-1.0.11-r3 fltk-1.1.0_rc5 (12 Aug 2002)
+
+  12 Aug 2002; Seemant Kulleen <seemant@gentoo.org> fltk-1.0.11-r3.ebuild
+  fltk-1.1.0_rc5.ebuild :
+
+  SLOTified them again.  And made them install into different locations.
 
 *fltk-1.1.0_rc4 (16 Jul 2002)
   
diff --git a/x11-libs/fltk/files/digest-fltk-1.0.11-r2 b/x11-libs/fltk/files/digest-fltk-1.0.11-r3
index cbb63778e7b2..cbb63778e7b2 100644
--- a/x11-libs/fltk/files/digest-fltk-1.0.11-r2
+++ b/x11-libs/fltk/files/digest-fltk-1.0.11-r3
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.0_beta10-r1 b/x11-libs/fltk/files/digest-fltk-1.1.0_beta10-r1
deleted file mode 100644
index f9dacf6cf45e..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.0_beta10-r1
+++ /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
deleted file mode 100644
index 2b7415ee78f4..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.0_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50ed494074f5e9ea10a9541a3a824813 fltk-1.1.0rc4-source.tar.bz2 1141343
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.0_rc5 b/x11-libs/fltk/files/digest-fltk-1.1.0_rc5
new file mode 100644
index 000000000000..240c1cf4e37c
--- /dev/null
+++ b/x11-libs/fltk/files/digest-fltk-1.1.0_rc5
@@ -0,0 +1 @@
+MD5 4d1f7ef15261ca466da80871bcbd0a84 fltk-1.1.0rc5-source.tar.bz2 1271676
diff --git a/x11-libs/fltk/fltk-1.0.11-r2.ebuild b/x11-libs/fltk/fltk-1.0.11-r2.ebuild
deleted file mode 100644
index 32d49288eeb8..000000000000
--- a/x11-libs/fltk/fltk-1.0.11-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 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-r2.ebuild,v 1.5 2002/08/01 11:59:04 seemant 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"
-LICENSE="FLTK | GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-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} \
-		${myconf} || 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-r3.ebuild b/x11-libs/fltk/fltk-1.0.11-r3.ebuild
new file mode 100644
index 000000000000..c295aea7cd38
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.0.11-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2002 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-r3.ebuild,v 1.1 2002/08/12 14:33:14 seemant 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"
+
+SLOT="1.0"
+LICENSE="FLTK | GPL-2"
+KEYWORDS="x86"
+
+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 || 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
+}
diff --git a/x11-libs/fltk/fltk-1.1.0_beta10-r1.ebuild b/x11-libs/fltk/fltk-1.1.0_beta10-r1.ebuild
deleted file mode 100644
index a9311683c584..000000000000
--- a/x11-libs/fltk/fltk-1.1.0_beta10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2002 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-r1.ebuild,v 1.5 2002/08/01 11:59:04 seemant Exp $
-
-MYVER=${PV/_beta/b}
-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"
-
-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} \
-		${myconf} || 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.1.0_rc4.ebuild b/x11-libs/fltk/fltk-1.1.0_rc5.ebuild
index 950c4323261f..501dba4d9999 100644
--- a/x11-libs/fltk/fltk-1.1.0_rc4.ebuild
+++ b/x11-libs/fltk/fltk-1.1.0_rc5.ebuild
@@ -1,45 +1,45 @@
 # Copyright 1999-2002 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_rc4.ebuild,v 1.4 2002/08/01 11:59:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.0_rc5.ebuild,v 1.1 2002/08/12 14:33:14 seemant Exp $
 
-MYVER=${PV/_/}
-S=${WORKDIR}/${PN}-${MYVER}
+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/${MYVER}/${PN}-${MYVER}-source.tar.bz2"
+SRC_URI="ftp://ftp.easysw.com/pub/fltk/${PV/_/}/${MY_P}-source.tar.bz2"
+
+SLOT="1.1"
+KEYWORDS="x86"
+LICENSE="FLTK | GPL-2"
 
 DEPEND="media-libs/libpng
 	opengl? ( virtual/opengl )"
 
-LICENSE="FLTK | GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
 src_compile() {
 
 	local myconf
-	#shared libraries are disabled by default, so we enable them here
 	myconf="--enable-shared"
 
-	use opengl || myconf="$myconf --disable-gl" #default enabled
+	use opengl || myconf="${myconf} --disable-gl"
 	
 	econf \
+		--includedir=/usr/include/${PN}-1.1 \
+		--libdir=/usr/lib/fltk-1.1 \
 		${myconf} || die "Configuration Failed"
-		
+
 	emake || die "Parallel Make Failed"
 
 }
 
 src_install () {
 
-	#make prefix=${D}/usr/ \
-	einstall || die "Installation Failed"
+	einstall \
+		includedir=${D}/usr/include/${PN}-1.1 \
+		libdir=${D}/usr/lib/fltk-1.1 || 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
-
 }
-