diff options
Diffstat (limited to 'gnome-base')
38 files changed, 0 insertions, 1972 deletions
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest deleted file mode 100644 index 143fe111..00000000 --- a/gnome-base/gconf/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c -AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 RMD160 77e4fae8a19a57904d9e6706238a94172da5c223 SHA1 9deb172ce170e7333931e61e3cf2ae6ade24bb33 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 -EBUILD gconf-9999.ebuild 2383 RMD160 693c2fd93762fa5a45383cfebae50e4fe66c1632 SHA1 89261763670eb3a845782e5952ddfddd7d6a2867 SHA256 e41ad4b9fd33a585bbecaaa2e0e70a76755222a82de74a25b22f9e061abcdbea diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch deleted file mode 100644 index 8ca6a0d4..00000000 --- a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c ---- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400 -+++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400 -@@ -856,6 +856,7 @@ main (int argc, char** argv) - { - g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n")); - makefile_install_mode = FALSE; -+ return 0; - } - - if (makefile_uninstall_mode && -@@ -863,6 +864,7 @@ main (int argc, char** argv) - { - g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n")); - makefile_uninstall_mode = FALSE; -+ return 0; - } - - if (makefile_install_mode || makefile_uninstall_mode) diff --git a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch deleted file mode 100644 index 680b1a15..00000000 --- a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Romain Perier <mrpouet@gentoo.org> -Date: Wed, 4 Nov 2009 11:58:25 +0100 -Subject: Do not segfault when entry is NULL - ---- - gconf/gconf-value.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - ---- a/gconf/gconf-value.c -+++ b/gconf/gconf-value.c -@@ -1609,6 +1609,7 @@ void - gconf_entry_set_value (GConfEntry *entry, - const GConfValue *val) - { -+ g_return_if_fail (entry != NULL); - gconf_entry_set_value_nocopy (entry, - val ? gconf_value_copy (val) : NULL); - } diff --git a/gnome-base/gconf/gconf-9999.ebuild b/gnome-base/gconf/gconf-9999.ebuild deleted file mode 100644 index aff1d13a..00000000 --- a/gnome-base/gconf/gconf-9999.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2-live - -DESCRIPTION="Gnome Configuration System and Daemon" -HOMEPAGE="http://projects.gnome.org/gconf/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="" -IUSE="debug doc +introspection ldap orbit policykit" - -RDEPEND=">=dev-libs/glib-2.25.9:2 - >=x11-libs/gtk+-2.90:3 - >=dev-libs/dbus-glib-0.74 - >=sys-apps/dbus-1 - >=dev-libs/libxml2-2:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - ldap? ( net-nds/openldap ) - orbit? ( >=gnome-base/orbit-2.4:2 ) - policykit? ( sys-auth/polkit )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - doc? ( >=dev-util/gtk-doc-1 )" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --enable-gtk - --disable-static - --enable-gsettings-backend - --with-gtk=3.0 - $(use_enable introspection) - $(use_with ldap openldap) - $(use_enable orbit) - $(use_enable policykit defaults-service) - ORBIT_IDL=$(type -P orbit-idl-2)" - # Need host's IDL compiler for cross or native build, bug #262747 - kill_gconf -} - -src_prepare() { - gnome2_src_prepare - - # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 - epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" -} - -src_install() { - gnome2_src_install - - keepdir /etc/gconf/gconf.xml.mandatory - keepdir /etc/gconf/gconf.xml.defaults - # Make sure this directory exists, bug #268070, upstream #572027 - keepdir /etc/gconf/gconf.xml.system - - echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf - echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf - doenvd 50gconf || die "doenv failed" - dodir /root/.gconfd || die -} - -pkg_preinst() { - kill_gconf -} - -pkg_postinst() { - kill_gconf - - # change the permissions to avoid some gconf bugs - einfo "changing permissions for gconf dirs" - find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \; - - einfo "changing permissions for gconf files" - find /etc/gconf/ -type f -exec chmod ugo+r "{}" \; -} - -kill_gconf() { - # This function will kill all running gconfd-2 that could be causing troubles - if [ -x /usr/bin/gconftool-2 ] - then - /usr/bin/gconftool-2 --shutdown - fi - - return 0 -} diff --git a/gnome-base/gcr/Manifest b/gnome-base/gcr/Manifest deleted file mode 100644 index 554ab9c7..00000000 --- a/gnome-base/gcr/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD gcr-9999.ebuild 1096 RMD160 2961837cd3475d0a1f8fb76164f332261e817a5d SHA1 a73f0882ceca6e2746a2495b38adb68e64b457c7 SHA256 d6d25de6f5a3db227d02968228f7aacd032d61789b538bbe8520bb12f954c4a6 diff --git a/gnome-base/gcr/gcr-9999.ebuild b/gnome-base/gcr/gcr-9999.ebuild deleted file mode 100644 index 8c6e54f0..00000000 --- a/gnome-base/gcr/gcr-9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2-live multilib pam virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -IUSE="debug doc +introspection test" -KEYWORDS="" - -RDEPEND=">=dev-libs/glib-2.30:2 - >=x11-libs/gtk+-3.0:3 - gnome-base/gconf:2 - >=sys-apps/dbus-1.0 - >=dev-libs/libgcrypt-1.2.2 - >=dev-libs/libtasn1-1 - >=app-crypt/p11-kit-0.6 - introspection? ( >=dev-libs/gobject-introspection-1.29 ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - sys-devel/libtool - >=dev-util/pkgconfig-0.9 - doc? ( >=dev-util/gtk-doc-1.9 )" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable test tests) - --disable-valgrind - --disable-sctrict - --disable-update-mime" - MAKEOPTS+=" -j1" -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "emake check failed!" -} diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest deleted file mode 100644 index 443a242a..00000000 --- a/gnome-base/gdm/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX 3.1.91-pam.d/gdm-fingerprint 466 RMD160 3f63354ccce1de0dacc3c4b304673fa56fb35e4e SHA1 6e2d0d67e4c9cbff1efe3de5f57b1ace137c3314 SHA256 3af315d6abe928dd769f2cc9896d536e187ab373b29667c185e452ac6063d9cc -AUX 3.1.91-pam.d/gdm-password 274 RMD160 88c235b0e1907829a38a1be9c8f0fdc262b042d7 SHA1 3b08e4022e421417cb1fd9a03fd01c1ddedb27d5 SHA256 4c26f02021ffa41500fa98aeda61dde6d059243f027cf93f8fb00fde39a9edd3 -AUX 3.1.91-pam.d/gdm-smartcard 573 RMD160 6e1655b9b6d6cb1710cf052bcf45e0f305ecd244 SHA1 19d459d5970e53ac9a40abdedd183873309b37bf SHA256 9c548668770aa68e730e5d5159d77067dbd0795dae2b7ba6d6ee347f88e90062 -AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140 -AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042 -AUX gdm-2.32.0-automagic-libxklavier-support.patch 2069 RMD160 805e7bfd5b2429c8fb5aeac397c2d564620ae41c SHA1 80bb72815646d40eb6a750a7be52d8e4f399d840 SHA256 91fdd46ab5ad1b4071cb798499ddd98bee47c67961906d1db0ee47cd4919fac5 -AUX gdm-2.32.0-fix-daemonize-regression.patch 4048 RMD160 4219fec833f0e62a10e52dee89ef5d1a8618d1c1 SHA1 69c5ed6869d5a467e64249f3afe695796c17c463 SHA256 e95e1ebfcfe2c896130e4925fa6f23911bcfe4db27e2a6788229538c6bb2a59d -AUX gdm-2.32.0-fix-vt-problems.patch 6156 RMD160 7c739dd278194e1a30672635e35b05f798ec9996 SHA1 6428abdc3c493c4b9f69fcaef8dcb88a910f4d14 SHA256 12da81b8085d76ce3099f1af0ec588c07c3f020f341f825683f4855c9303731e -AUX gdm-2.32.0-selinux-remove-attr.patch 851 RMD160 10dc29802fb29047188bff7aafe979a5e15e030a SHA1 d78bde425b7a141c91767c3e639ee0011feddadc SHA256 ad13d4b1253dca7d5ac362bcce9f5861c2830a3df32e5370a5a0d975c32ec258 -AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 RMD160 6ea58bdc1fa24d41f3c51fc7cdbabc05417053f0 SHA1 ad98258168b84c80d581085804b61649ac67e4d5 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe -AUX gdm-3.2.1.1-custom-session.patch 1317 RMD160 20a1dd5608f4154fe53fae4def03f509769da878 SHA1 4acf8ed9b11eb531505c0c58805f1b37948fcb77 SHA256 75bd1bdc0d396fee71ff41c2657f922a4c8e290c891cc72f47647ab832d0c285 -AUX gdm-3.2.1.1-disable-accessibility.patch 1637 RMD160 12f69b9b67fc6dbb0a57ed25f0d0ea68167f53f2 SHA1 0e6580f88768d2f8c20d2cfdf5d9c8ecb7f84e66 SHA256 60ef48cf07dab78c3f09e5e57cd9138398cfe1d5de4b17408d3c08da58239932 -DIST gdm-3.2.1.1-gentoo-files.tar.xz 996 RMD160 29fa24d0e0a4961d7e14a348fb620bcb4ad62828 SHA1 46651e31d865321de4de56841315ca5b27079d91 SHA256 610f7a1652996d77462773994adb5fd396ed973bbd9df51daa301004d38ca10a -EBUILD gdm-9999.ebuild 8422 RMD160 5683f63bafbbf677e95a37beebf5529122bb6a34 SHA1 46b4d9780ab4f7a884b93fc178d3c3183c2a53bd SHA256 90b6c2bd138eeccb45d46b6457a44faf045b8b5b22359149c491dc5822c7a4bb diff --git a/gnome-base/gdm/files/3.1.91-pam.d/gdm-fingerprint b/gnome-base/gdm/files/3.1.91-pam.d/gdm-fingerprint deleted file mode 100644 index 7d38de94..00000000 --- a/gnome-base/gdm/files/3.1.91-pam.d/gdm-fingerprint +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 -# Note: no pam_gnome_keyring.so support since the login password is not used -auth optional pam_env.so -auth required pam_tally2.so onerr=succeed -auth required pam_shells.so -auth required pam_nologin.so -auth required pam_fprintd.so -auth optional pam_permit.so - -account include system-login - -password required pam_deny.so - -session include system-auth diff --git a/gnome-base/gdm/files/3.1.91-pam.d/gdm-password b/gnome-base/gdm/files/3.1.91-pam.d/gdm-password deleted file mode 100644 index d965ecac..00000000 --- a/gnome-base/gdm/files/3.1.91-pam.d/gdm-password +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth include system-login -auth required pam_nologin.so - -account include system-login - -password include system-login - -session include system-auth -#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.1.91-pam.d/gdm-smartcard b/gnome-base/gdm/files/3.1.91-pam.d/gdm-smartcard deleted file mode 100644 index 5cf884da..00000000 --- a/gnome-base/gdm/files/3.1.91-pam.d/gdm-smartcard +++ /dev/null @@ -1,15 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth required pam_tally2.so onerr=succeed -auth required pam_shells.so -auth required pam_nologin.so -auth [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only -auth optional pam_permit.so - -account include system-login - -password optional pam_pkcs11.so -password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -password optional pam_permit.so - -session include system-auth diff --git a/gnome-base/gdm/files/49-keychain b/gnome-base/gdm/files/49-keychain deleted file mode 100644 index 77310b2a..00000000 --- a/gnome-base/gdm/files/49-keychain +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# source keychain variables - -keychain="`which keychain`" -if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ] -then - . "${HOME}/.bash_profile" -fi diff --git a/gnome-base/gdm/files/50-ssh-agent b/gnome-base/gdm/files/50-ssh-agent deleted file mode 100644 index 28af2672..00000000 --- a/gnome-base/gdm/files/50-ssh-agent +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# add ssh-agent if found - -sshagent="`which ssh-agent`" -if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then - command="$sshagent -- $command" -elif [ -z "$sshagent" ] ; then - echo "$0: ssh-agent not found!" -fi diff --git a/gnome-base/gdm/files/gdm-2.32.0-automagic-libxklavier-support.patch b/gnome-base/gdm/files/gdm-2.32.0-automagic-libxklavier-support.patch deleted file mode 100644 index 90c1cef3..00000000 --- a/gnome-base/gdm/files/gdm-2.32.0-automagic-libxklavier-support.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 481fe43b653b443ecfa8d4f3aa88d734d17cccd5 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 2 Nov 2010 23:21:27 +0100 -Subject: [PATCH 6/6] fix libxklavier automagic support - -libxklavier support is optional, make that fact explicit. ---- - configure.ac | 28 +++++++++++++++++++--------- - 1 files changed, 19 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 71d0247..10dbb72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,17 +129,26 @@ SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm" - AC_SUBST(SIMPLE_GREETER_CFLAGS) - AC_SUBST(SIMPLE_GREETER_LIBS) - --PKG_CHECK_MODULES(LIBXKLAVIER, -- libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, -- have_libxklavier=yes, -- have_libxklavier=no) --if test "x$have_libxklavier" = "xyes" ; then -- AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier]) -+AC_ARG_ENABLE([libxklavier], -+ AS_HELP_STRING([--enable-libxklavier], -+ [Enable libxklavier support @<:@default=yes@:>@]), -+ enable_libxklavier=$enableval, -+ enable_libxklavier=yes) -+have_libxklavier=no -+if test "x$enable_libxklavier" = "xyes"; then -+ PKG_CHECK_MODULES(LIBXKLAVIER, -+ libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, -+ have_libxklavier=yes, -+ have_libxklavier=no) -+ if test "x$have_libxklavier" = "xyes" ; then -+ AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier]) -+ fi -+ AC_SUBST(HAVE_LIBXKLAVIER) -+ AC_SUBST(LIBXKLAVIER_CFLAGS) -+ AC_SUBST(LIBXKLAVIER_LIBS) - fi -+ - AM_CONDITIONAL(HAVE_LIBXKLAVIER, test x$have_libxklavier = xyes) --AC_SUBST(HAVE_LIBXKLAVIER) --AC_SUBST(LIBXKLAVIER_CFLAGS) --AC_SUBST(LIBXKLAVIER_LIBS) - - PKG_CHECK_MODULES(SIMPLE_CHOOSER, - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION -@@ -1467,5 +1476,6 @@ echo \ - SELinux support: ${with_selinux} - ConsoleKit support: ${use_console_kit} - UPower support: ${have_upower} -+ Libxklavier support: ${have_libxklavier} - Build with RBAC: ${msg_rbac_shutdown} - " --- -1.7.3.1 - diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch deleted file mode 100644 index 2ae7f610..00000000 --- a/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 7f5104b242e6b36e6143183b14582d362763ff2a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 2 Nov 2010 23:16:51 +0100 -Subject: [PATCH 2/6] daemonize so that the boot process can continue - -Gentoo bug: #236701 - -Originally from: Dan Nicholson <dbn.lists@gmail.com> - -Fork gdm-binary, except when -nodaemon is used - -gdm-binary now forks and the parent terminates, except when the --nodaemon or --nodaemon options are used. This provides compatibility -with xdm. Fixes bug #550170. - ---- - daemon/main.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 64 insertions(+), 0 deletions(-) - -diff --git a/daemon/main.c b/daemon/main.c -index 5b8d66b..191b6e3 100644 ---- a/daemon/main.c -+++ b/daemon/main.c -@@ -513,6 +513,56 @@ is_debug_set (void) - return debug; - } - -+static void -+dup_dev_null (int fd, int flags) -+{ -+ int nullfd; -+ int dupfd; -+ -+ VE_IGNORE_EINTR (nullfd = open ("/dev/null", flags)); -+ if (G_UNLIKELY (nullfd < 0)) { -+ gdm_fail (_("Cannot open /dev/null: %s!"), -+ strerror (errno)); -+ exit (EXIT_FAILURE); -+ } -+ -+ VE_IGNORE_EINTR (dupfd = dup2 (nullfd, fd)); -+ if (G_UNLIKELY (dupfd < 0)) { -+ gdm_fail (_("Cannot duplicate /dev/null: %s!"), -+ strerror (errno)); -+ exit (EXIT_FAILURE); -+ } -+ -+ VE_IGNORE_EINTR (close (nullfd)); -+} -+ -+static void -+daemonify (void) -+{ -+ pid_t pid; -+ -+ pid = fork (); -+ -+ /* terminate the parent */ -+ if (pid > 0) -+ exit (EXIT_SUCCESS); -+ -+ if (G_UNLIKELY (pid < 0)) { -+ gdm_fail (_("fork () failed: %s!"), strerror (errno)); -+ exit (EXIT_FAILURE); -+ } -+ -+ if (G_UNLIKELY (setsid () < 0)) { -+ gdm_fail (_("setsid () failed: %s!"), strerror (errno)); -+ exit (EXIT_FAILURE); -+ } -+ -+ /* reopen stdin, stdout, stderr with /dev/null */ -+ dup_dev_null (STDIN_FILENO, O_RDONLY); -+ dup_dev_null (STDOUT_FILENO, O_RDWR); -+ dup_dev_null (STDERR_FILENO, O_RDWR); -+} -+ - int - main (int argc, - char **argv) -@@ -523,14 +573,17 @@ main (int argc, - DBusGConnection *connection; - GError *error; - int ret; -+ int i; - gboolean res; - gboolean xdmcp_enabled; - GdmSignalHandler *signal_handler; - static gboolean do_timed_exit = FALSE; - static gboolean print_version = FALSE; - static gboolean fatal_warnings = FALSE; -+ static gboolean no_daemon = FALSE; - static GOptionEntry entries [] = { - { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL }, -+ { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL }, - { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL }, - { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL }, - -@@ -547,6 +600,14 @@ main (int argc, - - g_type_init (); - -+ /* preprocess the arguments to support the xdm style -+ * -nodaemon option -+ */ -+ for (i = 0; i < argc; i++) { -+ if (strcmp (argv[i], "-nodaemon") == 0) -+ argv[i] = "--nodaemon"; -+ } -+ - context = g_option_context_new (_("GNOME Display Manager")); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_set_ignore_unknown_options (context, TRUE); -@@ -617,6 +678,9 @@ main (int argc, - exit (-1); - } - -+ if (no_daemon == FALSE) -+ daemonify (); -+ - /* pid file */ - delete_pid (); - write_pid (); --- -1.7.3.1 - diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch deleted file mode 100644 index f219a149..00000000 --- a/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 64002e623fea54ab10040206d164c5fdee4a43d2 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan <nirbheek@gentoo.org> -Date: Fri, 15 Apr 2011 22:13:44 +0530 -Subject: [PATCH] Fix VT grab race with getty causing X to grab the wrong VT - -On bootup, if X is spawned without any args, it'll take up the first unused VT. -If GDM starts up before gettys are spawned, X takes up VT1 or VT2 depending on -the init system and bootsplash. - -This is problematic because afterwards getty will come up underneath X, and -cause keyboard problems and eventually crash X. - -So we read /etc/inittab, check for open VTs, compare the two values, and take -the conservative one. ---- - configure.ac | 4 ++ - daemon/Makefile.am | 1 + - daemon/gdm-server.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 110 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ca0f8bb..b9e7462 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -302,6 +302,10 @@ AC_CHECK_TYPE(socklen_t,, - AC_CHECK_HEADERS(sys/sockio.h) - AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv]) - -+dnl Needed for querying the kernel for free VTs -+AC_CHECK_HEADERS(sys/vt.h) -+AC_CHECK_HEADERS(sys/ioctl.h) -+ - dnl checks needed for Darwin compatibility to linux **environ. - AC_CHECK_HEADERS(crt_externs.h) - AC_CHECK_FUNCS(_NSGetEnviron) -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index da18835..c1b6bda 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOGDIR=\"$(logdir)\" \ - -DSBINDIR=\"$(sbindir)\" \ -+ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ - -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 339f3cc..29d16dc 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -26,6 +26,8 @@ - #include <unistd.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - #include <sys/wait.h> - #include <errno.h> - #include <ctype.h> -@@ -42,6 +44,7 @@ - #include <glib/gi18n.h> - #include <glib/gstdio.h> - #include <glib-object.h> -+#include <gio/gio.h> - - #include <X11/Xlib.h> /* for Display */ - -@@ -54,6 +57,8 @@ extern char **environ; - - #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate)) - -+#define INITTAB SYSCONFDIR"/inittab" -+ - /* These are the servstat values, also used as server - * process exit codes */ - #define SERVER_TIMEOUT 2 /* Server didn't start */ -@@ -674,6 +679,105 @@ gdm_server_spawn (GdmServer *server, - } - - /** -+ * Parse the inittab file used by getty to spawn VTs to find unused ttys -+ */ -+static int -+get_free_vt_from_inittab () -+{ -+ GFile *gfile; -+ GFileInputStream *contents; -+ GDataInputStream *dstream; -+ GRegex *getty; -+ GMatchInfo *tty_match = NULL; -+ GSList *tty_list = NULL; -+ GError *error = NULL; -+ gchar *temp = NULL; -+ int vtno = 0; -+ -+ gfile = g_file_new_for_path (INITTAB); -+ contents = g_file_read (gfile, NULL, &error); -+ g_object_unref (gfile); -+ if (!contents) { -+ if (error) { -+ g_debug ("Unable to open file %s", INITTAB); -+ g_error_free (error); -+ } -+ goto out; -+ } -+ -+ dstream = g_data_input_stream_new (G_INPUT_STREAM (contents)); -+ getty = g_regex_new ("^c[0-9]+:.+getty.+tty([0-9]+)", 0, 0, NULL); -+ g_object_unref (contents); -+ -+ while (1) { -+ temp = g_data_input_stream_read_line (dstream, NULL, NULL, &error); -+ if (!temp) -+ break; -+ if (!g_regex_match (getty, temp, 0, &tty_match)) -+ continue; -+ g_free (temp); -+ temp = g_match_info_fetch (tty_match, 1); -+ if (!temp) -+ continue; -+ tty_list = g_slist_insert_sorted (tty_list, temp, (GCompareFunc)g_strcmp0); -+ g_match_info_free (tty_match); -+ } -+ -+ if (error) { -+ g_debug ("Unable to read line from %s", INITTAB); -+ g_error_free (error); -+ goto free; -+ } -+ -+ /* Ignore holes in vt allocation, just take the last one */ -+ temp = g_slist_last (tty_list)->data; -+ if (temp) -+ vtno = (int) g_ascii_strtoull (temp, NULL, 10) + 1; -+ -+free: -+ g_object_unref (dstream); -+ g_regex_unref (getty); -+ g_slist_free_full (tty_list, g_free); -+ g_free (error); -+out: -+ return vtno; -+} -+ -+/** -+ * Query the VT_* kernel ioctls to find an empty tty -+ */ -+static int -+get_free_vt_from_kernel() -+{ -+ int fd, vtno = 0; -+ -+ fd = open ("/dev/tty0", O_WRONLY, 0); -+ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { -+ vtno = 0; -+ g_debug ("Unable to find a free vt, falling back to Xorg autodetect"); -+ } -+ return vtno; -+} -+ -+static gchar* -+get_free_vt () -+{ -+ int inittab_vtno, kernel_vtno; -+ gchar* vt = NULL; -+ -+ inittab_vtno = get_free_vt_from_inittab(); -+ if (inittab_vtno > 0) -+ g_debug ("Inittab says vt%i is free\n", inittab_vtno); -+ kernel_vtno = get_free_vt_from_kernel(); -+ if (kernel_vtno > 0) -+ g_debug ("Kernel says vt%i is free\n", kernel_vtno); -+ /* Select the greater of the two because getty will use the others */ -+ if (kernel_vtno != 0 && inittab_vtno != 0) -+ vt = g_strdup_printf ("vt%i", kernel_vtno > inittab_vtno ? kernel_vtno : inittab_vtno); -+ return vt; -+} -+ -+/** - * gdm_server_start: - * @disp: Pointer to a GdmDisplay structure - * -@@ -686,7 +790,7 @@ gdm_server_start (GdmServer *server) - gboolean res; - - /* fork X server process */ -- res = gdm_server_spawn (server, NULL); -+ res = gdm_server_spawn (server, get_free_vt()); - - return res; - } --- -1.7.3.4 - diff --git a/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch deleted file mode 100644 index e563aa42..00000000 --- a/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 41badd6d2ca652a875fec3eea420ae876023076d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 2 Nov 2010 23:15:54 +0100 -Subject: [PATCH 1/6] remove unneeded linker directive for selinux - -Gentoo bug: #41022 - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ed07dce..71d0247 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then - AC_CHECK_LIB(selinux,setexeccon,/bin/true) - AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) - AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) -- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" - fi - - dnl --------------------------------------------------------------------------- --- -1.7.3.1 - diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch deleted file mode 100644 index b1cddf17..00000000 --- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1cb1841da3a8fedc1671637e2828d5e361af21fa Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 2 Nov 2010 23:19:31 +0100 -Subject: [PATCH 5/6] ssh-agent handling must be done at xinitrc.d - -Gentoo bug: #220603 ---- - data/Xsession.in | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/data/Xsession.in b/data/Xsession.in -index 0da187d..aa49b90 100755 ---- a/data/Xsession.in -+++ b/data/Xsession.in -@@ -189,14 +189,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then - done - fi - --# add ssh-agent if found --sshagent="`gdmwhich ssh-agent`" --if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then -- command="$sshagent -- $command" --elif [ -z "$sshagent" ] ; then -- echo "$0: ssh-agent not found!" --fi -- - echo "$0: Setup done, will execute: $command" - - eval exec $command --- -1.7.3.1 - diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch deleted file mode 100644 index 0642f7c0..00000000 --- a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b96c19976b6876648fd91949f78f06cf5d269b18 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 2 Nov 2010 23:19:07 +0100 -Subject: [PATCH] make custom session work - -Gentoo bug: #216984 - -fix custom sessions not doing sourcing in the proper order. ---- - data/Xsession.in | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/data/Xsession.in b/data/Xsession.in -index 118518c..201be92 100755 ---- a/data/Xsession.in -+++ b/data/Xsession.in -@@ -155,15 +155,6 @@ fi - - xhost +si:localuser:`id -un` || : - --# run all system xinitrc shell scripts. --if [ -d /etc/X11/xinit/xinitrc.d ]; then -- for i in /etc/X11/xinit/xinitrc.d/* ; do -- if [ -x "$i" -a ! -d "$i" ]; then -- . "$i" -- fi -- done --fi -- - if [ "x$command" = "xcustom" ] ; then - if [ -x "$HOME/.xsession" ]; then - command="$HOME/.xsession" -@@ -191,6 +182,15 @@ if [ "x$command" = "xdefault" ] ; then - fi - fi - -+# run all system xinitrc shell scripts. -+if [ -d /etc/X11/xinit/xinitrc.d ]; then -+ for i in /etc/X11/xinit/xinitrc.d/* ; do -+ if [ -x "$i" -a ! -d "$i" ]; then -+ . "$i" -+ fi -+ done -+fi -+ - # add ssh-agent if found - sshagent="`gdmwhich ssh-agent`" - if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then --- -1.7.7 - diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch deleted file mode 100644 index ab8325f4..00000000 --- a/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 91bd106c72362e51fbfa6966bc71dd0bb12d479d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gmail.com> -Date: Wed, 14 Sep 2011 22:09:56 -0400 -Subject: [PATCH] Disable a11y in gconf and gsettings defaults - ---- - data/00-upstream-settings | 6 +++--- - data/session-setup.entries | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/00-upstream-settings b/data/00-upstream-settings -index 1511b7b..87410cb 100644 ---- a/data/00-upstream-settings -+++ b/data/00-upstream-settings -@@ -7,7 +7,7 @@ - # - - [org/gnome/desktop/a11y/keyboard] --enable=true -+enable=false - - [org/gnome/desktop/background] - show-desktop-icons=false -@@ -16,7 +16,7 @@ show-desktop-icons=false - exec='/bin/true' - - [org/gnome/desktop/interface] --toolkit-accessibility=true -+toolkit-accessibility=false - - [org/gnome/desktop/lockdown] - disable-application-handlers=true -@@ -35,7 +35,7 @@ session-name='gdm-shell' - event-sounds=true - - [org/gnome/settings-daemon/plugins/a11y-keyboard] --active=true -+active=false - - [org/gnome/settings-daemon/plugins/a11y-settings] - active=false -diff --git a/data/session-setup.entries b/data/session-setup.entries -index b84e16f..a47d761 100644 ---- a/data/session-setup.entries -+++ b/data/session-setup.entries -@@ -406,14 +406,14 @@ - <entry> - <key>/desktop/gnome/interface/accessibility</key> - <value> -- <bool>true</bool> -+ <bool>false</bool> - </value> - </entry> - - <entry> - <key>/desktop/gnome/accessibility/keyboard/enable</key> - <value> -- <bool>true</bool> -+ <bool>false</bool> - </value> - </entry> - --- -1.7.7 - diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild deleted file mode 100644 index 291bbd6f..00000000 --- a/gnome-base/gdm/gdm-9999.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="yes" - -inherit autotools eutils gnome2-live pam systemd - -DESCRIPTION="GNOME Display Manager" -HOMEPAGE="http://www.gnome.org/projects/gdm/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -IUSE_LIBC="elibc_glibc" -IUSE="accessibility +consolekit fprint +gnome-shell ipv6 gnome-keyring +introspection selinux smartcard tcpd test xinerama +xklavier $IUSE_LIBC" - -# Name of the tarball with gentoo specific files -GDM_EXTRA="${PN}-3.2.1.1-gentoo-files" - -SRC_URI="${SRC_URI} - http://dev.gentoo.org/~tetromino/distfiles/gdm/${GDM_EXTRA}.tar.xz" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.29.3:2 - >=x11-libs/gtk+-2.91.1:3 - >=x11-libs/pango-1.3 - dev-libs/nspr - >=dev-libs/nss-3.11.1 - >=media-libs/fontconfig-2.5.0 - >=media-libs/libcanberra-0.4[gtk3] - >=gnome-base/gconf-2.31.3 - >=x11-misc/xdg-utils-1.0.2-r3 - >=sys-power/upower-0.9 - >=sys-apps/accountsservice-0.6.12 - - gnome-base/dconf - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - sys-apps/dbus - - app-text/iso-codes - - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrandr - x11-apps/sessreg - - virtual/pam - consolekit? ( sys-auth/consolekit ) - - accessibility? ( x11-libs/libXevie ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) - xklavier? ( >=x11-libs/libxklavier-4 )" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - x11-proto/randrproto - >=dev-util/intltool-0.40.0 - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" -# XXX: These deps are from session and desktop files in data/ directory -# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser) -# fprintd is used via dbus by gdm-fingerprint-extension -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-2.91.92 - x11-apps/xhost - - accessibility? ( - app-accessibility/gnome-mag - app-accessibility/gok - app-accessibility/orca - gnome-extra/at-spi:1 ) - consolekit? ( gnome-extra/polkit-gnome ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) - !gnome-shell? ( x11-wm/metacity ) - smartcard? ( - app-crypt/coolkey - sys-auth/pam_pkcs11 ) - - !gnome-extra/fast-user-switch-applet" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code. - # --with-at-spi-registryd-directory= needs to be passed explicitly because - # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 - G2CONF="${G2CONF} - --disable-schemas-install - --disable-static - --localstatedir=${EPREFIX}/var - --with-xdmcp=yes - --enable-authentication-scheme=pam - --with-pam-prefix=${EPREFIX}/etc - --with-at-spi-registryd-directory=${EPREFIX}/usr/libexec - $(use_with accessibility xevie) - $(use_enable ipv6) - $(use_enable xklavier libxklavier) - $(use_with consolekit console-kit) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - -src_prepare() { - gnome2_src_prepare - - # remove unneeded linker directive for selinux, bug #41022 - epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch" - - # daemonize so that the boot process can continue, bug #236701 - epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch" - - # GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852 - epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch" - - # make custom session work, bug #216984 - epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d, bug #220603 - epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # fix libxklavier automagic support - epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch" - - # don't load accessibility support at runtime when USE=-accessibility - use accessibility || epatch "${FILESDIR}/${PN}-3.2.1.1-disable-accessibility.patch" - - # make gdm-fallback session the default if USE=-gnome-shell - if ! use gnome-shell; then - sed -e "s:'gdm-shell':'gdm-fallback':" \ - -i data/00-upstream-settings || die "sed failed" - fi - - mkdir -p "${S}"/m4 - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # Install the systemd unit file - systemd_dounit "${gentoodir}/gdm@.service" - - # gdm-binary should be gdm to work with our init (#5598) - rm -f "${ED}/usr/sbin/gdm" - ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm" - # our x11's scripts point to /usr/bin/gdm - ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm" - - # log, etc. - keepdir /var/log/gdm - - # add xinitrc.d scripts - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" - doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm || die "doenvd failed" - - # install PAM files - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - dopamd "${gentoodir}"/pam.d/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome} -} - -pkg_postinst() { - gnome2_pkg_postinst - - dbus-launch dconf update || die "'dconf update' failed" - - ewarn - ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" - ewarn "visit us on #gentoo-desktop if you have problems." - ewarn - - elog "To make GDM start at boot, edit /etc/conf.d/xdm" - elog "and then execute 'rc-update add xdm default'." - elog "If you already have GDM running, you will need to restart it." - - elog - elog "GDM ignores most non-localization environment variables. If you" - elog "need GDM to launch gnome-session with a particular environment," - elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see" - elog "the pam_env man page for more information." - elog - - if use gnome-keyring; then - elog "For autologin to unlock your keyring, you need to set an empty" - elog "password on your keyring. Use app-crypt/seahorse for that." - fi - - if [ -f "/etc/X11/gdm/gdm.conf" ]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi - - # https://bugzilla.redhat.com/show_bug.cgi?id=513579 - # Lennart says this problem is fixed, but users are still reporting problems - # XXX: Do we want this elog? -# if has_version "media-libs/libcanberra[pulseaudio]" ; then -# elog -# elog "You have media-libs/libcanberra with the pulseaudio USE flag" -# elog "enabled. GDM will start a pulseaudio process to play sounds. This" -# elog "process should automatically terminate when a user logs into a" -# elog "desktop session. If GDM's pulseaudio fails to terminate and" -# elog "causes problems for users' audio, you can prevent GDM from" -# elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf" -# elog "so it contains the following two lines:" -# elog -# elog "autospawn = no" -# elog "daemon-binary = /bin/true" -# fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if rc-config list default | grep -q xdm; then - elog "To remove GDM from startup please execute" - elog "'rc-update del xdm default'" - fi -} diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest deleted file mode 100644 index 8f9583ae..00000000 --- a/gnome-base/gnome-control-center/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a -EBUILD gnome-control-center-9999-r1.ebuild 2890 RMD160 bcd2201789e3cef6f628e2167db2b5cba8b0b505 SHA1 8cc2439446bffcdcab23b2a0d34e2e83f7ace133 SHA256 622ecda1b4ffbab918e89905df80069dd39d314505396aec2872fa5b7b043e50 diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch deleted file mode 100644 index edbbf314..00000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b56f9e04f8822db34b030bea86d39c1d444a3cbb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Thu, 27 Oct 2011 23:55:23 -0400 -Subject: [PATCH] Make colord optional. - ---- - configure.ac | 19 ++++++++++++++++++- - panels/Makefile.am | 5 ++++- - 2 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d552ac8..fd9062e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,7 +106,24 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) - PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0) - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+ build_color=true -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES dbus-glib-1 - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 566a2f8..a375e2f 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -3,7 +3,6 @@ SUBDIRS= \ - background \ - screen \ - power \ -- color \ - display \ - media \ - mouse \ -@@ -17,6 +16,10 @@ SUBDIRS= \ - datetime \ - wacom - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ - if BUILD_PRINTERS - SUBDIRS += printers - endif --- -1.7.7.1 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild deleted file mode 100644 index 01e46418..00000000 --- a/gnome-base/gnome-control-center/gnome-control-center-9999-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2011 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 gnome2-live - -DESCRIPTION="GNOME Desktop Configuration Tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -IUSE="+cheese +colord +cups +networkmanager +socialweb" -KEYWORDS="" - -# 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) -COMMON_DEPEND=" - >=dev-libs/glib-2.29.14:2 - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.1.19:3 - >=gnome-base/gsettings-desktop-schemas-3.0.2 - >=gnome-base/gconf-2.0:2 - >=dev-libs/dbus-glib-0.73 - >=gnome-base/gnome-desktop-3.1.0:3 - >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?] - >=gnome-base/libgnomekbd-2.91.91 - dev-libs/libwacom - - app-text/iso-codes - dev-libs/libxml2:2 - gnome-base/gnome-menus:3 - gnome-base/libgtop:2 - media-libs/fontconfig - net-libs/gnome-online-accounts - - >=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 - - cheese? ( - media-libs/gstreamer:0.10 - >=media-video/cheese-2.91.91.1 ) - colord? ( >=x11-misc/colord-0.1.8 ) - cups? ( >=net-print/cups-1.4[dbus] ) - networkmanager? ( - >=gnome-extra/nm-applet-0.9.1.90 - >=net-misc/networkmanager-0.8.997 ) - 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 ) - - !<gnome-extra/gnome-color-manager-3.1.2 - !gnome-extra/gnome-media[pulseaudio] - !<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} - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - >=sys-devel/gettext-0.17 - >=dev-util/intltool-0.40.1 - >=dev-util/pkgconfig-0.19 - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1 - - cups? ( sys-apps/sed )" -# Needed for autoreconf -# gnome-base/gnome-common - -pkg_setup() { - G2CONF="${G2CONF} - --disable-update-mimedb - --disable-static - $(use_with cheese) - $(use_enable colord color) - $(use_enable cups) - $(use_with socialweb libsocialweb)" - DOCS="AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # Make colord plugin optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch" - - gnome2_src_prepare -} diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest deleted file mode 100644 index f3e6e453..00000000 --- a/gnome-base/gnome-keyring/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD gnome-keyring-9999-r1.ebuild 2633 RMD160 b89009af646309a2d4dc412a6d099e03fdeb6a97 SHA1 bf05c75a87f06ae2a09057de8c8ec9c5a84175c0 SHA256 c3cef2b1d5c248a2d8a5dffa38e5326378e295d5d4a5e0d907defecde2e3ffec diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999-r1.ebuild deleted file mode 100644 index ea364aa6..00000000 --- a/gnome-base/gnome-keyring/gnome-keyring-9999-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2-live multilib pam virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -IUSE="+caps debug doc pam test" -KEYWORDS="" - -# USE=valgrind is probably not a good idea for the tree -RDEPEND=">=dev-libs/glib-2.25:2 - gnome-base/gcr - >=x11-libs/gtk+-2.90.0:3 - >=app-crypt/p11-kit-0.6 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2 - >=dev-libs/libtasn1-1 - >=sys-apps/dbus-1.0 - caps? ( sys-libs/libcap-ng ) - pam? ( virtual/pam ) -" -# valgrind? ( dev-util/valgrind ) -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - doc? ( >=dev-util/gtk-doc-1.9 )" -PDEPEND=">=gnome-base/libgnome-keyring-3.1.92" -# eautoreconf needs: -# >=dev-util/gtk-doc-am-1.9 - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable test tests) - $(use_with caps libcap-ng) - $(use_enable pam) - $(use_with pam pam-dir $(getpam_mod_dir)) - --with-root-certs=${EPREFIX}/etc/ssl/certs/ - --enable-ssh-agent - --enable-gpg-agent - --disable-update-mime" - MAKEOPTS+=" -j1" -} - -src_test() { - # FIXME: /gkm/transaction/ tests fail - unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "emake check failed!" -} - -pkg_postinst() { - use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon - - gnome2_pkg_postinst -} - -# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes -# @FUNCTION: fcaps -# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file} -# @RETURN: 0 if all okay; non-zero if failure and fallback -# @DESCRIPTION: -# fcaps sets the specified capabilities in the effective and permitted set of -# the given file. In case of failure fcaps sets the given file-mode. -fcaps() { - local uid_gid=$1 - local perms=$2 - local capset=$3 - local path=$4 - local res - - chmod $perms $path && \ - chown $uid_gid $path - res=$? - - use caps || return $res - - #set the capability - setcap "$capset=ep" "$path" &> /dev/null - #check if the capabilitiy got set correctly - setcap -v "$capset=ep" "$path" &> /dev/null - res=$? - - if [ $res -ne 0 ]; then - ewarn "Failed to set capabilities. Probable reason is missed kernel support." - ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY" - ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store" - ewarn "${path}" - ewarn - ewarn "Falling back to suid now..." - chmod u+s ${path} - fi - return $res -} diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest deleted file mode 100644 index e551c354..00000000 --- a/gnome-base/gnome-menus/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b -AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 RMD160 39b97747a5b87c8bc217082268fa825e767cf528 SHA1 0d9cf9fae2224a3a42ef93ca51105fa8b33f0a42 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe -EBUILD gnome-menus-9999.ebuild 2527 RMD160 85971147a953812a0ea8a0a8ae69d745cb8b37cc SHA1 ca8aeb06f44cf6c8a0f3456f2a347ed9d52d99d5 SHA256 442086f6480e43016f5888d8e4a045e02776a9440f5821cee9a4c1855c70ddab diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome deleted file mode 100644 index b12a712e..00000000 --- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ] -then - export XDG_MENU_PREFIX=gnome- -fi diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch deleted file mode 100644 index 5f5f8b27..00000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- layout/applications.menu.orig 2007-09-21 17:51:43.000000000 +0300 -+++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300 -@@ -146,6 +146,19 @@ - <Not><Category>Core</Category></Not> - <Not><Category>Screensaver</Category></Not> - <Not><Category>X-GNOME-Settings-Panel</Category></Not> -+ <Not><Category>X-KDE-settings-accessibility</Category></Not> -+ <Not><Category>X-KDE-settings-components</Category></Not> -+ <Not><Category>X-KDE-settings-desktop</Category></Not> -+ <Not><Category>X-KDE-settings-looknfeel</Category></Not> -+ <Not><Category>X-KDE-settings-network</Category></Not> -+ <Not><Category>X-KDE-settings-webbrowsing</Category></Not> -+ <Not><Category>X-KDE-settings-peripherals</Category></Not> -+ <Not><Category>X-KDE-settings-hardware</Category></Not> -+ <Not><Category>X-KDE-settings-power</Category></Not> -+ <Not><Category>X-KDE-settings-security</Category></Not> -+ <Not><Category>X-KDE-settings-sound</Category></Not> -+ <Not><Category>X-KDE-settings-system</Category></Not> -+ <Not><Category>X-KDE-information</Category></Not> - </And> - </Include> - </Menu> <!-- End Other --> diff --git a/gnome-base/gnome-menus/gnome-menus-9999.ebuild b/gnome-base/gnome-menus/gnome-menus-9999.ebuild deleted file mode 100644 index 2e14c7cc..00000000 --- a/gnome-base/gnome-menus/gnome-menus-9999.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit eutils gnome2-live python - -DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec" -HOMEPAGE="http://www.gnome.org" - -LICENSE="GPL-2 LGPL-2" -SLOT="3" -KEYWORDS="" - -# +python for gmenu-simple-editor -IUSE="debug +introspection +python test" - -COMMON_DEPEND=">=dev-libs/glib-2.29.15:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - python? ( - >=dev-libs/gobject-introspection-0.9.5 - dev-python/pygobject:3 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/gtk+:3[introspection] )" -# Older versions of slot 0 install the menu editor and the desktop directories -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gnome-menus-3.0.1-r1:0" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40 - test? ( dev-libs/gjs )" - -pkg_setup() { - python_pkg_setup - DOCS="AUTHORS ChangeLog HACKING NEWS README" - - # Do NOT compile with --disable-debug/--enable-debug=no - # It disables api usage checks - if ! use debug ; then - G2CONF="${G2CONF} --enable-debug=minimum" - fi - - if use python || use introspection; then - use introspection || ewarn "Enabling introspection due to USE=python" - G2CONF="${G2CONF} --enable-introspection" - else - G2CONF="${G2CONF} --disable-introspection" - fi - - G2CONF="${G2CONF} --disable-static" -} - -src_prepare() { - gnome2_src_prepare - - # Don't show KDE standalone settings desktop files in GNOME others menu - epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch" - - # disable pyc compiling - mv py-compile py-compile-disabled - ln -s $(type -P true) py-compile - - python_copy_sources -} - -src_configure() { - python_execute_function -s gnome2_src_configure -} - -src_compile() { - python_execute_function -s gnome2_src_compile -} - -src_test() { - python_execute_function -s -d -} - -src_install() { - python_execute_function -s gnome2_src_install - python_clean_installation_image - - # Prefix menu, bug #256614 - mv "${ED}"/etc/xdg/menus/applications.menu \ - "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed" - - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/10-xdg-menu-gnome" -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_mod_optimize GMenuSimpleEditor - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - if use python; then - python_mod_cleanup GMenuSimpleEditor - fi -} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest deleted file mode 100644 index 3bcb418e..00000000 --- a/gnome-base/gnome-settings-daemon/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX 0001-Make-colord-optional.patch 4495 RMD160 0f2b9b49db8722515f673b0fb329de4fb921d0cd SHA1 3831173c79ccebb7d1c3cba7dd6f099061db914d SHA256 362fa496dbb137695b25d26da25b6c45858058f05bc698b9397b528a60ed7ef0 -AUX gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch 519 RMD160 a1f9801351d469aed5f626787c1ce1917468fda7 SHA1 4100b4d7c0e4f3fd85afe3eb4b0fc4e258e7edea SHA256 94c82c7f1b213af232bd1a401ddcaef1578dc7cc70ce3258e73887e438532133 -EBUILD gnome-settings-daemon-9999-r1.ebuild 3484 RMD160 4752e7660b58be3dae3dbd20128e82a76acf7a11 SHA1 a84247a58d4be214755fd68c5e57a405fd689ac6 SHA256 5cd200cedb8edab37899dc180734f70df9922f5dc29df21255554d0dbec59e95 diff --git a/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch b/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch deleted file mode 100644 index 586addfa..00000000 --- a/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 43cb1cd0f1a944b1668688c88dd565a1a61232c3 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Thu, 27 Oct 2011 23:30:41 -0400 -Subject: [PATCH 1/2] Make colord optional - -Conflicts: - - configure.ac - plugins/Makefile.am ---- - configure.ac | 38 ++++++++++++++++++++++++++++++++------ - data/Makefile.am | 7 ++++++- - plugins/Makefile.am | 7 ++++++- - 3 files changed, 44 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 357f832..5b8e2af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -93,6 +93,38 @@ dnl --------------------------------------------------------------------------- - PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) - - dnl --------------------------------------------------------------------------- -+dnl - Check for colord -+dnl --------------------------------------------------------------------------- -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [turn off color plugin]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) -+ build_color=true -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+ -+AC_SUBST(COLORD_CFLAGS) -+AC_SUBST(COLORD_LIBS) -+ -+dnl --------------------------------------------------------------------------- -+dnl - Check for libcanberra -+dnl --------------------------------------------------------------------------- -+PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3, -+ [have_libcanberra=true -+ AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define if libcanberra should be used])], -+ [have_libcanberra=false]) -+AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xtrue") -+ -+dnl --------------------------------------------------------------------------- - dnl - Check for LCMS2 - dnl --------------------------------------------------------------------------- - PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no) -@@ -190,12 +222,6 @@ dnl --------------------------------------------------------------------------- - PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra]) - - dnl --------------------------------------------------------------------------- --dnl - color --dnl --------------------------------------------------------------------------- -- --PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) -- --dnl --------------------------------------------------------------------------- - dnl - wacom - dnl --------------------------------------------------------------------------- - -diff --git a/data/Makefile.am b/data/Makefile.am -index 19decc2..cb2c976 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -11,7 +11,6 @@ gsettings_SCHEMAS = \ - org.gnome.settings-daemon.plugins.gschema.xml \ - org.gnome.settings-daemon.plugins.keyboard.gschema.xml \ - org.gnome.settings-daemon.plugins.power.gschema.xml \ -- org.gnome.settings-daemon.plugins.color.gschema.xml \ - org.gnome.settings-daemon.plugins.media-keys.gschema.xml \ - org.gnome.settings-daemon.plugins.xsettings.gschema.xml \ - org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \ -@@ -21,6 +20,12 @@ gsettings_SCHEMAS = \ - - all_schemas = $(gsettings_SCHEMAS) - -+if BUILD_COLOR -+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml -+else -+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml -+endif -+ - if HAVE_PACKAGEKIT - gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml - else -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 2b7566a..31fcb74 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -6,7 +6,6 @@ enabled_plugins = \ - automount \ - background \ - clipboard \ -- color \ - cursor \ - dummy \ - power \ -@@ -22,6 +21,12 @@ enabled_plugins = \ - - disabled_plugins = $(NULL) - -+if BUILD_COLOR -+enabled_plugins += color -+else -+disabled_plugins += color -+endif -+ - if HAVE_PACKAGEKIT - enabled_plugins += updates - else --- -1.7.9.106.g2a2aa.dirty - diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch deleted file mode 100644 index a87a3d9b..00000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c -index 80f664a..c9a29fb 100644 ---- a/plugins/mouse/gsd-mouse-manager.c -+++ b/plugins/mouse/gsd-mouse-manager.c -@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state) - - args[0] = "syndaemon"; - args[1] = "-i"; -- args[2] = "2.0"; -+ args[2] = "0.5"; - args[3] = "-K"; - args[4] = "-R"; - args[5] = NULL; diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild deleted file mode 100644 index 3fc2cef0..00000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2-live virtualx - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="http://www.gnome.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev" - -# Latest gsettings-desktop-schemas is needed due to commit e8d1de92 -# Latest gnome-desktop needed to fix the DPMS timeout bug #385063 -# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice -# upower-0.9.11 needed for UpSleepKind -COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.29.14:2 - >=x11-libs/gtk+-3.3.3:3 - >=gnome-base/gconf-2.6.1:2 - >=gnome-base/libgnomekbd-2.91.1 - >=gnome-base/gnome-desktop-3.2.0-r1:3 - >=gnome-base/gsettings-desktop-schemas-0.1.7.1 - media-fonts/cantarell - media-libs/fontconfig - >=media-libs/lcms-2.2:2 - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-0.9.16 - >=sys-power/upower-0.9.11 - >=x11-libs/libnotify-0.7.3 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXxf86misc - >=x11-libs/libxklavier-5.0 - >=media-sound/pulseaudio-0.9.16 - - colord? ( >=x11-misc/colord-0.1.13 ) - cups? ( >=net-print/cups-1.4[dbus] ) - packagekit? ( - || ( sys-fs/udev[gudev] - sys-fs/udev[extras] ) - >=app-admin/packagekit-base-0.6.12 ) - policykit? ( - >=sys-auth/polkit-0.97 - >=sys-apps/dbus-1.1.2[X] ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( || ( sys-fs/udev[gudev] - sys-fs/udev[extras] ) ) - dev-libs/libwacom" -# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly -# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x -# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - >=x11-themes/gnome-themes-standard-2.91 - >=x11-themes/gnome-icon-theme-2.91 - >=x11-themes/gnome-icon-theme-symbolic-2.91 - !<gnome-base/gnome-control-center-2.22 - !<gnome-extra/gnome-color-manager-3.1.1 - !<gnome-extra/gnome-power-manager-3.1.3" -# xproto-7.0.15 needed for power plugin -DEPEND="${COMMON_DEPEND} - cups? ( sys-apps/sed ) - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - x11-proto/inputproto - x11-proto/kbproto - x11-proto/xf86miscproto - >=x11-proto/xproto-7.0.15" - -pkg_setup() { - # README is empty - DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" - G2CONF="${G2CONF} - --disable-static - --disable-schemas-compile - --enable-gconf-bridge - --with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids - $(use_enable colord color) - $(use_enable cups) - $(use_enable debug) - $(use_enable debug more-warnings) - $(use_enable packagekit) - $(use_enable policykit polkit) - $(use_enable smartcard smartcard-support) - $(use_enable udev gudev)" -} - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=621836 - # Apparently this change severely affects touchpad usability for some - # people, so revert it if USE=short-touchpad-timeout. - # Revisit if/when upstream adds a setting for customizing the timeout. - use short-touchpad-timeout && - epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch" - - # Make colord optional; requires eautoreconf - epatch "${FILESDIR}/0001-Make-colord-optional.patch" - - gnome2_src_prepare -} - -src_test() { - Xemake check -} - -src_install() { - gnome2_src_install - - echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf - doenvd 51gsettings-dconf || die "doenvd failed" -} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest deleted file mode 100644 index 1191201d..00000000 --- a/gnome-base/gnome-shell/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX 0001-whitelist-notification-stuff.patch 914 RMD160 f0e2fdebe514fbb71287420e07de013bb4909863 SHA1 1ad63cb331bb3abbc5353fc55743cb5e52528840 SHA256 1dd82c876997bb0fe800c6097c5ac0ea78d98ec2f5d5d50b68a7ee2583e96b22 -EBUILD gnome-shell-9999-r1.ebuild 4043 RMD160 46deca7c6830e0b13689c68b7ef376b86838f5fd SHA1 734853b1f207eb9141145753a4104e270461cdb5 SHA256 77ed42df9750c787c0f0791632bd9800bcdc71010c685e3816df135a2c5a0e4f diff --git a/gnome-base/gnome-shell/files/0001-whitelist-notification-stuff.patch b/gnome-base/gnome-shell/files/0001-whitelist-notification-stuff.patch deleted file mode 100644 index 89538b41..00000000 --- a/gnome-base/gnome-shell/files/0001-whitelist-notification-stuff.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fc1c3460d4a6c53453f1c207e83a79fcc4b45349 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Sat, 29 Jan 2011 10:50:04 +0100 -Subject: [PATCH] whitelist notification stuff - ---- - js/ui/statusIconDispatcher.js | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/js/ui/statusIconDispatcher.js b/js/ui/statusIconDispatcher.js -index e159b39..bc74d8e 100644 ---- a/js/ui/statusIconDispatcher.js -+++ b/js/ui/statusIconDispatcher.js -@@ -9,6 +9,8 @@ const NotificationDaemon = imports.ui.notificationDaemon; - const Util = imports.misc.util; - - const STANDARD_TRAY_ICON_IMPLEMENTATIONS = { -+ 'dropbox': 'dropbox', -+ 'gnote': 'gnote', - 'bluetooth-applet': 'bluetooth', - 'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet - // when moved to control center --- -1.7.4.1.42.g43f9f.dirty - diff --git a/gnome-base/gnome-shell/gnome-shell-9999-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-9999-r1.ebuild deleted file mode 100644 index eb80a894..00000000 --- a/gnome-base/gnome-shell/gnome-shell-9999-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" - -inherit gnome2-live python - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="http://live.gnome.org/GnomeShell" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="+recorder" - -# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop -# FIXME: Automagic gnome-bluetooth[introspection] support. -# latest gsettings-desktop-schemas is needed due to commit 602fa1c6 -# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 -# libXfixes-5.0 needed for pointer barriers -COMMON_DEPEND=">=dev-libs/glib-2.31.0:2 - >=dev-libs/gjs-1.29.18 - >=dev-libs/gobject-introspection-0.10.1 - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.0.0:3[introspection] - >=media-libs/clutter-1.7.5:1.0[introspection] - app-misc/ca-certificates - >=dev-libs/folks-0.5.2 - >=dev-libs/json-glib-0.13.2 - >=gnome-base/gnome-desktop-2.91.2:3 - >=gnome-base/gsettings-desktop-schemas-2.91.91 - gnome-base/libgnome-keyring - >=gnome-extra/evolution-data-server-2.91.6[introspection] - >=media-libs/gstreamer-0.10.16:0.10 - >=media-libs/gst-plugins-base-0.10.16:0.10 - >=net-im/telepathy-logger-0.2.4[introspection] - net-libs/libsoup:2.4[introspection] - >=net-libs/telepathy-glib-0.15.5[introspection] - >=net-misc/networkmanager-0.8.999[introspection] - >=net-wireless/gnome-bluetooth-3.1.0[introspection] - >=net-im/telepathy-mission-control-5.9.0 - >=sys-auth/polkit-0.100[introspection] - >=x11-wm/mutter-3.2.1[introspection] - - dev-libs/libxml2:2 - x11-libs/pango[introspection] - >=dev-libs/libcroco-0.6.2:0.6 - - >=gnome-base/gnome-menus-3.1[introspection] - gnome-base/librsvg - media-libs/libcanberra - media-sound/pulseaudio - - >=x11-libs/startup-notification-0.11 - x11-libs/libX11 - >=x11-libs/libXfixes-5.0" -# Runtime-only deps are probably incomplete and approximate. -# Each block: -# 1. Pull in polkit-0.101 for pretty authorization dialogs -# 2. Introspection stuff + dconf needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast -# user switching with gdm-3.1.x) -# 6. caribou needed for on-screen keyboard -RDEPEND="${COMMON_DEPEND} - >=x11-themes/gnome-icon-theme-3.1.90 - >=x11-themes/gnome-icon-theme-symbolic-3.1.90 - >=x11-themes/gnome-themes-standard-3.1.90 - media-fonts/cantarell - - >=sys-auth/polkit-0.101[introspection] - - >=gnome-base/dconf-0.4.1 - >=gnome-base/libgnomekbd-2.91.4[introspection] - sys-power/upower[introspection] - - >=gnome-base/gnome-session-2.91.91 - - >=gnome-base/gnome-settings-daemon-2.91 - >=gnome-base/gnome-control-center-2.91.92-r1 - - >=sys-apps/accountsservice-0.6.14 - - >=app-accessibility/caribou-0.3 - - recorder? ( media-plugins/gst-plugins-vp8 )" -DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 - >=dev-util/pkgconfig-0.22 - >=dev-util/intltool-0.40 - gnome-base/gnome-common - !!=dev-lang/spidermonkey-1.8.2*" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -pkg_setup() { - DOCS="AUTHORS NEWS README" - # Don't error out on warnings - G2CONF="${G2CONF} - --enable-compile-warnings=maximum - --disable-schemas-compile - --disable-jhbuild-wrapper-script - --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt - BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch ${FILESDIR}/0001-whitelist-notification-stuff.patch - gnome2_src_prepare - # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 - # Note: sed Makefile.in because it is generated from several Makefile.ams - sed -e 's/-DG_DISABLE_DEPRECATED//g' \ - -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" -} - -src_install() { - gnome2_src_install - python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool -} diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest deleted file mode 100644 index 48e06d39..00000000 --- a/gnome-base/libgnome-keyring/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libgnome-keyring-9999.ebuild 1132 RMD160 609fbf07464183075ccfa0055032372d4cd1f0d0 SHA1 ec8f3b353e2f8fde3cd4ee19190547705d33d391 SHA256 17d02a81fbb71a444c3a26e52f7940e3185a9f2be1bd557d6abbd72219564126 diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild deleted file mode 100644 index 4fab4df2..00000000 --- a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2-live - -DESCRIPTION="Compatibility library for accessing secrets" -HOMEPAGE="http://live.gnome.org/GnomeKeyring" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="" -IUSE="debug doc test" - -RDEPEND=">=sys-apps/dbus-1.0 - gnome-base/gconf - >=gnome-base/gnome-keyring-3.1.92[test?]" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.9 - doc? ( >=dev-util/gtk-doc-1.9 )" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable test tests full)" - DOCS="AUTHORS ChangeLog NEWS README" -} - -src_prepare() { - # FIXME: Remove silly CFLAGS - sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \ - -e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \ - -i configure.ac || die "sed failed" - # FIXME: Remove DISABLE_DEPRECATED flags - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \ - -i configure.ac || die "sed 2 failed" - gnome2_src_prepare -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - dbus-launch emake check || die "tests failed" -} |