[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

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"
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Jonathan Callen]

commit:     5487e279c14e9f4a2ad6de18dd37b2490e632ea9
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 00:13:37 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:13:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5487e279

gnome-base/gnome-control-center: use ! blockers, not !!

(Portage version: 2.2.0_alpha23_p5/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838)

---
 .../gnome-control-center-2.91.90.ebuild            |    4 ++--
 .../gnome-control-center-9999.ebuild               |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
index 1b08877..d1101b0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
@@ -61,8 +61,8 @@ COMMON_DEPEND="
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
 
-	!!gnome-extra/gnome-media[pulseaudio]
-	!!<gnome-extra/gnome-media-2.32.0-r300"
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice"
 # PDEPEND to avoid circular dependency

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 1b08877..d1101b0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -61,8 +61,8 @@ COMMON_DEPEND="
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
 
-	!!gnome-extra/gnome-media[pulseaudio]
-	!!<gnome-extra/gnome-media-2.32.0-r300"
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice"
 # PDEPEND to avoid circular dependency

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     666b9ec5f3acaf4decef7c8e01dcfdd2e76a1214
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 10:16:03 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 10:16:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=666b9ec5

gnome-base/gnome-control-center: patch pushed upstream

---
 .../gnome-control-center-9999.ebuild               |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

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 9cb2b1b..d0fd32b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -90,8 +90,5 @@ src_prepare() {
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-	# bug 356729
-	epatch "${FILESDIR}/${PN}-fix-networkmanager-api.patch"
-
 	gnome2_src_prepare
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     dcdbeadf7ab91d4cf99c98c47a0389b4dbeacf44
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 19:45:00 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 19:45:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dcdbeadf

gnome-base/gnome-control-center: fix g-s-d deps

---
 .../gnome-control-center-9999.ebuild               |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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 d0fd32b..e157823 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -27,6 +27,7 @@ fi
 # 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
+# g-s-d-2.91.90.1 is needed for magnifier schema updates
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.11
 	>=x11-libs/gdk-pixbuf-2.23.0
@@ -35,7 +36,7 @@ COMMON_DEPEND="
 	>=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.9
+	>=gnome-base/gnome-settings-daemon-2.91.90.1
 	>=gnome-base/libgnomekbd-2.91.2
 
 	app-text/iso-codes

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     ac8f236b2fb15b48f9d60efdf30ed9d6cf7e0c6a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 11:42:47 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 13:11:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac8f236b

gnome-base/gnome-control-center: update live deps

---
 .../gnome-control-center-9999.ebuild               |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

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 e157823..bdfe8d7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -13,7 +13,8 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="doc +networkmanager +socialweb"
+# Make it +cheese once cheese is ported to gtk+3, and added to overlay
+IUSE="doc cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -22,34 +23,31 @@ else
 fi
 
 # WTF: pulseaudio is compulsary now for gnome-volume-control
-# 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
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d-2.91.90.1 is needed for magnifier schema updates
+# Latest gsettings-desktop-schemas is needed for commit f6b0ae89
 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.7
+	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
 	>=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.90.1
-	>=gnome-base/libgnomekbd-2.91.2
+	>=gnome-base/libgnomekbd-2.91.90
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
 	gnome-base/gnome-menus
 	gnome-base/libgtop:2
 	media-libs/fontconfig
-	media-libs/gstreamer:0.10
 
 	>=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
 
@@ -59,6 +57,10 @@ COMMON_DEPEND="
 	>=x11-libs/libxklavier-5.1
 	>=x11-libs/libXi-1.2
 
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-2.91.5 )
+	cups? ( >=net-print/cups-1.4 )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
 
@@ -88,6 +90,8 @@ src_prepare() {
 		--disable-update-mimedb
 		--disable-static
 		--disable-schemas-install
+		$(use_with cheese)
+		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     c8bc2551cc7f2787f5c5494d6e0ab9efd19afefd
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 18:04:23 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 11:21:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c8bc2551

gnome-base/gnome-control-center: 2.91.90 → 2.91.91

---
 ....ebuild => gnome-control-center-2.91.91.ebuild} |   26 ++++++++++---------
 .../gnome-control-center-9999.ebuild               |    4 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
similarity index 78%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
index 9cb2b1b..a62346e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
@@ -13,7 +13,8 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="doc +networkmanager +socialweb"
+# Make it +cheese once cheese is ported to gtk+3, and added to overlay
+IUSE="doc cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -22,33 +23,31 @@ else
 fi
 
 # WTF: pulseaudio is compulsary now for gnome-volume-control
-# 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
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d-2.91.90.1 is needed for magnifier schema updates
+# Latest gsettings-desktop-schemas is needed for commit f6b0ae89
 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.7
+	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
 	>=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.9
-	>=gnome-base/libgnomekbd-2.91.2
+	>=gnome-base/gnome-settings-daemon-2.91.90.1
+	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
 	gnome-base/gnome-menus
 	gnome-base/libgtop:2
 	media-libs/fontconfig
-	media-libs/gstreamer:0.10
 
 	>=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
 
@@ -58,6 +57,10 @@ COMMON_DEPEND="
 	>=x11-libs/libxklavier-5.1
 	>=x11-libs/libXi-1.2
 
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-2.91.5 )
+	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
 
@@ -87,11 +90,10 @@ src_prepare() {
 		--disable-update-mimedb
 		--disable-static
 		--disable-schemas-install
+		$(use_with cheese)
+		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-	# bug 356729
-	epatch "${FILESDIR}/${PN}-fix-networkmanager-api.patch"
-
 	gnome2_src_prepare
 }

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 bdfe8d7..a62346e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gnome-settings-daemon-2.91.90.1
-	>=gnome-base/libgnomekbd-2.91.90
+	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	cheese? (
 		media-libs/gstreamer:0.10
 		>=media-video/cheese-2.91.5 )
-	cups? ( >=net-print/cups-1.4 )
+	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
 

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     7c0c5eb298b0066fe6850d9b7ab675509d9b5d24
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 23:45:49 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 02:46:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7c0c5eb2

gnome-base/gnome-control-center: update deps

* Add explanation for gnome-desktop and gsettings-desktop-schemas ver dep bump

---
 .../gnome-control-center-2.91.91.ebuild            |    7 +++----
 .../gnome-control-center-9999.ebuild               |   20 +++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
