Version bump. New template, updated documentation and translations.

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

4 files changed, 66 insertions, 12 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/Manifest b/app-office/glabels/Manifest
index d5a917607f9d..f0906aa7dab2 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX glabels-2.2.6-documentation.patch 509 RMD160 6231fd6d03f6c08bf05d8b392332ae000552f4e9 SHA1 87c943ebcbaa942ad3896fd27df11a7ee19b0b2e SHA256 b270984050b466f1fc7b5772624bbf9c3d5517fb5a9e2ba73ba3abf122868a4d
+AUX glabels-2.2.7-documentation.patch 1251 RMD160 0fc052131c6b7a26e368e1728b7866c9ec354a1c SHA1 0e266318a5540afcd4c0328bcba38cdcfb648404 SHA256 bf53b2a253557d841dc9935c5b91cb05b08c52a6ca78c183009e69c5c7fafe6a
 DIST glabels-2.2.4.tar.gz 2020163 RMD160 1a0b07097e7635fbd99a881293c811ad68765b3b SHA1 0bcb60cd5b2bbc230b80304200e83776e424025f SHA256 23320b7af7f1038d3ff5aea90ac33ceaaa02ef6069d1b412b7f0d42bf6367b0b
-DIST glabels-2.2.5.tar.gz 2043669 RMD160 bab36234a1191705a5f4ffbd9ce6809d52c05d34 SHA1 115b4eebe35e2efc3f4203f318cf6064c4a26d10 SHA256 9b9a1ce1262de99a12cc2a07bf89840fd3b950778e3269ae0d30e14ce58d91bc
 DIST glabels-2.2.6.tar.gz 2829526 RMD160 33f66b3f27914e43d524ce56818ed96bd90e073b SHA1 f51ee679072cd5e0e5bfe1e0a7d62265a78003d6 SHA256 6aebc7bfa27caee5b715d971ae06bd7121818ebbb899c73e65453b041c400a2d
+DIST glabels-2.2.7.tar.gz 3808294 RMD160 03827d925ff465825035fdbc92efa3bf45f658b8 SHA1 cba6a01e14bd503e6d82077a8b68dc3b40e77883 SHA256 7ea7ea9f265aca8689a6bf1951650b25c0ac20148dfc535dc7ac37c01eb81b53
 EBUILD glabels-2.2.4.ebuild 1216 RMD160 22be67557900b0e1ff327b26ee4db8c131cc7984 SHA1 81cde4d129bb517585454b3004f18e1e2091688b SHA256 ac5e1e83bda0d4ae93597143d3395ee5953a5c1f4521ae646a68cd3acd5ee156
-EBUILD glabels-2.2.5.ebuild 1214 RMD160 31be2447ca5a9aba6d1455fc49a3b42405ae401a SHA1 1d6c84a05455ca03f16769a5c85057de8d831a2b SHA256 548fcaf450420e1b03aaa0bfcf9886799601e7f1eedd71c9e3eead884151c883
 EBUILD glabels-2.2.6.ebuild 1529 RMD160 a9e09b7fdbb222af57a0bc02e08e55443d405401 SHA1 276ad03e8999dba72a5b5bcea97390baa206156f SHA256 52ad9d0fbd336e4d811dd6cee46a70567a7fdc5ee3febcd268deb4932d337ba8
-MISC ChangeLog 7367 RMD160 c8677dc86bdcba46af4400bfeb560d8c487c14f1 SHA1 ca7b5335ffcbd0409049f0d260e016f6e45f841c SHA256 d2c44e8a1addeb350a2b9deb872bba5ecfcd618197078602a19394486228d8d1
+EBUILD glabels-2.2.7.ebuild 1703 RMD160 9a337d10588f6940279564d15c0fbf68dec3aca4 SHA1 a6aca37ad678a0bf6f4fa52fd1051950ff13553f SHA256 c072f8c98d794c18ba563bc9b328a3b2946918255942eea7de2f51300fcdeef4
+MISC ChangeLog 7612 RMD160 ff320aea4f86ba5cf774035348de5c379f7bf892 SHA1 c742d3bc416e136e514ce5a39f230a28f47af490 SHA256 619bc0f6fe345eed38de5babd00230857f02764a0ba9c55787316c901875c811
 MISC metadata.xml 442 RMD160 a0c516bebb6ed10f7601f2755743420474a29987 SHA1 e80325acb06a429d86845a9ed3aa6ec5b3e5a468 SHA256 e555b2c153df834e3c5df2ac918b323df2299172adb8d641cf23fd27649d188a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuFslEACgkQ1fmVwcYIWAbMwQCgjR4R65jpK8/66cVbswmU++m2
-cWwAniS6xiOSlw2sJIlE2apouUsk+ehB
-=hjQi
+iEYEARECAAYFAkudbmkACgkQ1fmVwcYIWAbMPgCeMojke1dkDzUZ/D/kluhT52Pj
+IWUAn1VYCsmuc9TyJea/9IFmqjdGWIOf
+=xOEo
 -----END PGP SIGNATURE-----
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() {