| 1 |
commit: 076d4beb76e46e1648c98cbf5bda3a4569f2cc18 |
| 2 |
Author: Sobhan Mohammadpour <sobhanmohammadpour1 <AT> yahoo <DOT> fr> |
| 3 |
AuthorDate: Sun Oct 28 16:27:24 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 28 17:28:57 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=076d4beb |
| 7 |
|
| 8 |
gnome-base/gnome-shell: 3.6.0 → 3.6.1 |
| 9 |
|
| 10 |
[GD] Drop sed, it is handled by eclass. |
| 11 |
|
| 12 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
| 13 |
|
| 14 |
--- |
| 15 |
...shell-3.6.0.ebuild => gnome-shell-3.6.1.ebuild} | 14 +++++--------- |
| 16 |
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 14 +++++--------- |
| 17 |
2 files changed, 10 insertions(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild |
| 20 |
similarity index 96% |
| 21 |
rename from gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild |
| 22 |
rename to gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild |
| 23 |
index 60c1640..a8612d2 100644 |
| 24 |
--- a/gnome-base/gnome-shell/gnome-shell-3.6.0.ebuild |
| 25 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.6.1.ebuild |
| 26 |
@@ -116,6 +116,11 @@ DEPEND="${COMMON_DEPEND} |
| 27 |
# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
| 28 |
|
| 29 |
pkg_setup() { |
| 30 |
+ python_set_active_version 2 |
| 31 |
+ python_pkg_setup |
| 32 |
+} |
| 33 |
+ |
| 34 |
+src_prepare() { |
| 35 |
DOCS="AUTHORS NEWS README" |
| 36 |
# Don't error out on warnings |
| 37 |
G2CONF="${G2CONF} |
| 38 |
@@ -126,11 +131,7 @@ pkg_setup() { |
| 39 |
$(use_enable networkmanager) |
| 40 |
$(use_with systemd) |
| 41 |
BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" |
| 42 |
- python_set_active_version 2 |
| 43 |
- python_pkg_setup |
| 44 |
-} |
| 45 |
|
| 46 |
-src_prepare() { |
| 47 |
# Fix automagic gnome-bluetooth dep, bug #398145 |
| 48 |
epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" |
| 49 |
|
| 50 |
@@ -139,11 +140,6 @@ src_prepare() { |
| 51 |
|
| 52 |
[[ ${PV} != 9999 ]] && eautoreconf |
| 53 |
gnome2_src_prepare |
| 54 |
- |
| 55 |
- # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 |
| 56 |
- # Note: sed Makefile.in because it is generated from several Makefile.ams |
| 57 |
- sed -e 's/-DG_DISABLE_DEPRECATED//g' \ |
| 58 |
- -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" |
| 59 |
} |
| 60 |
|
| 61 |
src_install() { |
| 62 |
|
| 63 |
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
| 64 |
index 60c1640..a8612d2 100644 |
| 65 |
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
| 66 |
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
| 67 |
@@ -116,6 +116,11 @@ DEPEND="${COMMON_DEPEND} |
| 68 |
# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
| 69 |
|
| 70 |
pkg_setup() { |
| 71 |
+ python_set_active_version 2 |
| 72 |
+ python_pkg_setup |
| 73 |
+} |
| 74 |
+ |
| 75 |
+src_prepare() { |
| 76 |
DOCS="AUTHORS NEWS README" |
| 77 |
# Don't error out on warnings |
| 78 |
G2CONF="${G2CONF} |
| 79 |
@@ -126,11 +131,7 @@ pkg_setup() { |
| 80 |
$(use_enable networkmanager) |
| 81 |
$(use_with systemd) |
| 82 |
BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" |
| 83 |
- python_set_active_version 2 |
| 84 |
- python_pkg_setup |
| 85 |
-} |
| 86 |
|
| 87 |
-src_prepare() { |
| 88 |
# Fix automagic gnome-bluetooth dep, bug #398145 |
| 89 |
epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" |
| 90 |
|
| 91 |
@@ -139,11 +140,6 @@ src_prepare() { |
| 92 |
|
| 93 |
[[ ${PV} != 9999 ]] && eautoreconf |
| 94 |
gnome2_src_prepare |
| 95 |
- |
| 96 |
- # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 |
| 97 |
- # Note: sed Makefile.in because it is generated from several Makefile.ams |
| 98 |
- sed -e 's/-DG_DISABLE_DEPRECATED//g' \ |
| 99 |
- -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" |
| 100 |
} |
| 101 |
|
| 102 |
src_install() { |
Archives