Use dash for time format separator (#531330 by Kristian Fiskerstrand), drop old

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

4 files changed, 49 insertions, 11 deletions

diff --git a/media-gfx/gnome-screenshot/ChangeLog b/media-gfx/gnome-screenshot/ChangeLog
index e7fb58bd8eaf..1fd405d8524d 100644
--- a/media-gfx/gnome-screenshot/ChangeLog
+++ b/media-gfx/gnome-screenshot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/gnome-screenshot
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/ChangeLog,v 1.20 2014/12/23 22:05:21 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/ChangeLog,v 1.21 2015/02/03 11:03:55 pacho Exp $
+
+*gnome-screenshot-3.14.0-r1 (03 Feb 2015)
+
+  03 Feb 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-screenshot-3.14.0-use-dash.patch,
+  +gnome-screenshot-3.14.0-r1.ebuild, -gnome-screenshot-3.14.0.ebuild:
+  Use dash for time format separator (#531330 by Kristian Fiskerstrand), drop
+  old
 
 *gnome-screenshot-3.14.0 (23 Dec 2014)
 
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index f905389bbb29..14b179a21905 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-screenshot-3.14.0-use-dash.patch 783 SHA256 ed7c6ac2f3b961dd3dd58d76cf066a265a4f0fabc2993dd76c6753fff4385169 SHA512 e3f22318eb95e508c897abfd73426945a0df9a73e10d8101185e9053a4e58bbdab8ed4ae88463925f88eaa781a1b1642f8a2a2dcaf63ca7ed7df2f0c20466f20 WHIRLPOOL 4083c6008d4d2b0dabebf12661dab91b49ea4f071b324b8b105e59b03226e88ee1c455e4493395d5a8df7909f384cab397688627cd8b624f6a45b62e1dd22209
 DIST gnome-screenshot-3.12.0.tar.xz 258112 SHA256 ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1 SHA512 0b150aba057eae041c35c76f8b1ed2e630ca7d5a59d3a9c7d2307b261530de7194113382085f580f58eaa657ec545df572e5c2ecd7e19184e3247f07814025dc WHIRLPOOL cf60b21d657d23b0d29dd87c5b8e2f0a2b7abb64db134bbb3ebd0813aa846f5804e459ab486e3bdf99b8aa7193e8c9ea54ffeffc404e4ea3a6c56e951357d12e
 DIST gnome-screenshot-3.14.0.tar.xz 259796 SHA256 d96f108421ab04ee5d26387387df3858764e61d7718c7376cbf87890bf33912a SHA512 b8ccdc9db548824eb6e7bc7c783c429363a510921c2187d5daa3f83cfda202a3a0e447db1cb49649940add84e4e404c2a821f96ec3e895e0fc3f549362bf79a3 WHIRLPOOL a2347d6509336d9872557a6db29657d15ecb22a642b5d2c20836b4f32559f166617e620f77676a67703a939a515e2ef4d1e5e1c793ba588e8dd915300c11ea58
 EBUILD gnome-screenshot-3.12.0.ebuild 1343 SHA256 53f8b835fd0c1fb069357e62d8fe9c84d4b6e92f15ed4540cc06a6f18f73c1ee SHA512 97ea00421f3a0f96146f8eef640be2689df7c58ae3afc5151495d29c9a0cda8c5e1648386f28d90dbeb1c90b27a44318e69fcebb58ca539ce7ba6a50a154f10b WHIRLPOOL fd37da8350a7d07c2d1186e34d4115d1251bcd64899f8b777b8ffeacca43c8d6763b46bf11c37c7415ce5ac4b71dd944fa5b77d04517d17701e96acd79c023bb
-EBUILD gnome-screenshot-3.14.0.ebuild 1345 SHA256 b66215ca15c660fa87b17309ac5f7f45d274f9227f09e883ec163d3824cce448 SHA512 5848f28ff58dbe23c5fca728d44f34438d0cbf58acd06e81cfe1bf1849b66ec244b36c1f452d30e8bd74a834bead2859c67f5c9d14450bb74c732de665970c02 WHIRLPOOL 1b30b47a67bee29a08a4c728a9415806eb29399c95f9dfdbee0ac8a84a081d5d7fcdfd64f3470aee91e630b710b18fc81df4adb159d9a541698e486805ffba3f
-MISC ChangeLog 3143 SHA256 c23c8498ed06840e5b0c4c7e9217bc63fcaa33801061c819ce1f99f6f1163f87 SHA512 29f57d0a7552637eeef8e0f930302a203dafe5cea461a22a58272b3d4662e14c7d15c5e070f9aa21977941730dda631fe1c86ecb71656d27488fe4d9a96fc2fb WHIRLPOOL a42cfdd6d1b4777356e73da3bb076f73484948fb9e5538e59996fef79fd4c5e226eb1abee4688f4e1ec7908b8f8f378f8537464b9fc21654d6bda378e38c61e5
+EBUILD gnome-screenshot-3.14.0-r1.ebuild 1529 SHA256 89b0fc129e017aa92591ac4e39174227c38ed73f5d1cf6347aa7352f317d2cea SHA512 8db65c82b3e85d798e88a561f38643bdc526be69cf0d6a35f971450a7d59795ad21cc9bf709c230dd5ea07fbbf5f33cbbac3015af0bf52d8de563beff050de3b WHIRLPOOL df05515801b68389f8fb9e03ee24174584b5378f465af517fdc4f9bdd5a1a94474ccab44e36850457f0deda27fae784ea05fc83fe38a3650baff4e1668fc6ddf
+MISC ChangeLog 3439 SHA256 4904317f1dfb80131675a6b1278cd7778d5c22b848f970f842ace09adf2ca3f9 SHA512 f35f913f0423a517f1c119d2776ddc27bad8d0b790a76a09329b1c3f698076c7dfae9c51fdb853a2a9eff676f6b95701a68ad475ce61128adc7999b6d5c2b1ec WHIRLPOOL 3b2a607ca8bf282ae96ac607b2dc66c52fddc0cad8f2f6ddb4fa602229fbb5080007a144b861b7efd0e5276c0446ba8db20b6d0cbd248fdabea16834dd0c10e5
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSZ5yEACgkQ1fmVwcYIWAbjQACff41oquSbQI16oSg6xh+FnhzD
-ProAoJQhgBBuCnZcok+QDzwxlbvtu05r
-=Rbls
+iEYEAREIAAYFAlTQqxwACgkQCaWpQKGI+9QTTgCfYvcyZEaF9lWrCGkYPCAWeO+R
+yccAnjGbQAhCBpO3ZMdWFX2Fm2ZCBPBi
+=skZT
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
new file mode 100644
index 000000000000..5a6580ee3f35
--- /dev/null
+++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
@@ -0,0 +1,23 @@
+From aa23783c39f96dd0b45f70d82557736a5b884c55 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Wed, 28 Jan 2015 12:43:58 +0000
+Subject: filename-builder: use dash for time format separator
+
+We can't use colons, but a separator here still looks nice. Use a dash.
+
+diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c
+index 06706d6..5eade9c 100644
+--- a/src/screenshot-filename-builder.c
++++ b/src/screenshot-filename-builder.c
+@@ -130,7 +130,7 @@ build_path (AsyncExistenceJob *job)
+       GDateTime *d;
+ 
+       d = g_date_time_new_now_local ();
+-      origin = g_date_time_format (d, "%Y-%m-%d %H:%M:%S");
++      origin = g_date_time_format (d, "%Y-%m-%d %H-%M-%S");
+       g_date_time_unref (d);
+     }
+   else
+-- 
+cgit v0.10.1
+
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
index 10e1e5a04a23..56cc3dd7344c 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0.ebuild,v 1.1 2014/12/23 22:05:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild,v 1.1 2015/02/03 11:03:55 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 inherit gnome2 readme.gentoo
 
 DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
+HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-fr
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/glib-2.35.1:2[dbus]
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
@@ -40,6 +40,12 @@ DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
 	non-interactive mode when launched from a terminal. If you want to choose
 	where to save the screenshot, run 'gnome-screenshot --interactive'"
 
+src_prepare() {
+	# filename-builder: use dash for time format separator (from 'master')
+	epatch "${FILESDIR}"/${PN}-3.14.0-use-dash.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	readme.gentoo_create_doc