Fixed deps to emerge the correct gnome1 version of them. (libglade, gconf and gnome-vfs). Fixes bug #4961

6 files changed, 30 insertions, 75 deletions

diff --git a/app-office/mrproject/ChangeLog b/app-office/mrproject/ChangeLog
index f8860c694238..b332454f205d 100644
--- a/app-office/mrproject/ChangeLog
+++ b/app-office/mrproject/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for app-office/mrproject
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/ChangeLog,v 1.4 2002/07/06 20:31:32 spider Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/ChangeLog,v 1.5 2002/07/15 13:15:45 stroke Exp $
 
+*mrproject-0.5.1-r1 (15 Jul 2002)
+  15 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> mrproject-0.5.1-r1.ebuild:
+  Fixed deps to emerge the correct gnome1 version of them. (libglade, gconf and 
+  gnome-vfs). Fixes bug #4961
+ 
 *mrproject-0.5.93 (06 Jul 2002)
   06 Jul 2002; Spider <spider@gentoo.org> mrproject-0.5.93.ebuild ;
   slightly old version, now uses debug.eclass
-
   
 *mrproject-0.5.92 (23 May 2002)
   23 May 2002; Spider <spider@gentoo.org> mrproject-0.5.92 :
diff --git a/app-office/mrproject/files/digest-mrproject-0.5.0 b/app-office/mrproject/files/digest-mrproject-0.5.0
deleted file mode 100644
index 5d6b1ce24d9a..000000000000
--- a/app-office/mrproject/files/digest-mrproject-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad41d2ec888b8a35ce217e4c4b38b67e mrproject-0.5.0.tar.gz 851735
diff --git a/app-office/mrproject/files/digest-mrproject-0.5.1 b/app-office/mrproject/files/digest-mrproject-0.5.1-r1
index f96375ae2ba8..f96375ae2ba8 100644
--- a/app-office/mrproject/files/digest-mrproject-0.5.1
+++ b/app-office/mrproject/files/digest-mrproject-0.5.1-r1
diff --git a/app-office/mrproject/mrproject-0.5.0.ebuild b/app-office/mrproject/mrproject-0.5.0.ebuild
deleted file mode 100644
index 6f925e41e90c..000000000000
--- a/app-office/mrproject/mrproject-0.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.0.ebuild,v 1.3 2002/07/11 06:30:17 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Project management application for GNOME"
-SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${P}.tar.gz"
-HOMEPAGE="http://mrproject.codefactory.se/"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
-	 >=gnome-base/ORBit-0.5.10-r1
-         >=gnome-extra/gal-0.18.1
-	 >=gnome-base/bonobo-1.0.17
-	 >=gnome-base/libglade-0.17-r1
-	 >=dev-libs/libxml-1.8.15
-	 >=gnome-base/gconf-1.0.7
-	 >=gnome-base/gnome-vfs-1.0.3
-	 >=gnome-base/oaf-0.6.6-r1
-	 >=gnome-base/gnome-print-0.34"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=dev-util/intltool-0.11"
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr 					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    --disable-more-warnings 				\
-		    --without-python $myconf || die
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
-
-
-
diff --git a/app-office/mrproject/mrproject-0.5.1.ebuild b/app-office/mrproject/mrproject-0.5.1-r1.ebuild
index e3f0f9398852..d8394acd7efe 100644
--- a/app-office/mrproject/mrproject-0.5.1.ebuild
+++ b/app-office/mrproject/mrproject-0.5.1-r1.ebuild
@@ -1,21 +1,25 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.1.ebuild,v 1.3 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.1-r1.ebuild,v 1.1 2002/07/15 13:15:45 stroke Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Project management application for GNOME"
 SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${P}.tar.gz"
 HOMEPAGE="http://mrproject.codefactory.se/"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/ORBit-0.5.10-r1
-	>=gnome-extra/gal-0.18.1
-	>=gnome-base/bonobo-1.0.17
-	>=gnome-base/libglade-0.17-r1
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+RDEPEND=">=media-libs/gdk-pixbuf-0.18
+	>=gnome-base/ORBit-0.5.16
+	>=gnome-extra/gal-0.19.2
+	>=gnome-base/bonobo-1.0.19
+	( >=gnome-base/libglade-0.17-r1
+	 <gnome-base/libglade-2.0.0 )
 	>=dev-libs/libxml-1.8.15
-	>=gnome-base/gconf-1.0.7
-	>=gnome-base/gnome-vfs-1.0.3
-	>=gnome-base/oaf-0.6.6-r1
+	=gnome-base/gconf-1.0*
+	=gnome-base/gnome-vfs-1.0*
+	>=gnome-base/oaf-0.6.8
 	>=gnome-base/gnome-print-0.34"
 
 DEPEND="${RDEPEND}
@@ -29,20 +33,20 @@ src_compile() {
 		myconf="--disable-nls"
 	fi
 
-	./configure --host=${CHOST} 					\
-		--prefix=/usr 					\
-		--sysconfdir=/etc					\
-		--localstatedir=/var/lib				\
-		--disable-more-warnings 				\
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--disable-more-warnings \
 		--without-python $myconf || die
 
 	emake || die
 }
 
 src_install () {
-	make prefix=${D}/usr						\
-		sysconfdir=${D}/etc					\
-		localstatedir=${D}/var/lib					\
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/lib \
 		install || die
 
 	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
diff --git a/app-office/mrproject/mrproject-0.5.93.ebuild b/app-office/mrproject/mrproject-0.5.93.ebuild
index 85aa92cb4283..c6ef96731e25 100644
--- a/app-office/mrproject/mrproject-0.5.93.ebuild
+++ b/app-office/mrproject/mrproject-0.5.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.93.ebuild,v 1.1 2002/07/06 20:31:32 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.93.ebuild,v 1.2 2002/07/15 13:15:45 stroke Exp $
 
 inherit debug
 
@@ -11,6 +11,7 @@ SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/unstable/${P}.tar.gz"
 HOMEPAGE="http://mrproject.codefactory.se/"
 SLOT="2"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=x11-libs/gtk+-2.0.5
 	>=x11-libs/pango-1.0.3