Version bump.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

5 files changed, 81 insertions, 50 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/Manifest b/app-office/glabels/Manifest
index a9def13f6590..a7e3fc82b371 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,10 +1,20 @@
+-----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.4.tar.gz 2020163 RMD160 1a0b07097e7635fbd99a881293c811ad68765b3b SHA1 0bcb60cd5b2bbc230b80304200e83776e424025f SHA256 23320b7af7f1038d3ff5aea90ac33ceaaa02ef6069d1b412b7f0d42bf6367b0b
 DIST glabels-2.2.7.tar.gz 3808294 RMD160 03827d925ff465825035fdbc92efa3bf45f658b8 SHA1 cba6a01e14bd503e6d82077a8b68dc3b40e77883 SHA256 7ea7ea9f265aca8689a6bf1951650b25c0ac20148dfc535dc7ac37c01eb81b53
 DIST glabels-2.2.8.tar.gz 3842721 RMD160 97506ca496fa35653462850ffd534384ee151733 SHA1 9b71da53ec3f27e886177a7c9089c8901fbf7fb2 SHA256 0401ab5ab55f1828e3db3633aa8f9b5a50a08bed74a5a9cb273e6274ce002f3c
-EBUILD glabels-2.2.4.ebuild 1199 RMD160 942c4f93b4923e08ab7c590d72ac275d81ff8c18 SHA1 9e2c59397c4553f1ac729d2e6e2d44c2bbd002d8 SHA256 05c660766a1df479e207b0feb61daec742f65305ca1c0a53e6dce4abdeecb534
+DIST glabels-2.3.0.tar.bz2 2796547 RMD160 4646c276b438a9ee78725c4b34c7a7480ee6432d SHA1 30c952fa1df0f307687cbb92d7b64e951fc5e7c7 SHA256 687109e8863dbf9a48597509656d378af8d52dfeb88657a8d5f8570a0e2cca24
 EBUILD glabels-2.2.7.ebuild 1703 RMD160 d4cd344a0242d5c548f46d0fae5473180c7f446a SHA1 1f6cff5a6b21518bafc265b1765f0b4abc9beaa7 SHA256 49cb2153c0b725b8beeab2714e170d2484da8634336095b7c4b05b20140dbc7e
 EBUILD glabels-2.2.8.ebuild 1483 RMD160 f07db8b94a70071bd4e9acbb77e55ba6843ddabe SHA1 4f2826cf53e46be9be444f26efa200e1202f4e0b SHA256 296a26e9b9b172060abb238f99404896f3f5c712bf4cdf3d6d3256d3af0c0e0c
-MISC ChangeLog 8530 RMD160 4beafd2835334aa356bdf6e0af6219181022ac9b SHA1 6a02fbca17e28ab6658dfb9d84492b831a2fcaf1 SHA256 9babd26047b1f3aad27f6f2b8ea2126b8fa572c7ed5dc97a471b8a44f874df92
-MISC metadata.xml 442 RMD160 a0c516bebb6ed10f7601f2755743420474a29987 SHA1 e80325acb06a429d86845a9ed3aa6ec5b3e5a468 SHA256 e555b2c153df834e3c5df2ac918b323df2299172adb8d641cf23fd27649d188a
+EBUILD glabels-2.3.0.ebuild 1343 RMD160 6486336c380fa726cdf97046b842eeeeb5f18e04 SHA1 e27d821f8eff63141877577ba6ec24e6887969f4 SHA256 f2248c5270c9f1446520ca89a1b07dee2fb404bef8a450eedb8e2de01eb171f9
+MISC ChangeLog 8690 RMD160 7e3508599925d190811823ff4b47efecadc9172d SHA1 9b535dd71d529cdd99c81b2b6205476f4371cdb5 SHA256 3e3ca677362efe16e14e6768f016be78a9b99dcd574426965dfb63ebdbf6ef34
+MISC metadata.xml 535 RMD160 683fada0da07356640fff1b3ffadae7713c27793 SHA1 c11edf862bc38883ae96ac36e207167874caa305 SHA256 3f7047af8b04690c462c06b2ab838b2a38150f610523ad8e31451821f07c5d7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyfwjQACgkQ1fmVwcYIWAaP5ACeMWjoK39fqv313Owr0RXLkD/U
+bbQAnR9inlKYAvjefsSgDVo/g+8Gyokm
+=8Jbz
+-----END PGP SIGNATURE-----
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>