Version bump, bug #293746. A couple of fixes and translation updates.

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

4 files changed, 94 insertions, 7 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 4cb2752f7a43..266e8db903ce 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/glabels
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.41 2009/05/02 14:09:38 eva Exp $
+# 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 $
+
+*glabels-2.2.6 (24 Feb 2010)
+
+  24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> +glabels-2.2.6.ebuild,
+  +files/glabels-2.2.6-documentation.patch:
+  Version bump, bug #293746. A couple of fixes and translation updates.
 
 *glabels-2.2.5 (02 May 2009)
 
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index a5c7a8457ece..d5a917607f9d 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX glabels-2.2.6-documentation.patch 509 RMD160 6231fd6d03f6c08bf05d8b392332ae000552f4e9 SHA1 87c943ebcbaa942ad3896fd27df11a7ee19b0b2e SHA256 b270984050b466f1fc7b5772624bbf9c3d5517fb5a9e2ba73ba3abf122868a4d
 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
 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
-MISC ChangeLog 7143 RMD160 3e87a6347c4ad230986977856a494b2093b38817 SHA1 c7bb4a5e165d3136bd843616109803df877b2e5d SHA256 7f44e397a458d2d192c6a0a6bb77f0e4afff1f61565f7b6e81c04777b3a72592
+EBUILD glabels-2.2.6.ebuild 1529 RMD160 a9e09b7fdbb222af57a0bc02e08e55443d405401 SHA1 276ad03e8999dba72a5b5bcea97390baa206156f SHA256 52ad9d0fbd336e4d811dd6cee46a70567a7fdc5ee3febcd268deb4932d337ba8
+MISC ChangeLog 7367 RMD160 c8677dc86bdcba46af4400bfeb560d8c487c14f1 SHA1 ca7b5335ffcbd0409049f0d260e016f6e45f841c SHA256 d2c44e8a1addeb350a2b9deb872bba5ecfcd618197078602a19394486228d8d1
 MISC metadata.xml 442 RMD160 a0c516bebb6ed10f7601f2755743420474a29987 SHA1 e80325acb06a429d86845a9ed3aa6ec5b3e5a468 SHA256 e555b2c153df834e3c5df2ac918b323df2299172adb8d641cf23fd27649d188a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkn8VCcACgkQ1fmVwcYIWAYT4gCgmoS4n7nxxVORsVXeHez4OgaL
-E24An3nnxf5ccjnmMse0Sd3a/D7L4P71
-=cWuH
+iEYEARECAAYFAkuFslEACgkQ1fmVwcYIWAbMwQCgjR4R65jpK8/66cVbswmU++m2
+cWwAniS6xiOSlw2sJIlE2apouUsk+ehB
+=hjQi
 -----END PGP SIGNATURE-----
diff --git a/app-office/glabels/files/glabels-2.2.6-documentation.patch b/app-office/glabels/files/glabels-2.2.6-documentation.patch
new file mode 100644
index 000000000000..1cc1c2431ca4
--- /dev/null
+++ b/app-office/glabels/files/glabels-2.2.6-documentation.patch
@@ -0,0 +1,16 @@
+Fix documentation validation issues
+
+ glabels.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/help/C/glabels.xml	2010-02-24 23:10:00.000000000 +0100
++++ b/help/C/glabels.xml	2010-02-24 23:13:46.000000000 +0100
+@@ -105,7 +105,7 @@
+       </revision> 
+     </revhistory> 
+ 
+-    <releaseinfo>This manual describes version &appversion; of &app;.
++    <releaseinfo>This manual describes version &appversion; of gLabels.
+     </releaseinfo> 
+     <legalnotice> 
+       <title>Feedback</title> 
diff --git a/app-office/glabels/glabels-2.2.6.ebuild b/app-office/glabels/glabels-2.2.6.ebuild
new file mode 100644
index 000000000000..7323f63a5a9b
--- /dev/null
+++ b/app-office/glabels/glabels-2.2.6.ebuild
@@ -0,0 +1,62 @@
+# 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.6.ebuild,v 1.1 2010/02/24 23:11:25 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Program for creating labels and business cards"
+HOMEPAGE="http://glabels.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc eds"
+
+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
+	>=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 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with eds libebook)
+		--disable-update-mimedb
+		--disable-update-desktopdb
+		--disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix documentation misuse of entities, bug #?
+	epatch "${FILESDIR}/${PN}-2.2.6-documentation.patch"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ewarn "As of 2.2.0, glabels had a file format change. Files will be"
+	ewarn "automatically converted to the new format but it is a one way"
+	ewarn "process only. Make backups."
+}