Version bump wrt #311573 by Michael Weber.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 165 insertions, 12 deletions

diff --git a/app-editors/mlview/ChangeLog b/app-editors/mlview/ChangeLog
index acfbd5943463..3a7f017cbbda 100644
--- a/app-editors/mlview/ChangeLog
+++ b/app-editors/mlview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/mlview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/ChangeLog,v 1.24 2010/01/01 21:05:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/ChangeLog,v 1.25 2010/03/27 08:37:57 ssuominen Exp $
+
+*mlview-0.9.0 (27 Mar 2010)
+
+  27 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +mlview-0.9.0.ebuild,
+  +files/mlview-0.9.0-desktop.patch, +files/mlview-0.9.0-gcc44.patch:
+  Version bump wrt #311573 by Michael Weber.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> mlview-0.8-r1.ebuild:
   Transfer Prefix keywords
diff --git a/app-editors/mlview/Manifest b/app-editors/mlview/Manifest
index a93bb44b5454..6b5ce001e25f 100644
--- a/app-editors/mlview/Manifest
+++ b/app-editors/mlview/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mlview-0.8-dot_desktop.patch 834 RMD160 95b12ff5f27cdf7df202cbb566f6389a9f96b27e SHA1 0c90ec0b88e5d6c45eb19664acc3d30c3565089b SHA256 0897491f39dcff84b80316b5f15ae8f33478ea4eafd33c2fb9ef54629d581c67
+AUX mlview-0.9.0-desktop.patch 433 RMD160 37b90b4f34a467d15a71448749c2212c5616d0d8 SHA1 d4260d33661b62550dcca920e5f5cc86e3dac8fa SHA256 a3bf2478072e477ab688112d9963371b99853f0919871a1f6d31cc682968f8de
+AUX mlview-0.9.0-gcc44.patch 1877 RMD160 628cf9389f5074147ca7854d2d3cc466c6fdfbe1 SHA1 cbb9e588c09597ce6ffc20356d7599b967e52a73 SHA256 34e5f9b2822b06f3cc23a86ccc46d1070c29859706ed8050cb832aca7ec73a0b
 DIST mlview-0.8.tar.bz2 728600 RMD160 75cd3cebbc5cfbe608d684d507866cc249268f16 SHA1 4ba5c76cc39062b7c180413a66c74bb912d966cf SHA256 5e27abcac30b00136470abb6eb7c2551b4ae1920267e796ab5131e9a41b1ee51
+DIST mlview-0.9.0.tar.bz2 754148 RMD160 6b810b478dbdb76dd4bb28fe627e455410f89ea7 SHA1 1e2d8e03747ffaaacbf9db15e8a7dabf573cee22 SHA256 568ce3fefe83eb163b4fbd7d62954ec3cad3000e966cd9f7461c2c9a3edb4dca
 EBUILD mlview-0.8-r1.ebuild 1039 RMD160 58020dddfdf8d650ff629d8417d301ef7487a263 SHA1 58341bdca6877fa3adf4734415db644d7848e041 SHA256 a4f98c7ba67f5eeb2042ab5d0d3217e93d1f20f09bf7c973f93d580be0d8c952
-MISC ChangeLog 4208 RMD160 e0ff4e4da572933a29b0a0267002a340e0784dd8 SHA1 e94d54f80ab81b5edbf958120ca162c574caf97a SHA256 889b9aa195d6f7ba879d4ccbcb027620eecc6f8a1fee9b2e705f706b64979426
+EBUILD mlview-0.9.0.ebuild 1247 RMD160 48cba841053a40ac9be6a24f0f71018a82abc42b SHA1 251ac52b9a30dbbac8d7d636e09c62b09d626283 SHA256 1afdc5654fec0efa261939f0ae8214b79fea4df41c29092f4884eb1b3a8a616a
+MISC ChangeLog 4433 RMD160 25719a16ac9891f21e959b45758c5e3bc8925209 SHA1 cf9b21eaaed30666c92b1c0ee8783ab1e63c13f6 SHA256 4ec8a224f3a7ac3c08e4d2e939666157be5adbed6217955edcf08f8c3d145279
 MISC metadata.xml 461 RMD160 37f4863a04788d8dc3a230ffac965a3aec17821d SHA1 5d2d1cf630197c726b3c88791665f2bf7b598214 SHA256 a16bef63ac50d9a84cf453f9673a7f2be0ea122883079ea2da3b464443a867bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+Y4gACgkQNQqtfCuFneOxDACfTECYxjFnz7R7L9SYrEJktUA0
