more in the great move

32 files changed, 30 insertions, 470 deletions

diff --git a/dev-libs/libole2/files/digest-libole2-0.2.3 b/dev-libs/libole2/files/digest-libole2-0.2.3-r1
index fef7dca25135..fef7dca25135 100644
--- a/dev-libs/libole2/files/digest-libole2-0.2.3
+++ b/dev-libs/libole2/files/digest-libole2-0.2.3-r1
diff --git a/dev-libs/libole2/libole2-0.2.3.ebuild b/dev-libs/libole2/libole2-0.2.3-r1.ebuild
index 39c7c70440e6..241eadd0d62b 100644
--- a/dev-libs/libole2/libole2-0.2.3.ebuild
+++ b/dev-libs/libole2/libole2-0.2.3-r1.ebuild
@@ -11,8 +11,9 @@ HOMEPAGE="http://www.gnome.org/"
 
 DEPEND=">=dev-libs/glib-1.2.8"
 
-src_compile() {                           
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
+src_compile() {
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr || die
 
 	emake || die
 }
diff --git a/gnome-base/ORBit/ORBit-0.5.10.ebuild b/gnome-base/ORBit/ORBit-0.5.10.ebuild
deleted file mode 100644
index 26e46c3d358c..000000000000
--- a/gnome-base/ORBit/ORBit-0.5.10.ebuild
+++ /dev/null
@@ -1,54 +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/gnome-base/ORBit/ORBit-0.5.10.ebuild,v 1.1 2001/10/05 10:02:19 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.labs.redhat.com/orbit/"
-
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext )
-	>=sys-apps/tcp-wrappers-7.6
-	>=dev-libs/glib-1.2.8
-	>=gnome-base/gnome-env-1.0"
-
-RDEPEND="virtual/glibc 
-	>=gnome-base/gnome-env-1.0
-	>=dev-libs/glib-1.2.8"
-
-
-src_compile() {
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} --prefix=/opt/gnome \
-        	    --sysconfdir=/etc/opt/gnome $myconf
-
-	assert "Configure failed."
-
-	make || die "Building failed."  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Installation failed."
-
-	dosed /opt/gnome/lib/*.la
-	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
-	dodoc docs/*.txt docs/IDEA1
-	docinto idl
-
-	cd libIDL
-	dodoc AUTHORS BUGS COPYING NEWS README*
-	docinto popt
-	
-	cd ../popt
-	dodoc CHANGES COPYING README
-}
-
-
-
-
diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.10 b/gnome-base/ORBit/files/digest-ORBit-0.5.10
deleted file mode 100644
index 012708fa6d4a..000000000000
--- a/gnome-base/ORBit/files/digest-ORBit-0.5.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84e818d9f6fa4f389b9ea82aa00e8f6c ORBit-0.5.10.tar.gz
diff --git a/gnome-extra/gb/files/digest-gb-0.0.19 b/gnome-extra/gb/files/digest-gb-0.0.19
deleted file mode 100644
index 4f6a08611580..000000000000
--- a/gnome-extra/gb/files/digest-gb-0.0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0d75995ce1195a8f0d4aee40ed0ddea gb-0.0.19.tar.gz
diff --git a/gnome-extra/gb/files/digest-gb-0.0.20 b/gnome-extra/gb/files/digest-gb-0.0.20-r1
index 77c06671589d..77c06671589d 100644
--- a/gnome-extra/gb/files/digest-gb-0.0.20
+++ b/gnome-extra/gb/files/digest-gb-0.0.20-r1
diff --git a/gnome-extra/gb/gb-0.0.19.ebuild b/gnome-extra/gb/gb-0.0.19.ebuild
deleted file mode 100644
index fed763669f49..000000000000
--- a/gnome-extra/gb/gb-0.0.19.ebuild
+++ /dev/null
@@ -1,24 +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
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Basic"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-print-0.29"
-
-src_compile() {                           
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {                               
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/gnome-libs/gb/gb-0.0.20.ebuild b/gnome-extra/gb/gb-0.0.20-r1.ebuild
index e9cd342f8c55..f22ecb7add00 100644
--- a/gnome-libs/gb/gb-0.0.20.ebuild
+++ b/gnome-extra/gb/gb-0.0.20-r1.ebuild
@@ -9,12 +9,13 @@ DESCRIPTION="GNOME Basic"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-RDEPEND=">=gnome-base/gnome-print-0.29"
+RDEPEND=">=gnome-base/gnome-print-0.30"
 
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr || die
 
 	emake || die
 }
@@ -27,3 +28,4 @@ src_install() {
 
 
 
+
diff --git a/gnome-extra/gb/gb-0.0.20.ebuild b/gnome-extra/gb/gb-0.0.20.ebuild
deleted file mode 100644
index e9cd342f8c55..000000000000
--- a/gnome-extra/gb/gb-0.0.20.ebuild
+++ /dev/null
@@ -1,29 +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
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Basic"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=gnome-base/gnome-print-0.29"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {                               
-	make DESTDIR=${D} install || die 
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
-
-
-
diff --git a/gnome-libs/glibwww/files/digest-glibwww-0.2-r1 b/gnome-extra/glibwww/files/digest-glibwww-0.2-r2
index 794b77812ee1..794b77812ee1 100644
--- a/gnome-libs/glibwww/files/digest-glibwww-0.2-r1
+++ b/gnome-extra/glibwww/files/digest-glibwww-0.2-r2
diff --git a/gnome-extra/gnomemm/files/digest-gnomemm-1.1.21 b/gnome-extra/gnomemm/files/digest-gnomemm-1.1.21
deleted file mode 100644
index 116e7c9a34be..000000000000
--- a/gnome-extra/gnomemm/files/digest-gnomemm-1.1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c92cd1e74a010cf63ccc3fdcb5b1865b gnomemm-1.1.21.tar.gz
diff --git a/gnome-extra/gnomemm/files/digest-gnomemm-1.2.0 b/gnome-extra/gnomemm/files/digest-gnomemm-1.2.0-r1
index e0432cbc7a5c..e0432cbc7a5c 100644
--- a/gnome-extra/gnomemm/files/digest-gnomemm-1.2.0
+++ b/gnome-extra/gnomemm/files/digest-gnomemm-1.2.0-r1
diff --git a/gnome-extra/gnomemm/gnomemm-1.1.21.ebuild b/gnome-extra/gnomemm/gnomemm-1.1.21.ebuild
deleted file mode 100644
index a8555b7e870b..000000000000
--- a/gnome-extra/gnomemm/gnomemm-1.1.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.80.ebuild,v 1.1 2001/06/20 13:47:39 darks Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/gnomemm-1.1.21.ebuild,v 1.4 2001/08/31 23:32:48 hallski Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="C++ binding for the GNOME libraries"
-SRC_URI="http://prdownloads.sourceforge.net/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-RDEPEND=">=x11-libs/gtkmm-1.2.5
-	 >=gnome-base/ORBit-0.5.8"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/gnome-extra/gnomemm/gnomemm-1.2.0.ebuild b/gnome-extra/gnomemm/gnomemm-1.2.0-r1.ebuild
index 697e2472c585..600c8a59cf04 100644
--- a/gnome-extra/gnomemm/gnomemm-1.2.0.ebuild
+++ b/gnome-extra/gnomemm/gnomemm-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.80.ebuild,v 1.1 2001/06/20 13:47:39 darks Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/gnomemm-1.2.0.ebuild,v 1.5 2001/09/01 11:37:53 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/gnomemm-1.2.0-r1.ebuild,v 1.1 2001/10/06 10:41:17 hallski Exp $
 
 
 S=${WORKDIR}/${P}
@@ -9,13 +9,14 @@ DESCRIPTION="C++ binding for the GNOME libraries"
 SRC_URI="http://prdownloads.sourceforge.net/gtkmm/${P}.tar.gz"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
 
-RDEPEND=">=x11-libs/gtkmm-1.2.5
-	 >=gnome-base/ORBit-0.5.8"
+RDEPEND=">=x11-libs/gtkmm-1.2.5-r1
+	 >=gnome-base/ORBit-0.5.10-r1"
 
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
+	./configure --host=${CHOST} 					\
+		    --prefix=/opt/gnome || die
 
 	emake || die
 }
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.10 b/gnome-extra/libgda/files/digest-libgda-0.2.10
deleted file mode 100644
index 84f1015e39c0..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07af13d295e15f2b779c8d3909b20846 libgda-0.2.10.tar.gz
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.9 b/gnome-extra/libgda/files/digest-libgda-0.2.9
deleted file mode 100644
index 5f45483be561..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 572b2b19a2e959aaa150ab490c57fb76 libgda-0.2.9.tar.gz
diff --git a/gnome-extra/libgda/libgda-0.2.10.ebuild b/gnome-extra/libgda/libgda-0.2.10.ebuild
deleted file mode 100644
index 79a2215d108c..000000000000
--- a/gnome-extra/libgda/libgda-0.2.10.ebuild
+++ /dev/null
@@ -1,68 +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
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gda lib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}
-	 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-db"
-
-RDEPEND="virtual/glibc
-        >=gnome-base/gconf-0.11
-	>=gnome-base/oaf-0.5.0
-        >=sys-libs/gdbm-1.8.0
-        >=sys-libs/readline-4.1
-	>=dev-perl/CORBA-ORBit-0.4.3
-	mysql? ( >=dev-db/mysql-3.23.26 )
-        postgres? ( >=dev-db/postgresql-7.1 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/which"
-
-src_compile() {                           
-	local myconf 
-
-	if [ "`use mysql`" ]
-	then
-		myconf="--with-mysql=/usr"
-	fi
-
-  	if [ "`use ldap`" ]
-	then
-    		myconf="$myconf --with-ldap=/usr"
-  	fi
-
-  	if [ "`use odbc`" ]
-	then
-    		myconf="$myconf --with-odbc"
-  	fi
-
-  	if [ "`use postgres`" ]
-	then
-    		myconf="$myconf --with-postgres=/usr"
-  	fi
-  
-	./configure --host=${CHOST} 					\
-		    --prefix=/opt/gnome 				\
-		    --sysconfdir=/etc/opt/gnome 			\
-		    --mandir=/opt/gnome/man				\
-		    $myconf || die
-
-	# Doesn't work with -j 4 (hallski)
-	make LDFLAGS="-lncurses" LIBREADLINE="-lreadline -lncurses" || die
-}
-
-src_install() {
-	make  DESTDIR=${D} PREFIX=${D}/usr 				\
-	      INSTALLMAN3DIR=${D}/usr/share/man/man3 			\
-	      GDA_oafinfodir=${D}/opt/gnome/share/oaf install || die
-
-	into /usr
-	dobin providers/gda-default-server/build_sqlite/{lemon,sqlite}
-	dodoc AUTHORS COPYING.* ChangeLog NEWS README
-}
diff --git a/gnome-extra/libgda/libgda-0.2.9.ebuild b/gnome-extra/libgda/libgda-0.2.9.ebuild
deleted file mode 100644
index 46703a7156ac..000000000000
--- a/gnome-extra/libgda/libgda-0.2.9.ebuild
+++ /dev/null
@@ -1,66 +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/gnome-extra/libgda/libgda-0.2.9.ebuild,v 1.4 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gda lib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-db"
-
-RDEPEND="virtual/glibc
-        >=gnome-base/gconf-0.11
-        >=sys-libs/gdbm-1.8.0
-        >=sys-libs/readline-4.1
-	mysql? ( >=dev-db/mysql-3.23.26 )
-        postgres? ( >=dev-db/postgresql-7.1 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/which
-	>=dev-perl/CORBA-ORBit-0.4.3"
-
-src_compile() {                           
-	local myconf 
-
-	if [ "`use mysql`" ]
-	then
-		myconf="--with-mysql=/usr"
-	fi
-
-	if [ "`use ldap`" ]
-	then
-		myconf="$myconf --with-ldap=/usr"
-	fi
-
-	if [ "`use odbc`" ]
-	then
-		myconf="$myconf --with-odbc"
-	fi
-
-	if [ "`use postgres`" ]
-	then
-		myconf="$myconf --with-postgres=/usr"
-	fi
-  
-	./configure --host=${CHOST} 					\
-		    --prefix=/opt/gnome					\
-		    --sysconfdir=/etc/opt/gnome				\
-		    --mandir=/opt/gnome/man				\
-		    $myconf || die
-
-	# Doesn't work with -j 4 (hallski)
-	make LDFLAGS="-lncurses" LIBREADLINE="-lreadline -lncurses" || die
-}
-
-src_install() {
-	make DESTDIR=${D} PREFIX=${D}/usr 				\
-	     INSTALLMAN3DIR=${D}/usr/share/man/man3			\
-	     GDA_oafinfodir=${D}/opt/gnome/share/oaf install || die
-
-	into /usr
-	dobin providers/gda-default-server/build_sqlite/{lemon,sqlite}
-	dodoc AUTHORS COPYING.* ChangeLog NEWS README
-}
diff --git a/gnome-extra/libgda/libgda-0.2.91.ebuild b/gnome-extra/libgda/libgda-0.2.91.ebuild
index 8f1e5b47927a..b9ee25db176b 100644
--- a/gnome-extra/libgda/libgda-0.2.91.ebuild
+++ b/gnome-extra/libgda/libgda-0.2.91.ebuild
@@ -11,9 +11,9 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}
 HOMEPAGE="http://www.gnome.org/gnome-db"
 
 RDEPEND="virtual/glibc
-        >=gnome-base/gconf-0.11
-	>=gnome-base/oaf-0.5.0
-	>=gnome-base/bonobo-1.0.8
+        >=gnome-base/gconf-1.0.4-r2
+	>=gnome-base/oaf-0.6.6-r1
+	>=gnome-base/bonobo-1.0.9-r1
         >=sys-libs/gdbm-1.8.0
         >=sys-libs/readline-4.1
 	>=dev-perl/CORBA-ORBit-0.4.3
@@ -54,10 +54,8 @@ src_compile() {
 	myconf="$myconf --disable-bonobotest"
   
 	./configure --host=${CHOST} 					\
-		    --prefix=/opt/gnome 				\
-		    --sysconfdir=/etc/opt/gnome 			\
-		    --mandir=/opt/gnome/man				\
-		    --with-bonobo-prefix=/opt/gnome			\
+		    --prefix=/usr	 				\
+		    --sysconfdir=/etc		 			\
 		    $myconf || die
 
 	# Wierd hack I had to do to get it to compile (seems the buildin sqlite
@@ -73,7 +71,7 @@ src_compile() {
 src_install() {
 	make  DESTDIR=${D} PREFIX=${D}/usr 				\
 	      INSTALLMAN3DIR=${D}/usr/share/man/man3 			\
-	      GDA_oafinfodir=${D}/opt/gnome/share/oaf install || die
+	      GDA_oafinfodir=${D}/usr/share/oaf install || die
 
 	into /usr
 	dobin providers/gda-default-server/build_sqlite/{lemon,sqlite}
diff --git a/gnome-libs/gb/files/digest-gb-0.0.19 b/gnome-libs/gb/files/digest-gb-0.0.19
deleted file mode 100644
index 4f6a08611580..000000000000
--- a/gnome-libs/gb/files/digest-gb-0.0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0d75995ce1195a8f0d4aee40ed0ddea gb-0.0.19.tar.gz
diff --git a/gnome-libs/gb/files/digest-gb-0.0.20 b/gnome-libs/gb/files/digest-gb-0.0.20
deleted file mode 100644
index 77c06671589d..000000000000
--- a/gnome-libs/gb/files/digest-gb-0.0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19e35bd7f24ad619250484a997c0e02d gb-0.0.20.tar.gz
diff --git a/gnome-libs/gb/gb-0.0.19.ebuild b/gnome-libs/gb/gb-0.0.19.ebuild
deleted file mode 100644
index fed763669f49..000000000000
--- a/gnome-libs/gb/gb-0.0.19.ebuild
+++ /dev/null
@@ -1,24 +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
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Basic"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-print-0.29"
-
-src_compile() {                           
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {                               
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/gnome-libs/glibwww/glibwww-0.2-r1.ebuild b/gnome-libs/glibwww/glibwww-0.2-r1.ebuild
deleted file mode 100644
index 3622c5d8d6ae..000000000000
--- a/gnome-libs/glibwww/glibwww-0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +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/gnome-libs/glibwww/glibwww-0.2-r1.ebuild,v 1.6 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome WWW Libraries"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=net-libs/libwww-1.5.3-r1
-	 >=gnome-base/gnome-libs-1.2.13
-	 gnome-base/gnome-env"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/gnome-libs/gnomemm/files/digest-gnomemm-1.1.21 b/gnome-libs/gnomemm/files/digest-gnomemm-1.1.21
deleted file mode 100644
index 116e7c9a34be..000000000000
--- a/gnome-libs/gnomemm/files/digest-gnomemm-1.1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c92cd1e74a010cf63ccc3fdcb5b1865b gnomemm-1.1.21.tar.gz
diff --git a/gnome-libs/gnomemm/files/digest-gnomemm-1.2.0 b/gnome-libs/gnomemm/files/digest-gnomemm-1.2.0
deleted file mode 100644
index e0432cbc7a5c..000000000000
--- a/gnome-libs/gnomemm/files/digest-gnomemm-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 546e830adc179af1be178619a6722c06 gnomemm-1.2.0.tar.gz
diff --git a/gnome-libs/gnomemm/gnomemm-1.1.21.ebuild b/gnome-libs/gnomemm/gnomemm-1.1.21.ebuild
deleted file mode 100644
index d0c47a823760..000000000000
--- a/gnome-libs/gnomemm/gnomemm-1.1.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.80.ebuild,v 1.1 2001/06/20 13:47:39 darks Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-libs/gnomemm/gnomemm-1.1.21.ebuild,v 1.4 2001/08/31 23:32:48 hallski Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="C++ binding for the GNOME libraries"
-SRC_URI="http://prdownloads.sourceforge.net/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-RDEPEND=">=x11-libs/gtkmm-1.2.5
-	 >=gnome-base/ORBit-0.5.8"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/gnome-libs/gnomemm/gnomemm-1.2.0.ebuild b/gnome-libs/gnomemm/gnomemm-1.2.0.ebuild
deleted file mode 100644
index 437ae4730852..000000000000
--- a/gnome-libs/gnomemm/gnomemm-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.80.ebuild,v 1.1 2001/06/20 13:47:39 darks Exp
-# $Header: /var/cvsroot/gentoo-x86/gnome-libs/gnomemm/gnomemm-1.2.0.ebuild,v 1.5 2001/09/01 11:37:53 hallski Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="C++ binding for the GNOME libraries"
-SRC_URI="http://prdownloads.sourceforge.net/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-RDEPEND=">=x11-libs/gtkmm-1.2.5
-	 >=gnome-base/ORBit-0.5.8"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/gnome-libs/libole2/files/digest-libole2-0.2.3 b/gnome-libs/libole2/files/digest-libole2-0.2.3
deleted file mode 100644
index fef7dca25135..000000000000
--- a/gnome-libs/libole2/files/digest-libole2-0.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9c620d0988ddd1dc786e9306cd454df libole2-0.2.3.tar.gz
diff --git a/gnome-libs/libole2/libole2-0.2.3.ebuild b/gnome-libs/libole2/libole2-0.2.3.ebuild
deleted file mode 100644
index 39c7c70440e6..000000000000
--- a/gnome-libs/libole2/libole2-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +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
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="libole2"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=dev-libs/glib-1.2.8"
-
-src_compile() {                           
-	./configure --host=${CHOST} --prefix=/opt/gnome || die
-
-	emake || die
-}
-
-src_install() {                               
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/gnome-libs/medusa/files/digest-medusa-0.5.1 b/gnome-libs/medusa/files/digest-medusa-0.5.1
deleted file mode 100644
index 5730bc610b05..000000000000
--- a/gnome-libs/medusa/files/digest-medusa-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26da7d668110d2a053a53ff23f15d0d0 medusa-0.5.1.tar.gz
diff --git a/gnome-libs/medusa/medusa-0.5.1.ebuild b/gnome-libs/medusa/medusa-0.5.1.ebuild
deleted file mode 100644
index 24e9576bd717..000000000000
--- a/gnome-libs/medusa/medusa-0.5.1.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-libs/medusa/medusa-0.5.1.ebuild,v 1.5 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="medusa"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-vfs-1.0"
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/opt/gnome					\
-		    --sysconfdir=/etc/opt/gnome 			\
-		    --mandir=/opt/gnome/man 				\
-		    --sharedstatedir=/var/lib 				\
-		    --localstatedir=/var/lib 				\
-		    --enable-prefere-db1 || die
-
-	emake medusainitdir=/tmp || die
-}
-
-src_install() {
-	make DESTDIR=${D} medusainitdir=/tmp install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index e4ded1e266bb..58196fd30de8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -131,6 +131,18 @@ gnome-libs/libxml2
 gnome-libs/libxslt
 gnome-base/libxml
 gnome-libs/libole2
+gnome-libs/eel
+gnome-base/gal
+gnome-libs/gb
+gnome-libs/gnomemm
+gnome-base/gtkhtml
+gnome-libs/libgda
+gnome-libs/libole2
+gnome-libs/librsvg
+gnome-base/libunicode
+gnome-libs/medusa
+gnome-apps/nautilus
+gnome-base/scrollkeeper
 
 # Don't use these.
 # These are the old locations. Will be removed when new locations are tested.
@@ -143,11 +155,8 @@ gnome-extra/bonobo-conf
 gnome-extra/bug-buddy
 app-office/dia
 media-gfx/ee
-gnome-base/eel
 app-office/evolution
 net-im/gabber
-gnome-extra/gal
-gnome-extra/gb
 app-editors/gedit
 app-misc/gentoo
 app-text/ggv
@@ -164,36 +173,24 @@ gnome-extra/gnome-pilot
 gnome-extra/gnome-pilot-conduits
 gnome-extra/gnome-pim
 gnome-extra/gnome-utils
-gnome-extra/gnomemm
 app-arch/gnorpm
 app-office/gnucash
 app-office/gnumeric
 media-gfx/gthumb
 app-misc/gtkdiff
-gnome-extra/gtkhtml
 app-misc/gtktalog
 gnome-extra/gtop
 gnome-extra/guppi
 net-misc/gupsc
 app-admin/gwcc
-gnome-extra/libgda
-gnome-extra/libole2
-gnome-base/librsvg
-dev-libs/libunicode
-dev-libs/libxml
-dev-libs/libxml2
-dev-libs/libxslt
 gnome-extra/mc
-gnome-extra/medusa
 dev-util/memprof
 app-office/mrproject
-gnome-base/nautilus
 net-analyzer/netleds_applet
 net-news/pan
 x11-terms/powershell
 gnome-extra/procman
 net-www/screem
-app-text/scrollkeeper
 app-crypt/seahorse
 media-gfx/sodipodi
 gnome-extra/users-guide