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

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

3 files changed, 19 insertions, 14 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/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."
-}