Version bump. New template, updated documentation and translations.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

3 files changed, 59 insertions, 6 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 266e8db903ce..4f4cdf950df6 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.42 2010/02/24 23:11:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.43 2010/03/14 23:16:52 eva Exp $
+
+*glabels-2.2.7 (14 Mar 2010)
+
+  14 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> -glabels-2.2.5.ebuild,
+  +glabels-2.2.7.ebuild, +files/glabels-2.2.7-documentation.patch:
+  Version bump. New template, updated documentation and translations.
 
 *glabels-2.2.6 (24 Feb 2010)
 
diff --git a/app-office/glabels/files/glabels-2.2.7-documentation.patch b/app-office/glabels/files/glabels-2.2.7-documentation.patch
new file mode 100644
index 000000000000..ef88dac81018
--- /dev/null
+++ b/app-office/glabels/files/glabels-2.2.7-documentation.patch
@@ -0,0 +1,25 @@
+Fix documentation validation issues
+
+ fr.po |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/help/fr/fr.po	2010-03-14 23:55:13.000000000 +0100
++++ b/help/fr/fr.po	2010-03-14 23:57:48.000000000 +0100
+@@ -1443,7 +1443,7 @@
+ "right-clicking the display area when there is a non-empty selection."
+ msgstr ""
+ "À partir du menu <menuchoice><guimenu>Objets</guimenu><guimenuitem>Rotation/"
+-"Renversement</guimenuitem>, on accède à un sous-menu permettant de faire pivoter un "
++"Renversement</guimenuitem></menuchoice>, on accède à un sous-menu permettant de faire pivoter un "
+ "objet de 90° dans n'importe quelle direction, ou de le renverser "
+ "horizontalement ou verticalement. Ces commandes sont aussi accessibles par "
+ "le menu contextuel (clic droit dans la zone d'affichage lorsqu'un élément "
+@@ -2191,7 +2191,7 @@
+ "menuchoice> menu item. This will display the print dialog as shown below."
+ msgstr ""
+ "Nous pouvons maintenant imprimer les adresses à partir du menu "
+-"<menuchoice><guimenu>Fichier</guimenu><guimenuitem>Imprimer</guimenuitem> et "
++"<menuchoice><guimenu>Fichier</guimenu><guimenuitem>Imprimer</guimenuitem></menuchoice> et "
+ "de la boîte de dialogue ci-dessous."
+ 
+ #: C/glabels.xml:1551(title)
diff --git a/app-office/glabels/glabels-2.2.5.ebuild b/app-office/glabels/glabels-2.2.7.ebuild
index 3b3ae2be4864..83d316460f08 100644
--- a/app-office/glabels/glabels-2.2.5.ebuild
+++ b/app-office/glabels/glabels-2.2.7.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.5.ebuild,v 1.1 2009/05/02 14:09:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.7.ebuild,v 1.1 2010/03/14 23:16:52 eva Exp $
 
+EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Program for creating labels and business cards"
 HOMEPAGE="http://glabels.sourceforge.net/"
@@ -19,12 +20,14 @@ RDEPEND=">=dev-libs/glib-2.12
 	>=x11-libs/gtk+-2.10
 	>=gnome-base/libgnome-2.16
 	>=gnome-base/libgnomeui-2.16
-	>=dev-libs/libxml2-2.6
+	>=dev-libs/libxml2-2.7
 	>=gnome-base/libglade-2.6
 	eds? ( >=gnome-extra/evolution-data-server-1.8 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.28
 	doc? ( dev-util/gtk-doc )"
 
@@ -34,7 +37,26 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_with eds libebook)
 		--disable-update-mimedb
-		--disable-update-desktopdb"
+		--disable-update-desktopdb
+		--disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix documentation misuse of entities, bug #?
+	epatch "${FILESDIR}/${PN}-2.2.6-documentation.patch"
+
+	# Fix malformed XML documentation, bug #?
+	epatch "${FILESDIR}/${PN}-2.2.7-documentation.patch"
+
+	# Fix intltool test, bug #?
+	echo "help/cs/glabels.xml" >> po/POTFILES.in
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die
 }
 
 pkg_postinst() {