[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-shell-extensions/

[Alexandre Restovtsev]

commit:     4e19e46d97dba3f4a5b186f3c1b3c05cca1709c6
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 18:22:39 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr  6 18:22:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4e19e46d

gnome-extra/gnome-shell-extensions: add 3.4.0

---
 ....ebuild => gnome-shell-extensions-3.4.0.ebuild} |   38 +++++++++----------
 .../gnome-shell-extensions-9999.ebuild             |   40 ++++++++++----------
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0.ebuild
similarity index 58%
copy from gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild
copy to gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0.ebuild
index 55ae724..0cccda3 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.4.0.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v 1.2 2011/12/12 19:56:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
-#	EGIT_BRANCH="gnome-3-0"
 	inherit gnome2-live
 fi
 
 DESCRIPTION="JavaScript extensions for GNOME Shell"
 HOMEPAGE="http://live.gnome.org/GnomeShell/Extensions"
+# Tarball not available from upstream website
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,11 +29,11 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.26
 	>=gnome-base/gnome-desktop-2.91.6:3[introspection]
 	>=gnome-base/libgtop-2.28.3[introspection]
-	app-admin/eselect-gnome-shell-extensions"
+	>=app-admin/eselect-gnome-shell-extensions-20111211"
 RDEPEND="${COMMON_DEPEND}
 	>=dev-libs/gjs-1.29
 	dev-libs/gobject-introspection
-	>=gnome-base/gnome-shell-3.2
+	>=gnome-base/gnome-shell-3.4
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gtk+:3[introspection]
@@ -40,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.26
+	>=dev-util/intltool-0.50
 	gnome-base/gnome-common"
 
 pkg_setup() {
@@ -50,19 +51,10 @@ pkg_setup() {
 		--disable-schemas-compile"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# xrandr-indicator crashes gnome-shell with <gjs-0.7.15;
-	# see gnome bug 649077. For simplicity, just disable it for gnome-3.0.
-	# sed -e 's:\(ALL_EXTENSIONS=.*\)xrandr-indicator:\1:' \
-	#	-i configure || die
-}
-
 src_install() {
 	gnome2_src_install
 
-	local example="example@××××××××××××××××××××××××××××.org"
+	local example="example@×××××××××××××××××××××××××××××××××××××.com"
 	if use examples; then
 		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
 			"${ED}usr/share/doc/${PF}/" || die
@@ -74,13 +66,19 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	einfo "Updating list of installed extensions"
-	eselect gnome-shell-extensions update || die
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
 	elog
 	elog "Installed extensions installed are initially disabled by default."
 	elog "To change the system default and enable some extensions, you can use"
 	elog "# eselect gnome-shell-extensions"
-	elog "Alternatively, you can use the org.gnome.shell enabled-extensions"
-	elog "gsettings key to change the disabled extension list per-user."
+	elog "Alternatively, to enable/disable extensions on a per-user basis,"
+	elog "you can use the https://extensions.gnome.org/ web interface, the"
+	elog "gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell"
+	elog "enabled-extensions gsettings key from the command line or a script."
 	elog
+	elog "In ${PN}-3.2.2, extension IDs have changed from"
+	elog "*.gnome.org to *.gcampax.github.com. As a result, extensions may"
+	elog "have become disabled, and you will need to re-enable them."
 }

diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild
index 55ae724..8fcab5a 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-9999.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v 1.2 2011/12/12 19:56:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
-#	EGIT_BRANCH="gnome-3-0"
 	inherit gnome2-live
 fi
 
 DESCRIPTION="JavaScript extensions for GNOME Shell"
 HOMEPAGE="http://live.gnome.org/GnomeShell/Extensions"
+# Tarball not available from upstream website
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,11 +31,11 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.26
 	>=gnome-base/gnome-desktop-2.91.6:3[introspection]
 	>=gnome-base/libgtop-2.28.3[introspection]
-	app-admin/eselect-gnome-shell-extensions"
+	>=app-admin/eselect-gnome-shell-extensions-20111211"
 RDEPEND="${COMMON_DEPEND}
 	>=dev-libs/gjs-1.29
 	dev-libs/gobject-introspection
-	>=gnome-base/gnome-shell-3.2
+	>=gnome-base/gnome-shell-3.4
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gtk+:3[introspection]
@@ -40,7 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.26
+	>=dev-util/intltool-0.50
 	gnome-base/gnome-common"
 
 pkg_setup() {
@@ -50,19 +53,10 @@ pkg_setup() {
 		--disable-schemas-compile"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# xrandr-indicator crashes gnome-shell with <gjs-0.7.15;
-	# see gnome bug 649077. For simplicity, just disable it for gnome-3.0.
-	# sed -e 's:\(ALL_EXTENSIONS=.*\)xrandr-indicator:\1:' \
-	#	-i configure || die
-}
-
 src_install() {
 	gnome2_src_install
 
-	local example="example@××××××××××××××××××××××××××××.org"
+	local example="example@×××××××××××××××××××××××××××××××××××××.com"
 	if use examples; then
 		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
 			"${ED}usr/share/doc/${PF}/" || die
@@ -74,13 +68,19 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	einfo "Updating list of installed extensions"
-	eselect gnome-shell-extensions update || die
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
 	elog
 	elog "Installed extensions installed are initially disabled by default."
 	elog "To change the system default and enable some extensions, you can use"
 	elog "# eselect gnome-shell-extensions"
-	elog "Alternatively, you can use the org.gnome.shell enabled-extensions"
-	elog "gsettings key to change the disabled extension list per-user."
+	elog "Alternatively, to enable/disable extensions on a per-user basis,"
+	elog "you can use the https://extensions.gnome.org/ web interface, the"
+	elog "gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell"
+	elog "enabled-extensions gsettings key from the command line or a script."
 	elog
+	elog "In ${PN}-3.2.2, extension IDs have changed from"
+	elog "*.gnome.org to *.gcampax.github.com. As a result, extensions may"
+	elog "have become disabled, and you will need to re-enable them."
 }