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

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

5 files changed, 71 insertions, 62 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/Manifest b/dev-util/nemiver/Manifest
index 112b49d3a495..146b2423080c 100644
--- a/dev-util/nemiver/Manifest
+++ b/dev-util/nemiver/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST nemiver-0.9.1.tar.xz 2280680 RMD160 77546ec22e0b1faf26c2c0f98b2302dee539759c SHA1 1c9f158a273bee87398eefb77e86dc25d007772e SHA256 a0e72b0437646190403be1fb53a60405f50bda048e13f982b42f14be41d51c99
+AUX nemiver-0.9.2-xml-validation.patch 1781 RMD160 1b0dd7d70b1513050cdceb552a8938731dd1d8db SHA1 0abfa46a1bc739086eb8a06b062e1d08f629d16b SHA256 d889e08d7a3fd428c168306ff5ce734d3a79a116d045c7a11a36ce6309404c01
 DIST nemiver-0.9.2.tar.xz 2294260 RMD160 041b1e6a42b76f0829762fb96417c84c93c408f9 SHA1 368cf73bc04645ec4980e3d30c4e05d4ce5f0b69 SHA256 770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520
-EBUILD nemiver-0.9.1.ebuild 1249 RMD160 7225700911524da05e83d7a0d94857c5dd44eefc SHA1 661f149c8e7def39918f7e08fb1effe763736d3b SHA256 280c8fc6b383bcbc54a68de4b85d2fdd0d717129c8d1d8ba9b9eb5c5539432ae
-EBUILD nemiver-0.9.2.ebuild 1248 RMD160 f9bc93e1a7cc92f90747bba4fc7029ca3e8d1e42 SHA1 1c55108823deafdd6234ceec583036112aef93cf SHA256 fd2376d8a4978b02ca1c04bcdb7d96f9aa69d32ee6eed95d14412a838c41b978
-MISC ChangeLog 6160 RMD160 ff56606028c241decbddf25fd6c0dc248d465999 SHA1 cab4882fd0a3d011efa5f2f98db1e57bf0944c7f SHA256 2462895061a54e7df610f00f089be562986ade5dad63da8209458f46bb035447
+EBUILD nemiver-0.9.2.ebuild 1372 RMD160 30a53a1b980c4c2d97e8799844c25803299965d8 SHA1 bae2b0e65a6b41a2b9b62a7b7d839f24e1f76230 SHA256 886a3c8c2b89db78c4af90d3146b5b2b6b78a181b7ca8f856266daddec57883f
+MISC ChangeLog 6362 RMD160 b9ceb954a14157d529750c0648709c5174665d3c SHA1 ceeb1c94d42c7f7faa5f485667bd0e91f3c28f15 SHA256 b6b4e0430fc03e25155ed07b82a7a81c6f8bf5dbabeae9923cd5511f8ba7368e
 MISC metadata.xml 562 RMD160 759a3728e2904aab256791a62a987d47fc8cef54 SHA1 273076d6c8a705c803afea683d6c8cc32dcf2fe0 SHA256 77fdb75b65c24a25f8415648121d161b34fe06778d73d32b3aa093f469daf9f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPjyVNAAoJEOTDgjZ80txdLnUH/iDSJpVmnUTv8ke1sRE79tG0
-clapHRuhfNgcC6sUp6bJ+iReAs3BlkWJk6telKo0erQSvSftJO92Wnr3ZaoxMtMK
-EJSs56wtc9+7j7lm1NsIBotPgTOuYPnUg6+cJS3ZvoHb7p8m77wTVq6QEBrxQ7MZ
-OIW8yCyY2sM+FuWa+tkJFt30qZj87eQQwYQKfpsBetuXJemaAG6jcFpMZHBRpwnE
-tJI6+tGXI3t4Or1L1JsWETP1LkmpW7jeWGndxIRw4PCh0mYudIedGSofxKtwp8HV
-I4skJwP3RbWsnUjnZA7yyAI4FYVuIb+QPQFyF2GjbtDsH4CPzGyk6e55vQ2972A=
-=K3Et
+iEYEARECAAYFAk+VJAIACgkQCaWpQKGI+9TMwgCdEcVrfwbD8QGeQMe/5+PhPwjS
+FH4An3ZVVHt8np7xeNexcMOM2/rfhnI5
+=aqVd
 -----END PGP SIGNATURE-----
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
+}