index a62346e..8998f50 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
@@ -22,7 +22,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-# WTF: pulseaudio is compulsary now for gnome-volume-control
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
@@ -30,11 +29,11 @@ fi
 # g-s-d-2.91.90.1 is needed for magnifier schema updates
 # Latest gsettings-desktop-schemas is needed for commit f6b0ae89
 COMMON_DEPEND="
-	>=dev-libs/glib-2.25.11
-	>=x11-libs/gdk-pixbuf-2.23.0
+	>=dev-libs/glib-2.25.11:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=x11-libs/gtk+-2.91.6:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
-	>=gnome-base/gconf-2.0
+	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gnome-settings-daemon-2.91.90.1

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 a62346e..99e5d89 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -22,21 +22,23 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-# WTF: pulseaudio is compulsary now for gnome-volume-control
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d-2.91.90.1 is needed for magnifier schema updates
-# Latest gsettings-desktop-schemas is needed for commit f6b0ae89
+#
+# Due to commit 70eb510 (gnome bug 633983):
+# * Latest gsettings-desktop-schemas is needed for commit 70eb510
+# * Latest gnome-desktop is needed for commit 7f3e3d52
 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.7.1
-	>=gnome-base/gconf-2.0
+	>=dev-libs/glib-2.25.11:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.0.2:3
+	>=gnome-base/gsettings-desktop-schemas-2.91.91.1
+	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
-	>=gnome-base/gnome-desktop-2.91.5:3
+	>=gnome-base/gnome-desktop-2.91.91.1:3
 	>=gnome-base/gnome-settings-daemon-2.91.90.1
 	>=gnome-base/libgnomekbd-2.91.91
 
@@ -59,7 +61,7 @@ COMMON_DEPEND="
 
 	cheese? (
 		media-libs/gstreamer:0.10
-		>=media-video/cheese-2.91.5 )
+		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     a8488bae77c037d2bfc2da92b79837183566b051
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 03:51:27 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 04:18:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a8488bae

gnome-base/gnome-control-center: 2.91.91 → 2.91.92

---
 ....ebuild => gnome-control-center-2.91.92.ebuild} |   13 +++++++------
 .../gnome-control-center-9999.ebuild               |   14 ++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.92.ebuild
similarity index 89%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.92.ebuild
index 8998f50..bd33314 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92.ebuild
@@ -13,8 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-# Make it +cheese once cheese is ported to gtk+3, and added to overlay
-IUSE="doc cheese +cups +networkmanager +socialweb"
+IUSE="doc +cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -27,12 +26,12 @@ fi
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d-2.91.90.1 is needed for magnifier schema updates
-# Latest gsettings-desktop-schemas is needed for commit f6b0ae89
+# Latest gsettings-desktop-schemas is needed for commit 73f9bffb
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.11:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-2.91.6:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
+	>=x11-libs/gtk+-3.0.2:3
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
@@ -58,7 +57,7 @@ COMMON_DEPEND="
 
 	cheese? (
 		media-libs/gstreamer:0.10
-		>=media-video/cheese-2.91.5 )
+		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
 	socialweb? ( net-libs/libsocialweb )
@@ -80,6 +79,8 @@ DEPEND="${COMMON_DEPEND}
 
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
+	
+	cups? ( sys-apps/sed )
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # Needed for autoreconf
 #	gnome-base/gnome-common

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 99e5d89..bd33314 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -13,8 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-# Make it +cheese once cheese is ported to gtk+3, and added to overlay
-IUSE="doc cheese +cups +networkmanager +socialweb"
+IUSE="doc +cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -27,18 +26,15 @@ fi
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d-2.91.90.1 is needed for magnifier schema updates
-#
-# Due to commit 70eb510 (gnome bug 633983):
-# * Latest gsettings-desktop-schemas is needed for commit 70eb510
-# * Latest gnome-desktop is needed for commit 7f3e3d52
+# Latest gsettings-desktop-schemas is needed for commit 73f9bffb
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.11:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=x11-libs/gtk+-3.0.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
-	>=gnome-base/gnome-desktop-2.91.91.1:3
+	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gnome-settings-daemon-2.91.90.1
 	>=gnome-base/libgnomekbd-2.91.91
 
@@ -83,6 +79,8 @@ DEPEND="${COMMON_DEPEND}
 
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
+	
+	cups? ( sys-apps/sed )
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # Needed for autoreconf
 #	gnome-base/gnome-common

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     0a266686fc6b03f2d9239ab791be618fb846f132
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 02:28:16 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 02:28:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0a266686

gnome-control-center: fix patch name

* Fixes bug 360493, reported by landscape69

---
 .../gnome-control-center-2.91.92-r2.ebuild         |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
index 84027a5..df60b71 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
@@ -96,7 +96,7 @@ src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=360057
-	epatch "${FILESDIR}/${PN}-fix-desktop-file.patch"
+	epatch "${FILESDIR}/${P}-fix-desktop-file.patch"
 
 	gnome2_src_prepare
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Jonathan Callen]

commit:     e1446e06b44f42cd9dae478c1d73110cefeb79ec
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 04:26:35 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 04:26:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e1446e06

gnome-base/gnome-control-center: Add blocker on old gdm

Older gdm installs files that collide with current
gnome-control-center. Ensure that this isn't an issue by adding a
blocker.

Also move all blockers to RDEPEND, as they are runtime-only.

(Portage version: 2.2.0_alpha28_p8/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838)

---
 .../gnome-control-center-2.91.92-r2.ebuild         |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
index df60b71..734344a 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
@@ -60,12 +60,13 @@ COMMON_DEPEND="
 		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
-	socialweb? ( net-libs/libsocialweb )
+	socialweb? ( net-libs/libsocialweb )"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/accountsservice
 
 	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/accountsservice"
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<gnome-base/gdm-2.91.94"
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 DEPEND="${COMMON_DEPEND}
@@ -79,7 +80,7 @@ DEPEND="${COMMON_DEPEND}
 
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
-	
+
 	cups? ( sys-apps/sed )
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # Needed for autoreconf

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     a2a568e2255b4fd052e572d17c42e3e4ae747a3b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 17:35:07 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 17:35:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a2a568e2

gnome-base/gnome-control-center: 2.91.93 → 3.0.0

