51 files changed, 125 insertions, 310 deletions

diff --git a/app-cdr/cdrdao/cdrdao-1.1.5.ebuild b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
index c98cc2ea8766..171548246360 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.5.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Peter Kadau <peter.kadau@web.de>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5.ebuild,v 1.1 2001/08/23 13:38:21 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 A=${P}.src.tar.gz
 S=${WORKDIR}/cdrdao-1.1.5
@@ -13,9 +13,9 @@ DEPEND=">=dev-util/pccts-1.33.24-r1"
 
 if [ "`use gnome`" ]
 then 
-	RDEPEND=">=gnome-base/gnome-libs-1.2.3
-         >=x11-libs/gtkmm-1.2.5
-         >=gnome-libs/gnomemm-1.1.17"
+	RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
+         >=x11-libs/gtkmm-1.2.5-r1
+         >=gnome-extra/gnomemm-1.1.17"
 else
 	RDEPEND=""
 fi
@@ -64,10 +64,10 @@ src_install() {
 	then
 
 		# binary
-		into /opt/gnome
+		into /usr
         	dobin xdao/gcdmaster
-		# pixmaps for gcdmaster in /opt/gnome/share/pixmaps/gcdmaster
-		insinto /opt/gnome/share/pixmaps/gcdmaster
+		# pixmaps for gcdmaster in /usr/share/pixmaps/gcdmaster
+		insinto /usr/share/pixmaps/gcdmaster
 		doins xdao/pixmap_copycd.png 
 		doins xdao/pixmap_audiocd.png
 		doins xdao/pixmap_datacd.png
@@ -78,11 +78,11 @@ src_install() {
 		doins xdao/pixmap_dumpcd.png
 		doins xdao/gcdmaster.png
 		# application links
-		# gcdmaster.desktop in /opt/gnome/share/gnome/apps/Applications
-		insinto /opt/gnome/share/gnome/apps/Applications
+		# gcdmaster.desktop in /usr/share/gnome/apps/Applications
+		insinto /usr/share/gnome/apps/Applications
 		doins xdao/gcdmaster.desktop
-		# xcdrdao.1 renamed to gcdmaster.1 in /opt/gnome/share/man/man1/
-		into /opt/gnome
+		# xcdrdao.1 renamed to gcdmaster.1 in /usr/share/man/man1/
+		into /usr
 		newman xdao/xcdrdao.man gcdmaster.1
 	fi
 }
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.5 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.5-r1
index cd12f4f1fea3..cd12f4f1fea3 100644
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.5
+++ b/app-cdr/cdrdao/files/digest-cdrdao-1.1.5-r1
diff --git a/app-doc/gentoo-web/gentoo-web-1.0.ebuild b/app-doc/gentoo-web/gentoo-web-1.0.ebuild
index 4aa323b6d944..bddd42b5104b 100644
--- a/app-doc/gentoo-web/gentoo-web-1.0.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
 # of the GNU General Public License, v2 or later 
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-1.0.ebuild,v 1.8 2001/08/28 04:17:27 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-1.0.ebuild,v 1.9 2001/10/06 17:22:51 azarah Exp $
  
 S=${WORKDIR}/${P}
 DESCRIPTION="www.gentoo.org website"
 SRC_URI=""
 HOMEPAGE="http://www.gentoo.org"
-RDEPEND="sys-devel/python gnome-libs/libxslt net-www/apache"
+RDEPEND="sys-devel/python dev-libs/libxslt net-www/apache"
 
 src_unpack() {
 	if [ "$MAINTAINER" != "yes" ]
diff --git a/app-doc/gentoo-web/gentoo-web-2.0.ebuild b/app-doc/gentoo-web/gentoo-web-2.0.ebuild
index db88ca78ff53..54925dbac538 100644
--- a/app-doc/gentoo-web/gentoo-web-2.0.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
 # of the GNU General Public License, v2 or later 
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.0.ebuild,v 1.4 2001/08/28 04:17:27 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.0.ebuild,v 1.5 2001/10/06 17:22:51 azarah Exp $
  
 S=${WORKDIR}/${P}
 DESCRIPTION="www.gentoo.org website"
 SRC_URI=""
 HOMEPAGE="http://www.gentoo.org"
-RDEPEND="sys-devel/python gnome-libs/libxslt net-www/apache"
+RDEPEND="sys-devel/python dev-libs/libxslt net-www/apache"
 
 src_unpack() {
 	if [ "$MAINTAINER" != "yes" ]
diff --git a/app-doc/gentoo-web/gentoo-web-2.1.ebuild b/app-doc/gentoo-web/gentoo-web-2.1.ebuild
index ffb1b96aba5e..43a637086b53 100644
--- a/app-doc/gentoo-web/gentoo-web-2.1.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
 # of the GNU General Public License, v2 or later 
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.1.ebuild,v 1.6 2001/08/28 04:17:27 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.1.ebuild,v 1.7 2001/10/06 17:22:51 azarah Exp $
  
 S=${WORKDIR}/${P}
 DESCRIPTION="www.gentoo.org website"
 SRC_URI="http://www.red-bean.com/cvs2cl/cvs2cl.pl"
 HOMEPAGE="http://www.gentoo.org"
-RDEPEND="sys-devel/python gnome-libs/libxslt net-www/apache"
+RDEPEND="sys-devel/python dev-libs/libxslt net-www/apache"
 
 src_unpack() {
 	if [ "$MAINTAINER" != "yes" ]
diff --git a/app-doc/gentoo-web/gentoo-web-2.2.ebuild b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
index 4edebf665288..bef9441af063 100644
--- a/app-doc/gentoo-web/gentoo-web-2.2.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
 # of the GNU General Public License, v2 or later 
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.2.ebuild,v 1.19 2001/09/26 18:59:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.2.ebuild,v 1.20 2001/10/06 17:22:51 azarah Exp $
  
 S=${WORKDIR}/${P}
 DESCRIPTION="www.gentoo.org website"
 SRC_URI="http://www.red-bean.com/cvs2cl/cvs2cl.pl"
 HOMEPAGE="http://www.gentoo.org"
-RDEPEND="sys-devel/python gnome-libs/libxslt"
+RDEPEND="sys-devel/python dev-libs/libxslt"
 
 src_unpack() {
 	if [ "$MAINTAINER" != "yes" ]
diff --git a/app-doc/gmanedit/files/digest-gmanedit-0.3.3 b/app-doc/gmanedit/files/digest-gmanedit-0.3.3-r1
index d409bb2f33f2..d409bb2f33f2 100644
--- a/app-doc/gmanedit/files/digest-gmanedit-0.3.3
+++ b/app-doc/gmanedit/files/digest-gmanedit-0.3.3-r1
diff --git a/app-doc/gmanedit/gmanedit-0.3.3.ebuild b/app-doc/gmanedit/gmanedit-0.3.3-r1.ebuild
index 025459c9f135..5224553f0b14 100644
--- a/app-doc/gmanedit/gmanedit-0.3.3.ebuild
+++ b/app-doc/gmanedit/gmanedit-0.3.3-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gmanedit/gmanedit-0.3.3.ebuild,v 1.1 2001/06/25 06:19:43 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gmanedit/gmanedit-0.3.3-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 #P=
 A=${P}.tar.bz2
@@ -11,7 +11,7 @@ SRC_URI="http://gmanedit.sourceforge.net/files/${A}"
 HOMEPAGE="http://gmanedit.sourceforge.net/"
 
 DEPEND="virtual/x11
-		  >=gnome-base/gnome-core-1.4.0"
+		  >=gnome-base/gnome-core-1.4.0.4-r1"
 
 src_unpack() {
 	unpack ${A}
@@ -23,11 +23,11 @@ src_compile() {
 
 local myconf
 if [ -z "`use gnome`" ]; then
-	myconf="--with-gnome-includes=/opt/gnome/include\
-				--with-gnome-libs=/opt/gnome/lib"
+	myconf="--with-gnome-includes=/usr/include\
+				--with-gnome-libs=/usr/lib"
 fi
 # NOTE WILL NOT COMPILE WITHOUT --disable-nls
-	 try ./configure --prefix=/opt/gnome --host=${CHOST}\
+	 try ./configure --prefix=/usr --host=${CHOST}\
 		--disable-nls  ${myconf}
     try make
 
diff --git a/app-text/docbook2X/docbook2X-0.6.1.ebuild b/app-text/docbook2X/docbook2X-0.6.1.ebuild
index c066c315fe7a..3d9004927c2b 100644
--- a/app-text/docbook2X/docbook2X-0.6.1.ebuild
+++ b/app-text/docbook2X/docbook2X-0.6.1.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.6.1.ebuild,v 1.4 2001/05/30 18:24:34 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.6.1.ebuild,v 1.5 2001/10/06 17:22:51 azarah Exp $
 
 #P=
 A=${P}.tar.gz
@@ -13,7 +13,7 @@ HOMEPAGE="http://docbook2x.sourceforge.net"
 RDEPEND=">=dev-perl/XML-Writer-0.4
         >=dev-perl/XML-XSLT-0.31
 	>=dev-perl/SGMLSpm-1.03"
-	#>=gnome-libs/libxslt-0.5.0"
+	#>=dev-libs/libxslt-0.5.0"
 
 src_install () {
 
diff --git a/app-text/gmanedit/files/digest-gmanedit-0.3.3 b/app-text/gmanedit/files/digest-gmanedit-0.3.3-r1
index d409bb2f33f2..d409bb2f33f2 100644
--- a/app-text/gmanedit/files/digest-gmanedit-0.3.3
+++ b/app-text/gmanedit/files/digest-gmanedit-0.3.3-r1
diff --git a/app-text/gmanedit/gmanedit-0.3.3.ebuild b/app-text/gmanedit/gmanedit-0.3.3-r1.ebuild
index ae335cabd71c..152be34ab38f 100644
--- a/app-text/gmanedit/gmanedit-0.3.3.ebuild
+++ b/app-text/gmanedit/gmanedit-0.3.3-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/gmanedit/gmanedit-0.3.3.ebuild,v 1.1 2001/06/25 06:19:43 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gmanedit/gmanedit-0.3.3-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 #P=
 A=${P}.tar.bz2
@@ -11,7 +11,7 @@ SRC_URI="http://gmanedit.sourceforge.net/files/${A}"
 HOMEPAGE="http://gmanedit.sourceforge.net/"
 
 DEPEND="virtual/x11
-		  >=gnome-base/gnome-core-1.4.0"
+		  >=gnome-base/gnome-core-1.4.0.4-r1"
 
 src_unpack() {
 	unpack ${A}
@@ -23,11 +23,11 @@ src_compile() {
 
 local myconf
 if [ -z "`use gnome`" ]; then
-	myconf="--with-gnome-includes=/opt/gnome/include\
-				--with-gnome-libs=/opt/gnome/lib"
+	myconf="--with-gnome-includes=/usr/include\
+				--with-gnome-libs=/usr/lib"
 fi
 # NOTE WILL NOT COMPILE WITHOUT --disable-nls
-	 try ./configure --prefix=/opt/gnome --host=${CHOST}\
+	 try ./configure --prefix=/usr --host=${CHOST}\
 		--disable-nls  ${myconf}
     try make
 
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.03.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.03-r1.ebuild
index 4460029615a8..d1580ae3b216 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.03.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.03-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/dev-perl/XML-LibXSLT/XML-LibXSLT-1.03.ebuild,v 1.2 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXSLT/XML-LibXSLT-1.03-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="http://cpan.valueclick.com/modules/by-category/11_String_Lang_Text_Proc
 HOMEPAGE="http://cpan.valueclick.com/modules/by-category/11_String_Lang_Text_Proc/XML/${P}.readme"
 
 DEPEND=">=sys-devel/perl-5
-	>=gnome-libs/libxslt-0.9
+	>=dev-libs/libxslt-1.0.1
 	>=dev-perl/XML-LibXML-0.9"
 
 src_compile() {
diff --git a/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-1.03 b/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-1.03-r1
index 2094c7ed1093..2094c7ed1093 100644
--- a/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-1.03
+++ b/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-1.03-r1
diff --git a/dev-util/pharmacy/files/digest-pharmacy-0.3 b/dev-util/pharmacy/files/digest-pharmacy-0.3-r1
index 49cc8bb38944..49cc8bb38944 100644
--- a/dev-util/pharmacy/files/digest-pharmacy-0.3
+++ b/dev-util/pharmacy/files/digest-pharmacy-0.3-r1
diff --git a/dev-util/pharmacy/pharmacy-0.3.ebuild b/dev-util/pharmacy/pharmacy-0.3-1.ebuild
index e4e9ae608bb3..7c3bcbf720b3 100644
--- a/dev-util/pharmacy/pharmacy-0.3.ebuild
+++ b/dev-util/pharmacy/pharmacy-0.3-1.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 Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3.ebuild,v 1.1 2001/06/15 19:18:12 blutgens Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 #P=
 A=${P}.tar.gz
@@ -10,11 +10,11 @@ DESCRIPTION="Gnome Front-End to CVS"
 SRC_URI="http://prdownloads.sourceforge.net/pharmacy/${A}"
 HOMEPAGE="http://pharmacy.sourceforge.net"
 
-DEPEND=">=gnome-base/gnome-libs-1.2.13"
+DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
 
 src_compile() {
 
-    try ./configure --prefix=/opt/gnome --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
@@ -23,8 +23,8 @@ src_install () {
 
     try make DESTDIR=${D} install
     dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-    insinto /opt/gnome/doc/pharmacy/index
+    insinto /usr/share/doc/pharmacy/index
     doins docs/index/* 
-	 insinto /opt/gnome/doc/pharmacy  docs/index.sgml
+    insinto /usr/share/doc/pharmacy  docs/index.sgml
 }
 
diff --git a/incoming/powertweak-0.99.1.ebuild b/incoming/powertweak-0.99.1.ebuild
index 722e45e4dda7..2004bf4293db 100644
--- a/incoming/powertweak-0.99.1.ebuild
+++ b/incoming/powertweak-0.99.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/app-admin/powerteak/powertweak-0.99.1.ebuild
-# $Header: /var/cvsroot/gentoo-x86/incoming/powertweak-0.99.1.ebuild,v 1.5 2001/10/06 14:36:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/incoming/powertweak-0.99.1.ebuild,v 1.6 2001/10/06 17:22:51 azarah Exp $
 
 
 A=${P}.tar.bz2
@@ -16,7 +16,7 @@ DEPEND=">=x11-libs/gtk+-1.2.10-r4
 
 src_compile() {
 # fix minor bug in textmode/Makefile.am with no -L<path> to libxml.so
-  sed -e "s:GPML = -lgpm:GPML = -L/opt/gnome/lib -lgpm:" < src/textmode/Makefile.am > src/textmode/Makefile.am_fix
+  sed -e "s:GPML = -lgpm:GPML = -L/usr/lib -lgpm:" < src/textmode/Makefile.am > src/textmode/Makefile.am_fix
   mv src/textmode/Makefile.am_fix src/textmode/Makefile.am
   ./autogen.sh
 
diff --git a/media-gfx/eog/eog-0.6.ebuild b/media-gfx/eog/eog-0.6-r1.ebuild
index b65aa0adbe70..cdbcdf4f1c93 100644
--- a/media-gfx/eog/eog-0.6.ebuild
+++ b/media-gfx/eog/eog-0.6-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/media-gfx/eog/eog-0.6.ebuild,v 1.4 2001/06/11 08:11:28 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,26 +10,26 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-        >=gnome-base/bonobo-1.0.4
-        >=gnome-base/gconf-1.0.1
+        >=gnome-base/bonobo-1.0.9-r1
+        >=gnome-base/gconf-1.0.4-r2
         >=dev-util/xml-i18n-tools-0.8.4"
 
 RDEPEND="virtual/glibc
-        >=gnome-base/gconf-1.0.1
-        >=gnome-base/bonobo-1.0.4"
+        >=gnome-base/gconf-1.0.4-r2
+        >=gnome-base/bonobo-1.0.9-r1"
 
 src_compile() {
   local myconf
   if [ -z "`use nls`" ] ; then
     myconf="--disable-nls"
   fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome $myconf
+  try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc/gnome $myconf
   try pmake
 }
 
 src_install() {
-  try make prefix=${D}/opt/gnome sysconfdir=/etc/opt/gnome \
-	GCONG_CONFIG_SOURCE=xml=${D}/etc/opt/gnome/gconf/gconf.xml.defaults install
+  try make prefix=${D}/usr sysconfdir=/etc/gnome \
+	GCONG_CONFIG_SOURCE=xml=${D}/etc/gnome/gconf/gconf.xml.defaults install
   dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README TODO MAINTAINERS
 
 }
diff --git a/media-gfx/eog/files/digest-eog-0.6 b/media-gfx/eog/files/digest-eog-0.6-r1
index 15bafa69aa84..15bafa69aa84 100644
--- a/media-gfx/eog/files/digest-eog-0.6
+++ b/media-gfx/eog/files/digest-eog-0.6-r1
diff --git a/media-gfx/gphoto/files/digest-gphoto-0.4.3 b/media-gfx/gphoto/files/digest-gphoto-0.4.3-r1
index 34ce510a76d5..34ce510a76d5 100644
--- a/media-gfx/gphoto/files/digest-gphoto-0.4.3
+++ b/media-gfx/gphoto/files/digest-gphoto-0.4.3-r1
diff --git a/media-gfx/gphoto/gphoto-0.4.3.ebuild b/media-gfx/gphoto/gphoto-0.4.3-r1.ebuild
index 40181fa8e8fa..f99d5d7e10a4 100644
--- a/media-gfx/gphoto/gphoto-0.4.3.ebuild
+++ b/media-gfx/gphoto/gphoto-0.4.3-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 AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-0.4.3.ebuild,v 1.11 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-0.4.3-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 
 A=${P}.tar.gz
@@ -11,7 +11,7 @@ SRC_URI="http://www.gphoto.net/dist/${A}"
 HOMEPAGE="http://www.gphoto.org"
 
 DEPEND="virtual/glibc
-	>=media-libs/imlib-1.8
+	>=media-libs/imlib-1.9.10-r1
 	>=media-gfx/imagemagick-4.1"
 	
 
@@ -19,13 +19,13 @@ src_compile() {
 
    # -pipe does no work
    CFLAGS="${CFLAGS/-pipe}"
-   try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome
+   try ./configure --prefix=/usr --sysconfdir=/etc/gnome
    try make clean
    try pmake
 }
 
 src_install() {
-    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome  install
+    try make prefix=${D}/usr sysconfdir=${D}/etc/gnome  install
     dodoc AUTHORS CONTACTS COPYING ChangeLog FAQ MANUAL NEWS* PROGRAMMERS \
 	 README THANKS THEMES TODO
 }
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.23 b/media-gfx/sodipodi/files/digest-sodipodi-0.23
deleted file mode 100644
index 94a1916488b3..000000000000
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 947dcc478cb871b36da72b5938c466df sodipodi-0.23.tar.gz
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.24 b/media-gfx/sodipodi/files/digest-sodipodi-0.24
deleted file mode 100644
index 202bc6c8378d..000000000000
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87cbb29d00a5ad2c9ec84a45bf5c0431 sodipodi-0.24.tar.gz
diff --git a/media-gfx/sodipodi/files/digest-sodipodi-0.24.1 b/media-gfx/sodipodi/files/digest-sodipodi-0.24.1-r1
index c6da38096595..c6da38096595 100644
--- a/media-gfx/sodipodi/files/digest-sodipodi-0.24.1
+++ b/media-gfx/sodipodi/files/digest-sodipodi-0.24.1-r1
diff --git a/media-gfx/sodipodi/sodipodi-0.23.ebuild b/media-gfx/sodipodi/sodipodi-0.23.ebuild
deleted file mode 100644
index bff13ec7f989..000000000000
--- a/media-gfx/sodipodi/sodipodi-0.23.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.23.ebuild,v 1.5 2001/09/25 05:28:03 hallski Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-
-DEPEND=">=gnome-base/gnome-print-0.21 
-	nls? ( sys-devel/gettext )
-	>=gnome-base/gal-0.4
-	bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use bonobo`" ]
-    then
-      myconf="--with-bonobo"
-    else
-      myconf="--without-bonobo"
-    fi
-    if [ -z "`use nls`" ] ; then
-      myconf="$myconf --disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome \
-	--enable-gnome --enable-gnome-print ${myconf}
-    try pmake
-
-}
-
-src_install () {
-
-    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/media-gfx/sodipodi/sodipodi-0.24.ebuild b/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild
index fdcd82935649..37d661c025b5 100644
--- a/media-gfx/sodipodi/sodipodi-0.24.ebuild
+++ b/media-gfx/sodipodi/sodipodi-0.24.1-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 Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.24.ebuild,v 1.1 2001/09/28 13:26:12 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.24.1-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,9 +9,9 @@ DESCRIPTION="Vector illustrating application for GNOME"
 SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
 HOMEPAGE="http://sodipodi.sourceforge.net/"
 
-RDEPEND=">=gnome-base/gnome-print-0.21 
-         >=gnome-base/gal-0.4
-	 bonobo? ( >=gnome-base/bonobo-0.37 )"
+RDEPEND=">=gnome-base/gnome-print-0.30 
+         >=gnome-extra/gal-0.13-r1
+	 bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
@@ -29,8 +29,8 @@ src_compile() {
 		myconf="$myconf --disable-nls"
 	fi
 
-	./configure --host=${CHOST} --prefix=/opt/gnome 		\
-	            --sysconfdir=/etc/opt/gnome 			\
+	./configure --host=${CHOST} --prefix=/usr 		\
+	            --sysconfdir=/etc/gnome 			\
 		    --enable-gnome --enable-gnome-print ${myconf} || die
 
 	emake || die
diff --git a/media-gfx/sodipodi/sodipodi-0.24.1.ebuild b/media-gfx/sodipodi/sodipodi-0.24.1.ebuild
deleted file mode 100644
index 95b1e258dd87..000000000000
--- a/media-gfx/sodipodi/sodipodi-0.24.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sodipodi/sodipodi-0.24.1.ebuild,v 1.1 2001/10/05 08:15:53 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Vector illustrating application for GNOME"
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
-HOMEPAGE="http://sodipodi.sourceforge.net/"
-
-RDEPEND=">=gnome-base/gnome-print-0.21 
-         >=gnome-base/gal-0.4
-	 bonobo? ( >=gnome-base/bonobo-0.37 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	if [ "`use bonobo`" ] ; then
-		myconf="--with-bonobo"
-	else
-		myconf="--without-bonobo"
-	fi
-
-	if [ -z "`use nls`" ] ; then
-		myconf="$myconf --disable-nls"
-	fi
-
-	./configure --host=${CHOST} --prefix=/opt/gnome 		\
-	            --sysconfdir=/etc/opt/gnome 			\
-		    --enable-gnome --enable-gnome-print ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
diff --git a/media-sound/xmms-aalsa/files/digest-xmms-aalsa-0.5.4-r2 b/media-sound/xmms-aalsa/files/digest-xmms-aalsa-0.5.4-r3
index d95ddd7f1ef4..d95ddd7f1ef4 100644
--- a/media-sound/xmms-aalsa/files/digest-xmms-aalsa-0.5.4-r2
+++ b/media-sound/xmms-aalsa/files/digest-xmms-aalsa-0.5.4-r3
diff --git a/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild b/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
index 532f73f6ac26..5128773bd358 100644
--- a/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild
+++ b/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
@@ -1,19 +1,13 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 S=${WORKDIR}/xmms-aalsa_0.5.4
 DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
 SRC_URI="http://www1.tcnet.ne.jp/fmurata/linux/aalsa/xmms-aalsa_0.5.4.tar.gz"
-DEPEND="virtual/glibc >=media-sound/xmms-1.2.3 >=media-libs/alsa-lib-0.5.9"
 
-if [ -n "`use gnome`" ]
-then
-  myprefix=/opt/gnome
-else
-  myprefix=/usr/X11R6
-fi
+DEPEND="virtual/glibc >=media-sound/xmms-1.2.5-r1 >=media-libs/alsa-lib-0.5.9"
 
 src_unpack() {
 	unpack ${A}
@@ -23,12 +17,12 @@ src_unpack() {
 }
 
 src_compile() {
-	try ./configure --prefix=`${myprefix}` --host=${CHOST}
+	try ./configure --prefix=/usr --host=${CHOST}
 	try make
 }
 
 src_install() {
-	try make DESTDIR=${D} libdir=${myprefix}/lib/xmms/Output install
+	try make DESTDIR=${D} libdir=/usr/lib/xmms/Output install
 	dodoc AUTHORS COPYING NEWS README
 }
 
diff --git a/media-sound/xmms-arts/files/digest-xmms-arts-0.4 b/media-sound/xmms-arts/files/digest-xmms-arts-0.4-r1
index 4e01baeb6500..4e01baeb6500 100644
--- a/media-sound/xmms-arts/files/digest-xmms-arts-0.4
+++ b/media-sound/xmms-arts/files/digest-xmms-arts-0.4-r1
diff --git a/media-sound/xmms-arts/xmms-arts-0.4.ebuild b/media-sound/xmms-arts/xmms-arts-0.4-r1.ebuild
index e9cdffca39f4..a53e548c6a64 100644
--- a/media-sound/xmms-arts/xmms-arts-0.4.ebuild
+++ b/media-sound/xmms-arts/xmms-arts-0.4-r1.ebuild
@@ -1,15 +1,22 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-arts/xmms-arts-0.4.ebuild,v 1.6 2001/08/11 03:50:11 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-arts/xmms-arts-0.4-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
 SRC_URI="http://home.earthlink.net/~bheath/xmms-arts/xmmsarts-0.4.tar.gz"
 HOMEPAGE="http://home.earthlink.net/~bheath/xmms-arts/"
 
-DEPEND="virtual/glibc >=media-sound/xmms-1.2.3 >=kde-base/kdelibs-2.1.1 sys-devel/autoconf"
-RDEPEND="virtual/glibc >=media-sound/xmms-1.2.3 >=kde-base/kdelibs-2.1.1"
+DEPEND="virtual/glibc
+	>=media-sound/xmms-1.2.5-r1
+	>=kde-base/kdelibs-2.1.1
+	sys-devel/autoconf"
+	
+RDEPEND="virtual/glibc
+	 >=media-sound/xmms-1.2.5-r1
+	 >=kde-base/kdelibs-2.1.1"
+	 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -19,14 +26,7 @@ src_unpack() {
 }
 
 src_compile() {     
-	local myconf
-	if [ "`use gnome`" ]
-	then
-	  myconf="--prefix=/opt/gnome"
-	else
-	  myconf="--prefix=/usr/X11R6"
-	fi
-	try CFLAGS="$CFLAGS -I/usr/X11R6/include -I/opt/gnome/include" ./configure $myconf --host=${CHOST}
+	try CFLAGS="$CFLAGS -I/usr/X11R6/include -I/usr/include" ./configure --prefix=/usr --host=${CHOST}
 	try make
 }
 
diff --git a/media-sound/xmms-nas/files/digest-xmms-nas-0.2 b/media-sound/xmms-nas/files/digest-xmms-nas-0.2-r1
index 2962b1d34725..2962b1d34725 100644
--- a/media-sound/xmms-nas/files/digest-xmms-nas-0.2
+++ b/media-sound/xmms-nas/files/digest-xmms-nas-0.2-r1
diff --git a/media-sound/xmms-nas/xmms-nas-0.2.ebuild b/media-sound/xmms-nas/xmms-nas-0.2-r1.ebuild
index 9790b332ed65..f5869cf56956 100644
--- a/media-sound/xmms-nas/xmms-nas-0.2.ebuild
+++ b/media-sound/xmms-nas/xmms-nas-0.2-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/media-sound/xmms-nas/xmms-nas-0.2.ebuild,v 1.3 2001/06/06 16:55:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-nas/xmms-nas-0.2-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A xmms plugin for NAS"
@@ -12,20 +12,13 @@ DEPEND="media-sound/xmms media-sound/nas"
 
 src_compile() {
 
-    local myprefix
-    if [ "`use gnome`" ]
-    then
-      myprefix="/opt/gnome"
-    else
-      myprefix="/usr/X11R6"
-    fi
-    try ./configure --prefix=${myprefix} --host=${CHOST}
-    if [ "`use gnome`" ]
-    then
-      cp Makefile Makefile.orig
-      sed -e "s:^CFLAGS = :CFLAGS = -I/opt/gnome/include :" \
-	Makefile.orig > Makefile
-    fi
+    try ./configure --prefix=/usr --host=${CHOST}
+#    if [ "`use gnome`" ]
+#    then
+#      cp Makefile Makefile.orig
+#      sed -e "s:^CFLAGS = :CFLAGS = -I/opt/gnome/include :" \
+#	Makefile.orig > Makefile
+#    fi
     touch config.h
     try make
 
diff --git a/media-sound/xmms-shn/files/digest-xmms-shn-2.2.3 b/media-sound/xmms-shn/files/digest-xmms-shn-2.2.3-r1
index bac461e382e0..bac461e382e0 100644
--- a/media-sound/xmms-shn/files/digest-xmms-shn-2.2.3
+++ b/media-sound/xmms-shn/files/digest-xmms-shn-2.2.3-r1
diff --git a/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild b/media-sound/xmms-shn/xmms-shn-2.2.3-r1.ebuild
index 3ea0f3030b2e..b62cd26d123d 100644
--- a/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild
+++ b/media-sound/xmms-shn/xmms-shn-2.2.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild,v 1.4 2001/06/06 16:55:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-shn/xmms-shn-2.2.3-r1.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="This input plugin allows xmms to play .shn compressed (lossless) files"
@@ -10,18 +10,12 @@ HOMEPAGE="http://shnutils.freeshell.org/xmms-shn"
 DEPEND="virtual/glibc >=media-sound/xmms-1.2.3"
 
 src_compile() {
-	if [ "`use gnome`" ]
-	then
-	  echo /opt/gnome > ${S}/mydest
-	else
-	  echo /usr/X11R6 > ${S}/mydest
-	fi
-	try ./configure --prefix=`cat ${S}/mydest` --host=${CHOST}
+	try ./configure --prefix=/usr --host=${CHOST}
 	try make
 }
 
 src_install() {
-	try make DESTDIR=${D} libdir=`cat ${S}/mydest`/lib/xmms/Input install
+	try make DESTDIR=${D} libdir=/usr/lib/xmms/Input install
 	dodoc AUTHORS COPYING NEWS README
 }
 
diff --git a/media-video/avi-xmms/avi-xmms-1.2.2-r1.ebuild b/media-video/avi-xmms/avi-xmms-1.2.2-r2.ebuild
index 906958dcddef..9035e41af95d 100644
--- a/media-video/avi-xmms/avi-xmms-1.2.2-r1.ebuild
+++ b/media-video/avi-xmms/avi-xmms-1.2.2-r2.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2001 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/media-video/avi-xmms/avi-xmms-1.2.2-r1.ebuild,v 1.1 2001/05/11 01:07:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avi-xmms/avi-xmms-1.2.2-r2.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A xmms plugin for AVI/DivX movies"
 SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/avi-xmms-1.2.2.tar.gz"
 HOMEPAGE="http://www.xmms.org/plugins_input.html"
 
-DEPEND=">=media-video/avifile-0.53.5 media-sound/xmms"
+DEPEND=">=media-video/avifile-0.53.5 media-sound/xmms-1.2.5-r1"
 
 src_compile() {
-    local myprefix
-    if [ "`use gnome`" ]
-    then
-      myprefix="/opt/gnome"
-	else
-      myprefix="/usr/X11R6"
-    fi
-    echo $myprefix > ${T}/myprefix
-	try ./configure --prefix=$myprefix --host=${CHOST} --disable-sdltest
+
+    try ./configure --prefix=/usr --host=${CHOST} --disable-sdltest
     try make
 }
 
 src_install () {
-    try make libdir=`cat ${T}/myprefix`/lib/xmms/Input DESTDIR=${D} install
+    try make libdir=/usr/lib/xmms/Input DESTDIR=${D} install
     dodoc AUTHORS COPYING ChangeLog README TODO
 }
 
diff --git a/media-video/avi-xmms/files/digest-avi-xmms-1.2.2-r1 b/media-video/avi-xmms/files/digest-avi-xmms-1.2.2-r2
index 7df12b143c99..7df12b143c99 100644
--- a/media-video/avi-xmms/files/digest-avi-xmms-1.2.2-r1
+++ b/media-video/avi-xmms/files/digest-avi-xmms-1.2.2-r2
diff --git a/media-video/avifile/files/digest-avifile-0.53.5-r1 b/media-video/avifile/files/digest-avifile-0.53.5-r1
new file mode 100644
index 000000000000..2dc688978b84
--- /dev/null
+++ b/media-video/avifile/files/digest-avifile-0.53.5-r1
@@ -0,0 +1,2 @@
+MD5 3d51465e8a720af0bb1afa68aa4e7373 avifile-0.53.5.tar.gz
+MD5 ffc44e68b581994613931a9e47500446 binaries-010122.zip
diff --git a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.2 b/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.2
deleted file mode 100644
index 3f23aca648d0..000000000000
--- a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9793f9ec974c384fbd65624fa9aaba81 smpeg-xmms-0.3.2.tar.gz
diff --git a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4 b/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r1
index 961eaa99970d..961eaa99970d 100644
--- a/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4
+++ b/media-video/smpeg-xmms/files/digest-smpeg-xmms-0.3.4-r1
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.2.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.2.ebuild
deleted file mode 100644
index e83c39bcf114..000000000000
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +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/media-video/smpeg-xmms/smpeg-xmms-0.3.2.ebuild,v 1.3 2001/05/10 12:08:20 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A MPEG Plugin for XMMS"
-SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${A}"
-HOMEPAGE="http://www.xmms.org/plugins_input.html"
-
-DEPEND=">=media-sound/xmms-1.2.3
-	>=media-libs/smpeg-0.4.2"
-
-src_compile() {
-
-    cd ${S}
-    local myopts
-    if [ -n "`use gnome`" ]
-    then
-	myopts="--prefix=/opt/gnome"
-    else
-	myopts="--prefix=/usr/X11R6"
-    fi
-    try ./configure ${myopts} --disable-sdltest --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING README TODO ChangeLog
-}
-
-
-
diff --git a/media-video/smpeg-xmms/smpeg-xmms-0.3.4.ebuild b/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild
index 2cb8a695a3d5..2682f8a27f93 100644
--- a/media-video/smpeg-xmms/smpeg-xmms-0.3.4.ebuild
+++ b/media-video/smpeg-xmms/smpeg-xmms-0.3.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/media-video/smpeg-xmms/smpeg-xmms-0.3.4.ebuild,v 1.1 2001/09/11 19:33:31 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smpeg-xmms/smpeg-xmms-0.3.4-r1.ebuild,v 1.1 2001/10/06 17:22:52 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,23 +10,18 @@ SRC_URI="ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/${A}"
 HOMEPAGE="http://www.xmms.org/plugins_input.html"
 
 DEPEND=">=media-sound/xmms-1.2.3
-	>=media-libs/smpeg-0.4.2
+	>=media-libs/smpeg-0.4.4-r1
 	sdl? ( >=media-libs/libsdl-1.2.2 )"
 
 src_compile() {
 
     cd ${S}
     local myopts
-    if [ -n "`use gnome`" ]
-    then
-	myopts="--prefix=/opt/gnome"
-    else
-	myopts="--prefix=/usr/X11R6"
-    fi
-	if [ -z "`use sdl`" ];then
+    if [ -z "`use sdl`" ];then
 	myopts="${myopts} --disable-sdltest"
-	fi
-    try ./configure ${myopts} --host=${CHOST}
+    fi
+	
+    try ./configure ${myopts} --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/net-im/gnomeicu/files/digest-gnomeicu-0.96.1-r1 b/net-im/gnomeicu/files/digest-gnomeicu-0.96.1-r2
index 0a0eb44cbaba..0a0eb44cbaba 100644
--- a/net-im/gnomeicu/files/digest-gnomeicu-0.96.1-r1
+++ b/net-im/gnomeicu/files/digest-gnomeicu-0.96.1-r2
diff --git a/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild b/net-im/gnomeicu/gnomeicu-0.96.1-r2.ebuild
index a68e4441c8c2..3ad30adadc7e 100644
--- a/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.96.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # A Gnome ICQ Clone
 # Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.96.1-r2.ebuild,v 1.1 2001/10/06 17:22:52 azarah Exp $
 
 
 A=${P}.tar.bz2
@@ -11,9 +11,9 @@ SRC_URI="http://download.sourceforge.net/gnomeicu/${A}"
 HOMEPAGE="http://gnomeicu.sourceforge.net/"
 
 DEPEND="virtual/glibc sys-devel/gettext
-	>=gnome-base/gnome-core-1.2.4
+	>=gnome-base/gnome-core-1.4.0.4-r1
         >=sys-libs/gdbm-1.8.0"
-RDEPEND=">=gnome-base/gnome-core-1.2.4
+RDEPEND=">=gnome-base/gnome-core-1.4.0.4-r1
         >=sys-libs/gdbm-1.8.0"
 
 src_unpack() {
@@ -28,7 +28,7 @@ src_compile() {
 
   local myconf
   local myprefix
-  myprefix="/opt/gnome"
+  myprefix="/usr"
   if [ -z "`use esd`" ]
   then
   	myconf="--disable-esd-test"
diff --git a/net-misc/fwbuilder/files/digest-fwbuilder-0.9.1 b/net-misc/fwbuilder/files/digest-fwbuilder-0.9.1
deleted file mode 100644
index 375582e8f82b..000000000000
--- a/net-misc/fwbuilder/files/digest-fwbuilder-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abfca108c0765bbd76a1dbad5bf45739 fwbuilder-0.9.1.tar.gz
diff --git a/net-misc/fwbuilder/files/digest-fwbuilder-0.9.5 b/net-misc/fwbuilder/files/digest-fwbuilder-0.9.5-r1
index ea0ffc302490..ea0ffc302490 100644
--- a/net-misc/fwbuilder/files/digest-fwbuilder-0.9.5
+++ b/net-misc/fwbuilder/files/digest-fwbuilder-0.9.5-r1
diff --git a/net-misc/fwbuilder/fwbuilder-0.9.1.ebuild b/net-misc/fwbuilder/fwbuilder-0.9.1.ebuild
deleted file mode 100644
index bc733bdf24be..000000000000
--- a/net-misc/fwbuilder/fwbuilder-0.9.1.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fwbuilder/fwbuilder-0.9.1.ebuild,v 1.1 2001/07/10 08:16:04 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION=""
-SRC_URI="http://prdownloads.sourceforge.net/fwbuilder/$A"
-HOMEPAGE="http://fwbuilder.sourceforge.net"
-
-DEPEND=">=x11-libs/gtkmm-1.0.0
-	gnome-libs/libxslt
-	gnome-base/gnome-core"
-
-src_compile() {
-
-    try ./configure --prefix=/opt/gnome --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-
-}
-
diff --git a/net-misc/fwbuilder/fwbuilder-0.9.5.ebuild b/net-misc/fwbuilder/fwbuilder-0.9.5-r1.ebuild
index 7a33a6067758..a00b28d9a7e9 100644
--- a/net-misc/fwbuilder/fwbuilder-0.9.5.ebuild
+++ b/net-misc/fwbuilder/fwbuilder-0.9.5-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fwbuilder/fwbuilder-0.9.5.ebuild,v 1.1 2001/08/06 21:24:01 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fwbuilder/fwbuilder-0.9.5-r1.ebuild,v 1.1 2001/10/06 17:22:52 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,13 @@ DESCRIPTION="A firewall GUI"
 SRC_URI="http://prdownloads.sourceforge.net/fwbuilder/$A"
 HOMEPAGE="http://fwbuilder.sourceforge.net"
 
-DEPEND=">=x11-libs/gtkmm-1.2.3
-	>=gnome-libs/libxslt-1.0.1
-	gnome-base/gnome-core"
+DEPEND=">=x11-libs/gtkmm-1.2.5-r1
+	>=dev-libs/libxslt-1.0.1
+	>=gnome-base/gnome-core-1.4.0.4-r1"
 
 src_compile() {
     
-    try ./configure --prefix=/opt/gnome --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     cp config.h config.h.orig
     sed -e "s:#define HAVE_XMLSAVEFORMATFILE 1://:" config.h.orig > config.h
     if [ "`use static`" ] ; then
diff --git a/net-www/opera/files/digest-opera-5.0-r1 b/net-www/opera/files/digest-opera-5.0-r1
new file mode 100644
index 000000000000..2e9afe5710d9
--- /dev/null
+++ b/net-www/opera/files/digest-opera-5.0-r1
@@ -0,0 +1 @@
+MD5 be5bf254a6b6ac36b32446cbc50de304 opera-5.0-dynamic.i386.tar.gz
diff --git a/sys-apps/baselayout/baselayout-1.6.1.ebuild b/sys-apps/baselayout/baselayout-1.6.1.ebuild
index aadff732131b..7447ede8e303 100644
--- a/sys-apps/baselayout/baselayout-1.6.1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.1.ebuild,v 1.2 2001/08/31 03:55:14 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.1.ebuild,v 1.3 2001/10/06 17:22:52 azarah Exp $
 
 SV=1.1.4
 S=${WORKDIR}/rc-scripts-${SV}
@@ -95,11 +95,12 @@ src_install()
 		#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control
 		#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services
 		#end supervise stuff
-		
+	
+# Drobbins or Hallski please check this!	
 		keepdir /opt
-		keepdir /opt/gnome/man
-		keepdir /opt/gnome/share
-		dosym ../man /opt/gnome/share/man
+#		keepdir /opt/gnome/man
+#		keepdir /opt/gnome/share
+#		dosym ../man /opt/gnome/share/man
 #		It makes sense to move these to the PAM package.
 #		dodir /etc/pam.d
 #		cd ${FILESDIR}/pam.d
diff --git a/sys-apps/baselayout/baselayout-1.6.2.ebuild b/sys-apps/baselayout/baselayout-1.6.2.ebuild
index f3db76e65991..2f10a08f1208 100644
--- a/sys-apps/baselayout/baselayout-1.6.2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.2.ebuild,v 1.7 2001/09/14 00:40:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.2.ebuild,v 1.8 2001/10/06 17:22:52 azarah Exp $
 
 SV=1.1.5
 S=${WORKDIR}/rc-scripts-${SV}
@@ -105,11 +105,12 @@ src_install()
 		#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control
 		#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services
 		#end supervise stuff
-		
+	
+# Drobbins or Hallski please check this!
 		keepdir /opt
-		keepdir /opt/gnome/man
-		keepdir /opt/gnome/share
-		dosym ../man /opt/gnome/share/man
+#		keepdir /opt/gnome/man
+#		keepdir /opt/gnome/share
+#		dosym ../man /opt/gnome/share/man
 	fi
 
 #the .keep file messes up Portage when looking in /var/db/pkg
diff --git a/sys-apps/baselayout/baselayout-1.6.3.ebuild b/sys-apps/baselayout/baselayout-1.6.3.ebuild
index 4c331342bd42..f9229a26770d 100644
--- a/sys-apps/baselayout/baselayout-1.6.3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.3.ebuild,v 1.2 2001/09/15 20:12:32 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.3.ebuild,v 1.3 2001/10/06 17:22:52 azarah Exp $
 
 SV=1.1.6
 S=${WORKDIR}/rc-scripts-${SV}
@@ -105,11 +105,12 @@ src_install()
 		#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control
 		#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services
 		#end supervise stuff
-		
+	
+# Drobbins or Hallski please check this!
 		keepdir /opt
-		keepdir /opt/gnome/man
-		keepdir /opt/gnome/share
-		dosym ../man /opt/gnome/share/man
+#		keepdir /opt/gnome/man
+#		keepdir /opt/gnome/share
+#		dosym ../man /opt/gnome/share/man
 	fi
 
 #the .keep file messes up Portage when looking in /var/db/pkg