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

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

6 files changed, 15 insertions, 164 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/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."
 }