---
 ...93.ebuild => gnome-control-center-3.0.0.ebuild} |    8 +++-----
 .../gnome-control-center-9999.ebuild               |    8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.ebuild
similarity index 92%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.0.ebuild
index b7ab781..b06dff7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="doc +cheese +cups +networkmanager +socialweb"
+IUSE="+cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -25,7 +25,6 @@ fi
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d-2.91.90.1 is needed for magnifier schema updates
 # Latest gsettings-desktop-schemas is needed for commit 73f9bffb
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.11:2
@@ -35,7 +34,7 @@ COMMON_DEPEND="
 	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-settings-daemon-2.91.90.1
+	>=gnome-base/gnome-settings-daemon-2.91.94
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -81,8 +80,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
 
-	cups? ( sys-apps/sed )
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	cups? ( sys-apps/sed )"
 # Needed for autoreconf
 #	gnome-base/gnome-common
 

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 b7ab781..b06dff7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="doc +cheese +cups +networkmanager +socialweb"
+IUSE="+cheese +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -25,7 +25,6 @@ fi
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d-2.91.90.1 is needed for magnifier schema updates
 # Latest gsettings-desktop-schemas is needed for commit 73f9bffb
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.11:2
@@ -35,7 +34,7 @@ COMMON_DEPEND="
 	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
 	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-settings-daemon-2.91.90.1
+	>=gnome-base/gnome-settings-daemon-2.91.94
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -81,8 +80,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
 
-	cups? ( sys-apps/sed )
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	cups? ( sys-apps/sed )"
 # Needed for autoreconf
 #	gnome-base/gnome-common
 

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     6c362ec98fd962ce955a87363032a5ac52a35c10
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 16:37:05 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 13:42:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6c362ec9

gnome-base/gnome-control-center: 3.0.0 → 3.0.0.1

---
 ....ebuild => gnome-control-center-3.0.0.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
similarity index 100%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     ac7ddb2b8c7242d5491c703fc3969cc6d61984d0
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 21:53:24 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 10:51:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac7ddb2b

gnome-base/gnome-control-center: QAed

	* Fix phase names

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 .../gnome-control-center-3.0.0.1.ebuild            |    4 +---
 .../gnome-control-center-9999.ebuild               |    6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
index d1de139..ca45eff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
@@ -84,7 +84,7 @@ DEPEND="${COMMON_DEPEND}
 # Needed for autoreconf
 #	gnome-base/gnome-common
 
-src_prepare() {
+pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
@@ -93,6 +93,4 @@ src_prepare() {
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	gnome2_src_prepare
 }

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 b06dff7..ca45eff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND="
 		media-libs/gstreamer:0.10
 		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
-	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
+	networkmanager? ( >=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
@@ -84,7 +84,7 @@ DEPEND="${COMMON_DEPEND}
 # Needed for autoreconf
 #	gnome-base/gnome-common
 
-src_prepare() {
+pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
@@ -93,6 +93,4 @@ src_prepare() {
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	gnome2_src_prepare
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     14f2828fe3fcaccae0e6b8d2770996f86c70909d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:14:49 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 21:21:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=14f2828f

gnome-base/gnome-control-center: 3.0.0.1 → 3.0.1.1

---
 ....ebuild => gnome-control-center-3.0.1.1.ebuild} |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
similarity index 98%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
index 9ddf3af..862790a 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.0.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
@@ -90,7 +90,6 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
-		--disable-schemas-install
 		$(use_with cheese)
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     d589f6229a410be3465b833d1fa02aacef15ba80
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri May 27 02:40:01 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 18:10:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d589f622

gnome-base/gnome-control-center: 3.0.1.1 → 3.0.2

* Add runtime dependency on cups-pk-helper (new package added in previous
  patch), without which gnome-control-center cannot add or remove printers.
* Fix a typo in LDFLAGS (gnome bug 651162).

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ....1.ebuild => gnome-control-center-3.0.2.ebuild} |   10 ++++++++++
 .../gnome-control-center-9999.ebuild               |    1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
similarity index 90%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
index 862790a..4c7c3ac 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
@@ -64,6 +64,7 @@ COMMON_DEPEND="
 	socialweb? ( net-libs/libsocialweb )"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
+	cups? ( net-print/cups-pk-helper )
 
 	!gnome-extra/gnome-media[pulseaudio]
 	!<gnome-extra/gnome-media-2.32.0-r300
@@ -95,3 +96,12 @@ pkg_setup() {
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=651162
+	# XXX: remove for next release
+	sed -e 's:no-undefined:-no-undefined:' \
+		-i libgnome-control-center/Makefile.* || die "sed failed"
+
+	gnome2_src_prepare
+}

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 9ddf3af..f0b273a 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -64,6 +64,7 @@ COMMON_DEPEND="
 	socialweb? ( net-libs/libsocialweb )"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
+	cups? ( net-print/cups-pk-helper )
 
 	!gnome-extra/gnome-media[pulseaudio]
 	!<gnome-extra/gnome-media-2.32.0-r300

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Nirbheek Chauhan]

commit:     852f992d3072b99ad0b4ff509936833e429a52f3
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 17:29:49 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 17:30:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=852f992d

gnome-base/gnome-control-center: fix bug 369577

* pulseaudio[glib] is needed because pulse/glib-mainloop.h is used

---
 .../gnome-control-center-3.0.2.ebuild              |    2 +-
 .../gnome-control-center-9999.ebuild               |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
index 4c7c3ac..5b26187 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 
 	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-0.9.16
+	>=media-sound/pulseaudio-0.9.16[glib]
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
 

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 f0b273a..d3f4688 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 
 	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-0.9.16
+	>=media-sound/pulseaudio-0.9.16[glib]
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
 
@@ -91,7 +91,6 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
-		--disable-schemas-install
 		$(use_with cheese)
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Alexandre Restovtsev]

commit:     fb3dca3f5e7d3949ca44e9d421f7027f09bd344a
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Oct  2 19:10:44 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Oct  2 19:10:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fb3dca3f

gnome-base/gnome-control-center: add missing apg rdepend

Thanks to Olivier Crete for pointing out the error.

---
 .../gnome-control-center-3.2.0-r1.ebuild           |    1 +
 .../gnome-control-center-9999.ebuild               |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild
index 2678a7d..b84267c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.0-r1.ebuild
@@ -70,6 +70,7 @@ COMMON_DEPEND="
 	socialweb? ( net-libs/libsocialweb )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
+	app-admin/apg
 	sys-apps/accountsservice
 	cups? ( net-print/cups-pk-helper )
 

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 f64557f..92e8642 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -70,6 +70,7 @@ COMMON_DEPEND="
 	socialweb? ( net-libs/libsocialweb )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
+	app-admin/apg
 	sys-apps/accountsservice
 	cups? ( net-print/cups-pk-helper )
 

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Alexandre Restovtsev]

commit:     281eddd9466f9c28c1a0e9e42ccb6722202c89e5
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 08:59:12 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr  6 08:59:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=281eddd9

gnome-base/gnome-control-center: 3.3.92 → 3.4.0

Now with wacom support

---
 ...92.ebuild => gnome-control-center-3.4.0.ebuild} |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.0.ebuild
similarity index 94%
rename from gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.4.0.ebuild
index a825a04..1deae44 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb"
+IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb wacom"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -67,13 +67,16 @@ COMMON_DEPEND="
 	networkmanager? (
 		>=gnome-extra/nm-applet-0.9.1.90
 		>=net-misc/networkmanager-0.8.997 )
-	socialweb? ( net-libs/libsocialweb )"
+	socialweb? ( net-libs/libsocialweb )
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-libs/libXi )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	app-admin/apg
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	cups? ( net-print/cups-pk-helper )
+	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
 
 	!<gnome-base/gdm-2.91.94
 	!<gnome-extra/gnome-color-manager-3.1.2
@@ -109,7 +112,8 @@ pkg_setup() {
 		$(use_with cheese)
 		$(use_enable colord color)
 		$(use_enable cups)
-		$(use_with socialweb libsocialweb)"
+		$(use_with socialweb libsocialweb)
+		$(use_enable wacom)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Alexandre Restovtsev]

commit:     1edfcac10c11f2a8a143de43cf91f73956fcff9f
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  8 00:37:43 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Sep  8 00:37:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1edfcac1

gnome-base/gnome-control-center: sync with gx86

---
 .../gnome-control-center-9999.ebuild               |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

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 da57456..f1f3e61 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -80,7 +80,9 @@ RDEPEND="${COMMON_DEPEND}
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
 		net-print/cups-pk-helper )
-	!systemd? ( sys-auth/consolekit )
+	!systemd? (
+		app-admin/openrc-settingsd
+		sys-auth/consolekit )
 	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
 
 	!<gnome-base/gdm-2.91.94

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Alexandre Rostovtsev]

commit:     543cae884d816b6ae45792b66518269788f4c2dc
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 23:14:50 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 23:18:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=543cae88

gnome-base/gnome-control-center: 3.5.92 → 3.6.0

Update license, add xsltproc dep, punt unneded apg dep.

---
 ...92.ebuild => gnome-control-center-3.6.0.ebuild} |   18 +++++++++---------
 .../gnome-control-center-9999.ebuild               |   18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
similarity index 97%
rename from gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
index 53be9cb..7e55ae0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="GNOME Desktop Configuration Tool"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
 if [[ ${PV} = 9999 ]]; then
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.5.13:3
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
 	>=gnome-base/gnome-desktop-3.5.91:3
-	>=gnome-base/gnome-settings-daemon-3.5.90[colord?,policykit]
+	>=gnome-base/gnome-settings-daemon-3.6.0[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -55,10 +55,6 @@ COMMON_DEPEND="
 	>=x11-libs/libXi-1.2
 
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
 	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -69,11 +65,14 @@ COMMON_DEPEND="
 		>=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )
 	systemd? ( >=sys-apps/systemd-31 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
 	wacom? ( >=dev-libs/libwacom-0.6
 		>=x11-libs/libXi-1.2 )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
-	app-admin/apg
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
@@ -97,10 +96,11 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/kbproto
 
-	>=sys-devel/gettext-0.17
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	dev-libs/libxml2:2
 
 	cups? ( sys-apps/sed )
 

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 53be9cb..7e55ae0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="GNOME Desktop Configuration Tool"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
 if [[ ${PV} = 9999 ]]; then
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.5.13:3
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
 	>=gnome-base/gnome-desktop-3.5.91:3
-	>=gnome-base/gnome-settings-daemon-3.5.90[colord?,policykit]
+	>=gnome-base/gnome-settings-daemon-3.6.0[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -55,10 +55,6 @@ COMMON_DEPEND="
 	>=x11-libs/libXi-1.2
 
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
 	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -69,11 +65,14 @@ COMMON_DEPEND="
 		>=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )
 	systemd? ( >=sys-apps/systemd-31 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
 	wacom? ( >=dev-libs/libwacom-0.6
 		>=x11-libs/libXi-1.2 )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
-	app-admin/apg
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
@@ -97,10 +96,11 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/kbproto
 
-	>=sys-devel/gettext-0.17
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	dev-libs/libxml2:2
 
 	cups? ( sys-apps/sed )
 

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Priit Laes]

commit:     c7c4682050481ef938c939a523bfad3a4173da07
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Oct 25 06:28:42 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Oct 25 06:28:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c7c46820

gnome-base/gnome-control-center: 3.6.0 → 3.6.2

---
 ....0.ebuild => gnome-control-center-3.6.2.ebuild} |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
similarity index 99%
rename from gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
index 7e55ae0..49d5648 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
@@ -114,7 +114,6 @@ pkg_setup() {
 		--disable-static
 		--enable-documentation
 		$(use_enable bluetooth)
-		$(use_with cheese)
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable gnome-online-accounts goa)

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     51c6d063d5909c77f51b6c2ba549bbc755abdd95
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 19:31:47 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 19:33:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=51c6d063

gnome-base/gnome-control-center: 3.6.2 → 3.6.3

---
 ....2.ebuild => gnome-control-center-3.6.3.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.3.ebuild
similarity index 100%
rename from gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.6.3.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     79fedd0917e8947ee1a174ca4579e8cec4bb4664
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 22:00:20 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 22:00:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=79fedd09

gnome-base/gnome-control-center: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