-PNEAn3X5fdV2jYBBi9ohsRDe1Gx3Dkam
-=PA2Z
------END PGP SIGNATURE-----
diff --git a/app-editors/mlview/files/mlview-0.9.0-desktop.patch b/app-editors/mlview/files/mlview-0.9.0-desktop.patch
new file mode 100644
index 000000000000..3906e6f30c4a
--- /dev/null
+++ b/app-editors/mlview/files/mlview-0.9.0-desktop.patch
@@ -0,0 +1,20 @@
+--- mlview.desktop.in
++++ mlview.desktop.in
+@@ -1,13 +1,10 @@
+ [Desktop Entry]
+-Version=0.9.4
+-Encoding=UTF-8
+ Type=Application
+ Name=MlView XML Editor
+ GenericName=MlView Generic XML Editor
+-Categories=Application;Development;
++Categories=Development;
+ Comment=A generic simple XML editor for GNOME
+-Icon=mlview-app-icon.xpm
+-TryExec=mlv
+-Exec=@MLVIEW_EXE@ %F
++Icon=mlview-app-icon
++TryExec=mlview
++Exec=mlview %F
+ Terminal=false
+-
diff --git a/app-editors/mlview/files/mlview-0.9.0-gcc44.patch b/app-editors/mlview/files/mlview-0.9.0-gcc44.patch
new file mode 100644
index 000000000000..b82398f726d7
--- /dev/null
+++ b/app-editors/mlview/files/mlview-0.9.0-gcc44.patch
@@ -0,0 +1,82 @@
+http://bugs.gentoo.org/311573
+
+--- src/mlview-tree-view.h
++++ src/mlview-tree-view.h
+@@ -178,7 +178,7 @@
+ 
+ 	enum MlViewStatus build_app_edit_menu () ;
+ 
+-	GtkDialog * TreeView::get_expand_tree_dialog ()  ;
++	GtkDialog * get_expand_tree_dialog ()  ;
+ 
+ 	void clear_completion_popup_submenus () ;
+ 
+--- src/mlview-source-view.h
++++ src/mlview-source-view.h
+@@ -53,7 +53,7 @@
+ 
+ 	enum MlViewStatus set_default_options () ;
+ 
+-	MlViewXMLDocument* SourceView::get_document () ;
++	MlViewXMLDocument* get_document () ;
+ 
+ 	GtkUIManager * get_ui_manager () ;
+ 
+--- src/mlview-validator.cc
++++ src/mlview-validator.cc
+@@ -25,6 +25,7 @@
+ 
+ #include "mlview-validator.h"
+ #include "mlview-safe-ptr-utils.h"
++#include <memory>
+ 
+ #define MESSAGE_LINE_LENGTH 55
+ namespace mlview
+--- src/mlview-plugin.h
++++ src/mlview-plugin.h
+@@ -46,12 +46,12 @@
+ 		
+ 		//forbid assignation/copy
+ 		Plugin& operator= (Plugin const&) ;
+-		Plugin::Plugin (Plugin const&) ;
++		Plugin (Plugin const&) ;
+ 
+ 	public:
+ 		Plugin (const PluginDescriptor &a_descr) ;
+ 
+-		Plugin::Plugin (const UString &a_url) ;
++		Plugin (const UString &a_url) ;
+ 		
+ 		virtual ~Plugin () ;
+ 		
+--- src/mlview-editor.cc
++++ src/mlview-editor.cc
+@@ -157,7 +157,7 @@
+ 			contextual_menu (NULL)
+ 	{}
+ 
+-	static void EditorPriv::schemas_window_destroy_cb
++	static void schemas_window_destroy_cb
+ 	(GtkWidget *a_widget, struct DocumentWindowData *a_win) ;
+ 
+ 	static void validation_window_destroy_cb
+@@ -406,17 +406,13 @@
+ 	         gtk_dialog_run (GTK_DIALOG (dialog));
+ 
+ 
+-	switch (button) {
+-	case GTK_RESPONSE_OK:
++	if (button == GTK_RESPONSE_OK) {
+ 		sel_menu_item = gtk_menu_get_active(GTK_MENU(menu));
+ 
+ 		result = (ViewDescriptor *)g_object_get_data
+ 		         (G_OBJECT(sel_menu_item), "mlview_view_desc");
+-		break;
+-
+-	default:
++	} else {
+ 		result = NULL ;
+-		break;
+ 	}
+ 	gtk_widget_destroy (dialog);
+ 	return result;
diff --git a/app-editors/mlview/mlview-0.9.0.ebuild b/app-editors/mlview/mlview-0.9.0.ebuild
new file mode 100644
index 000000000000..0873bf1c9211
--- /dev/null
+++ b/app-editors/mlview/mlview-0.9.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/mlview-0.9.0.ebuild,v 1.1 2010/03/27 08:37:57 ssuominen Exp $
+
+EAPI=2
+inherit eutils gnome2
+
+DESCRIPTION="XML editor for the GNOME environment"
+HOMEPAGE="http://www.freespiders.org/projects/gmlview/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/libxml2-2.6.11
+	>=dev-libs/libxslt-1.1.8
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.6:2
+	>=dev-cpp/gtkmm-2.4
+	>=gnome-base/libglade-2.4
+	>=dev-cpp/libglademm-2.6
+	>=gnome-base/libgnome-2.8.1
+	>=gnome-base/gnome-vfs-2.6
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/gconf-2.6.2
+	=x11-libs/gtksourceview-1*
+	>=x11-libs/vte-0.11.12
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	DOCS="AUTHORS BRANCHES ChangeLog NEWS README"
+	G2CONF="--disable-dependency-tracking
+		--disable-static
+		$(use_enable debug)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name '*.la' -exec rm -f {} +
+}