updated to new location and 1.4.1

9 files changed, 80 insertions, 139 deletions

diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0
deleted file mode 100644
index 06452b898cc4..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4931aae4c0d92cdf8c2da57fe56c1e99 gnome-utils-1.4.0.tar.gz
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0.1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0.1
deleted file mode 100644
index c5d145122529..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 600335222229e086fe0cbfd6e3e2e10e gnome-utils-1.4.0.1.tar.gz
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0.2 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0.2
deleted file mode 100644
index 1b552e939e0f..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9163752e2d3d47765915f1466871c0c gnome-utils-1.4.0.2.tar.gz
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1
new file mode 100644
index 000000000000..ce5f5627b47f
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1
@@ -0,0 +1 @@
+MD5 e58cd560f58867f9ca7ce0d063848755 gnome-utils-1.4.1.tar.gz
diff --git a/gnome-extra/gnome-utils/files/gnome-utils-1.4.1-compile.patch b/gnome-extra/gnome-utils/files/gnome-utils-1.4.1-compile.patch
new file mode 100644
index 000000000000..dc4e6384204d
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/gnome-utils-1.4.1-compile.patch
@@ -0,0 +1,25 @@
+diff -u -r gnome-utils-1.4.1.orig/configure.in gnome-utils-1.4.1/configure.in
+--- gnome-utils-1.4.1.orig/configure.in	Fri Oct  5 06:02:18 2001
++++ gnome-utils-1.4.1/configure.in	Sun Oct  7 00:37:33 2001
+@@ -226,7 +226,7 @@
+ GLADE_LIBS=`gnome-config --libs libglade`
+ GLADE_CFLAGS=`gnome-config --cflags libglade`
+ AC_SUBST(GLADE_LIBS)
+-AC_SUBST(GLADE_FGLAGS)
++AC_SUBST(GLADE_CFLAGS)
+ 
+ dnl *******************************
+ dnl gtkhtml
+diff -u -r gnome-utils-1.4.1.orig/gfloppy/src/Makefile.am gnome-utils-1.4.1/gfloppy/src/Makefile.am
+--- gnome-utils-1.4.1.orig/gfloppy/src/Makefile.am	Fri Aug 24 07:19:35 2001
++++ gnome-utils-1.4.1/gfloppy/src/Makefile.am	Sun Oct  7 00:30:28 2001
+@@ -6,7 +6,8 @@
+ 	-I$(top_srcdir)/intl 			\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+         -DGLADEDIR=\""$(gladedir)"\"           	\
+-	$(GNOME_INCLUDEDIR)
++	$(GNOME_INCLUDEDIR)			\
++	$(GLADE_CFLAGS)
+ 
+ bin_PROGRAMS = gfloppy
+ 
diff --git a/gnome-extra/gnome-utils/gnome-utils-1.4.0.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.0.1.ebuild
deleted file mode 100644
index df92b0a4e62d..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-1.4.0.1.ebuild
+++ /dev/null
@@ -1,46 +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/gnome-extra/gnome-utils/gnome-utils-1.4.0.1.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-utils"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A}
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-core-1.2.4
-	>=gnome-base/libgtop-1.0.0
-        >=sys-apps/e2fsprogs-1.19-r2
-        >=dev-util/guile-1.4
-        >=sys-apps/shadow-20000000
-	>=gnome-base/libglade-0.11
-        nls? ( sys-devel/gettext )"
-RDEPEND=">=gnome-base/gnome-core-1.2.4
-	>=gnome-base/libgtop-1.0.10
-	>=gnome-base/libglade-0.11
-        >=sys-apps/e2fsprogs-1.19-r2"
-
-src_compile() {                           
-  local myconf
-  if [ -z "`use nls`" ] ; then
-     myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-ncurses --with-messages=/var/log/syslog.d/current \
-	--with-sysconfdir=/etc/opt/gnome $myconf
-  try pmake
-}
-
-src_install() {
-
-  #dodir /opt/gnome/bin
-  try make prefix=${D}/opt/gnome install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-}
-
-
-
-
diff --git a/gnome-extra/gnome-utils/gnome-utils-1.4.0.2.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.0.2.ebuild
deleted file mode 100644
index dd89000a9e9f..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-1.4.0.2.ebuild
+++ /dev/null
@@ -1,46 +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/gnome-extra/gnome-utils/gnome-utils-1.4.0.2.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-utils"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A}
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-core-1.2.4
-	>=gnome-base/libgtop-1.0.0
-        >=sys-apps/e2fsprogs-1.19-r2
-        >=dev-util/guile-1.4
-        >=sys-apps/shadow-20000000
-	>=gnome-base/libglade-0.11
-        nls? ( sys-devel/gettext )"
-RDEPEND=">=gnome-base/gnome-core-1.2.4
-	>=gnome-base/libgtop-1.0.10
-	>=gnome-base/libglade-0.11
-        >=sys-apps/e2fsprogs-1.19-r2"
-
-src_compile() {                           
-  local myconf
-  if [ -z "`use nls`" ] ; then
-     myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-ncurses --with-messages=/var/log/syslog.d/current \
-	--with-sysconfdir=/etc/opt/gnome $myconf
-  try pmake
-}
-
-src_install() {
-
-  #dodir /opt/gnome/bin
-  try make prefix=${D}/opt/gnome install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-}
-
-
-
-
diff --git a/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild
deleted file mode 100644
index e8ad8bcf6f24..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild
+++ /dev/null
@@ -1,44 +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/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-utils"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A}
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-core-1.2.4
-	>=gnome-base/libgtop-1.0.10
-        >=sys-apps/e2fsprogs-1.19-r2
-        >=dev-util/guile-1.4
-        >=sys-apps/shadow-20000000
-        nls? ( sys-devel/gettext )"
-RDEPEND=">=gnome-base/gnome-core-1.2.4
-	>=gnome-base/libgtop-1.0.10
-        >=sys-apps/e2fsprogs-1.19-r2"
-
-src_compile() {                           
-  local myconf
-  if [ -z "`use nls`" ] ; then
-     myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-ncurses --with-messages=/var/log/syslog.d/current \
-	--with-sysconfdir=/etc/opt/gnome $myconf
-  try pmake
-}
-
-src_install() {
-
-  #dodir /opt/gnome/bin
-  try make prefix=${D}/opt/gnome install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-}
-
-
-
-
diff --git a/gnome-extra/gnome-utils/gnome-utils-1.4.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.1.ebuild
new file mode 100644
index 000000000000..360b8c8d6d6b
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-1.4.1.ebuild
@@ -0,0 +1,54 @@
+# 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-extra/gnome-utils/gnome-utils-1.4.1.ebuild,v 1.1 2001/10/06 22:50:42 hallski Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="gnome-utils"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A}
+HOMEPAGE="http://www.gnome.org/"
+
+RDEPEND=">=gnome-base/gnome-core-1.0.4-r1
+	 >=gnome-base/libgtop-1.0.12-r1
+	 >=gnome-base/libglade-0.17-r1
+         >=sys-apps/e2fsprogs-1.19-r2"
+
+DEPEND="${RDEPEND}
+        >=dev-util/guile-1.4
+        >=sys-apps/shadow-20000000
+        nls? ( sys-devel/gettext )"
+
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-compile.patch
+	automake
+	autoconf
+}
+
+src_compile() {                           
+	local myconf
+
+	if [ -z "`use nls`" ] ; then
+		myconf="--disable-nls"
+	fi
+
+	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
+
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr					\
+		    --with-ncurses 					\
+		    --with-messages=/var/log/syslog.d/current 		\
+		    --with-sysconfdir=/etc $myconf || die
+	
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING* ChangeLog NEWS README*
+}