---
 .../gnome-control-center-3.6.3-r1.ebuild           |  150 --------------------
 .../gnome-control-center-9999.ebuild               |   65 +++++----
 gnome-base/gnome-control-center/metadata.xml       |   21 +++
 3 files changed, 57 insertions(+), 179 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
deleted file mode 100644
index 95baa04..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
-#
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.5.13:3
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	>=gnome-base/gnome-desktop-3.5.91:3
-	>=gnome-base/gnome-settings-daemon-3.6.0[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
-
-	app-text/iso-codes
-	dev-libs/libpwquality
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3
-
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
-	colord? ( >=x11-misc/colord-0.1.8 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	kerberos? ( virtual/krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.1.90
-		>=net-misc/networkmanager-0.8.997 )
-	socialweb? ( net-libs/libsocialweb )
-	systemd? ( >=sys-apps/systemd-31 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	wacom? ( >=dev-libs/libwacom-0.6
-		>=x11-libs/libXi-1.2 )"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/accountsservice
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	!systemd? (
-		app-admin/openrc-settingsd
-		sys-auth/consolekit )
-	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2"
-# 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
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		--enable-documentation
-		$(use_enable bluetooth)
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable i18n ibus)
-		$(use_with socialweb libsocialweb)
-		$(use_enable systemd)
-		$(use_with v4l cheese)
-		$(use_enable wacom)"
-	# XXX: $(use_with kerberos) # for 3.7.x
-	if ! use kerberos; then
-		G2CONF+=" KRB5_CONFIG=$(type -P true)"
-	fi
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Make some panels optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=686840
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
-	# Needed for g-c-c 3.6.3 and PulseAudio >2.1. Remove in 3.6.4.
-	epatch "${FILESDIR}/${P}-pulseaudio-3-fix.patch"
-	[[ ${PV} != 9999 ]] && eautoreconf
-
-	gnome2_src_prepare
-
-	# panels/datetime/Makefile.am gets touched as a result of something in our
-	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
-}

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 311c928..cb62b57 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
@@ -28,12 +28,12 @@ fi
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d[policykit] needed for bug #403527
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
+	>=dev-libs/glib-2.31:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=x11-libs/gtk+-3.5.13:3
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	>=gnome-base/gnome-desktop-3.5.91:3
-	>=gnome-base/gnome-settings-daemon-3.6.0[colord?,policykit]
+	>=gnome-base/gnome-desktop-3.5.91:3=
+	>=gnome-base/gnome-settings-daemon-3.6[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 
 	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2.0[glib]
+	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
 	>=x11-libs/libnotify-0.7.3
@@ -54,7 +54,7 @@ COMMON_DEPEND="
 	x11-libs/libXxf86misc
 	>=x11-libs/libXi-1.2
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
 	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -69,8 +69,10 @@ COMMON_DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/clutter-gtk:1.0
 		>=media-video/cheese-3.5.91 )
-	wacom? ( >=dev-libs/libwacom-0.6
-		>=x11-libs/libXi-1.2 )"
+	wacom? (
+		>=dev-libs/libwacom-0.6
+		>=x11-libs/libXi-1.2 )
+"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
@@ -88,7 +90,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-color-manager-3.1.2
 	!gnome-extra/gnome-media[pulseaudio]
 	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2"
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 DEPEND="${COMMON_DEPEND}
@@ -104,11 +107,32 @@ DEPEND="${COMMON_DEPEND}
 
 	cups? ( sys-apps/sed )
 
-	gnome-base/gnome-common"
+	gnome-base/gnome-common
+"
 # Needed for autoreconf
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_prepare() {
+	# Make some panels optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=686840
+	epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
+	# Needed for g-c-c 3.6.3 and PulseAudio >2.1. Remove in 3.6.4.
+	epatch "${FILESDIR}/${P}-pulseaudio-3-fix.patch"
+	[[ ${PV} != 9999 ]] && eautoreconf
+
+	gnome2_src_prepare
+
+	# panels/datetime/Makefile.am gets touched as a result of something in our
+	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
+}
+
+src_configure() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
@@ -127,22 +151,5 @@ pkg_setup() {
 		G2CONF+=" KRB5_CONFIG=$(type -P true)"
 	fi
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Make some panels optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=686840
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
-	[[ ${PV} != 9999 ]] && eautoreconf
-
-	gnome2_src_prepare
-
-	# panels/datetime/Makefile.am gets touched as a result of something in our
-	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
+	gnome2_src_configure
 }

diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
new file mode 100644
index 0000000..aca3103
--- /dev/null
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="colord">Support color management using
+			<pkg>x11-misc/colord</pkg></flag>
+    <flag name="cheese">Add support for taking pictures for the user
+			accounts panel using <pkg>media-video/cheese</pkg></flag>
+    <flag name="gnome-online-accounts">Enable configuration panel for
+			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+    <flag name="i18n">Enable support for enhanced input methods through
+			<pkg>app-i18n/ibus</pkg></flag>
+    <flag name="socialweb">Add support for desktop background images from
+			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
+    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+    <flag name="wacom">Enable support for Wacom tablets and drawing
+			devices</flag>
+  </use>
+</pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Alexandre Rostovtsev]

commit:     572c7f743f483a9ef274e569f964633ae659cbfd
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 22 08:07:44 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Jan 22 08:10:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=572c7f74

gnome-base/gnome-control-center: sync with gx86

Rename USE=wacom to INPUT_DEVICES=wacom.

Package-Manager: portage-2.2.0_alpha158
Manifest-Sign-Key: CF0ADD61

---
 .../gnome-control-center-9999.ebuild               |   18 +++++++++---------
 gnome-base/gnome-control-center/metadata.xml       |    6 ------
 2 files changed, 9 insertions(+), 15 deletions(-)

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 cb62b57..73030ff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,11 +16,11 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +networkmanager +socialweb systemd v4l"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
@@ -59,6 +59,9 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.4[dbus] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.6
+		>=x11-libs/libXi-1.2 )
 	kerberos? ( virtual/krb5 )
 	networkmanager? (
 		>=gnome-extra/nm-applet-0.9.1.90
@@ -69,12 +72,10 @@ COMMON_DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/clutter-gtk:1.0
 		>=media-video/cheese-3.5.91 )
