8 files changed, 59 insertions, 66 deletions
diff --git a/dev-util/regexxer/ChangeLog b/dev-util/regexxer/ChangeLog
index 6395b9b58e0d..bf763d30f26b 100644
--- a/dev-util/regexxer/ChangeLog
+++ b/dev-util/regexxer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/regexxer
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/ChangeLog,v 1.9 2004/11/30 05:09:19 joem Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/ChangeLog,v 1.10 2005/06/14 18:35:29 smithj Exp $
+
+*regexxer-0.8 (14 Jun 2005)
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> -regexxer-0.4.ebuild,
+  -regexxer-0.5.ebuild, +regexxer-0.8.ebuild:
+  version bump for #57041 and cleanup
 
   29 Nov 2004; Joe McCann <joem@gentoo.org> regexxer-0.4.ebuild,
   regexxer-0.5.ebuild, regexxer-0.6.ebuild:
diff --git a/dev-util/regexxer/Manifest b/dev-util/regexxer/Manifest
index c35ca226c5e6..17d0f09fff39 100644
--- a/dev-util/regexxer/Manifest
+++ b/dev-util/regexxer/Manifest
@@ -1,8 +1,6 @@
-MD5 e03854426c39c4f2521824db6fe33950 ChangeLog 1355
+MD5 12202e38435874aa13381df4d9bdab8b ChangeLog 1541
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
 MD5 ab41b98a81b360cfa373a620eff6dd49 regexxer-0.6.ebuild 850
-MD5 ca538753224908357e33b3aad5c24630 regexxer-0.5.ebuild 760
-MD5 4ad26f7ae35f8a7a954983e5d8ce9816 regexxer-0.4.ebuild 617
-MD5 3ac12c5f2b8e2e58b961252d400f2c9b files/digest-regexxer-0.4 64
-MD5 76d865f39afa1066c7a923808c9e058c files/digest-regexxer-0.5 64
+MD5 cf9463ded48b3ae3f735d5ed61b5fdf3 regexxer-0.8.ebuild 1313
 MD5 b4cafef08f3ba8c3ec97e302a3902662 files/digest-regexxer-0.6 64
+MD5 44e2df1763cce65f4a99cfd093f201ef files/digest-regexxer-0.8 64
diff --git a/dev-util/regexxer/files/digest-regexxer-0.4 b/dev-util/regexxer/files/digest-regexxer-0.4
deleted file mode 100644
index e5ad8a20d46c..000000000000
--- a/dev-util/regexxer/files/digest-regexxer-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e761fe8dd24eaa9f1d203672a92bbfd5 regexxer-0.4.tar.gz 154047
diff --git a/dev-util/regexxer/files/digest-regexxer-0.5 b/dev-util/regexxer/files/digest-regexxer-0.5
deleted file mode 100644
index 9cba18087714..000000000000
--- a/dev-util/regexxer/files/digest-regexxer-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bdbf7356b0645651a03f907675e80a6 regexxer-0.5.tar.gz 158239
diff --git a/dev-util/regexxer/files/digest-regexxer-0.8 b/dev-util/regexxer/files/digest-regexxer-0.8
new file mode 100644
index 000000000000..7c0926c49920
--- /dev/null
+++ b/dev-util/regexxer/files/digest-regexxer-0.8
@@ -0,0 +1 @@
+MD5 acaa19b119cc7159c42b7f93e02f9fbd regexxer-0.8.tar.gz 270342
diff --git a/dev-util/regexxer/regexxer-0.4.ebuild b/dev-util/regexxer/regexxer-0.4.ebuild
deleted file mode 100644
index 030262a4ad2e..000000000000
--- a/dev-util/regexxer/regexxer-0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.4.ebuild,v 1.7 2004/11/30 05:09:19 joem Exp $
-
-DESCRIPTION="An interactive tool for performing search and replace operations"
-HOMEPAGE="http://regexxer.sourceforge.net/"
-LICENSE="GPL-2"
-
-SRC_URI="mirror://sourceforge/regexxer/${P}.tar.gz"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="=dev-cpp/gtkmm-2.2.1*
-		>=dev-libs/libpcre-3.9-r2"
-
-
-src_compile() {
-	econf || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	einstall
-}
diff --git a/dev-util/regexxer/regexxer-0.5.ebuild b/dev-util/regexxer/regexxer-0.5.ebuild
deleted file mode 100644
index b15411f88c80..000000000000
--- a/dev-util/regexxer/regexxer-0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.5.ebuild,v 1.5 2004/11/30 05:09:19 joem Exp $
-
-DESCRIPTION="An interactive tool for performing search and replace operations"
-HOMEPAGE="http://regexxer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/regexxer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=dev-libs/glib-2
-	=dev-libs/libsigc++-1.2*
-	=dev-cpp/gtkmm-2.2.1*
-	>=dev-libs/libpcre-3.9-r2"
-
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
-
-src_compile() {
-	econf || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc README
-}
diff --git a/dev-util/regexxer/regexxer-0.8.ebuild b/dev-util/regexxer/regexxer-0.8.ebuild
new file mode 100644
index 000000000000..d8e82b42c1d2
--- /dev/null
+++ b/dev-util/regexxer/regexxer-0.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.8.ebuild,v 1.1 2005/06/14 18:35:29 smithj Exp $
+
+DESCRIPTION="An interactive tool for performing search and replace operations"
+HOMEPAGE="http://regexxer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+#inherit gnome2
+
+LICENSE="GPL-2"
+IUSE="gnome"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND=">=dev-cpp/libglademm-2.4.0
+	>=dev-libs/libsigc++-2.0
+	>=dev-cpp/gtkmm-2.4.0
+	>=dev-libs/libpcre-4.0
+	>=dev-cpp/gconfmm-2.6.1"
+
+
+DEPEND="dev-util/pkgconfig
+	${RDEPEND}"
+
+src_compile() {
+	echo $GCONF_CONFIG_SOURCE
+	econf || die "econf failed."
+	emake || die "emake failed."
+}
+
+src_install() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	einstall || die "install failed"
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+}
+
+pkg_postinst() {
+	# More or less copied from gnome2_gconf_install, which didn't work here
+	export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
+	einfo "Installing GNOME 2 GConf schemas"
+	${ROOT}/usr/bin/gconftool-2 --makefile-install-rule ${S}/regexxer.schemas 1>/dev/null
+	if use gnome ; then
+		insinto /usr/share/gnome/apps/Development
+		doins ${S}/regexxer.desktop
+	fi
+}