many virtual/x11 and virtual/opengl dependency fixups, and a few removals

of older ebuilds

8 files changed, 16 insertions, 124 deletions

diff --git a/x11-libs/fltk/fltk-1.0.10-r1.ebuild b/x11-libs/fltk/fltk-1.0.10-r1.ebuild
index d23044aac677..39b67e9fb991 100644
--- a/x11-libs/fltk/fltk-1.0.10-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.0.10-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.10-r1.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.10-r1.ebuild,v 1.2 2001/04/23 19:59:42 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=">=x11-base/xfree-4.0.1
-	opengl? ( >=media-libs/mesa-3.4 )"
+DEPEND="virtual/x11 opengl? ( virtual/opengl )"
 
 
 src_compile() {
diff --git a/x11-libs/fltk/fltk-1.0.10.ebuild b/x11-libs/fltk/fltk-1.0.10.ebuild
deleted file mode 100644
index c5ed1b35c317..000000000000
--- a/x11-libs/fltk/fltk-1.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.10.ebuild,v 1.1 2000/12/11 18:05:42 achim 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=">=x11-base/xfree-4.0.1
-	>=media-libs/mesa-3.4"
-
-
-src_compile() {
-
-    cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-shared
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try make prefix=${D}/usr/X11R6 install
-    dodoc CHANGES COPYING README*
-    mv ${D}/usr/X11R6/share/doc/fltk ${D}/usr/doc/${PF}/html
-
-}
-
diff --git a/x11-libs/qt-x11/qt-x11-2.2.2.ebuild b/x11-libs/qt-x11/qt-x11-2.2.2.ebuild
index 6d8a0493df2c..164a86ba2b95 100644
--- a/x11-libs/qt-x11/qt-x11-2.2.2.ebuild
+++ b/x11-libs/qt-x11/qt-x11-2.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.2.ebuild,v 1.1 2000/12/11 18:05:42 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.2.ebuild,v 1.2 2001/04/23 19:59:44 drobbins Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/qt-2.2.2
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.kde.org/"
 
 DEPEND=">=media-libs/libpng-1.0.7
 	>=media-libs/libmng-0.9.3
-	>=media-libs/mesa-3.4
+	virtual/opengl	
 	>=media-sound/nas-1.4.1
-	>=x11-base/xfree-4.0.1"
+	virtual/x11"
 
 export QTDIR=${S}
 
diff --git a/x11-libs/qt-x11/qt-x11-2.2.3.ebuild b/x11-libs/qt-x11/qt-x11-2.2.3.ebuild
index 68faf28935f5..e98613454f27 100644
--- a/x11-libs/qt-x11/qt-x11-2.2.3.ebuild
+++ b/x11-libs/qt-x11/qt-x11-2.2.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.3.ebuild,v 1.5 2001/01/13 20:07:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.3.ebuild,v 1.6 2001/04/23 19:59:44 drobbins Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/qt-${PV}
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.kde.org/"
 
 DEPEND=">=media-libs/libpng-1.0.7
 	>=media-libs/libmng-0.9.3
-	>=media-libs/mesa-3.4
+	virtual/opengl	
 	>=media-sound/nas-1.4.1
-	>=x11-base/xfree-4.0.2"
+	virtual/x11"
 
 export QTDIR=${S}
 
diff --git a/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild b/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild
index ad9bfac4d10c..66a4f4d49a4a 100644
--- a/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild
+++ b/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild,v 1.1 2001/01/31 01:21:48 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild,v 1.2 2001/04/23 19:59:44 drobbins Exp $
 
 A=${PN}-2.2.3.tar.gz
 S=${WORKDIR}/qt-2.2.3
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.kde.org/"
 
 DEPEND=">=media-libs/libpng-1.0.7
 	>=media-libs/libmng-0.9.3
-	>=media-libs/mesa-3.4
+	virtual/opengl	
 	>=media-sound/nas-1.4.1
-	>=x11-base/xfree-4.0.2"
+	virtual/x11"
 
 export QTDIR=${S}
 
diff --git a/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild b/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild
index 470dc023c463..391619b60094 100644
--- a/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild
+++ b/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild,v 1.2 2001/04/23 19:59:44 drobbins Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/qt-${PV}
@@ -13,9 +13,9 @@ HOMEPAGE="http://www.kde.org/"
 DEPEND=">=media-libs/libpng-1.0.9
 	>=media-libs/libmng-1.0.0
 	>=media-libs/jpeg-6b
-	opengl? ( >=media-libs/mesa-3.4 )
+	opengl? ( virtual/opengl )
 	nas? ( >=media-sound/nas-1.4.1 )
-	>=x11-base/xfree-4.0.2"
+	virtual/x11"
 
 export QTDIR=${S}
 
diff --git a/x11-libs/qt-x11/qt-x11-2.2.4.ebuild b/x11-libs/qt-x11/qt-x11-2.2.4.ebuild
deleted file mode 100644
index 2d66403004a3..000000000000
--- a/x11-libs/qt-x11/qt-x11-2.2.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.4.ebuild,v 1.1 2001/02/06 17:04:27 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/qt-${PV}
-DESCRIPTION="QT 2.2"
-SRC_PATH="kde/stable/2.0/distribution/tar/generic/src/${A}"
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${A}"
-HOMEPAGE="http://www.kde.org/"
-
-DEPEND=">=media-libs/libpng-1.0.7
-	>=media-libs/libmng-0.9.3
-	>=media-libs/mesa-3.4
-	>=media-sound/nas-1.4.1
-	>=x11-base/xfree-4.0.2"
-
-export QTDIR=${S}
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  cp configure configure.orig
-  sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure
-}
-
-src_compile() {
-    cd ${S}
-    export LDFLAGS="-ldl"
-    ./configure -sm -thread -system-zlib -system-jpeg -system-nas-sound \
-	-system-libmng -system-libpng -gif -platform linux-g++ -ldl -lpthread
-    cd ${S}/src
-    cp Makefile Makefile.orig
-    sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile
-    cd ${S}/tools
-    cp Makefile Makefile.orig
-    sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile
-    cd ${S}/src/moc
-    cp Makefile Makefile.orig
-    sed -e "s/-pipe -O2/${CFLAGS}/" Makefile.orig > Makefile
-    cd ${S}
-    try make symlinks src-moc src-mt sub-src sub-tools
-}
-
-src_install() {
-
-        QTBASE=/usr/X11R6/lib
-	cd ${S}
-	dodir $QTBASE/${P}
-	into $QTBASE/${P}
-	dobin bin/*
-	dolib.so lib/libqt.so.${PV}
-	dolib.so lib/libqt-mt.so.${PV}
-	dolib.so lib/libqutil.so.1.0.0
-	preplib $QTBASE/${P}
-	dosym	libqt.so.${PV} 	  $QTBASE/${P}/lib/libqt.so
-	dosym   libqt-mt.so.${PV} $QTBASE/${P}/lib/libqt-mt.so
-	dosym   libqutil.so.1.0.0 $QTBASE/${P}/lib/libqutil.so
-	cd ${D}${QTBASE}
- 	ln -sf  qt-x11-${PV} qt
-	cd ${S}
-	dodir ${QTBASE}/${P}/include
-	cp include/* ${D}${QTBASE}/${P}/include/
-	doman doc/man/man3/*
-
-	dodoc ANNOUNCE FAQ LICENSE.QPL MANIFEST PLATFORMS
-	dodoc PORTING README*
-        cp -af ${S}/doc/html ${D}/usr/doc/${P}
-        insinto /etc/env.d
-        doins ${FILESDIR}/90qt
-
-}
-
-
-
-
diff --git a/x11-libs/qt-x11/qt-x11-2.3.0.ebuild b/x11-libs/qt-x11/qt-x11-2.3.0.ebuild
index 25b7f417bbff..4a2177b2478d 100644
--- a/x11-libs/qt-x11/qt-x11-2.3.0.ebuild
+++ b/x11-libs/qt-x11/qt-x11-2.3.0.ebuild
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.kde.org/"
 DEPEND=">=media-libs/libpng-1.0.9
 	>=media-libs/libmng-1.0.0
 	>=media-libs/jpeg-6b
-	opengl? ( >=media-libs/mesa-glu-3.4 )
+	opengl? ( virtual/opengl )
 	nas? ( >=media-sound/nas-1.4.1 )
-	>=x11-base/xfree-4.0.2"
+	virtual/x11"
 
 export QTDIR=${S}