-	wacom? (
-		>=dev-libs/libwacom-0.6
-		>=x11-libs/libXi-1.2 )
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon[input_devices_wacom?]
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
@@ -84,7 +85,6 @@ RDEPEND="${COMMON_DEPEND}
 	!systemd? (
 		app-admin/openrc-settingsd
 		sys-auth/consolekit )
-	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
 
 	!<gnome-base/gdm-2.91.94
 	!<gnome-extra/gnome-color-manager-3.1.2
@@ -142,10 +142,10 @@ src_configure() {
 		$(use_enable cups)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable i18n ibus)
+		$(use_enable input_devices_wacom wacom)
 		$(use_with socialweb libsocialweb)
 		$(use_enable systemd)
-		$(use_with v4l cheese)
-		$(use_enable wacom)"
+		$(use_with v4l cheese)"
 	# XXX: $(use_with kerberos) # for 3.7.x
 	if ! use kerberos; then
 		G2CONF+=" KRB5_CONFIG=$(type -P true)"

diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index aca3103..e06fb6b 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -5,17 +5,11 @@
   <use>
     <flag name="colord">Support color management using
 			<pkg>x11-misc/colord</pkg></flag>
-    <flag name="cheese">Add support for taking pictures for the user
-			accounts panel using <pkg>media-video/cheese</pkg></flag>
     <flag name="gnome-online-accounts">Enable configuration panel for
 			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
     <flag name="i18n">Enable support for enhanced input methods through
 			<pkg>app-i18n/ibus</pkg></flag>
     <flag name="socialweb">Add support for desktop background images from
 			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
-    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
-			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
-    <flag name="wacom">Enable support for Wacom tablets and drawing
-			devices</flag>
   </use>
 </pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     12c5cf3664fbe86f4f8f01b34ec8e95fb7de2291
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 20:19:01 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 20:27:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=12c5cf36

gnome-base/gnome-control-center: moved to gentoo-x86 + sync live ebuild

---
 .../gnome-control-center-3.10.2.ebuild             | 175 ---------------------
 .../gnome-control-center-9999.ebuild               |   4 +-
 2 files changed, 2 insertions(+), 177 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
deleted file mode 100644
index 9f0a88f..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-#
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.2:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.9.12:3
-	>=gnome-base/gsettings-desktop-schemas-3.9.91
-	>=gnome-base/gnome-desktop-3.9.90:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-3.6.14-r1[smbclient] )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	socialweb? ( net-libs/libsocialweb )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.30
-	x11-themes/gnome-icon-theme-symbolic
-	colord? (
-		>=gnome-extra/gnome-color-manager-3
-		>=x11-misc/colord-0.1.34
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# 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
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Gentoo handles completions in a different directory, bugs #465094 and #477390
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		shell/Makefile.am || die "sed completiondir failed"
-
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	# top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
-	# avoid libtoolize "We've already been run in this tree" warning, bug #484988
-	local d
-	for d in . egg-list-box; do
-		pushd "${d}" > /dev/null
-		AT_NOELIBTOOLIZE=yes eautoreconf
-		popd > /dev/null
-	done
-	elibtoolize --force
-
-	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
-	# We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	# Upstream think they should be removed, preventing compilation errors too
-	# (https://bugzilla.gnome.org/704822)
-	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_with socialweb libsocialweb) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}

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 7d5c17a..13d6d21 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -74,7 +74,7 @@ COMMON_DEPEND="
 		>=x11-misc/colord-0.1.34 )
 	cups? (
 		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-3.6.14-r1[smbclient] )
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
 	i18n? ( >=app-i18n/ibus-1.5.2 )
 	kerberos? ( app-crypt/mit-krb5 )

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     bba64c3142bfbbf313e138c579af05a5f560fb66
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 23:34:34 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 23:34:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bba64c31

gnome-base/gnome-control-center: needs rebuild with colord changes subslot

---
 gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild | 2 +-
 gnome-base/gnome-control-center/gnome-control-center-9999.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
index 7abf471..35a71e7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
 	colord? (
 		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34 )
+		>=x11-misc/colord-0.1.34:0= )
 	cups? (
 		>=net-print/cups-1.4[dbus]
 		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )

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 524dd38..ff2a845 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -72,7 +72,7 @@ COMMON_DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
 	colord? (
 		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34 )
+		>=x11-misc/colord-0.1.34:0= )
 	cups? (
 		>=net-print/cups-1.4[dbus]
 		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
@@ -137,7 +137,7 @@ src_prepare() {
 
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     3c5497c6691f2044fd7ffb6fbd7f8d2818ca77df
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 23:17:46 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 23:21:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3c5497c6

gnome-base/gnome-control-center: 3.12.1-r1 → 3.14.0

---
 ...1.ebuild => gnome-control-center-3.14.0.ebuild} | 28 +++++++++++-----------
 .../gnome-control-center-9999.ebuild               | 28 +++++++++++-----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
similarity index 90%
rename from gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
index 35a71e7..a4a4090 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
@@ -30,23 +30,20 @@ QA_CONFIGURE_OPTIONS=".*"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.91:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.11.1:3
-	>=gnome-base/gsettings-desktop-schemas-3.9.91
+	>=x11-libs/gtk+-3.13:3
+	>=gnome-base/gsettings-desktop-schemas-3.13.91
 	>=gnome-base/gnome-desktop-3.11.3:3=
 	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
 
 	>=dev-libs/libpwquality-1.2.2
 	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
+	gnome-base/libgtop:2=
 	media-libs/fontconfig
-	>=media-libs/grilo-0.2.6:0.2
 
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99
+	>=sys-power/upower-0.99:=
 	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
@@ -55,6 +52,7 @@ COMMON_DEPEND="
 
 	virtual/opengl
 	x11-apps/xmodmap
+	x11-libs/cairo
 	x11-libs/libX11
 	x11-libs/libXxf86misc
 	>=x11-libs/libXi-1.2
@@ -62,11 +60,14 @@ COMMON_DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
 	colord? (
 		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0= )
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
 	cups? (
 		>=net-print/cups-1.4[dbus]
 		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.9.90 )
 	i18n? ( >=app-i18n/ibus-1.5.2 )
 	kerberos? ( app-crypt/mit-krb5 )
 	v4l? (
@@ -80,18 +81,17 @@ COMMON_DEPEND="
 		>=x11-libs/libXi-1.2 )
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
 RDEPEND="${COMMON_DEPEND}
 	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
 	>=sys-apps/accountsservice-0.6.30
 	x11-themes/gnome-icon-theme-symbolic
-	colord? (
-		>=gnome-extra/gnome-color-manager-3
-		>=x11-misc/colord-0.1.34
-		>=x11-libs/colord-gtk-0.1.24 )
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
 		net-print/cups-pk-helper )
 	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
 
 	!<gnome-base/gdm-2.91.94
 	!<gnome-extra/gnome-color-manager-3.1.2
