new version; removed older

6 files changed, 83 insertions, 74 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 024ef315f4d2..d512391cdae3 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.2 2002/02/02 18:12:04 azarah Exp $
+
+*gnome-utils-1.4.1.2 (2 Feb 2002)
+
+  2 Feb 2002; M.Schlemmer <azarah@gentoo.org> gnome-utils-1.4.1.2.ebuild :
+
+  Updated date in copyright;  changed Author to Maintainer;  removed the
+  DEPEND on portage since it is not needed anymore.  Bumped the shadow
+  DEPEND down to 4, as it compiles fine; removed the guile patch, as it
+  seems fixed.
 
 *gnome-utils-1.4.1.1-r4 (1 Feb 2002)
 
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1.1-r1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1.1-r1
deleted file mode 100644
index 1493f73a131f..000000000000
--- a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e8a004bf2e6aec7175e9cab8263d609 gnome-utils-1.4.1.1.tar.gz 4404788
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1.2 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1.2
new file mode 100644
index 000000000000..cdde2e5158ae
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.4.1.2
@@ -0,0 +1 @@
+MD5 02bd79a6c5d7f89c2485f3a4258d22fd gnome-utils-1.4.1.2.tar.gz 4632458
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
deleted file mode 100644
index dc4e6384204d..000000000000
--- a/gnome-extra/gnome-utils/files/gnome-utils-1.4.1-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.1.1-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.1.1-r1.ebuild
deleted file mode 100644
index 263b0ee5fc71..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-1.4.1.1-r1.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-1.4.1.1-r1.ebuild,v 1.1 2001/11/05 00:15:53 agriffis Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-utils"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=gnome-base/gnome-core-1.4.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
-	use nls || myconf="--disable-nls"
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
-	./configure --host=${CHOST}  \
-				--prefix=/usr \
-				--mandir=/usr/share/man \
-				--with-ncurses  \
-				--with-messages=/var/log/syslog.d/current  \
-				--localstatedir=/var/lib \
-				--sysconfdir=/etc $myconf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING* ChangeLog NEWS README*
-}
diff --git a/gnome-extra/gnome-utils/gnome-utils-1.4.1.2.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.1.2.ebuild
new file mode 100644
index 000000000000..7b21a58bcc17
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-1.4.1.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-1.4.1.2.ebuild,v 1.1 2002/02/02 18:12:04 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="gnome-utils"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.gnome.org/"
+
+RDEPEND=">=gnome-base/gnome-core-1.4.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.5
+	>=sys-apps/shadow-4
+	nls? ( sys-devel/gettext )"
+
+
+src_unpack() {
+
+	unpack ${A}
+	
+	# Fix compile error with >=dev-util/guile-1.5
+	# NOTE: someone with guile coding experience should verify that
+	#       scm_num2dbl is used correctly!
+#	cd ${S}
+#	cp gtt/ghtml.c gtt/ghtml.c.orig
+#	sed -e 's:SCM_NUM2DBL (node):scm_num2dbl (node, "ghtml"):' \
+#		gtt/ghtml.c.orig >gtt/ghtml.c
+}
+
+src_compile() {
+
+	local myconf
+	use nls || myconf="--disable-nls"
+	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
+	
+	./configure --host=${CHOST}  \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-ncurses  \
+		--with-messages=/var/log/syslog.d/current  \
+		--localstatedir=/var/lib \
+		--sysconfdir=/etc \
+		$myconf || die
+				
+	emake || die
+}
+
+src_install() {
+	cd omf-install
+	cp Makefile Makefile.old
+	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
+	rm Makefile.old
+	cd ${S}
+
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING* ChangeLog NEWS README*
+}
+
+pkg_postinst() {
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update >/dev/null 2>&1
+}
+
+pkg_postrm() {
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update >/dev/null 2>&1
+}