[gentoo-commits] proj/gnome:master commit in: media-gfx/gnome-screenshot/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     fa55e48f4ff3011fc028e490fe08019fdfba18ea
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 23:05:35 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 23:10:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fa55e48f

media-gfx/gnome-screenshot: 3.8.3 → 3.10.0

---
 ...-9999.ebuild => gnome-screenshot-3.10.0.ebuild} | 33 ++++++++++------------
 .../gnome-screenshot/gnome-screenshot-9999.ebuild  | 24 +++++++++-------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.10.0.ebuild
similarity index 53%
copy from media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
copy to media-gfx/gnome-screenshot/gnome-screenshot-3.10.0.ebuild
index 29d8e0c..0d5775f 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.10.0.ebuild
@@ -1,31 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit gnome2 readme.gentoo
 
-DESCRIPTION="Screenshot utility for GNOME 3"
+DESCRIPTION="Screenshot utility for GNOME"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
+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
+	>=dev-libs/glib-2.35.1:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
@@ -44,11 +36,16 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+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_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
 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"
+	readme.gentoo_print_elog
 }

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
index 29d8e0c..2e43460 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit gnome2 readme.gentoo
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
-DESCRIPTION="Screenshot utility for GNOME 3"
+DESCRIPTION="Screenshot utility for GNOME"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2+"
@@ -25,7 +24,7 @@ fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
-	>=dev-libs/glib-2.33.1:2
+	>=dev-libs/glib-2.35.1:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
@@ -44,11 +43,16 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+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_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
 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"
+	readme.gentoo_print_elog
 }