Version bump, remove development version.

(Portage version: 2.1.10.36/cvs/Linux x86_64)

3 files changed, 50 insertions, 58 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 7849a5bf8ca5..0c66fbb0a12b 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.57 2011/03/16 07:59:42 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.58 2011/11/21 12:11:57 pacho Exp $
+
+*glabels-3.0.0 (21 Nov 2011)
+
+  21 Nov 2011; Pacho Ramos <pacho@gentoo.org> +glabels-3.0.0.ebuild,
+  -glabels-2.3.0.ebuild:
+  Version bump, remove development version.
 
   16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> glabels-2.2.8.ebuild,
   glabels-2.3.0.ebuild:
diff --git a/app-office/glabels/glabels-2.3.0.ebuild b/app-office/glabels/glabels-2.3.0.ebuild
deleted file mode 100644
index 5d4d8d058ea2..000000000000
--- a/app-office/glabels/glabels-2.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 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.4 2011/03/16 07:59:43 nirbheek 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 ~ppc ~sparc ~x86"
-IUSE="barcode doc eds"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=x11-libs/gtk+-2.20:2
-	>=dev-libs/libxml2-2.7:2
-	>=gnome-base/gconf-2.28:2
-	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/glabels-3.0.0.ebuild b/app-office/glabels/glabels-3.0.0.ebuild
new file mode 100644
index 000000000000..dc2ed721822d
--- /dev/null
+++ b/app-office/glabels/glabels-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.0.ebuild,v 1.1 2011/11/21 12:11:57 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Program for creating labels and business cards"
+HOMEPAGE="http://www.glabels.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="barcode doc eds"
+
+RDEPEND=">=dev-libs/glib-2.28.2:2
+	>=x11-libs/gtk+-3.0.9:3
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/librsvg-2.32.0:2
+	>=x11-libs/cairo-1.10.0
+	>=x11-libs/pango-1.28.1
+	barcode? (
+		>=app-text/barcode-0.98
+		>=media-gfx/qrencode-3.1 )
+	eds? ( >=gnome-extra/evolution-data-server-2.30.3 )"
+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 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		$(use_with eds libebook)
+		--disable-static"
+}