@@ -127,7 +127,7 @@ src_prepare() {
 
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.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 ff2a845..3291a22 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -40,23 +40,20 @@ QA_CONFIGURE_OPTIONS=".*"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.91:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.11.1:3
-	>=gnome-base/gsettings-desktop-schemas-3.9.91
+	>=x11-libs/gtk+-3.13:3
+	>=gnome-base/gsettings-desktop-schemas-3.13.91
 	>=gnome-base/gnome-desktop-3.11.3:3=
 	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
 
 	>=dev-libs/libpwquality-1.2.2
 	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
+	gnome-base/libgtop:2=
 	media-libs/fontconfig
-	>=media-libs/grilo-0.2.6:0.2
 
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99
+	>=sys-power/upower-0.99:=
 	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
@@ -65,6 +62,7 @@ COMMON_DEPEND="
 
 	virtual/opengl
 	x11-apps/xmodmap
+	x11-libs/cairo
 	x11-libs/libX11
 	x11-libs/libXxf86misc
 	>=x11-libs/libXi-1.2
@@ -72,11 +70,14 @@ COMMON_DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
 	colord? (
 		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0= )
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
 	cups? (
 		>=net-print/cups-1.4[dbus]
 		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.9.90 )
 	i18n? ( >=app-i18n/ibus-1.5.2 )
 	kerberos? ( app-crypt/mit-krb5 )
 	v4l? (
@@ -90,18 +91,17 @@ COMMON_DEPEND="
 		>=x11-libs/libXi-1.2 )
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
 RDEPEND="${COMMON_DEPEND}
 	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
 	>=sys-apps/accountsservice-0.6.30
 	x11-themes/gnome-icon-theme-symbolic
-	colord? (
-		>=gnome-extra/gnome-color-manager-3
-		>=x11-misc/colord-0.1.34
-		>=x11-libs/colord-gtk-0.1.24 )
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
 		net-print/cups-pk-helper )
 	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
 
 	!<gnome-base/gdm-2.91.94
 	!<gnome-extra/gnome-color-manager-3.1.2
@@ -137,7 +137,7 @@ src_prepare() {
 
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     321910764bacf3b7e0a4a93efe2f6ddb244bae0b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 15 22:18:14 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Oct 15 22:18:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32191076

gnome-base/gnome-control-center: 3.14.0 → 3.14.1

---
 ...me-control-center-3.14.0.ebuild => gnome-control-center-3.14.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.1.ebuild
similarity index 100%
rename from gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.14.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     e4bf3eae90b6a16fffe0b54b01ff8665a8a37007
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 22:15:22 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 22:27:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e4bf3eae

gnome-base/gnome-control-center: 3.14.1 → 3.14.2

---
 ...me-control-center-3.14.1.ebuild => gnome-control-center-3.14.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild
similarity index 100%
rename from gnome-base/gnome-control-center/gnome-control-center-3.14.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     254d760f05750b46c0fec602f96ff1c8f1ab4f14
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 22 23:07:17 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 22 23:07:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=254d760f

gnome-base/gnome-control-center: moved to gentoo-x86

---
 .../gnome-control-center-3.14.2.ebuild             | 163 ---------------------
 1 file changed, 163 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild
deleted file mode 100644
index 9ea3b80..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-#
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.13:3
-	>=gnome-base/gsettings-desktop-schemas-3.13.91
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.2.6:0.2
-		>=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.30
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# 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
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Gentoo handles completions in a different directory, bugs #465094 and #477390
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		shell/Makefile.am || die "sed completiondir failed"
-
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-
-	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
-	# We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	# Upstream think they should be removed, preventing compilation errors too
-	# (https://bugzilla.gnome.org/704822)
-	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     0dd8734fb2a1d8f432a2a5b18ff61b5615dc02be
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 21:49:48 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 21:49:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0dd8734f

gnome-base/gnome-control-center: 3.16.1 → 3.16.2

 ...me-control-center-3.16.1.ebuild => gnome-control-center-3.16.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
similarity index 100%
rename from gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     8ca0aa6424f54868c61ad237db348f4669a8ab6c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 15:38:22 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 17 15:38:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8ca0aa64

gnome-base/gnome-control-center: socialweb is phased out

 gnome-base/gnome-control-center/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index e06fb6b..04485bd 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -9,7 +9,5 @@
 			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
     <flag name="i18n">Enable support for enhanced input methods through
 			<pkg>app-i18n/ibus</pkg></flag>
-    <flag name="socialweb">Add support for desktop background images from
-			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
   </use>
 </pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Dennis Lamm]

commit:     3464146e7331dae4ebf78cf0a3b1a83a2a3a7ed2
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 12:09:37 2018 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 12:09:37 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3464146e

gnome-base/gnome-control-center: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../gnome-control-center-3.20.0.ebuild             | 155 ---------------------
 .../gnome-control-center-9999.ebuild               |   3 +-
 2 files changed, 1 insertion(+), 157 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.0.ebuild
deleted file mode 100644
index b70af421..00000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.20.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.19.12:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.19.3
-	>=gnome-base/gnome-desktop-3.19.93:3=
-	>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	virtual/libgudev
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3
-		>=net-libs/gnome-online-accounts-3.15.1 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.7.995
-		>=net-misc/networkmanager-0.9.8[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.39
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# 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
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.20.0-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}

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 1bac6d50..2a48430c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GCONF_DEBUG="yes"

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Sobhan Mohammadpour]

commit:     634c4e012f49fe9928a2e98fe3e56b4c0d333321
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 15:52:54 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 15:52:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=634c4e01

nome-base/gnome-control-center: bump

