gnome to /usr changes, NOTE: i might have missed a few DEPENDs, and when hallski come back, he can still move stuff around

17 files changed, 41 insertions, 115 deletions

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