Fix xml validation, bug #413143 by Markus Meier. Drop old.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

4 files changed, 64 insertions, 50 deletions

diff --git a/dev-util/nemiver/ChangeLog b/dev-util/nemiver/ChangeLog
index 0f702085c491..fc01059ecce7 100644
--- a/dev-util/nemiver/ChangeLog
+++ b/dev-util/nemiver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/nemiver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/ChangeLog,v 1.39 2012/04/18 20:34:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/ChangeLog,v 1.40 2012/04/23 09:42:20 pacho Exp $
+
+  23 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/nemiver-0.9.2-xml-validation.patch, -nemiver-0.9.1.ebuild,
+  nemiver-0.9.2.ebuild:
+  Fix xml validation, bug #413143 by Markus Meier. Drop old.
 
   18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> nemiver-0.9.2.ebuild:
   Stable for amd64, wrt bug #410611
diff --git a/dev-util/nemiver/files/nemiver-0.9.2-xml-validation.patch b/dev-util/nemiver/files/nemiver-0.9.2-xml-validation.patch
new file mode 100644
index 000000000000..d2ae6437c42c
--- /dev/null
+++ b/dev-util/nemiver/files/nemiver-0.9.2-xml-validation.patch
@@ -0,0 +1,51 @@
+From 306cf3ae850af238dc8ef79e9cb8cf8f84e2418f Mon Sep 17 00:00:00 2001
+From: Dustin Polke <DuPol@gmx.de>
+Date: Thu, 19 Apr 2012 15:58:25 +0000
+Subject: Fix XML validation.
+
+This fixes the following validation failures:
+./de/nemiver.xml:82: element releaseinfo: validity error : Element
+application is not declared in releaseinfo list of possible children
+./fr/nemiver.xml:38: element publishername: validity error : Element
+application is not declared in publishername list of possible children
+./fr/nemiver.xml:82: element releaseinfo: validity error : Element
+application is not declared in releaseinfo list of possible children
+---
+diff --git a/help/de/de.po b/help/de/de.po
+index a8b3794..6e4c0e9 100644
+--- a/help/de/de.po
++++ b/help/de/de.po
+@@ -274,8 +274,7 @@ msgstr "Aktualisierung für die Version 0.5.0"
+ #: C/nemiver.xml:82(releaseinfo)
+ msgid "This manual describes version 0.5.0 of Nemiver."
+ msgstr ""
+-"Dieses Handbuch beschreibt Version 0.5.0 von <application>Nemiver</"
+-"application>."
++"Dieses Handbuch beschreibt Version 0.5.0 von Nemiver."
+ 
+ #: C/nemiver.xml:85(title)
+ msgid "Feedback"
+diff --git a/help/fr/fr.po b/help/fr/fr.po
+index eadcfdb..a28e12d 100644
+--- a/help/fr/fr.po
++++ b/help/fr/fr.po
+@@ -258,7 +258,7 @@ msgstr "Jonathon Jongsma"
+ 
+ #: C/nemiver.xml:38(publishername)
+ msgid "Nemiver Project"
+-msgstr "Projet <application>Nemiver</application>"
++msgstr "Projet Nemiver"
+ 
+ #: C/nemiver.xml:43(firstname)
+ msgid "Jonathon"
+@@ -296,7 +296,7 @@ msgstr "Mise à jour pour la version 0.5.0"
+ msgid "This manual describes version 0.5.0 of Nemiver."
+ msgstr ""
+ "Le présent manuel décrit le fonctionnement de la version 0.5.0 de "
+-"<application>Nemiver</application>."
++"Nemiver."
+ 
+ #: C/nemiver.xml:85(title)
+ msgid "Feedback"
+--
+cgit v0.9.0.2
diff --git a/dev-util/nemiver/nemiver-0.9.1.ebuild b/dev-util/nemiver/nemiver-0.9.1.ebuild
deleted file mode 100644
index 5dbbf48b2155..000000000000
--- a/dev-util/nemiver/nemiver-0.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/nemiver-0.9.1.ebuild,v 1.1 2012/02/12 16:20:52 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
-HOMEPAGE="http://projects.gnome.org/nemiver/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="memoryview"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-cpp/glibmm-2.30:2
-	>=dev-cpp/gtkmm-3:3.0
-	>=dev-cpp/gtksourceviewmm-3:3.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=gnome-base/libgtop-2.19
-	>=x11-libs/vte-0.28:2.90
-	>=dev-db/sqlite-3:3
-	sys-devel/gdb
-	dev-libs/boost
-	memoryview? ( >=app-editors/ghex-2.90:2 )"
-# FIXME: dynamiclayout needs unreleased stable gdlmm:3
-# dynamiclayout? ( >=dev-cpp/gdlmm-3.0:3 )
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/docbook-xml-dtd:4.1.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-symsvis
-		--disable-dynamiclayout
-		--enable-gsettings
-		$(use_enable memoryview)
-		--disable-static"
-}
diff --git a/dev-util/nemiver/nemiver-0.9.2.ebuild b/dev-util/nemiver/nemiver-0.9.2.ebuild
index 34eadb21fe1b..6a46531ff492 100644
--- a/dev-util/nemiver/nemiver-0.9.2.ebuild
+++ b/dev-util/nemiver/nemiver-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/nemiver-0.9.2.ebuild,v 1.2 2012/04/18 20:34:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/nemiver-0.9.2.ebuild,v 1.3 2012/04/23 09:42:20 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -46,3 +46,9 @@ pkg_setup() {
 		$(use_enable memoryview)
 		--disable-static"
 }
+
+src_prepare() {
+	# Fix XML validation, bug #413143
+	epatch "${FILESDIR}/${P}-xml-validation.patch"
+	gnome2_src_prepare
+}