bump to 2.2.1 and remove broken 2.2.0

 * fixes rotated labels clipping
 * add missing pkg-config macro, fix bug #204276
 * add ewarn about file format change, fix part of bug #206055
Package-Manager: portage-2.1.4.4

6 files changed, 98 insertions, 12 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 4fdd5ff3a8fe..6761cbfa7629 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/glabels
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.27 2007/12/31 12:46:56 eva Exp $
+# 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 $
+
+*glabels-2.2.1 (24 Feb 2008)
+
+  24 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/glabels-2.2.1-drop-gtk-doc.patch,
+  +files/glabels-2.2.1-pkg-config-macro.patch, -glabels-2.2.0.ebuild,
+  +glabels-2.2.1.ebuild:
+  bump to 2.2.1 and remove broken 2.2.0
+   * fixes rotated labels clipping
+   * add missing pkg-config macro, fix bug #204276
+   * add ewarn about file format change, fix part of bug #206055
 
 *glabels-2.2.0 (31 Dec 2007)
 
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index 1753c63db889..44528379320e 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,6 +1,18 @@
+-----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.0.tar.gz 1987772 RMD160 8edf20742846d59010afa8139fe9cee57dbd2fcd SHA1 19bffa3059e2297702ac4c05e8bfd48ec1fddcef SHA256 7409d71236b67729179fb63d90af8a8c93a66b22af757200c519b532b0adef13
-EBUILD glabels-2.0.4.ebuild 1112 RMD160 51ea5b15e4678ab18d2b5d40703c0e847eb9b9d1 SHA1 10dac5a13200239215d26c74a9c088ed943eda9d SHA256 1405b3f38e57e20d6241d3ced575f1b0152ad93df18f68ab5b44ee5aaa00fea5
-EBUILD glabels-2.2.0.ebuild 989 RMD160 0c44984010bda2cb12b098f4e069243b5abe59e9 SHA1 2fa4e46960865db5c552c433b6e36b3c32dba8a1 SHA256 3a86356f4dee0606f356698dcaea5d43e056d5fb05f975340ec001325288a8ae
-MISC ChangeLog 5007 RMD160 494796513f8d7570057dacd03aee5763e3ff4ae9 SHA1 44f9ecb8f0713f241b09e1132c40182c4e74c941 SHA256 5d917a023d5b9117e49f6c69aad6104bc1f09214d6737daa38a446cd8a7f117d
+DIST glabels-2.2.1.tar.gz 1988676 RMD160 8294f5b9952dcf28fa80979c0dc6ee622c9891ab SHA1 0457394503c9aebcf3670601dae9d80895275889 SHA256 0dcbe5815d9dc7a533be134ee1a2f04476423175e0cfb0c2f4feb794c01b1baf
+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
 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
+-----END PGP SIGNATURE-----
diff --git a/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch b/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch
new file mode 100644
index 000000000000..e916b05987b6
--- /dev/null
+++ b/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch
@@ -0,0 +1,33 @@
+--- configure.old.in	2008-02-24 11:36:15.000000000 +0100
++++ configure.in	2008-02-24 11:40:45.000000000 +0100
+@@ -22,8 +22,14 @@
+ 
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ 
++dnl Crazy hack for dropping the dep on gtk-doc
++AC_DEFUN(GTK_DOC_CHECK, [])
+ GTK_DOC_CHECK(1.0)
+ 
++dnl Crazy hack for dropping the dep on gtk-doc
++AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
++
+ dnl ---------------------------------------------------------------------------
+ dnl - LIBGLABELS API versioning
+ dnl ---------------------------------------------------------------------------
+--- Makefile.am.old	2008-02-24 11:41:55.000000000 +0100
++++ Makefile.am	2008-02-24 11:42:16.000000000 +0100
+@@ -10,8 +10,11 @@
+ 	libglabels \
+ 	src \
+ 	data \
+-	help \
+-	docs
++	help
++
++if ENABLE_GTK_DOC
++	SUBDIRS += docs
++endif
+ 
+ EXTRA_DIST = \
+ 	README \
diff --git a/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch b/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch
new file mode 100644
index 000000000000..26016d32f8d3
--- /dev/null
+++ b/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch
@@ -0,0 +1,10 @@
+--- configure.old.in	2008-02-24 11:36:15.000000000 +0100
++++ configure.in	2008-02-24 11:37:05.000000000 +0100
+@@ -10,6 +10,7 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_INTLTOOL([0.21])
++PKG_PROG_PKG_CONFIG
+ 
+ AM_PROG_LIBTOOL
+ 
diff --git a/app-office/glabels/glabels-2.0.4.ebuild b/app-office/glabels/glabels-2.0.4.ebuild
index ae636b689b0a..74bb2f09ede6 100644
--- a/app-office/glabels/glabels-2.0.4.ebuild
+++ b/app-office/glabels/glabels-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0.4.ebuild,v 1.6 2007/07/13 07:04:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.0.4.ebuild,v 1.7 2008/02/24 11:03:57 eva Exp $
 
 inherit eutils gnome2
 
@@ -37,7 +37,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 
 	gnome2_omf_fix "${S}"/help/C/Makefile.in
 }
diff --git a/app-office/glabels/glabels-2.2.0.ebuild b/app-office/glabels/glabels-2.2.1.ebuild
index eeccafe91123..417ff0e0b7a7 100644
--- a/app-office/glabels/glabels-2.2.0.ebuild
+++ b/app-office/glabels/glabels-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0.ebuild,v 1.2 2007/12/31 18:31:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.1.ebuild,v 1.1 2008/02/24 11:03:57 eva Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="Program for creating labels and business cards"
 HOMEPAGE="http://glabels.sourceforge.net/"
@@ -34,3 +34,23 @@ pkg_setup() {
 		--disable-update-mimedb
 		--disable-update-desktopdb"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix missing pkg-config macro (bug 204276)
+	epatch "${FILESDIR}/${P}-pkg-config-macro.patch"
+
+	# drop gtk-doc for eautoreconf
+	use doc || epatch "${FILESDIR}/${P}-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."
+}