Version bump, prevent false positives with configure options checking, make modemmanager optional (#463852 by Evgeny Bobkin and poncho), smbclient needed for printers panel (#463762), fix bash-completion dir to Gentoo path (#465094 by poncho).

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 203 insertions, 1 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 1b0026927311..bf39bd7d76c8 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.126 2013/05/09 20:08:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.127 2013/05/12 09:02:01 pacho Exp $
+
+*gnome-control-center-3.8.1.5 (12 May 2013)
+
+  12 May 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-control-center-3.8.1.5-optional-modemmanager.patch,
+  +gnome-control-center-3.8.1.5.ebuild, metadata.xml:
+  Version bump, prevent false positives with configure options checking, make
+  modemmanager optional (#463852 by Evgeny Bobkin and poncho), smbclient needed
+  for printers panel (#463762), fix bash-completion dir to Gentoo path (#465094
+  by poncho).
 
   09 May 2013; Pacho Ramos <pacho@gentoo.org>
   gnome-control-center-3.8.0-r1.ebuild:
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch
new file mode 100644
index 000000000000..cf40dca5004a
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch
@@ -0,0 +1,30 @@
+--- gnome-control-center-3.8.1.5-orig/configure.ac	2013-05-06 18:32:26.000000000 +0200
++++ gnome-control-center-3.8.1.5-dev/configure.ac	2013-05-11 22:57:47.955153458 +0200
+@@ -200,8 +200,25 @@
+ fi
+ 
+ # Check for libmm-glib for ModemManager1 support
+-PKG_CHECK_MODULES(MM_GLIB, mm-glib,
+-                  [have_libmm_glib=yes], have_libmm_glib=no)
++build_modemmanager=false
++AC_ARG_ENABLE(modemmanager,
++	AC_HELP_STRING([--disable-modemmanager],
++		[disable modemmanager support]),
++	[case "${enableval}" in
++		yes) WANT_MODEMMANAGER=yes ;;
++		no)  WANT_MODEMMANAGER=no ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --disable-modemmanager) ;;
++	esac],
++	[WANT_MODEMMANAGER=no]) dnl Default value
++
++if test "x$WANT_MODEMMANAGER" = xyes ; then
++	PKG_CHECK_MODULES(MM_GLIB, mm-glib,
++                  [have_libmm_glib=yes],
++		  AC_MSG_ERROR(No ModemManager1 support (libmm-glib) not found))
++else
++	have_libmm_glib=no
++fi
++
+ if test "x$have_libmm_glib" = xno ; then
+   AC_MSG_WARN(*** Network panel will not be built with ModemManager1 support (libmm-glib not found) ***)
+ else
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.1.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.1.5.ebuild
new file mode 100644
index 000000000000..5bd59ff492ba
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.1.5.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.1.5.ebuild,v 1.1 2013/05/12 09:02:01 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+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 modemmanager +socialweb systemd 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
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35.1:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.7.7:3
+	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
+	>=gnome-base/gnome-desktop-3.7.5:3=
+	>=gnome-base/gnome-settings-daemon-3.7.3[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[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.9.1
+	>=x11-libs/libnotify-0.7.3
+
+	>=gnome-extra/nm-applet-0.9.7.995
+	>=net-misc/networkmanager-0.9.8[modemmanager?]
+
+	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.29 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		>=net-fs/samba-3.6.14-r1[smbclient] )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8.1 )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
+	kerberos? ( virtual/krb5 )
+	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+	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 )
+	input_devices_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/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.29 )
+	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, bug #465094
+	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
+		shell/Makefile.am || die "sed completiondir failed"
+
+	# Make some panels optional; requires eautoreconf
+	# https://bugzilla.gnome.org/697478
+	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
+
+	# https://bugzilla.gnome.org/686840
+	epatch "${FILESDIR}/${PN}-3.7.4-optional-kerberos.patch"
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
+	epatch "${FILESDIR}/${PN}-3.8.0-paths.patch"
+
+	# Make modemmanager optional, bug 463852, upstream bug #700145
+	epatch "${FILESDIR}/${PN}-3.8.1.5-optional-modemmanager.patch"
+
+	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() {
+	# FIXME: add $(use_with kerberos) support?
+	! use kerberos && G2CONF+=" KRB5_CONFIG=$(type -P true)"
+
+	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 modemmanager) \
+		$(use_with socialweb libsocialweb) \
+		$(use_enable systemd) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index 0fe31de608d0..17ae0f3b00f4 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -9,6 +9,8 @@
 			<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="modemmanager">Enable support for mobile broadband devices
+			using <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="socialweb">Add support for desktop background images from
 			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
 	</use>