Version bump. New templates, updated translations, fix a crash with glib-2.24.

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

4 files changed, 27 insertions, 22 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 6992e420a775..c0595ba9b289 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2010/05/25 21:15:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.47 2010/05/26 20:37:29 eva Exp $
+
+*glabels-2.2.8 (26 May 2010)
+
+  26 May 2010; Gilles Dartiguelongue <eva@gentoo.org> glabels-2.2.4.ebuild,
+  -glabels-2.2.6.ebuild, +glabels-2.2.8.ebuild:
+  Version bump. New templates, updated translations, fix a crash with
+  glib-2.24.
 
   25 May 2010; Pacho Ramos <pacho@gentoo.org> glabels-2.2.7.ebuild:
   stable amd64, bug 319961
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index 9a330bb846ae..2f4edb493f4b 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -4,17 +4,17 @@ 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.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.6.ebuild 1529 RMD160 a9e09b7fdbb222af57a0bc02e08e55443d405401 SHA1 276ad03e8999dba72a5b5bcea97390baa206156f SHA256 52ad9d0fbd336e4d811dd6cee46a70567a7fdc5ee3febcd268deb4932d337ba8
+DIST glabels-2.2.8.tar.gz 3842721 RMD160 97506ca496fa35653462850ffd534384ee151733 SHA1 9b71da53ec3f27e886177a7c9089c8901fbf7fb2 SHA256 0401ab5ab55f1828e3db3633aa8f9b5a50a08bed74a5a9cb273e6274ce002f3c
+EBUILD glabels-2.2.4.ebuild 1199 RMD160 942c4f93b4923e08ab7c590d72ac275d81ff8c18 SHA1 9e2c59397c4553f1ac729d2e6e2d44c2bbd002d8 SHA256 05c660766a1df479e207b0feb61daec742f65305ca1c0a53e6dce4abdeecb534
 EBUILD glabels-2.2.7.ebuild 1702 RMD160 cfd2c51282b8e61f37c101abf922b404b714ec9c SHA1 63a8da55b5570c45271605004268bf41be6ffe82 SHA256 eaea854d71611be17870db010e8b4fb83c217f3801203a2d1c8e8ea5fc9631eb
-MISC ChangeLog 7896 RMD160 f0fd839d67676a070b5e8e3ebd7a08b2c31dbe0d SHA1 3626e73237f83ba9a50ec35437f19c4df80e7456 SHA256 e56d0f3ed396d440828711ef1f0e45193d45f07911f43a726641c8c84f50d0c5
+EBUILD glabels-2.2.8.ebuild 1483 RMD160 e7bbc594818b288a4a2a4c7789f8698af5010235 SHA1 e9894534469f41e19cc7e9587cbdc7e19edbe42e SHA256 6678f204ffd31b84831e836391173641287ca72f5ac06e27111230d3a44384b4
+MISC ChangeLog 8132 RMD160 9e1a9268a319916261f7f73e9781c3ce7cfd804f SHA1 1e875d881a65a348026acea2db4fa647a1e214af SHA256 218daec28a6cf2459b2448b46d1b86b80b29bcf0044250e52a15bf0efecbc1c6
 MISC metadata.xml 442 RMD160 a0c516bebb6ed10f7601f2755743420474a29987 SHA1 e80325acb06a429d86845a9ed3aa6ec5b3e5a468 SHA256 e555b2c153df834e3c5df2ac918b323df2299172adb8d641cf23fd27649d188a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv8PfwACgkQCaWpQKGI+9T1PACfffdv+l746d4w+19pY0M3TNwL
-Cc0An1SC6N/Um7nJKdwnLa2Nc2tEbSOk
-=3IA3
+iEYEARECAAYFAkv9hqEACgkQ1fmVwcYIWAYBfwCePvmsPInIGCyQIN9wxegRnFxT
+ewoAnjmcYL47SvUpO3JHVHqDs+Ya9tPz
+=4emN
 -----END PGP SIGNATURE-----
diff --git a/app-office/glabels/glabels-2.2.4.ebuild b/app-office/glabels/glabels-2.2.4.ebuild
index dd1b09d6e9df..6004119e9a2d 100644
--- a/app-office/glabels/glabels-2.2.4.ebuild
+++ b/app-office/glabels/glabels-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# 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.4.ebuild,v 1.5 2009/03/18 22:42:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.4.ebuild,v 1.6 2010/05/26 20:37:29 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="sparc"
 IUSE="doc eds"
 
 RDEPEND=">=dev-libs/glib-2.12
diff --git a/app-office/glabels/glabels-2.2.6.ebuild b/app-office/glabels/glabels-2.2.8.ebuild
index 7323f63a5a9b..deeff8b39b92 100644
--- a/app-office/glabels/glabels-2.2.6.ebuild
+++ b/app-office/glabels/glabels-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.8.ebuild,v 1.1 2010/05/26 20:37:29 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ 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}
@@ -46,17 +46,15 @@ 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() {
-	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."
-}