Version bump, remove development version.

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

4 files changed, 63 insertions, 61 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/Manifest b/app-office/glabels/Manifest
index f430f2e7d922..e3f55645b8cc 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glabels-2.2.6-documentation.patch 509 RMD160 6231fd6d03f6c08bf05d8b392332ae000552f4e9 SHA1 87c943ebcbaa942ad3896fd27df11a7ee19b0b2e SHA256 b270984050b466f1fc7b5772624bbf9c3d5517fb5a9e2ba73ba3abf122868a4d
 AUX glabels-2.2.7-documentation.patch 1251 RMD160 0fc052131c6b7a26e368e1728b7866c9ec354a1c SHA1 0e266318a5540afcd4c0328bcba38cdcfb648404 SHA256 bf53b2a253557d841dc9935c5b91cb05b08c52a6ca78c183009e69c5c7fafe6a
 DIST glabels-2.2.8.tar.gz 3842721 RMD160 97506ca496fa35653462850ffd534384ee151733 SHA1 9b71da53ec3f27e886177a7c9089c8901fbf7fb2 SHA256 0401ab5ab55f1828e3db3633aa8f9b5a50a08bed74a5a9cb273e6274ce002f3c
-DIST glabels-2.3.0.tar.bz2 2796547 RMD160 4646c276b438a9ee78725c4b34c7a7480ee6432d SHA1 30c952fa1df0f307687cbb92d7b64e951fc5e7c7 SHA256 687109e8863dbf9a48597509656d378af8d52dfeb88657a8d5f8570a0e2cca24
+DIST glabels-3.0.0.tar.bz2 2924060 RMD160 76a05aaf4ab3d80efc6fbf549da964bc4e50031e SHA1 74f5a3fb09a12ef15827c1eef6f13b82c27a621e SHA256 a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a
 EBUILD glabels-2.2.8.ebuild 1494 RMD160 54dc36b9207db7a85580f88745f37c1d49480956 SHA1 8109a428b16647e5304b0696aaf18e35dca64b93 SHA256 93ba4ef4cbad21086d411ed423582e08390ae1b6b28cad75739e55585a1a0549
-EBUILD glabels-2.3.0.ebuild 1364 RMD160 247be249c3ca202d49f1511647ab9367c9a29a3d SHA1 e9304073b5755bc4e3ceae479f0db5ec4683ed30 SHA256 0284fa401cbae43dda67cdccef7236b628245091c09676d40121050ef64aedf9
-MISC ChangeLog 9237 RMD160 5ef869c5075c5a616fecc6f602a95b63b5493cf1 SHA1 931303c1be89de80338f2441d05a5705f2abe185 SHA256 8a809f155e5737ee9bfa732a4bbe0630b59580aa983a71cc282ff7d4975e8515
+EBUILD glabels-3.0.0.ebuild 1110 RMD160 8dff063a3c482e824e31dd682a7b25ac7085f582 SHA1 baf1fee8deb914db288c2dc2b6629de4f427e91b SHA256 76fd3ed5fe44e830feb52ab0c368e57ea474691bda55186626e216515351ae04
+MISC ChangeLog 9403 RMD160 97f0b93762cdd777a8d29c581d86d10bda92271b SHA1 a50bb3e5b43f6231efb98e541daa343ab50aea4e SHA256 9302976838190e3b2a2cec837ffd416eb9980ac597daf8ecda13550e98901e31
 MISC metadata.xml 535 RMD160 683fada0da07356640fff1b3ffadae7713c27793 SHA1 c11edf862bc38883ae96ac36e207167874caa305 SHA256 3f7047af8b04690c462c06b2ab838b2a38150f610523ad8e31451821f07c5d7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk7KQBMACgkQCaWpQKGI+9TslgCfQHwLGFW5MAJumhazrZgtkE6r
+YTYAniMD8OHyv0Cd0iNseVmkZjPd6IZK
+=DzBb
+-----END PGP SIGNATURE-----
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"
+}