Fix bug 248497 and clean old

(Portage version: 2.1.7.17/cvs/Linux x86_64)

6 files changed, 43 insertions, 84 deletions

diff --git a/app-editors/gphpedit/ChangeLog b/app-editors/gphpedit/ChangeLog
index 9f2557211857..ea9e04e43c78 100644
--- a/app-editors/gphpedit/ChangeLog
+++ b/app-editors/gphpedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gphpedit
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/ChangeLog,v 1.18 2008/03/27 21:29:12 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/ChangeLog,v 1.19 2010/03/12 13:07:33 pacho Exp $
+
+*gphpedit-0.9.91-r1 (12 Mar 2010)
+
+  12 Mar 2010; Pacho Ramos <pacho@gentoo.org> -gphpedit-0.4.3.ebuild,
+  -gphpedit-0.9.6.ebuild, -gphpedit-0.9.50.ebuild, -gphpedit-0.9.80.ebuild,
+  +gphpedit-0.9.91-r1.ebuild, +files/gphpedit-0.9.91-find_replace.patch:
+  Fix bug 248497 and clean old
 
   27 Mar 2008; Markus Meier <maekke@gentoo.org> gphpedit-0.9.91.ebuild:
   amd64/x86 stable, bug #214904; quotes
diff --git a/app-editors/gphpedit/files/gphpedit-0.9.91-find_replace.patch b/app-editors/gphpedit/files/gphpedit-0.9.91-find_replace.patch
new file mode 100644
index 000000000000..e12864367e6a
--- /dev/null
+++ b/app-editors/gphpedit/files/gphpedit-0.9.91-find_replace.patch
@@ -0,0 +1,17 @@
+# Should be fixed in upstream trunk, then next upstream
+# release shouldn't need this. For more info:
+# https://bugs.launchpad.net/ubuntu/+source/gphpedit/+bug/46487 
+--- gphpedit-0.9.91.orig/src/find_replace.c
++++ gphpedit-0.9.91/src/find_replace.c
+@@ -478,7 +478,10 @@
+ 
+ 	replace_all_dialog = gnome_ok_dialog(message->str);
+ 	gnome_dialog_run_and_close(GNOME_DIALOG(replace_all_dialog));
+-	g_free(replace_all_dialog);
++	// Comment the line bellow as suggested at 
++	// http://www.gphpedit.org/bugs/bug_view.php?id=132 to avoid from
++	// a crash after searching & replacing.
++	//g_free(replace_all_dialog);
+ 	
+ 	gtk_scintilla_goto_pos(GTK_SCINTILLA(main_window.current_editor->scintilla), start_pos);
+ }
diff --git a/app-editors/gphpedit/gphpedit-0.4.3.ebuild b/app-editors/gphpedit/gphpedit-0.4.3.ebuild
deleted file mode 100644
index 7042e89a138e..000000000000
--- a/app-editors/gphpedit/gphpedit-0.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.4.3.ebuild,v 1.8 2005/01/01 13:26:44 eradicator Exp $
-
-inherit gnome2
-
-DESCRIPTION="A Gnome2 PHP/HTML source editor"
-HOMEPAGE="http://www.gphpedit.org/"
-SRC_URI="http://gphpedit.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=x11-libs/gtk+-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=x11-libs/gtkscintilla2-0.0.8"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-SCROLLKEEPER_UPDATE="0"
diff --git a/app-editors/gphpedit/gphpedit-0.9.50.ebuild b/app-editors/gphpedit/gphpedit-0.9.50.ebuild
deleted file mode 100644
index 0cd9ac4dcfb4..000000000000
--- a/app-editors/gphpedit/gphpedit-0.9.50.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.50.ebuild,v 1.3 2006/01/12 22:37:46 compnerd Exp $
-
-inherit gnome2
-
-DESCRIPTION="A Gnome2 PHP/HTML source editor"
-HOMEPAGE="http://www.gphpedit.org/"
-SRC_URI="http://gphpedit.org/download/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libgnomeui-2.0
-	=gnome-extra/gtkhtml-2*"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="AUTHORS ChangeLog README"
-SCROLLKEEPER_UPDATE="0"
diff --git a/app-editors/gphpedit/gphpedit-0.9.6.ebuild b/app-editors/gphpedit/gphpedit-0.9.6.ebuild
deleted file mode 100644
index 2f12c0f179aa..000000000000
--- a/app-editors/gphpedit/gphpedit-0.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.6.ebuild,v 1.7 2006/01/12 22:37:46 compnerd Exp $
-
-inherit gnome2
-
-DESCRIPTION="A Gnome2 PHP/HTML source editor"
-HOMEPAGE="http://www.gphpedit.org/"
-SRC_URI="http://gphpedit.org/download/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=x11-libs/gtk+-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=x11-libs/gtkscintilla2-0.1.0
-	=gnome-extra/gtkhtml-2*"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-SCROLLKEEPER_UPDATE="0"
diff --git a/app-editors/gphpedit/gphpedit-0.9.80.ebuild b/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild
index 19fe6c65bfa6..d90100979762 100644
--- a/app-editors/gphpedit/gphpedit-0.9.80.ebuild
+++ b/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.80.ebuild,v 1.2 2006/02/24 00:33:33 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.91-r1.ebuild,v 1.1 2010/03/12 13:07:33 pacho Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A Gnome2 PHP/HTML source editor"
 HOMEPAGE="http://www.gphpedit.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.gphpedit.org/download/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.0
@@ -20,7 +20,18 @@ RDEPEND=">=x11-libs/gtk+-2.0
 	=gnome-extra/gtkhtml-2*"
 
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.12.0"
+		sys-devel/gettext
+		>=dev-util/pkgconfig-0.12.0"
 
 DOCS="AUTHORS ChangeLog README TODO"
+
+# Parallel build unhappy (bug #145351)
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}"/${PN}-0.9.91-empty-apply-prefs.patch
+	# Fix crash when finding and replacing, see bug #248497
+	epatch "${FILESDIR}"/${PN}-0.9.91-find_replace.patch
+}