Bump to 2.2.3. Bug fixes.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

3 files changed, 30 insertions, 10 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index cb71ce44383c..91630514d550 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2008/11/04 01:31:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.32 2008/11/19 23:19:11 eva Exp $
+
+*glabels-2.2.3 (20 Nov 2008)
+
+  20 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org> -glabels-2.2.1.ebuild,
+  +glabels-2.2.3.ebuild:
+  Bump to 2.2.3. Bug fixes.
 
   04 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index b7c4d2e441db..a3f7eb50bffa 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glabels-2.2.1-drop-gtk-doc.patch 865 RMD160 bfad04f775829ad49c46a766b9ed6ca2f9894272 SHA1 d3d4712a96210674b4e5009fb7393146ca08426c SHA256 e07dec2e00e44d0eb0f0503619058032eebe8a7e0977b9d82da6e48e0fe69013
 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
+DIST glabels-2.2.3.tar.gz 2018981 RMD160 ac166ba1b7d98299d444a314dbf23295b9cce5d3 SHA1 41c1a221ccd6686c4c7d14db6218c0d0cabd3bb3 SHA256 bceabfdc60b061d158c7d694a0886d9b721ceda0d33816bfc010eaf05b24acb7
 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
 EBUILD glabels-2.2.2.ebuild 1514 RMD160 c3b0c0be104a6d589dbb9d58c5a3898213a038d9 SHA1 41ccaecee6417f1eacf8d7099440776bf90389a0 SHA256 6a91daef0fe96e6ae86c71df23dca70b1baf85a0ac148374ccaa2e2f4c03fec7
-MISC ChangeLog 5772 RMD160 88a1853c25ec0e9df30ddf4a67c1f7c5330be73a SHA1 c0e1d35624a81220d6225c1cfbfd284d302dea8c SHA256 64992f0e3766a36f8c5ddf6910c6d9431c7c61f4bbcc6408a54a4f093762137c
+EBUILD glabels-2.2.3.ebuild 1667 RMD160 0381919179a1453ab4ac49fc106ab7a39e815d22 SHA1 809badf9ab04520c330374d6741e4f923c59eae7 SHA256 52a03a486625c66f25b3485d3842e11e7b3caad4e9648cfcc86a250da8d17a10
+MISC ChangeLog 5925 RMD160 0894d7c40f2bec4a5722e13fb8c5bb6bf7e31240 SHA1 6ad9c76c2332e66fce35e1f454fafc1d05cf2868 SHA256 4cfc28c390cbcf50add05e46dd87e4730def56acff59e46bfe1b445e13233497
 MISC metadata.xml 442 RMD160 a0c516bebb6ed10f7601f2755743420474a29987 SHA1 e80325acb06a429d86845a9ed3aa6ec5b3e5a468 SHA256 e555b2c153df834e3c5df2ac918b323df2299172adb8d641cf23fd27649d188a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkkrQYACgkQ1fmVwcYIWAZZRACdF/cuZY5X9BLc8Z5TRIonPzvo
+zx4An0s+z/gkknAHs0VjOCDIBixqGVXC
+=IzKg
+-----END PGP SIGNATURE-----
diff --git a/app-office/glabels/glabels-2.2.1.ebuild b/app-office/glabels/glabels-2.2.3.ebuild
index 417ff0e0b7a7..3d091b3478fa 100644
--- a/app-office/glabels/glabels-2.2.1.ebuild
+++ b/app-office/glabels/glabels-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2008/02/24 11:03:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.3.ebuild,v 1.1 2008/11/19 23:19:11 eva Exp $
 
 inherit eutils gnome2 autotools
 
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper
 	>=dev-util/intltool-0.28
+	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -38,19 +39,22 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
-	# Fix missing pkg-config macro (bug 204276)
-	epatch "${FILESDIR}/${P}-pkg-config-macro.patch"
+	# Fix missing pkg-config macro (bug #204276)
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=2316013&group_id=46122&atid=445116
+	epatch "${FILESDIR}/${PN}-2.2.1-pkg-config-macro.patch"
 
-	# drop gtk-doc for eautoreconf
-	use doc || epatch "${FILESDIR}/${P}-drop-gtk-doc.patch"
+	# Intltool tests fixes
+	echo "data/templates/dymo-other-templates.xml" >> po/POTFILES.in
+	echo "libglabels/db.c" >> po/POTFILES.in
 
+	intltoolize --force || die "intltoolize failed"
 	eautoreconf
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	ewarn "This version of ${PN} has a file format change. Files will be"
+	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."
 }