From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/, gnome-extra/gnome-power-manager/files/
Date: Tue, 22 Feb 2011 19:44:32 +0000 (UTC) [thread overview]
Message-ID: <1455a37a74fc564f41a1dec26b2d9e32e56d354a.nirbheek@gentoo> (raw)
commit: 1455a37a74fc564f41a1dec26b2d9e32e56d354a
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 15:29:53 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 15:30:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1455a37a
gnome-extra/gnome-power-manager: 2.91.5 -> 2.91.90
* Reorder src_prepare so that eautoreconf is avoided
---
...-power-manager-2.91.5-fix-schemas-migrate.patch | 41 --------------------
...1.ebuild => gnome-power-manager-2.91.90.ebuild} | 27 +++----------
...5-r1.ebuild => gnome-power-manager-9999.ebuild} | 27 +++----------
3 files changed, 14 insertions(+), 81 deletions(-)
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.91.5-fix-schemas-migrate.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.91.5-fix-schemas-migrate.patch
deleted file mode 100644
index 5d2baf9..0000000
--- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.91.5-fix-schemas-migrate.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 40f32d9a78c334605ee5ff0dced2c85b0e837f5c Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Wed, 19 Jan 2011 20:44:58 +0530
-Subject: [PATCH] gschema.migrate: button keys moved to gnome-settings-daemon, fix typo
-
-* hibernate/power/suspend button keys moved to gnome-settings-daemon,
- fix the migration schema to point there
-* Fix typo in brightness-ac schema key
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639956
----
- data/org.gnome.power-manager.gschema.migrate | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/data/org.gnome.power-manager.gschema.migrate b/data/org.gnome.power-manager.gschema.migrate
-index d767fe5..c562857 100644
---- a/data/org.gnome.power-manager.gschema.migrate
-+++ b/data/org.gnome.power-manager.gschema.migrate
-@@ -2,10 +2,7 @@
- backlight-enable = /apps/gnome-power-manager/backlight/enable
- backlight-battery-reduce = /apps/gnome-power-manager/backlight/battery_reduce
- brightness-dim-battery = /apps/gnome-power-manager/backlight/brightness_dim_battery
--brightness-ac" = /apps/gnome-power-manager/backlight/brightness_ac
--button-suspend = /apps/gnome-power-manager/buttons/suspend
--button-hibernate = /apps/gnome-power-manager/buttons/hibernate
--button-power = /apps/gnome-power-manager/buttons/power
-+brightness-ac = /apps/gnome-power-manager/backlight/brightness_ac
- use-time-for-policy = /apps/gnome-power-manager/general/use_time_for_policy
- lock-use-screensaver = /apps/gnome-power-manager/lock/use_screensaver_settings
- lock-blank-screen = /apps/gnome-power-manager/lock/blank_screen
-@@ -37,3 +34,7 @@ time-action = /apps/gnome-power-manager/thresholds/time_action
- enable-sound = /apps/gnome-power-manager/ui/enable_sound
- show-actions = /apps/gnome-power-manager/ui/show_actions
- icon-policy = /apps/gnome-power-manager/ui/icon_policy
-+[org.gnome.settings-daemon.plugins.power]
-+button-suspend = /apps/gnome-power-manager/buttons/suspend
-+button-hibernate = /apps/gnome-power-manager/buttons/hibernate
-+button-power = /apps/gnome-power-manager/buttons/power
---
-1.7.3.4
-
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.90.ebuild
similarity index 78%
copy from gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
copy to gnome-extra/gnome-power-manager/gnome-power-manager-2.91.90.ebuild
index d88579b..35a5704 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.5 2010/12/12 16:53:55 armin76 Exp $
@@ -62,20 +62,21 @@ DEPEND="${COMMON_DEPEND}
# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
src_prepare() {
+ gnome2_src_prepare
+
G2CONF="${G2CONF}
$(use_enable test tests)
$(use_enable doc docbook-docs)
+ --disable-strict
--enable-compile-warnings=minimum
--disable-schemas-compile"
DOCS="AUTHORS ChangeLog NEWS README TODO"
- # Should get merged soonish, remove from live version after that
- # https://bugzilla.gnome.org/show_bug.cgi?id=639956
- epatch "${FILESDIR}/${P}-fix-schemas-migrate.patch"
-
# Drop debugger CFLAGS from configure
+ # XXX: touch configure.ac only if running eautoreconf, otherwise
+ # maintainer mode gets triggered -- even if the order is correct
sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
- -i configure.ac configure || die "debugger sed failed"
+ -i configure || die "debugger sed failed"
if ! use doc; then
# Remove the docbook2man rules here since it's not handled by a proper
@@ -84,20 +85,6 @@ src_prepare() {
-i man/Makefile.am man/Makefile.in \
|| die "docbook sed failed"
fi
-
- # glibc splits this out, whereas other libc's do not tend to
- if use elibc_glibc; then
- sed -e 's/-lresolv//' \
- -i configure.ac configure || die "resolv sed failed"
- fi
-
- if [[ ${PV} != 9999 ]]; then
- # FIXME: This is required to prevent maintainer mode after "debugger sed"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- fi
-
- gnome2_src_prepare
}
src_test() {
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
similarity index 78%
rename from gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
rename to gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
index d88579b..35a5704 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.91.5-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.5 2010/12/12 16:53:55 armin76 Exp $
@@ -62,20 +62,21 @@ DEPEND="${COMMON_DEPEND}
# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
src_prepare() {
+ gnome2_src_prepare
+
G2CONF="${G2CONF}
$(use_enable test tests)
$(use_enable doc docbook-docs)
+ --disable-strict
--enable-compile-warnings=minimum
--disable-schemas-compile"
DOCS="AUTHORS ChangeLog NEWS README TODO"
- # Should get merged soonish, remove from live version after that
- # https://bugzilla.gnome.org/show_bug.cgi?id=639956
- epatch "${FILESDIR}/${P}-fix-schemas-migrate.patch"
-
# Drop debugger CFLAGS from configure
+ # XXX: touch configure.ac only if running eautoreconf, otherwise
+ # maintainer mode gets triggered -- even if the order is correct
sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
- -i configure.ac configure || die "debugger sed failed"
+ -i configure || die "debugger sed failed"
if ! use doc; then
# Remove the docbook2man rules here since it's not handled by a proper
@@ -84,20 +85,6 @@ src_prepare() {
-i man/Makefile.am man/Makefile.in \
|| die "docbook sed failed"
fi
-
- # glibc splits this out, whereas other libc's do not tend to
- if use elibc_glibc; then
- sed -e 's/-lresolv//' \
- -i configure.ac configure || die "resolv sed failed"
- fi
-
- if [[ ${PV} != 9999 ]]; then
- # FIXME: This is required to prevent maintainer mode after "debugger sed"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- fi
-
- gnome2_src_prepare
}
src_test() {
next reply other threads:[~2011-02-22 19:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 19:44 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-27 20:25 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/, gnome-extra/gnome-power-manager/files/ Alexandre Restovtsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455a37a74fc564f41a1dec26b2d9e32e56d354a.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox