Bump to 2.2.5. Fix problems with gtk+-2.16. Clean up old revisions.

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

7 files changed, 28 insertions, 173 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 8f0f984f9886..4cb2752f7a43 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.40 2009/03/18 22:42:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.41 2009/05/02 14:09:38 eva Exp $
+
+*glabels-2.2.5 (02 May 2009)
+
+  02 May 2009; 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.0.4.ebuild,
+  -glabels-2.2.2.ebuild, -glabels-2.2.3.ebuild, +glabels-2.2.5.ebuild:
+  Bump to 2.2.5. Fix problems with gtk+-2.16. Clean up old revisions.
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> glabels-2.2.4.ebuild:
   stable ppc, bug 259936
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index cd893a069cc6..a5c7a8457ece 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,12 +1,16 @@
-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.2.tar.gz 1990436 RMD160 65aee5f9837b104c123a6559ea9d3db63841c4e1 SHA1 1792e4b5f6142dc3022dcb455d53fa5b3a31b319 SHA256 f457ef164f7db57fc4f4abdc8458e0be633a01d91690376c50d3732f94301eb8
-DIST glabels-2.2.3.tar.gz 2018981 RMD160 ac166ba1b7d98299d444a314dbf23295b9cce5d3 SHA1 41c1a221ccd6686c4c7d14db6218c0d0cabd3bb3 SHA256 bceabfdc60b061d158c7d694a0886d9b721ceda0d33816bfc010eaf05b24acb7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST glabels-2.2.4.tar.gz 2020163 RMD160 1a0b07097e7635fbd99a881293c811ad68765b3b SHA1 0bcb60cd5b2bbc230b80304200e83776e424025f SHA256 23320b7af7f1038d3ff5aea90ac33ceaaa02ef6069d1b412b7f0d42bf6367b0b
-EBUILD glabels-2.0.4.ebuild 1104 RMD160 3e0904bcf1f3a6813082db985850fc71f4f8952d SHA1 0c3060257127560d51e62e54666d065025401e0d SHA256 2d03c99bd0ca3537f1202b4476da6119f3ef48c63b1596deead70bfc95238a96
-EBUILD glabels-2.2.2.ebuild 1514 RMD160 c3b0c0be104a6d589dbb9d58c5a3898213a038d9 SHA1 41ccaecee6417f1eacf8d7099440776bf90389a0 SHA256 6a91daef0fe96e6ae86c71df23dca70b1baf85a0ac148374ccaa2e2f4c03fec7
-EBUILD glabels-2.2.3.ebuild 1666 RMD160 65c878062897872d3ca72c263a9eaabfe2b7b887 SHA1 cea19c9e73e1df7dd332c9d30dea1af265cc3bdf SHA256 ef896c52f2317a01dccfd1c84ca7c6ef67e5ffa8d7acd8c36999332614d2bd8e
+DIST glabels-2.2.5.tar.gz 2043669 RMD160 bab36234a1191705a5f4ffbd9ce6809d52c05d34 SHA1 115b4eebe35e2efc3f4203f318cf6064c4a26d10 SHA256 9b9a1ce1262de99a12cc2a07bf89840fd3b950778e3269ae0d30e14ce58d91bc
 EBUILD glabels-2.2.4.ebuild 1216 RMD160 22be67557900b0e1ff327b26ee4db8c131cc7984 SHA1 81cde4d129bb517585454b3004f18e1e2091688b SHA256 ac5e1e83bda0d4ae93597143d3395ee5953a5c1f4521ae646a68cd3acd5ee156
-MISC ChangeLog 6807 RMD160 bde9d8bc9fe3f6d2bb116e25990fe4673a9a0628 SHA1 6bf081ac4f4c9eb560a802ed84993b2101ad42ef SHA256 ecf9a1a1dd45267433ad39ae595847a00b4a3c52d8795d12a64e4a50b80cc4af
+EBUILD glabels-2.2.5.ebuild 1214 RMD160 31be2447ca5a9aba6d1455fc49a3b42405ae401a SHA1 1d6c84a05455ca03f16769a5c85057de8d831a2b SHA256 548fcaf450420e1b03aaa0bfcf9886799601e7f1eedd71c9e3eead884151c883
+MISC ChangeLog 7143 RMD160 3e87a6347c4ad230986977856a494b2093b38817 SHA1 c7bb4a5e165d3136bd843616109803df877b2e5d SHA256 7f44e397a458d2d192c6a0a6bb77f0e4afff1f61565f7b6e81c04777b3a72592
 MISC metadata.xml 442 RMD160 a0c516bebb6ed10f7601f2755743420474a29987 SHA1 e80325acb06a429d86845a9ed3aa6ec5b3e5a468 SHA256 e555b2c153df834e3c5df2ac918b323df2299172adb8d641cf23fd27649d188a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn8VCcACgkQ1fmVwcYIWAYT4gCgmoS4n7nxxVORsVXeHez4OgaL
+E24An3nnxf5ccjnmMse0Sd3a/D7L4P71
+=cWuH
+-----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
deleted file mode 100644
index e916b05987b6..000000000000
--- a/app-office/glabels/files/glabels-2.2.1-drop-gtk-doc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index 26016d32f8d3..000000000000
--- a/app-office/glabels/files/glabels-2.2.1-pkg-config-macro.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 74bb2f09ede6..000000000000
--- a/app-office/glabels/glabels-2.0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.7 2008/02/24 11:03:57 eva Exp $
-
-inherit eutils gnome2
-
-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=""
-
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.3.2
-	>=gnome-base/libgnome-2.0.1
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomecanvas-2.0.1
-	>=gnome-base/libglade-2.0.1"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.28"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb --disable-update-desktopdb"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	gnome2_omf_fix "${S}"/help/C/Makefile.in
-}
diff --git a/app-office/glabels/glabels-2.2.3.ebuild b/app-office/glabels/glabels-2.2.3.ebuild
deleted file mode 100644
index 56e2d16b20e0..000000000000
--- a/app-office/glabels/glabels-2.2.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.3.ebuild,v 1.4 2009/01/09 17:49:51 ranger 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
-	dev-util/gtk-doc-am
-	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)
-	# 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"
-
-	# 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 "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."
-}
diff --git a/app-office/glabels/glabels-2.2.2.ebuild b/app-office/glabels/glabels-2.2.5.ebuild
index ddad10466f07..3b3ae2be4864 100644
--- a/app-office/glabels/glabels-2.2.2.ebuild
+++ b/app-office/glabels/glabels-2.2.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/03/20 20:12:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.5.ebuild,v 1.1 2009/05/02 14:09:38 eva Exp $
 
-inherit eutils gnome2 autotools
+GCONF_DEBUG="no"
+
+inherit gnome2
 
 DESCRIPTION="Program for creating labels and business cards"
 HOMEPAGE="http://glabels.sourceforge.net/"
@@ -35,23 +37,10 @@ pkg_setup() {
 		--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
-	intltoolize --force || die "intltoolize failed"
-}
-
 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."
 }