Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/gnome-base
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gconf/Manifest4
-rw-r--r--gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch19
-rw-r--r--gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch18
-rw-r--r--gnome-base/gconf/gconf-9999.ebuild19
-rw-r--r--gnome-base/gdm/Manifest5
-rw-r--r--gnome-base/gdm/files/gdm-3.1.91-hardcoded-gnome-session-path-env.patch137
-rw-r--r--gnome-base/gdm/gdm-9999.ebuild22
-rw-r--r--gnome-base/gnome-keyring/Manifest2
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-9999-r1.ebuild5
-rw-r--r--gnome-base/gnome-menus/Manifest2
-rw-r--r--gnome-base/gnome-menus/gnome-menus-9999.ebuild10
-rw-r--r--gnome-base/libgnome-keyring/Manifest2
-rw-r--r--gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild4
13 files changed, 83 insertions, 166 deletions
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index ba12c212..143fe111 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1 +1,3 @@
-EBUILD gconf-9999.ebuild 1906 RMD160 4817d6d1aced13ea0b6fe8ffd926d93ae457feb4 SHA1 627092216897df415680ab5d151479daada36e6a SHA256 174b0fa42f64cf05e8486abdb4079fb311815118056a05808f91c5b1bb0f1fbf
+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
new file mode 100644
index 00000000..8ca6a0d4
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 00000000..680b1a15
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch
@@ -0,0 +1,18 @@
+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
index d1db270c..aff1d13a 100644
--- a/gnome-base/gconf/gconf-9999.ebuild
+++ b/gnome-base/gconf/gconf-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/gconf/"
LICENSE="LGPL-2"
SLOT="2"
KEYWORDS=""
-IUSE="debug doc +introspection ldap policykit"
+IUSE="debug doc +introspection ldap orbit policykit"
RDEPEND=">=dev-libs/glib-2.25.9:2
>=x11-libs/gtk+-2.90:3
@@ -23,6 +23,7 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
>=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
@@ -33,16 +34,28 @@ pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
--enable-gtk
- --disable-orbit
--disable-static
--enable-gsettings-backend
--with-gtk=3.0
$(use_enable introspection)
$(use_with ldap openldap)
- $(use_enable policykit defaults-service)"
+ $(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
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 9ab0a16a..87f831c0 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -8,8 +8,7 @@ AUX gdm-2.32.0-fix-daemonize-regression.patch 4048 RMD160 4219fec833f0e62a10e52d
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.1.91-hardcoded-gnome-session-path-env.patch 6065 RMD160 4e9093010c37a8f9cb66f00025defd83b94da4d4 SHA1 98e14070e948f251ac4beba0f899a87025acf15c SHA256 97e86c85ce54edd63acce1c8fcd30c48c5855a2fa8eeaf750156e2524cd06390
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-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
-EBUILD gdm-9999.ebuild 8411 RMD160 356ff7769edc4e8555ca97b0e8e6eb08e5148d37 SHA1 e8cb847cabaebdb9cd6a10cf2d4e792bcb3ba51e SHA256 3eca8e559597617c5b8e9afcfa0ac3e51b30c8aad1f47589e583bc0518623263
+DIST gdm-3.2.1.1-gentoo-files.tar.xz 996 RMD160 29fa24d0e0a4961d7e14a348fb620bcb4ad62828 SHA1 46651e31d865321de4de56841315ca5b27079d91 SHA256 610f7a1652996d77462773994adb5fd396ed973bbd9df51daa301004d38ca10a
+EBUILD gdm-9999.ebuild 8336 RMD160 5e39e22b7639d771a7443e5b9f49b18e1cd93e4a SHA1 9c98592c990cd8e18ede7419b6dcc43f4a8f23d1 SHA256 038c0d4425a471f99fcbdd16f7133bb55c759f5433b0253b82bae154cccef8a6
diff --git a/gnome-base/gdm/files/gdm-3.1.91-hardcoded-gnome-session-path-env.patch b/gnome-base/gdm/files/gdm-3.1.91-hardcoded-gnome-session-path-env.patch
deleted file mode 100644
index 6e2054bb..00000000
--- a/gnome-base/gdm/files/gdm-3.1.91-hardcoded-gnome-session-path-env.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 791fb64fbf7d4752c4e607708739f627f09b71e2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 7 Aug 2011 02:15:11 -0400
-Subject: [PATCH 1/2] Don't hardcode gnome-session path, don't drop harmless
- env variables
-
-Don't hardcode the location of the gnome-session executable to /usr/bin.
-The system administrator may want have installed a custom wrapper in
-/usr/local that he wants gdm to use instead.
-
-Also, change the logic for how environment variables in spawned session
-processes are set. Instead of inheriting i18n variables from the current
-process and then setting the needed ones, we now:
-1. set needed environment variables;
-2. inherit env variables that had not been set in step 1 from the
- current process;
-3. drop specific variables that may cause problems.
-
-This allows a system administrator to force gdm to spawn sessions with a
-particular custom environment variable set to e.g. work around hardware
-driver bugs.
-
-Addresses https://bugzilla.gnome.org/show_bug.cgi?id=656094
----
- daemon/gdm-greeter-session.c | 2 +-
- daemon/gdm-welcome-session.c | 44 ++++++++++++++++++++++++++---------------
- 2 files changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
-index 8032065..73653b9 100644
---- a/daemon/gdm-greeter-session.c
-+++ b/daemon/gdm-greeter-session.c
-@@ -78,7 +78,7 @@ gdm_greeter_session_new (const char *display_name,
- GObject *object;
-
- object = g_object_new (GDM_TYPE_GREETER_SESSION,
-- "command", BINDIR "/gnome-session -f --debug",
-+ "command", "gnome-session -f --debug",
- "server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH,
- "server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE,
- "server-env-var-name", "GDM_GREETER_DBUS_ADDRESS",
-diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
-index 41144a8..ff11da9 100644
---- a/daemon/gdm-welcome-session.c
-+++ b/daemon/gdm-welcome-session.c
-@@ -238,32 +238,28 @@ build_welcome_environment (GdmWelcomeSession *welcome_session,
- {
- GHashTable *hash;
- struct passwd *pwent;
-- static const char * const optional_environment[] = {
-+ static const char * const lang_environment[] = {
- "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
- "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
- "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
- "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH",
- NULL
- };
-+ static const char * const drop_environment[] = {
-+ "MAIL", NULL
-+ };
-+ char **curr_environment;
- char *system_data_dirs;
- int i;
-
- load_lang_config_file (LANG_CONFIG_FILE,
-- (const char **) optional_environment);
-+ (const char **) lang_environment);
-+ curr_environment = g_listenv ();
-
-- /* create a hash table of current environment, then update keys has necessary */
-+ /* Create a hash table for environment variables.
-+ * First, insert keys we need to set. */
- hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-
-- for (i = 0; optional_environment[i] != NULL; i++) {
-- if (g_getenv (optional_environment[i]) == NULL) {
-- continue;
-- }
--
-- g_hash_table_insert (hash,
-- g_strdup (optional_environment[i]),
-- g_strdup (g_getenv (optional_environment[i])));
-- }
--
- system_data_dirs = g_strjoinv (":", (char **) g_get_system_data_dirs ());
-
- g_hash_table_insert (hash,
-@@ -292,7 +288,6 @@ build_welcome_environment (GdmWelcomeSession *welcome_session,
- g_hash_table_insert (hash, g_strdup ("USERNAME"), g_strdup (welcome_session->priv->user_name));
-
- g_hash_table_insert (hash, g_strdup ("GDM_VERSION"), g_strdup (VERSION));
-- g_hash_table_remove (hash, "MAIL");
-
- g_hash_table_insert (hash, g_strdup ("HOME"), g_strdup ("/"));
- g_hash_table_insert (hash, g_strdup ("PWD"), g_strdup ("/"));
-@@ -318,12 +313,28 @@ build_welcome_environment (GdmWelcomeSession *welcome_session,
- g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
- }
-
-- g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
--
- g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
- g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
- g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
-
-+ /* Second, insert environment variables from current process that haven't been set in the hash yet. */
-+ for (i = 0; curr_environment[i] != NULL; i++) {
-+ if (g_hash_table_lookup (hash, curr_environment[i]) != NULL ||
-+ g_getenv (curr_environment[i]) == NULL) {
-+ continue;
-+ }
-+
-+ g_hash_table_insert (hash,
-+ g_strdup (curr_environment[i]),
-+ g_strdup (g_getenv (curr_environment[i])));
-+ }
-+
-+ /* Third, remove undesirable environment variables. */
-+ for (i = 0; drop_environment[i] != NULL; i++)
-+ g_hash_table_remove (hash, drop_environment[i]);
-+
-+ g_strfreev (curr_environment);
-+
- return hash;
- }
-
-@@ -337,6 +348,7 @@ get_welcome_environment (GdmWelcomeSession *welcome_session,
- hash = build_welcome_environment (welcome_session, start_session);
-
- env = g_ptr_array_new ();
-+
- g_hash_table_foreach (hash, (GHFunc)listify_hash, env);
- g_hash_table_destroy (hash);
-
---
-1.7.6.1
-
diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild
index e9fa2546..ca20fc31 100644
--- a/gnome-base/gdm/gdm-9999.ebuild
+++ b/gnome-base/gdm/gdm-9999.ebuild
@@ -19,10 +19,10 @@ 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}-2.20.9-gentoo-files-r1"
+GDM_EXTRA="${PN}-3.2.1.1-gentoo-files"
SRC_URI="${SRC_URI}
- mirror://gentoo/${GDM_EXTRA}.tar.bz2"
+ 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
@@ -113,7 +113,6 @@ pkg_setup() {
# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
G2CONF="${G2CONF}
--disable-schemas-install
- --disable-maintainer-mode
--disable-static
--localstatedir=${EPREFIX}/var
--with-xdmcp=yes
@@ -165,9 +164,6 @@ src_prepare() {
# fix libxklavier automagic support
epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
- # don't ignore all non-i18n environment variables, gnome bug 656094
- epatch "${FILESDIR}/${PN}-3.1.91-hardcoded-gnome-session-path-env.patch"
-
# don't load accessibility support at runtime when USE=-accessibility
use accessibility || epatch "${FILESDIR}/${PN}-3.2.1.1-disable-accessibility.patch"
@@ -206,13 +202,8 @@ src_install() {
doenvd 99xdg-gdm || die "doenvd failed"
# install PAM files
- cp "${FILESDIR}"/3.1.91-pam.d/gdm-{password,fingerprint,smartcard} \
- "${gentoodir}"/pam.d/
use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
- dopamd "${gentoodir}"/pam.d/gdm{,-autologin,-password,-fingerprint,-smartcard}
- # gdm-welcome is the PAM file for the gdm greeter itself
- pamd_mimic system-services gdm-welcome auth account session
+ dopamd "${gentoodir}"/pam.d/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome}
}
pkg_postinst() {
@@ -229,6 +220,13 @@ pkg_postinst() {
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."
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 384f9008..f3e6e453 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1 +1 @@
-EBUILD gnome-keyring-9999-r1.ebuild 2521 RMD160 d13a6cf47cf2234d4335f1bef082350aad991ac6 SHA1 a656995adb35b3da6ba4e55d8bdf5e21dce819cb SHA256 19cdba1220b9eda22e258ff110561989454d8b2d07cd80d7a4f0ab6a267f5223
+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
index 701980a5..ea364aa6 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2-live multilib pam virtualx
+inherit gnome2-live multilib pam virtualx
DESCRIPTION="Password and keyring managing daemon"
HOMEPAGE="http://www.gnome.org/"
@@ -16,6 +16,7 @@ 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
@@ -27,6 +28,7 @@ RDEPEND=">=dev-libs/glib-2.25:2
caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
+# valgrind? ( dev-util/valgrind )
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/gtk-doc-am-1.9
@@ -53,6 +55,7 @@ pkg_setup() {
}
src_test() {
+ # FIXME: /gkm/transaction/ tests fail
unset DBUS_SESSION_BUS_ADDRESS
Xemake check || die "emake check failed!"
}
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index f7785106..3e6902cc 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,3 @@
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 2498 RMD160 f3bcd569fe2296bea762860646cbfc4c6dd7a220 SHA1 e46c0daad9fade382ab5938d8fb5feeb6fd0cc7b SHA256 3a6156f00df86779b8ef13a0a2e0a6005bb498efbdb99c7aba433c639114f426
+EBUILD gnome-menus-9999.ebuild 2527 RMD160 3f8d7367a3704a66e24314217e17602eaa782e20 SHA1 ee6816179492e55a3061beff2b2aa18c7c7d05aa SHA256 2e31251bd4977a13fc0fbca379009d4d35027dd6fae3a943256c37a2d620f701
diff --git a/gnome-base/gnome-menus/gnome-menus-9999.ebuild b/gnome-base/gnome-menus/gnome-menus-9999.ebuild
index d94e4895..d436dd89 100644
--- a/gnome-base/gnome-menus/gnome-menus-9999.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -19,7 +19,8 @@ LICENSE="GPL-2 LGPL-2"
SLOT="3"
KEYWORDS=""
-IUSE="debug +introspection python test"
+# +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 )
@@ -30,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
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-r50:0"
+ !<gnome-base/gnome-menus-3.0.1-r1:0"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9
@@ -38,6 +39,7 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-libs/gjs )"
pkg_setup() {
+ python_pkg_setup
DOCS="AUTHORS ChangeLog HACKING NEWS README"
# Do NOT compile with --disable-debug/--enable-debug=no
@@ -90,7 +92,7 @@ src_install() {
"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
exeinto /etc/X11/xinit/xinitrc.d/
- doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
+ doexe "${FILESDIR}/10-xdg-menu-gnome"
}
pkg_postinst() {
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index da175ef9..48e06d39 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1 +1 @@
-EBUILD libgnome-keyring-9999.ebuild 1137 RMD160 696ed208f46f937873942094089f758c05d7da49 SHA1 2482a3274bdcf6a15aeaa97ee8fa9738562c0212 SHA256 cf7c279a58e8e889c45c7f1d75a37a05c34936300bcbfef4cbeab0b12ccd2983
+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
index 8b447f5f..4fab4df2 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2-live
+inherit gnome2-live
DESCRIPTION="Compatibility library for accessing secrets"
HOMEPAGE="http://live.gnome.org/GnomeKeyring"
@@ -18,7 +18,7 @@ IUSE="debug doc test"
RDEPEND=">=sys-apps/dbus-1.0
gnome-base/gconf
- >=gnome-base/gnome-keyring-2.29[test?]"
+ >=gnome-base/gnome-keyring-3.1.92[test?]"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/intltool-0.35