Version bump for Gnome 3.6. Bump to EAPI=5, fix license.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 66 insertions, 15 deletions

diff --git a/media-gfx/gnome-screenshot/ChangeLog b/media-gfx/gnome-screenshot/ChangeLog
index 678522e31897..5723b86c692a 100644
--- a/media-gfx/gnome-screenshot/ChangeLog
+++ b/media-gfx/gnome-screenshot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gnome-screenshot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/ChangeLog,v 1.2 2012/05/06 20:25:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/ChangeLog,v 1.3 2012/12/23 23:03:36 eva Exp $
+
+*gnome-screenshot-3.6.1 (23 Dec 2012)
+
+  23 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-screenshot-3.4.1.ebuild, +gnome-screenshot-3.6.1.ebuild:
+  Version bump for Gnome 3.6. Bump to EAPI=5, fix license.
 
   06 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-screenshot-3.4.1.ebuild:
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 327d63f70f20..84fb6191cac5 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gnome-screenshot-3.4.1.tar.xz 264236 RMD160 f2d00639c990f0c40920f0de36ac3797cec26a42 SHA1 f91ee2830c783659d30ddfd6be93c15477c06ab9 SHA256 47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488
-EBUILD gnome-screenshot-3.4.1.ebuild 1356 RMD160 01028e7faaafc82a28bc5eb5171bcfe794707b32 SHA1 88185f3bfab598540d8dfcbc0905d22ef042e0bb SHA256 9190fdc63d2ca2062a8addd68a94a29feec2e2d7749dfa9de4bff34a6bb4c170
-MISC ChangeLog 633 RMD160 2e25f8d386064122b44abc8a2978a162df9fc0e5 SHA1 f2febe83eff41a98461852abd5d92f4fdf9c95ef SHA256 1b4b687a56b925a347c7770d84166065099357ae176baf9efbf18df7c585d1a8
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+DIST gnome-screenshot-3.4.1.tar.xz 264236 SHA256 47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488 SHA512 79ed5fd928aed4f9c0082aa979f2edbf9c4de4d76a0f132b9e42d7da2edccf226e4a2227eccf5c49415b24fb0007cbbb3932e3075444457f0dd48e57685bec6c WHIRLPOOL 41f9b8ede172347c011ea8e916153f7885a8af3a4692d30710ddfe11f0e6378935d073123f02270a13aaab0b57bc2e3f0657911e354c4e256c37d6cd6fe5c2db
+DIST gnome-screenshot-3.6.1.tar.xz 272796 SHA256 7954424f927c9cf5451d27e78edd10fa80d15345dfdb78bd7bc98f873617f382 SHA512 4fabec15d2bd8266ba3ac65e50d67363602db4b3de997810a9c1311613a54d972b05b2171de86d2c2034b3824a925d81915eb3d66d206f4da2785f4784c43da6 WHIRLPOOL cdc02dc7909d3a7ad5a8cdeb778f128b86879271a85c4aa95275e241aa4a572ab9045853e8318cbe9e1c51d07fb334ec5b8fd15eca872db83deddeff10435088
+EBUILD gnome-screenshot-3.4.1.ebuild 1351 SHA256 7979227de8f4f93801c4706b48761d2ab291a80c9048fcbe658a2ade2a933bf0 SHA512 9cf89e19e79bab507e53f0487d68d4b81865ad39ca6d78f907c8a8d8173c133c92c63b6ae187324518b31d790dfaf72076215e2884d2d3212c406c89383da795 WHIRLPOOL 00da8ee0ff859b520af47e49f2b34ffc9ba6629de050d5bc7362b1483d3fbe8a8f4dc37bad1e6a246ff5036ae13091588ca271147297fc2e0fe764a34eefde7a
+EBUILD gnome-screenshot-3.6.1.ebuild 1278 SHA256 ad228cf0177d6adbe827ddc795163fff1679be5fb473e1536387f70c1456c1f8 SHA512 0cd1149c053f07db08e00c56ebfdf5d0fb50f2a4df72438425ab92165dbc0f819084ae012aa915132e869204d0ba1169002c740d863d5a719041603ba8e5a98e WHIRLPOOL 6b3e0fbd07a0081d7982385506bb02affd645296a83166026392a6acd7893336758ffd6bcc85a9098a60589752fd7187424cb65fb9f51456f922a3bd229cb62a
+MISC ChangeLog 845 SHA256 4903b48f1f0a8de85bcdedfeae3dce1c5fa91baa462fc8e98bce0aa80208d6e0 SHA512 d654d5a6bf16892edd9649d35e8786ea6cb6526f70f700e35b7619957512e9d0ee3b398e6a8e24ba557ea98247a9ef954aeca74bfbc722fd91faa89d943ce957 WHIRLPOOL 1c41e40a50ab6d17faa2f0f5b27058b754cafed2ad4e2d21395a803b13f04b34403e9d57cff5fc7be12533733eeecf36c3e2dadbaac2cd0b6853802b753a85ec
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPpt41AAoJEJ0WA1zPCt1h2GYH/iD9kDZw9id7rJhQEik5iZBc
-c6HhyyFMUnLowzwIrlRRLIhdNwaphG1zXoeeQVmgWDj7PxgRQ/9LN6W6SU3LUeKU
-BGaZnqjRRppoYOVzEnxHNmIcM/XpwOYYNam1diPSLmzc/jrl+Q6IOpZb9uSCaNHK
-NGhLCDjEJ2yEoCCIU+wuptH7nVQDJm0HzJjI9lOQgdWNewSZagA0gnyQvwM6lQPT
-QgQPWCR5WKO1pPTcnEiIkTEke5P3Ec4H+PQBzC4UOG9qEQ/E9gBQjb3KZkJK5Sez
-gbBWNXQc3jpPQm5Mj+ak5pEhMDuTVyOc6yAajJwtJn+qZ+lVjD/1OKIDjp8NHuo=
-=gjkB
+iEYEAREIAAYFAlDXjckACgkQ1fmVwcYIWAa7zgCeNmoTmzztTYxzN1Dj/KBjjLtM
+aG8An2h5G3y7IbsGSpG2jYaw41o0ngUK
+=wMSK
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild
index e56eaacc07fd..5f024ee33d1e 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.1.ebuild,v 1.2 2012/05/06 20:25:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-screenshot/gnome-screenshot-3.4.1.ebuild,v 1.3 2012/12/23 23:03:36 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="Screenshot utility for GNOME 3"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.6.1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.6.1.ebuild
new file mode 100644
index 000000000000..bc014526144e
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 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.6.1.ebuild,v 1.1 2012/12/23 23:03:36 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Screenshot utility for GNOME 3"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# libcanberra 0.26-r2 is needed for gtk+:3 fixes
+COMMON_DEPEND="
+	>=dev-libs/glib-2.33.1:2
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.0.3:3
+	x11-libs/libX11
+	x11-libs/libXext
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xextproto
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "${P} saves screenshots in ~/Pictures/ and defaults to"
+	elog "non-interactive mode when launched from a terminal. If you want to choose"
+	elog "where to save the screenshot, run"
+	elog " $ gnome-screenshot --interactive"
+}