glimmer

3 files changed, 46 insertions, 38 deletions

diff --git a/dev-util/glimmer/files/digest-glimmer-1.1.9.1 b/dev-util/glimmer/files/digest-glimmer-1.1.9.1-r1
index 6c51fe1ebe36..6c51fe1ebe36 100644
--- a/dev-util/glimmer/files/digest-glimmer-1.1.9.1
+++ b/dev-util/glimmer/files/digest-glimmer-1.1.9.1-r1
diff --git a/dev-util/glimmer/glimmer-1.1.9.1-r1.ebuild b/dev-util/glimmer/glimmer-1.1.9.1-r1.ebuild
new file mode 100644
index 000000000000..951f7edc5366
--- /dev/null
+++ b/dev-util/glimmer/glimmer-1.1.9.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Tod M. Neidt <tneidt@fidnet.com>
+# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
+
+P_VERSION="1.1.9-1"
+S=${WORKDIR}/glimmer-${P_VERSION}
+DESCRIPTION="All-purpose gnome code editor."
+SRC_URI="http://prdownloads.sourceforge.net/glimmer/${PN}-${P_VERSION}.tar.gz"
+HOMEPAGE="http://glimmer.sourceforge.net"
+
+DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
+	>=gnome-base/ORBit-0.5.10-r1
+	>=gnome-base/gnome-vfs-1.0.2-r1
+	>=gnome-base/gnome-print-0.20"
+
+# These are requirements when build with --enable-python.
+# We should update this to build with --enable-python if USE=python,
+# some work might have to be done to make play with Python 2.X
+
+#	>=dev-lang/python-1.5.2
+#	>=dev-python/gnome-python-1.4.1"
+
+src_compile() {
+
+#--disable-python disable python scripting, needed to build with python-2.x
+# see homepage
+
+	# regex is included in glibc now, so disable buildin regex since it cause compile errors
+	mv src/gtkextext/gtkextext.h src/gtkextext/gtkextext.h.orig
+	sed -e 's/\#include "..\/regex\/regex.h"/\#include <regex.h>/' src/gtkextext/gtkextext.h.orig >src/gtkextext/gtkextext.h	
+	mv src/Makefile.am src/Makefile.am.orig
+	grep -v 'regex/libregex.a \\' src/Makefile.am.orig >src/Makefile.am.grep
+	sed -e 's/SUBDIRS \= regex gtkextext/SUBDIRS \= gtkextext/' src/Makefile.am.grep >src/Makefile.am
+	automake
+
+	./configure --disable-python --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
+	
+	make || die
+}
+
+src_install () {
+	make prefix=${D}/usr sysconfdir=${D}/etc/gnome install || die
+	dodoc AUTHORS ABOUT-NLS ChangeLog NEWS PROPS TODO README INSTALL COPYING
+}
+
diff --git a/dev-util/glimmer/glimmer-1.1.9.1.ebuild b/dev-util/glimmer/glimmer-1.1.9.1.ebuild
deleted file mode 100644
index 2c23b36f50cf..000000000000
--- a/dev-util/glimmer/glimmer-1.1.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Tod M. Neidt <tneidt@fidnet.com>
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
-
-A=glimmer-1.1.9-1.tar.gz
-S=${WORKDIR}/glimmer-1.1.9-1
-DESCRIPTION="All-purpose gnome code editor."
-SRC_URI="http://prdownloads.sourceforge.net/glimmer/${A}"
-HOMEPAGE="http://glimmer.sourceforge.net"
-
-DEPEND=">=gnome-base/gnome-libs-1.2.13
-	>=gnome-base/ORBit-0.5.8
-	>=gnome-base/gnome-vfs-1.0
-	>=gnome-base/gnome-print-0.25"
-
-# These are requirements when build with --enable-python.
-# We should update this to build with --enable-python if USE=python,
-# some work might have to be done to make play with Python 2.X
-
-#	>=dev-lang/python-1.5.2
-#	>=dev-python/gnome-python-1.4.1"
-
-src_compile() {
-
-#--disable-python disable python scripting, needed to build with python-2.x
-# see homepage
-
-	./configure --disable-python --infodir=/opt/gnome/info --mandir=/opt/gnome/man --prefix=/opt/gnome --host=${CHOST} || die
-	
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ABOUT-NLS ChangeLog NEWS PROPS TODO README INSTALL COPYING
-}
-