Fix bug 248497 and clean old

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

7 files changed, 50 insertions, 97 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/Manifest b/app-editors/gphpedit/Manifest
index 8b7462987a48..991894cd1cbb 100644
--- a/app-editors/gphpedit/Manifest
+++ b/app-editors/gphpedit/Manifest
@@ -2,22 +2,16 @@
 Hash: SHA1
 
 AUX gphpedit-0.9.91-empty-apply-prefs.patch 834 RMD160 e38171c8d421f9d7079685d3d914c8636ca536fc SHA1 8c13734e60b599930e9439988c797b452581ab96 SHA256 ebe2293aadd0fd7fcd71dc6b3ebd879ea1a70d96348b013d012215fc0cc2b60e
-DIST gphpedit-0.4.3.tar.gz 362543 RMD160 e61890f2cdb05fff6ac4bec1291add5c2d8ba9d2 SHA1 e06c86da944401f4517b5fac9aaebb882449e5e4 SHA256 bd519c959cb16740a0868c1aa1dc562923134be160eb3a3cde95f4c27f320ebb
-DIST gphpedit-0.9.50.tar.gz 829535 RMD160 07705a1021a0ac921b554c31f57f61b6c05c5f42 SHA1 c35efaa09925b4d6113cf3775a06d7ae3b3b9c69 SHA256 4cc569647828371a110e46a71b423597f91dc4168899e6b8c398dc6be62b329c
-DIST gphpedit-0.9.6.tar.gz 375088 RMD160 e45bcbfe09e132a1cdc36fcb2ab7ae535deb0332 SHA1 654e7de564fa1548a75e77a9c9822d4ba0d1beea SHA256 b5ebb9c10ee140d9861ba607e331d659f230ae81006d2aa78deb732cb2d18f12
-DIST gphpedit-0.9.80.tar.gz 2369130 RMD160 d72073fb3de0ec0812ebab3211964bfacf959813 SHA1 f535406cfee1abcf8fb7db4aa19849a33acadc84 SHA256 607a36e51d8d2e60f2747d672efe780c96e18a451ff3f82bff93ecb171306849
+AUX gphpedit-0.9.91-find_replace.patch 706 RMD160 7f18a9ab8974a52d5113e3d65867e209437dd198 SHA1 9e92527f8a049b0d079e61f2cf77195fefacb683 SHA256 7c84c7df8763d778458542e3bcb6dfabb6b4f1c54b94c4950908be779f468a5d
 DIST gphpedit-0.9.91.tar.gz 3327239 RMD160 f837c821062722c627465741c0a0d5dc4fc84972 SHA1 7662e2deb07fa223c511a82668d15899260f64e6 SHA256 64b55916747171edf4cc1d90f038ca56b68d56d821e0b6c8f514266abb8e9b39
-EBUILD gphpedit-0.4.3.ebuild 650 RMD160 5d1cfce4d338d702c55b8f77effe0c018e25df72 SHA1 ff6c9ee221b6ac5e9d74dc8bf1560e8767030640 SHA256 dbff3a474d64b7003817ebbc8a8c1718d9bda07f2c8702f053ecdd2a7b62eec0
-EBUILD gphpedit-0.9.50.ebuild 678 RMD160 5d158066a506e43fcc94d5bad76a6429e4eafd75 SHA1 dc9d871e0f8c9711f36ad2862ea7d53c9f7994d6 SHA256 b2bad3e851a734dc4cbfeeeb6f6ce4853bebecef8c239a26a02d22d20667d104
-EBUILD gphpedit-0.9.6.ebuild 680 RMD160 a3de1f624bf78346b4200832e1f4af6c92055b1a SHA1 33bcc512ed18938473ba6c5413fade4df7228e34 SHA256 87671b76d5ac6db82b774edf7cc62676a0db8ac187a5763253ef1bd2e85e7d79
-EBUILD gphpedit-0.9.80.ebuild 684 RMD160 7e1e4f42d31aaa1cc48ed36b2031ed338bdaa565 SHA1 4fcda78cbbe609c17dcdd33806d61fba1c69a586 SHA256 14c21abf4cc8bdef367099a6223438e8283e54f19688ab5385c8b7c7d964b569
+EBUILD gphpedit-0.9.91-r1.ebuild 974 RMD160 05d0732b3691a5d7741f6cbbf553b657cb3b5ad7 SHA1 15c1145cfef13b03a25d99a511597f2b38d880c5 SHA256 7a93d785651975f03c46920000e19cf731082dbe49e2e629bbd9c47c567f6a78
 EBUILD gphpedit-0.9.91.ebuild 858 RMD160 cabb4a39e790f87c56d8866e4906db2fc8bf788d SHA1 3c6c7b480e7a3346bc1eef1713d42dc46a3caa1f SHA256 60ffc3d1ec44abce84df5691e0b2ac687516eb79428a9da8d17999ba9bee51a5
-MISC ChangeLog 2314 RMD160 94066a56a0cc15f1ee435d32f11fdfc97b061e4c SHA1 011338387541f2828e5f68c8193b57a9c0f40b99 SHA256 2da6b3c6a3b086f309c0c96fcf6407d28f2e148ae125869334ec5f18675c7f25
+MISC ChangeLog 2599 RMD160 7b9065f8701940798ede04526d6fbbe88e721631 SHA1 bdcb3cc41fc44fdfacc95c9925e6b01616cce838 SHA256 0b340206a6b11c538d13dc44f3e5e7d7ebbf3b9b274423280fd0ec196ab64715
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iD8DBQFH7BHukKaRLQcq0GIRAhv6AJ0RkwO8Z7HtGgGj8u2oNR4t1bN8eQCfQIWa
-/UaWbgWceuoAFpsFAZDIenM=
-=7LBZ
+iEYEARECAAYFAkuaPKkACgkQCaWpQKGI+9SkQQCaA8De3re6Af02pIjqsRnlsrNm
+pNIAn2pEJPsXxfF7Bigg1Wj4spjbqZF4
+=/43v
 -----END PGP SIGNATURE-----
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
+}