From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/
Date: Tue, 22 Feb 2011 19:44:33 +0000 (UTC) [thread overview]
Message-ID: <ac94b3546890eb017785fec98b551204c5a5a48c.nirbheek@gentoo> (raw)
commit: ac94b3546890eb017785fec98b551204c5a5a48c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 19:10:03 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 19:32:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac94b354
gnome-base/gnome-control-center: 2.91.7 -> 2.91.90
* Lots and lots of plugin updates and bugfixes
---
....ebuild => gnome-control-center-2.91.90.ebuild} | 29 ++++++++----------
.../gnome-control-center-9999.ebuild | 30 +++++++++++--------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
similarity index 81%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
index c867504..1b08877 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
@@ -6,14 +6,14 @@ EAPI="3"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit eutils gnome2
+inherit gnome2
-DESCRIPTION="The gnome2 Desktop configuration tool"
+DESCRIPTION="GNOME Desktop Configuration Tool"
HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="doc"
+IUSE="doc +networkmanager +socialweb"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
@@ -21,9 +21,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-# TODO: appindicator
# WTF: pulseaudio is compulsary now for gnome-volume-control
-# XXX: libXft is checked for, but not used anywhere?
# FIXME: Cheese is optional, but automagic => force-enabled for now
# FIXME: Cups is optional, but automagic => force-enabled for now
# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
@@ -33,11 +31,11 @@ COMMON_DEPEND="
>=dev-libs/glib-2.25.11
>=x11-libs/gdk-pixbuf-2.23.0
>=x11-libs/gtk+-2.91.6:3
- >=gnome-base/gsettings-desktop-schemas-0.1.3
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
>=gnome-base/gconf-2.0
>=dev-libs/dbus-glib-0.73
>=gnome-base/gnome-desktop-2.91.5:3
- >=gnome-base/gnome-settings-daemon-2.91.2
+ >=gnome-base/gnome-settings-daemon-2.91.9
>=gnome-base/libgnomekbd-2.91.2
app-text/iso-codes
@@ -46,21 +44,23 @@ COMMON_DEPEND="
gnome-base/libgtop:2
media-libs/fontconfig
media-libs/gstreamer:0.10
- net-print/cups
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-0.9.16
>=media-video/cheese-2.29.90
+ >=net-print/cups-1.4
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
x11-apps/xmodmap
x11-libs/libX11
- x11-libs/libXft
x11-libs/libXxf86misc
- >=x11-libs/libxklavier-4.0
+ >=x11-libs/libxklavier-5.1
>=x11-libs/libXi-1.2
+ networkmanager? ( >=net-misc/networkmanager-0.8.992 )
+ socialweb? ( net-libs/libsocialweb )
+
!!gnome-extra/gnome-media[pulseaudio]
!!<gnome-extra/gnome-media-2.32.0-r300"
RDEPEND="${COMMON_DEPEND}
@@ -73,7 +73,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/kbproto
>=sys-devel/gettext-0.17
- >=dev-util/intltool-0.40
+ >=dev-util/intltool-0.40.1
>=dev-util/pkgconfig-0.19
app-text/scrollkeeper
@@ -83,13 +83,10 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gnome-common
src_prepare() {
- # TODO: libsocialweb
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
- --disable-schemas-install"
+ --disable-schemas-install
+ $(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
-
- # Taken from upstream, remove for next release, bug 353684
- epatch "${FILESDIR}/${P}-port-to-gtkstyle-context.patch"
}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 82fd020..1b08877 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -8,12 +8,12 @@ GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
inherit gnome2
-DESCRIPTION="The gnome2 Desktop configuration tool"
+DESCRIPTION="GNOME Desktop Configuration Tool"
HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="doc"
+IUSE="doc +networkmanager +socialweb"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
@@ -21,21 +21,21 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-# TODO: appindicator
# WTF: pulseaudio is compulsary now for gnome-volume-control
-# XXX: libXft is checked for, but not used anywhere?
# FIXME: Cheese is optional, but automagic => force-enabled for now
# FIXME: Cups is optional, but automagic => force-enabled for now
# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
+#
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
COMMON_DEPEND="
>=dev-libs/glib-2.25.11
>=x11-libs/gdk-pixbuf-2.23.0
>=x11-libs/gtk+-2.91.6:3
- >=gnome-base/gsettings-desktop-schemas-0.1.3
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
>=gnome-base/gconf-2.0
>=dev-libs/dbus-glib-0.73
>=gnome-base/gnome-desktop-2.91.5:3
- >=gnome-base/gnome-settings-daemon-2.91.2
+ >=gnome-base/gnome-settings-daemon-2.91.9
>=gnome-base/libgnomekbd-2.91.2
app-text/iso-codes
@@ -44,32 +44,36 @@ COMMON_DEPEND="
gnome-base/libgtop:2
media-libs/fontconfig
media-libs/gstreamer:0.10
- net-print/cups
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-0.9.16
>=media-video/cheese-2.29.90
+ >=net-print/cups-1.4
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
x11-apps/xmodmap
x11-libs/libX11
- x11-libs/libXft
x11-libs/libXxf86misc
- >=x11-libs/libxklavier-4.0
+ >=x11-libs/libxklavier-5.1
>=x11-libs/libXi-1.2
+ networkmanager? ( >=net-misc/networkmanager-0.8.992 )
+ socialweb? ( net-libs/libsocialweb )
+
!!gnome-extra/gnome-media[pulseaudio]
!!<gnome-extra/gnome-media-2.32.0-r300"
RDEPEND="${COMMON_DEPEND}
sys-apps/accountsservice"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
DEPEND="${COMMON_DEPEND}
x11-proto/xproto
x11-proto/xf86miscproto
x11-proto/kbproto
>=sys-devel/gettext-0.17
- >=dev-util/intltool-0.40
+ >=dev-util/intltool-0.40.1
>=dev-util/pkgconfig-0.19
app-text/scrollkeeper
@@ -78,11 +82,11 @@ DEPEND="${COMMON_DEPEND}
# Needed for autoreconf
# gnome-base/gnome-common
-pkg_setup() {
- # TODO: libsocialweb
+src_prepare() {
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
- --disable-schemas-install"
+ --disable-schemas-install
+ $(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
next reply other threads:[~2011-02-22 19:45 UTC|newest]
Thread overview: 39+ 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-02-27 3:02 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/ Jonathan Callen
2011-02-28 10:19 Nirbheek Chauhan
2011-02-28 20:25 Nirbheek Chauhan
2011-03-04 14:57 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-03-15 13:08 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-03-26 2:54 Nirbheek Chauhan
2011-03-26 5:10 Jonathan Callen
2011-04-05 0:57 Nirbheek Chauhan
2011-04-07 13:44 Nirbheek Chauhan
2011-04-08 10:52 Gilles Dartiguelongue
2011-04-27 22:22 Gilles Dartiguelongue
2011-05-30 18:39 Nirbheek Chauhan
2011-06-02 17:39 Nirbheek Chauhan
2011-10-02 19:11 Alexandre Restovtsev
2012-04-06 9:00 Alexandre Restovtsev
2012-09-08 0:37 Alexandre Restovtsev
2012-09-30 0:15 Alexandre Rostovtsev
2012-10-25 6:30 Priit Laes
2012-11-18 19:33 Gilles Dartiguelongue
2012-12-25 22:01 Gilles Dartiguelongue
2013-01-22 8:12 Alexandre Rostovtsev
2014-02-12 20:58 Gilles Dartiguelongue
2014-04-25 23:35 Gilles Dartiguelongue
2014-10-11 23:30 Gilles Dartiguelongue
2014-10-15 22:26 Gilles Dartiguelongue
2014-11-23 22:28 Gilles Dartiguelongue
2014-12-22 23:11 Gilles Dartiguelongue
2015-05-12 22:20 Gilles Dartiguelongue
2015-05-17 15:39 Gilles Dartiguelongue
2018-01-12 12:09 Dennis Lamm
2018-02-09 15:55 Sobhan Mohammadpour
2018-04-16 16:28 Sobhan Mohammadpour
2018-09-10 21:33 Gilles Dartiguelongue
2018-09-26 20:29 Mart Raudsepp
2018-09-26 20:29 Mart Raudsepp
2018-09-28 17:58 Mart Raudsepp
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=ac94b3546890eb017785fec98b551204c5a5a48c.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