Package-Manager: Portage-2.3.23, Repoman-2.3.6
RepoMan-Options: --force
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../gnome-control-center-3.26.1.ebuild             | 166 +++++++++++++++++++++
 gnome-base/gnome-control-center/metadata.xml       |   2 +-
 2 files changed, 167 insertions(+), 1 deletion(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.1.ebuild
new file mode 100644
index 00000000..01975eef
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-3.24.2-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+# display panel requires colord and gnome-settings-daemon[colord]
+# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
+COMMON_DEPEND="
+	>=dev-libs/glib-2.53.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
+	>=gnome-base/gsettings-desktop-schemas-3.21.4
+	>=gnome-base/gnome-desktop-3.21.2:3=
+	>=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit]
+	>=x11-misc/colord-0.1.34:0=
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+	>=sys-apps/accountsservice-0.6.39
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+
+	virtual/libgudev
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.3.0:0.3=
+		>=net-libs/gnome-online-accounts-3.25.3:= )
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-misc/networkmanager-1.2.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	v4l? (
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${COMMON_DEPEND}
+	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	>=gnome-base/libgnomekbd-3
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# 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
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+#	sys-devel/autoconf-archive
+
+PATCHES=(
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	"${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional.patch
+	"${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-wayland.patch
+	"${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-networkmanager.patch
+	"${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-cups.patch
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-gentoo-paths.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=780544
+	"${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-fix-without-gdkwayland.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable ibus) \
+		$(use_enable kerberos) \
+		$(use_enable networkmanager) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}

diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index 89591e99..4e408626 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -10,7 +10,7 @@
 			<pkg>x11-misc/colord</pkg></flag>
 		<flag name="gnome-online-accounts">Enable configuration panel for
 			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
-		<flag name="i18n">Enable support for enhanced input methods through
+		<flag name="ibus">Enable support for enhanced input methods through
 			<pkg>app-i18n/ibus</pkg></flag>
 	</use>
 </pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Sobhan Mohammadpour]

commit:     1a9ef4c90ca3c01520d524afc731eb66ef76a1d6
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 16:28:19 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 16:28:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=1a9ef4c9

gnome-base/gnome-control-center: bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --force
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 ...me-control-center-3.26.1.ebuild => gnome-control-center-3.26.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
similarity index 100%
rename from gnome-base/gnome-control-center/gnome-control-center-3.26.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Gilles Dartiguelongue]

commit:     0ba862c6c0b28c90d5f98a94408b85c75a0f658e
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 11:03:51 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 11:03:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0ba862c6

gnome-base/gnome-control-center: remove unneeded QA check workaround

Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --force
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
index cd5abacb..cbf8f1dc 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild
@@ -16,9 +16,6 @@ SLOT="2"
 IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d[policykit] needed for bug #403527
 # kerberos unfortunately means mit-krb5; build fails with heimdal

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Mart Raudsepp]

commit:     f76fdbfa14a6b56efba99cf825a795cfda5c2151
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 20:25:58 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 20:25:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f76fdbfa

gnome-base/gnome-control-center: revbump with full patchset

Include full patchset with lots of fixes in upstream gnome-3-26
branch. Add glib-utils build dep.

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../gnome-control-center-3.26.2-r1.ebuild          | 157 +++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
new file mode 100644
index 00000000..ab4f3f3c
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+# display panel requires colord and gnome-settings-daemon[colord]
+# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
+COMMON_DEPEND="
+	>=dev-libs/glib-2.53.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
+	>=gnome-base/gsettings-desktop-schemas-3.21.4
+	>=gnome-base/gnome-desktop-3.21.2:3=
+	>=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit]
+	>=x11-misc/colord-0.1.34:0=
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+	>=sys-apps/accountsservice-0.6.39
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+
+	virtual/libgudev
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.3.0:0.3=
+		>=net-libs/gnome-online-accounts-3.25.3:= )
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-misc/networkmanager-1.2.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	v4l? (
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${COMMON_DEPEND}
+	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	>=gnome-base/libgnomekbd-3
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+#	sys-devel/autoconf-archive
+
+PATCHES=(
+	# Lots of patches from gnome-3-26 branch on top of 3.26.2
+	# Makes some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/patches/
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable ibus) \
+		$(use_enable kerberos) \
+		$(use_enable networkmanager) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Mart Raudsepp]

commit:     34679e6d17d5365b091777213d4f903ed20ce04d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 20:22:06 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 20:22:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=34679e6d

gnome-base/gnome-control-center: Remove too outdated live ebuild

git master uses meson, so no point in blind syncing from my updates.

 .../gnome-control-center-9999.ebuild               | 162 ---------------------
 1 file changed, 162 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
deleted file mode 100644
index 1c6d93dc..00000000
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.19.12:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.19.3
-	>=gnome-base/gnome-desktop-3.19.93:3=
-	>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	virtual/libgudev
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3
-		>=net-libs/gnome-online-accounts-3.15.1 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.7.995
-		>=net-misc/networkmanager-0.9.8[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.39
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.20.0-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
-	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/

[Mart Raudsepp]

commit:     2df2b35cd47445e75f857d1c050e1c581742b891
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 21:41:57 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 21:41:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2df2b35c

gnome-base/gnome-control-center: remove, moved to ::gentoo

 .../gnome-control-center-3.26.2-r1.ebuild          | 157 ---------------------
 gnome-base/gnome-control-center/metadata.xml       |  16 ---
 2 files changed, 173 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
deleted file mode 100644
index ab4f3f3c..00000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-# display panel requires colord and gnome-settings-daemon[colord]
-# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.53.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.21.4
-	>=gnome-base/gnome-desktop-3.21.2:3=
-	>=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit]
-	>=x11-misc/colord-0.1.34:0=
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=sys-apps/accountsservice-0.6.39
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-
-	virtual/libgudev
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3=
-		>=net-libs/gnome-online-accounts-3.25.3:= )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-#	sys-devel/autoconf-archive
-
-PATCHES=(
-	# Lots of patches from gnome-3-26 branch on top of 3.26.2
-	# Makes some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}

diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
deleted file mode 100644
index 4e408626..00000000
--- a/gnome-base/gnome-control-center/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="colord">Support color management using
-			<pkg>x11-misc/colord</pkg></flag>
-		<flag name="gnome-online-accounts">Enable configuration panel for
-			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
-		<flag name="ibus">Enable support for enhanced input methods through
-			<pkg>app-i18n/ibus</pkg></flag>
-	</use>
-</pkgmetadata>