Version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 57 insertions, 89 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 0f1af2279999..869add06780e 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.76 2014/04/18 08:24:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.77 2014/11/11 11:19:57 pacho Exp $
+
+*glabels-3.2.1 (11 Nov 2014)
+
+  11 Nov 2014; Pacho Ramos <pacho@gentoo.org> +glabels-3.2.1.ebuild,
+  -files/glabels-3.0.1-eds-3.6.patch:
+  Version bump
 
   18 Apr 2014; Pacho Ramos <pacho@gentoo.org> -glabels-3.0.1-r1.ebuild,
   -glabels-3.0.1.ebuild:
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index f4bc9db07543..54b2b6986f3a 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX glabels-3.0.1-eds-3.6.patch 2511 SHA256 e7f5d8296779e5b811acd7eff57ea2cee37862f7c2796092966c648ead551c7c SHA512 36dfc088354b95721bc4c41309b37e808771ffa564059d623e4c64c67e6361c4bae16f9f4aaac259cbd63afc69add91d8eac8424e4b054de5f991fa71ea6a811 WHIRLPOOL 28bc487565575eca9932982376cf3958017d006801649327879241680050add15f56d4f68b7b2a0e3d7d75c42edb8a088190f792fe8acafddec966ebe3c7ca14
 DIST glabels-3.2.0.tar.xz 3359392 SHA256 c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9 SHA512 67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91dd2a85f0989c9133af6b011c3ff WHIRLPOOL f79e3d15ba32041133654fd67c7e05c4bba9e8d899344c52b503c1232ddc5cce8efcec20937c2d21d4f7fa3164a6d4c5ff8f1d9a770dea59c24fcc524b460673
+DIST glabels-3.2.1.tar.xz 3368052 SHA256 db615f653b6e78ef1209814b5e6d8d3af4f8d3444a259ddbcc0dfb279c7df855 SHA512 d68fab2697cc596d45fe19c0a4c02a7bceffcb12ff72d71aaff565c62e95afeab6c2cc5b0eb00581c992b576b7ffe81d7b7a0763be2044186ba07929de78a266 WHIRLPOOL 3c0c9d1fba0548442d19a3271f466c1cf84db361d527da4b6c00d231c56a6fb7c1c61b4015d640e805878b7774ba89920c3c4ebc19b2f3fb1049d9bef12bbbc7
 EBUILD glabels-3.2.0.ebuild 1009 SHA256 2393dd1c4e0078da0cdf6fda917fb628624cb2324399899b709c961fcdcee92d SHA512 c3b59f3dfa9f59284924af9f44721d162ea740b75c8c1926a838458ddbc73a91b819a37613fbdfc08844633bc5da7b841b5f6a28874c5c6525481a654e5bfa63 WHIRLPOOL 72e1253b27a8af453c34e94854617b0d42aba60e43276e009e90c7815476090239efbee63d1fdaea9fa09b6e37bda426fb2c33fe7c944baa905d9a5d5225c7c8
-MISC ChangeLog 11614 SHA256 26701bd9a1c342d589ca1546314cef09cf6968bb2909dc7af8c65fa600b6f2d7 SHA512 b842da1fa118aa4b08fabf14fb623dd2434bf4a7f7e758284e4a6a5b6a1dc67afab4a34291fbe6c66b8a6ffe686c9eacec801f737460d44ed78a2c0e9ad98201 WHIRLPOOL 6a3bfc1cb6b6ae2a108f53a74fecabdb43e889d439aa5fbbdf9026455c194133be095571afe0fa1844ddc8d7879af2f306334d725a32c0057c3ea12cc8871702
+EBUILD glabels-3.2.1.ebuild 1011 SHA256 3c769c444e31ee0707c75c99c3ea0c90ead1cbadcf333198d7d6cb99401e9f7d SHA512 235e9d08096206b824c28050623077d236650cd9a6bdb8fecf5d93069b019364d4001cfab6cde3639f38771fe4c2101cca3de686acc704b104267e6f725d43ab WHIRLPOOL 4df7c9a353ce0d806e70be2cb52437063182de148c206b1106ff869831e10ea9577033785e6784bc6c73a4ed85d79bfab5c47162f13fea2dfbcd76af8dcc051c
+MISC ChangeLog 11767 SHA256 9c7c5eb87bb5c5e67807a9f3c171881123609d711bba1dad1bfe647cc58fdd00 SHA512 ea3c82881e515c8554b2e2345eac99c244a13c7ff824dd0e6abcf0c0ab5788f3d8c90bff176d43395136d3b78aaeadca5cface7d4ea6db778e459b2144fb4b28 WHIRLPOOL b89e72056a3abe8f56a288a662da64f3f37122baea6f33a6f046b6db3d2539f29860f5a884b85a09c19309c81fc12872a69bdfa34def2aaea97d64a1d0e5eb6e
 MISC metadata.xml 535 SHA256 3f7047af8b04690c462c06b2ab838b2a38150f610523ad8e31451821f07c5d7a SHA512 8fc6d7b5a7dfb5df35a5ea73a657c9d3177daaf9ef6711dde10beab7544c7d9bf8eac73f9483907ba2ed895ce318c2774abbad62a963ae6d58221fe1ee409ee0 WHIRLPOOL 2495f07b313c795d7815a4aadf19ac423cedeb9aa6296d75d7e3ff53b6e1443e10bf452d12f2cc09a3cf8df27388e27b3264b32e88b9aa658fca467b069234c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNQ4UQACgkQCaWpQKGI+9QDAwCfcoJcJYBYNX63j27yN9cscWE+
-EaoAn1EY/2XVECIOZhwIZNyYil0PRLhM
-=szyq
+iEYEAREIAAYFAlRh8N4ACgkQCaWpQKGI+9RVhQCfYZpPHiTot2SwDllOHDJbNXrD
+J2EAn1IDtixoHL7Ms08guKNEwjjiBT/E
+=F6s5
 -----END PGP SIGNATURE-----
diff --git a/app-office/glabels/files/glabels-3.0.1-eds-3.6.patch b/app-office/glabels/files/glabels-3.0.1-eds-3.6.patch
deleted file mode 100644
index b979dd5ad130..000000000000
--- a/app-office/glabels/files/glabels-3.0.1-eds-3.6.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 6b7d7e831e5542b6ea3c15802fa882a42399fc15 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-Date: Mon, 01 Apr 2013 08:53:59 +0000
-Subject: unbreak with evolution-data-server >= 3.6.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685130
----
-diff --git a/src/merge-evolution.c b/src/merge-evolution.c
-index bd14483..c3c2639 100644
---- a/src/merge-evolution.c
-+++ b/src/merge-evolution.c
-@@ -29,7 +29,7 @@
- 
- #include "merge-evolution.h"
- 
--#include <libebook/e-book.h>
-+#include <libebook/libebook.h>
- #include <glib/gi18n.h>
- #include <stdio.h>
- #include <string.h>
-@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gconstpointer *a, gconstpointer *b)
- /*--------------------------------------------------------------------------*/
- /* Open merge source.                                                       */
- /*--------------------------------------------------------------------------*/
-+static EBook *
-+gl_open_system_addressbook (GError **error)
-+{
-+   ESourceRegistry *registry;
-+   EBook *book = NULL;
-+   ESource *source;
-+
-+   registry = e_source_registry_new_sync (NULL, error);
-+   if (!registry)
-+       return NULL;
-+
-+   source = e_source_registry_ref_builtin_address_book (registry);
-+   if (!source) {
-+       g_object_unref (registry);
-+       return NULL;
-+   }
-+
-+   book = e_book_new (source, error);
-+
-+   g_object_unref (source);
-+   g_object_unref (registry);
-+
-+   return book;
-+}
-+
- static void
- gl_merge_evolution_open (glMerge *merge)
- {
-@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
-                 return;
-         }
- 
--        merge_evolution->priv->book = e_book_new_system_addressbook(&error);
-+        merge_evolution->priv->book = gl_open_system_addressbook(&error);
-         if (!merge_evolution->priv->book) {
-                 g_warning ("Couldn't open addressbook.");
-                 if (error)
-                 {
--                        g_warning ("e_book_new_system_addressbook: %s", error->message);
-+                        g_warning ("gl_open_system_addressbook: %s", error->message);
-                         g_error_free (error);
-                 }
-                 e_book_query_unref(query);
-diff --git a/src/merge-vcard.c b/src/merge-vcard.c
-index da1deff..6554015 100644
---- a/src/merge-vcard.c
-+++ b/src/merge-vcard.c
-@@ -27,7 +27,7 @@
- 
- #include "merge-vcard.h"
- 
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
---
-cgit v0.9.1
diff --git a/app-office/glabels/glabels-3.2.1.ebuild b/app-office/glabels/glabels-3.2.1.ebuild
new file mode 100644
index 000000000000..f223743af621
--- /dev/null
+++ b/app-office/glabels/glabels-3.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.2.1.ebuild,v 1.1 2014/11/11 11:19:57 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 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}
+	app-text/scrollkeeper
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.28
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with eds libebook) \
+		--disable-static
+}