Fix absolute paths to be Gentoo-appropriate and add missing runtime dependency on system-config-printer-gnome.

(Portage version: 2.2.0_alpha119/cvs/Linux x86_64)

4 files changed, 293 insertions, 3 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 54f8455bf958..28f09154688a 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.105 2012/05/27 23:14:36 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.106 2012/07/19 02:46:04 tetromino Exp $
+
+*gnome-control-center-3.4.2-r1 (19 Jul 2012)
+
+  19 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.4.2.ebuild, +gnome-control-center-3.4.2-r1.ebuild,
+  +files/gnome-control-center-3.4.2-gentoo-paths.patch:
+  Fix absolute paths to be Gentoo-appropriate and add missing runtime
+  dependency on system-config-printer-gnome.
 
   27 May 2012; Matt Turner <mattst88@gentoo.org>
   gnome-control-center-3.2.3.ebuild:
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch
new file mode 100644
index 000000000000..377312ec3fcd
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch
@@ -0,0 +1,147 @@
+From 44cd56e05a59fbdfcd3dc5b12c0c7ff178b230f1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 18 Jul 2012 22:12:04 -0400
+Subject: [PATCH] Use Gentoo-appropriate absolute paths
+
+---
+ panels/common/Makefile.am               |    2 +-
+ panels/datetime/Makefile.am             |    1 +
+ panels/datetime/test-endianess.c        |    4 ++--
+ panels/datetime/test-timezone.c         |    2 +-
+ panels/datetime/tz.h                    |    4 ++--
+ panels/printers/Makefile.am             |    3 +++
+ panels/printers/cc-printers-panel.c     |    4 ++--
+ panels/printers/pp-new-printer-dialog.c |    2 +-
+ panels/user-accounts/Makefile.am        |    2 +-
+ 9 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
+index 6ed8e6c..2d7b1cc 100644
+--- a/panels/common/Makefile.am
++++ b/panels/common/Makefile.am
+@@ -9,7 +9,7 @@ AM_CPPFLAGS =						\
+ 	$(LIBLANGUAGE_CFLAGS)				\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DUIDIR=\""$(pkgdatadir)/ui"\"			\
+-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
++	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
+ 
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index 65ee027..9a97d24 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -72,6 +72,7 @@ AM_CPPFLAGS =						\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+ 	-DDATADIR="\"$(uidir)\""			\
++	-DREALDATADIR="\"$(datadir)\""			\
+ 	$(NULL)
+ 
+ noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 490df17..b43fc87 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -38,11 +38,11 @@ int main (int argc, char **argv)
+ 		return 0;
+ 	}
+ 
+-	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ 	if (dir == NULL) {
+ 		/* Try with /usr/share/locale/
+ 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+-		dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++		dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ 		if (dir == NULL) {
+ 			return 1;
+ 		}
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index 5667657..8483b87 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -1,7 +1,7 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+ 
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+ 
+ static GList *
+ get_timezone_list (GList *tzs,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 71c1c23..ca4b3c4 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -29,9 +29,9 @@
+ #include <glib.h>
+ 
+ #ifndef __sun
+-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++#  define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++#  define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
+ 
+ typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 0dade8c..3e5d7a8 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -12,6 +12,9 @@ INCLUDES = 						\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+ 	-DDATADIR="\"$(uidir)\""			\
++	-DREALDATADIR="\"$(datadir)\""			\
++	-DPREFIX="\"$(prefix)\""			\
++	-DLIBEXECDIR="\"$(libexecdir)\""			\
+ 	$(NULL)
+ 
+ ccpanelsdir = $(PANELS_DIR)
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index f5cf0d9..09f3e56 100644
+--- a/panels/printers/cc-printers-panel.c
++++ b/panels/printers/cc-printers-panel.c
+@@ -2199,8 +2199,8 @@ test_page_cb (GtkButton *button,
+ 
+   if (printer_name)
+     {
+-      const gchar  *const dirs[] = { "/usr/share/cups",
+-                                     "/usr/local/share/cups",
++      const gchar  *const dirs[] = { REALDATADIR "/cups",
++                                     PREFIX "/local/share/cups",
+                                      NULL };
+       const gchar  *testprint[] = { "%s/data/testprint",
+                                     "%s/data/testprint.ps",
+diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
+index eb134b5..d435a61 100644
+--- a/panels/printers/pp-new-printer-dialog.c
++++ b/panels/printers/pp-new-printer-dialog.c
+@@ -1058,7 +1058,7 @@ search_address_cb (GtkToggleButton *togglebutton,
+                 }
+ 
+               /* Use SNMP to get printer's informations */
+-              command = g_strdup_printf ("/usr/lib/cups/backend/snmp %s", host);
++              command = g_strdup_printf (LIBEXECDIR "/cups/backend/snmp %s", host);
+               if (g_spawn_command_line_sync (command, &standard_output, NULL, &exit_status, &error))
+                 {
+                   if (exit_status == 0 && standard_output)
+diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am
+index 2907f01..4da4fee 100644
+--- a/panels/user-accounts/Makefile.am
++++ b/panels/user-accounts/Makefile.am
+@@ -10,7 +10,7 @@ ccpanels_LTLIBRARIES = libuser-accounts.la
+ AM_CPPFLAGS =						\
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\"	\
+-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
++	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
+ 	-I$(srcdir)/../common/				\
+-- 
+1.7.8.6
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..a61fd5dfdb11
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2012 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.4.2-r1.ebuild,v 1.1 2012/07/19 02:46:04 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# 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
+# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
+# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
+# 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.3.5:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	>=gnome-base/gnome-desktop-3.1.91:3
+	>=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit]
+	>=gnome-base/libgnomekbd-2.91.91
+
+	app-text/iso-codes
+	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-0.9.16[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/libxklavier-5.1
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-3.3.5 )
+	colord? ( >=x11-misc/colord-0.1.8 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
+	socialweb? ( net-libs/libsocialweb )
+	systemd? ( >=sys-apps/systemd-31 )
+	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
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
+	!systemd? ( 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
+
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		$(use_enable bluetooth)
+		$(use_with cheese)
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_enable gnome-online-accounts goa)
+		$(use_with socialweb libsocialweb)
+		$(use_enable systemd)
+		$(use_enable wacom)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Make some panels optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch"
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}/${PN}-3.4.2-gentoo-paths.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
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
index aff960bfacaf..3157107ab82c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.2.ebuild,v 1.3 2012/05/25 08:15:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild,v 1.4 2012/07/19 02:46:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? ( net-print/cups-pk-helper )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
 	!systemd? ( sys-auth/consolekit )
 	wacom? ( gnome-base/gnome-settings-daemon[wacom] )