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

10 files changed, 18 insertions, 110 deletions

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
-}