cleaned up, use DESTDIR=, fixed some RDEPEND/DEPEND issues

5 files changed, 46 insertions, 83 deletions

diff --git a/gnome-base/eel/eel-1.0.1.ebuild b/gnome-base/eel/eel-1.0.1.ebuild
index e5c1f728f4ce..a50b66a03f1e 100644
--- a/gnome-base/eel/eel-1.0.1.ebuild
+++ b/gnome-base/eel/eel-1.0.1.ebuild
@@ -9,29 +9,26 @@ DESCRIPTION="eel"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-vfs-1.0.1
-        >=media-libs/gdk-pixbuf-0.11.0
-        >=media-libs/freetype-2.0.1
-	>=gnome-libs/librsvg-1.0
+RDEPEND=">=media-libs/freetype-2.0.1
+         >=gnome-base/gnome-vfs-1.0.1
+         >=media-libs/gdk-pixbuf-0.11.0
+	 >=gnome-libs/librsvg-1.0"
+
+DEPEND="${RDEPEND}
         >=dev-util/xml-i18n-tools-0.8.4"
 
-RDEPEND=">=media-libs/freetype-2.0.1
-        >=gnome-base/gnome-vfs-1.0.1
-        >=media-libs/gdk-pixbuf-0.11.0
-	>=gnome-libs/librsvg-1.0"
 
 src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome
-  try make  # Doesn't work with -j 4 (hallski)
-}
+	./configure --host=${CHOST}					\
+		    --prefix=/opt/gnome					\
+		    --sysconfdir=/etc/opt/gnome				\
+		    --mandir=/opt/gnome/man || die
 
-src_install() {                               
-  try make DESTDIR=${D} install
-#  try make prefix=${D}/opt/gnome install
-
-  dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
+	make || die # Doesn't work with -j 4 (hallski)
 }
 
+src_install() {                           
+	make DESTDIR=${D} install || die
 
-
+	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
+}
diff --git a/gnome-base/eel/eel-1.0.ebuild b/gnome-base/eel/eel-1.0.ebuild
deleted file mode 100644
index e5c1f728f4ce..000000000000
--- a/gnome-base/eel/eel-1.0.ebuild
+++ /dev/null
@@ -1,37 +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="eel"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-vfs-1.0.1
-        >=media-libs/gdk-pixbuf-0.11.0
-        >=media-libs/freetype-2.0.1
-	>=gnome-libs/librsvg-1.0
-        >=dev-util/xml-i18n-tools-0.8.4"
-
-RDEPEND=">=media-libs/freetype-2.0.1
-        >=gnome-base/gnome-vfs-1.0.1
-        >=media-libs/gdk-pixbuf-0.11.0
-	>=gnome-libs/librsvg-1.0"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome
-  try make  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-  try make DESTDIR=${D} install
-#  try make prefix=${D}/opt/gnome install
-
-  dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
-
-
-
diff --git a/gnome-base/eel/files/digest-eel-1.0 b/gnome-base/eel/files/digest-eel-1.0
deleted file mode 100644
index c75c5abc26f2..000000000000
--- a/gnome-base/eel/files/digest-eel-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18bad2f74b36b1a9ba4229ded7c11530 eel-1.0.tar.gz
diff --git a/gnome-base/librsvg/librsvg-1.0.0.ebuild b/gnome-base/librsvg/librsvg-1.0.0.ebuild
index 8e9d37439669..8993c53001cc 100644
--- a/gnome-base/librsvg/librsvg-1.0.0.ebuild
+++ b/gnome-base/librsvg/librsvg-1.0.0.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/gnome-base/librsvg/librsvg-1.0.0.ebuild,v 1.5 2001/07/29 10:42:12 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-1.0.0.ebuild,v 1.6 2001/08/31 23:32:48 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,24 +9,26 @@ DESCRIPTION="librsvg"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-libs-1.2.10
+RDEPEND="virtual/glibc
+	>=gnome-base/gnome-libs-1.2.10
 	>=media-libs/freetype-2.0.1
 	>=gnome-base/libxml-1.8
 	>=media-libs/gdk-pixbuf-0.10
         >=dev-libs/popt-1.5"
 
-RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}"
 
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome
-  try pmake
-}
+src_compile() {                       
+	./configure --host=${CHOST}					\
+	 	    --prefix=/opt/gnome 				\
+		    --sysconfdir=/etc/opt/gnome				\
+		    --mandir=/opt/gnome/man
 
-src_install() {
-  try make DESTDIR=${D} install
-  dodoc AUTHORS COPYING ChangeLog NEWS README*
+	emake || die
 }
 
+src_install() {
+	make DESTDIR=${D} install || die
 
-
+	dodoc AUTHORS COPYING ChangeLog NEWS README*
+}
diff --git a/gnome-base/librsvg/librsvg-1.0.1.ebuild b/gnome-base/librsvg/librsvg-1.0.1.ebuild
index c2a205eba797..3081551590f0 100644
--- a/gnome-base/librsvg/librsvg-1.0.1.ebuild
+++ b/gnome-base/librsvg/librsvg-1.0.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-1.0.1.ebuild,v 1.2 2001/07/29 10:42:12 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-1.0.1.ebuild,v 1.3 2001/08/31 23:32:48 hallski Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,24 +9,26 @@ DESCRIPTION="librsvg"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-libs-1.2.10
-	>=media-libs/freetype-2.0.1
-	>=gnome-base/libxml-1.8
-	>=media-libs/gdk-pixbuf-0.10
-        >=dev-libs/popt-1.5"
+RDEPEND="virtual/glibc
+	 >=gnome-base/gnome-libs-1.2.10
+	 >=media-libs/freetype-2.0.1
+	 >=gnome-base/libxml-1.8
+	 >=media-libs/gdk-pixbuf-0.10
+         >=dev-libs/popt-1.5"
 
-RDEPEND="virtual/glibc"
+RDEPEND="${RDEPEND}"
 
 src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome
-  try pmake
-}
+	./configure --host=${CHOST} 					\
+		    --prefix=/opt/gnome 				\
+		    --sysconfdir=/etc/opt/gnome				\
+		    --mandir=/opt/gnome/man
 
-src_install() {
-  try make DESTDIR=${D} install
-  dodoc AUTHORS COPYING ChangeLog NEWS README*
+	emake || die
 }
 
+src_install() {
+	make DESTDIR=${D} install || die
 
-
+	dodoc AUTHORS COPYING ChangeLog NEWS README*
+}