Version bump.

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

4 files changed, 67 insertions, 46 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 009a83021abd..206d10f29711 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.51 2010/09/11 10:51:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.52 2010/09/26 21:59:11 eva Exp $
+
+*glabels-2.3.0 (26 Sep 2010)
+
+  26 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> -glabels-2.2.4.ebuild,
+  +glabels-2.3.0.ebuild, metadata.xml:
+  Version bump.
 
   11 Sep 2010; <nixnut@gentoo.org> glabels-2.2.8.ebuild:
   ppc stable #335817
diff --git a/app-office/glabels/glabels-2.2.4.ebuild b/app-office/glabels/glabels-2.2.4.ebuild
deleted file mode 100644
index 6004119e9a2d..000000000000
--- a/app-office/glabels/glabels-2.2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.4.ebuild,v 1.6 2010/05/26 20:37:29 eva Exp $
-
-inherit 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="sparc"
-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"
-}
-
-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.3.0.ebuild b/app-office/glabels/glabels-2.3.0.ebuild
new file mode 100644
index 000000000000..560a2ff09872
--- /dev/null
+++ b/app-office/glabels/glabels-2.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.3.0.ebuild,v 1.1 2010/09/26 21:59:11 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Program for creating labels and business cards"
+HOMEPAGE="http://glabels.sourceforge.net/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="barcode doc eds"
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	>=x11-libs/gtk+-2.20:2
+	>=dev-libs/libxml2-2.7
+	>=gnome-base/gconf-2.28
+	barcode? (
+		>=app-text/barcode-0.98
+		>=media-gfx/qrencode-3.1 )
+	eds? ( >=gnome-extra/evolution-data-server-2.28 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.28
+	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
+		--disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix malformed XML documentation, bug #?
+	epatch "${FILESDIR}/${PN}-2.2.7-documentation.patch"
+
+	# Fix intltool test, bug #?
+	echo "help/cs/glabels-3.0.xml" >> po/POTFILES.in
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-office/glabels/metadata.xml b/app-office/glabels/metadata.xml
index d9bf79e1fa97..6cab71eddf79 100644
--- a/app-office/glabels/metadata.xml
+++ b/app-office/glabels/metadata.xml
@@ -8,4 +8,7 @@
   laser/ink-jet peel-off label and business card sheets that you'll
   find at most office supply stores.
 </longdescription>
+<use>
+	<flag name="barcode">Enable barcode support through external libraries.</flag>
+</use>
 </pkgmetadata>