New release: 2.0.3

(Portage version: 2.0.51.22-r1)

5 files changed, 124 insertions, 2 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 38e56226b9fb..1cb75e7ed0b3 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.16 2005/04/21 20:01:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.17 2005/07/03 14:14:59 leonardop Exp $
+
+*glabels-2.0.3 (03 Jul 2005)
+
+  03 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> glabels-2.0.3.ebuild,
+  files/glabels-2.0.3-update_dbs_switch.patch:
+  New release. Modified patch to enable/disable running
+  update-{mime,desktop}-database.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> glabels-2.0.2.ebuild:
   stable on amd64
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index b9519077ad33..bc57a10ce5fd 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,5 +1,8 @@
 MD5 d2822d2dfc7d614ecccd86558bb742a6 ChangeLog 3619
-MD5 1f5d76fa3b05b3b857ed01ceebab53e6 glabels-2.0.2.ebuild 1109
+MD5 35741d41a6a709c957f20d56ecf57126 glabels-2.0.3.ebuild 1113
 MD5 54b7f17aa1f3cf4e8cc03858fd99070c metadata.xml 554
+MD5 1f5d76fa3b05b3b857ed01ceebab53e6 glabels-2.0.2.ebuild 1109
+MD5 404e5eb4136f5093ca0ae319757c1e26 .glabels-2.0.3.ebuild.swp 12288
+MD5 994518077c87cf6a6ec073abb4d0ba34 files/digest-glabels-2.0.3 66
 MD5 3f3dda95f4d36a5df9fcb2096bde8f44 files/digest-glabels-2.0.2 66
 MD5 f151423cc5fb2f1ded05168f2158ad01 files/glabels-2.0.2-no_update_desktop_db.patch 437
diff --git a/app-office/glabels/files/digest-glabels-2.0.3 b/app-office/glabels/files/digest-glabels-2.0.3
new file mode 100644
index 000000000000..fb8b41c18e7a
--- /dev/null
+++ b/app-office/glabels/files/digest-glabels-2.0.3
@@ -0,0 +1 @@
+MD5 c077afdeac5ba0c685e404eea1d794e8 glabels-2.0.3.tar.gz 1946268
diff --git a/app-office/glabels/files/glabels-2.0.3-update_dbs_switch.patch b/app-office/glabels/files/glabels-2.0.3-update_dbs_switch.patch
new file mode 100644
index 000000000000..f39ffac2ff4b
--- /dev/null
+++ b/app-office/glabels/files/glabels-2.0.3-update_dbs_switch.patch
@@ -0,0 +1,59 @@
+diff -NurdB glabels-2.0.3/configure.in glabels-2.0.3-patched/configure.in
+--- glabels-2.0.3/configure.in	2005-06-19 19:25:27.000000000 -0500
++++ glabels-2.0.3-patched/configure.in	2005-07-02 21:28:24.000000000 -0500
+@@ -73,7 +73,7 @@
+ AC_SUBST(LIBGNOMEPRINTUI_REQUIRED)
+ AC_SUBST(LIBGNOMECANVAS_REQUIRED)
+ AC_SUBST(LIBGLADE_REQUIRED)
+-               
++
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - GLABELS prerequisites
+@@ -126,6 +126,16 @@
+ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
+ AM_CONDITIONAL(HAVE_NEWER_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
+ 
++AC_ARG_ENABLE(update-mimedb, AC_HELP_STRING([--disable-update-mimedb],
++              [disable the update-mime-database after install [default=no]]),,
++              enable_update_mimedb=yes)
++AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
++
++AC_ARG_ENABLE(update-desktopdb, AC_HELP_STRING([--disable-update-desktopdb],
++              [disable the update-desktop-database after install [default=no]]),,
++              enable_update_desktopdb=yes)
++AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
++
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Supported languages
+diff -NurdB glabels-2.0.3/data/mime/Makefile.am glabels-2.0.3-patched/data/mime/Makefile.am
+--- glabels-2.0.3/data/mime/Makefile.am	2004-08-09 09:46:23.000000000 -0500
++++ glabels-2.0.3-patched/data/mime/Makefile.am	2005-07-02 21:28:17.000000000 -0500
+@@ -28,18 +28,26 @@
+ 
+ 
+ install-data-hook:
++if ENABLE_UPDATE_MIMEDB
+ if HAVE_NEW_MIME
+ 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+ endif
++endif
++if ENABLE_UPDATE_DESKTOPDB
+ if HAVE_NEWER_MIME
+ 	$(UPDATE_DESKTOP_DATABASE) 
+ endif
++endif
+ 
+ uninstall-hook:
++if ENABLE_UPDATE_MIMEDB
+ if HAVE_NEW_MIME
+ 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+ endif
++endif
++if ENABLE_UPDATE_DESKTOPDB
+ if HAVE_NEWER_MIME
+ 	$(UPDATE_DESKTOP_DATABASE) 
+ endif
++endif
+ 
diff --git a/app-office/glabels/glabels-2.0.3.ebuild b/app-office/glabels/glabels-2.0.3.ebuild
new file mode 100644
index 000000000000..f290dfb25302
--- /dev/null
+++ b/app-office/glabels/glabels-2.0.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.0.3.ebuild,v 1.1 2005/07/03 14:14:59 leonardop 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="static"
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.0.5
+	>=gnome-base/libgnome-2.0.1
+	>=gnome-base/libgnomeui-2.0.1
+	>=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
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.21"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+G2CONF="${G2CONF} --disable-update-mimedb --disable-update-desktopdb \
+$(use_enable static)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Avoid sandbox violation. See bug #60545.
+	epatch ${FILESDIR}/${P}-update_dbs_switch.patch
+
+	einfo "Running aclocal"
+	aclocal || die "Aclocal failed"
+	einfo "Running autoconf"
+	autoconf || die "Autoconf failed"
+	einfo "Running automake"
+	automake || die "Automake failed"
+	einfo "Running libtoolize"
+	libtoolize --copy --force
+}