bump to 2.2.2, fix crashers and rendering problems

Package-Manager: portage-2.1.4.4

3 files changed, 68 insertions, 5 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 6761cbfa7629..c540e7cee2e0 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.28 2008/02/24 11:03:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.29 2008/02/25 19:18:47 eva Exp $
+
+*glabels-2.2.2 (25 Feb 2008)
+
+  25 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org> +glabels-2.2.2.ebuild:
+  bump to 2.2.2, fix crashers and rendering problems
 
 *glabels-2.2.1 (24 Feb 2008)
 
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index 44528379320e..230d96fdf9cd 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -5,14 +5,16 @@ AUX glabels-2.2.1-drop-gtk-doc.patch 865 RMD160 bfad04f775829ad49c46a766b9ed6ca2
 AUX glabels-2.2.1-pkg-config-macro.patch 226 RMD160 01ebad465e53a2427f779d88caab1e68509d1754 SHA1 ec25aca64dc7e1c49c528a62be3ac3797063baa0 SHA256 366a6d522853af7cfa96ed9c9191a0af1759db6511c816fd79ce1e37ed995a5d
 DIST glabels-2.0.4.tar.gz 1920095 RMD160 9ed141bc23c085d0f5131192463421e07f13945a SHA1 3794028a978e6976ea230b191a28746d3a9bb4a7 SHA256 8e3eefb2d560b870e44d3dbbc5e73c0e519f6df1caa4e7eb1bf012709c454dd2
 DIST glabels-2.2.1.tar.gz 1988676 RMD160 8294f5b9952dcf28fa80979c0dc6ee622c9891ab SHA1 0457394503c9aebcf3670601dae9d80895275889 SHA256 0dcbe5815d9dc7a533be134ee1a2f04476423175e0cfb0c2f4feb794c01b1baf
+DIST glabels-2.2.2.tar.gz 1990436 RMD160 65aee5f9837b104c123a6559ea9d3db63841c4e1 SHA1 1792e4b5f6142dc3022dcb455d53fa5b3a31b319 SHA256 f457ef164f7db57fc4f4abdc8458e0be633a01d91690376c50d3732f94301eb8
 EBUILD glabels-2.0.4.ebuild 1104 RMD160 3e0904bcf1f3a6813082db985850fc71f4f8952d SHA1 0c3060257127560d51e62e54666d065025401e0d SHA256 2d03c99bd0ca3537f1202b4476da6119f3ef48c63b1596deead70bfc95238a96
 EBUILD glabels-2.2.1.ebuild 1451 RMD160 ecd7bec18d4677846722951d17d436816f0d6ff3 SHA1 dc87fe663b95d2806130b5bd36ad1ae40051df81 SHA256 286ed3e68670b6b496b4980689e49114ada347d64e73a9409b1894a28d4f9884
-MISC ChangeLog 5421 RMD160 0c6c3520838574f130643e5ea1045f82d307fee1 SHA1 d32bddbf3dd3e2eec99e0df21be42f4007977f5a SHA256 1474cc27a512d8b522551f616ba14d7d4454015728f624ed66674647b4933c88
+EBUILD glabels-2.2.2.ebuild 1465 RMD160 20476d7e99e49579246b3396d1e98fb151600dd4 SHA1 3b774e20afa8caa5d390ba2eb4832b743cc2228e SHA256 4bb6d360f14db620490ffd82c4e618563fd68aea5f9ff80813ed04994d4c443c
+MISC ChangeLog 5582 RMD160 e5a808b5ddf787b4b5498cd0035c581182658d26 SHA1 52335fc376b3baa4ad3320129329b1239e0af346 SHA256 ee726967779f146e8e371df7f4e67b90739620c2b6d7a67eb3003edb73be6c55
 MISC metadata.xml 561 RMD160 e310774966e93524a1bff3d21fae9f721f3559f8 SHA1 14cf2f711fc21e21030931799fca6881c9a67d86 SHA256 ea2bdba6f8ed4d2108f0dfec7aeb3fa7939c4a1b5c87f7e18f1c8b95ccb142df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHwU8l1fmVwcYIWAYRAvTKAKDRGjl7U7FwLkmtADAnlDl9Xup3+QCfZp1m
-1LJRPREHt7nWi/93K+l2ZU0=
-=aypn
+iD8DBQFHwxSh1fmVwcYIWAYRAsivAKCWoBnoN6QQmU8i9UiF0zsOCGjH1ACgxRe2
+1gTrMoR0+gn7ocgzbXt2cHw=
+=ykhe
 -----END PGP SIGNATURE-----
diff --git a/app-office/glabels/glabels-2.2.2.ebuild b/app-office/glabels/glabels-2.2.2.ebuild
new file mode 100644
index 000000000000..d0c891f5e0a5
--- /dev/null
+++ b/app-office/glabels/glabels-2.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.2.ebuild,v 1.1 2008/02/25 19:18:47 eva Exp $
+
+inherit eutils gnome2 autotools
+
+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
+	>=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"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix missing pkg-config macro (bug 204276)
+	epatch "${FILESDIR}/${PN}-2.2.1-pkg-config-macro.patch"
+
+	# drop gtk-doc for eautoreconf
+	use doc || epatch "${FILESDIR}/${PN}-2.2.1-drop-gtk-doc.patch"
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ewarn "This version of ${PN} has 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."
+}