Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From e989ad40361b52a71858e87d4e30ae4541a9b910 Mon Sep 17 00:00:00 2001
- From: Paul Seidler <sepek@exherbo.org>
- Date: Sun, 24 Jun 2012 11:41:52 +0200
- Subject: [PATCH 1/5] gdm[systemd]: only install service files if CK
- ---
- .../gdm/{gdm-3.4.1-r1.exheres-0 => gdm-3.4.1-r2.exheres-0} | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
- rename packages/gnome-desktop/gdm/{gdm-3.4.1-r1.exheres-0 => gdm-3.4.1-r2.exheres-0} (89%)
- diff --git a/packages/gnome-desktop/gdm/gdm-3.4.1-r1.exheres-0 b/packages/gnome-desktop/gdm/gdm-3.4.1-r2.exheres-0
- similarity index 89%
- rename from packages/gnome-desktop/gdm/gdm-3.4.1-r1.exheres-0
- rename to packages/gnome-desktop/gdm/gdm-3.4.1-r2.exheres-0
- index b673863..ad6b809 100644
- --- a/packages/gnome-desktop/gdm/gdm-3.4.1-r1.exheres-0
- +++ b/packages/gnome-desktop/gdm/gdm-3.4.1-r2.exheres-0
- @@ -42,11 +42,13 @@ DEPENDENCIES="
- run:
- gnome-desktop/gnome-session
- gnome-desktop/gnome-settings-daemon
- - systemd? ( x11-server/xorg-server[>=1.12] ) [[ note = [ for multi-seat ] ]]
- + consolekit? ( gnome-desktop/gnome-session[-systemd] )
- + !consolekit? ( systemd? ( x11-server/xorg-server[>=1.12] ) [[ note = [ for multi-seat ] ]] )
- test:
- dev-libs/check[>=0.9.4]
- recommendation:
- gnome-desktop/gnome-shell
- + consolekit? ( gnome-desktop/gnome-shell[-systemd] )
- "
- DEFAULT_SRC_PREPARE_PATCHES=(
- @@ -59,7 +61,8 @@ src_configure() {
- $(option_with xdmcp) \
- $(option_with tcpd tcp-wrappers) \
- $(option_with consolekit console-kit) \
- - $(option_with systemd) \
- + $(option systemd && ! option consolekit && echo '--with-systemd' \
- + || echo '--without-systemd' ) \
- $(option_enable gobject-introspection introspection) \
- "--with-default-path=/bin:/usr/bin" \
- "--with-lang-file=/etc/env.d/02locale" \
- --
- 1.7.10.4
- From 1d87f2c203ed7cbd9b31b57b7bd1ec596dc65b3a Mon Sep 17 00:00:00 2001
- From: Paul Seidler <sepek@exherbo.org>
- Date: Sun, 24 Jun 2012 11:42:39 +0200
- Subject: [PATCH 2/5] news: add warning for gdm[systemd]
- ---
- .../2012-06-24-gdm-systemd-warning.en.txt | 11 +++++++++++
- 1 file changed, 11 insertions(+)
- create mode 100644 metadata/news/2012-06-24-gdm-systemd-warning/2012-06-24-gdm-systemd-warning.en.txt
- diff --git a/metadata/news/2012-06-24-gdm-systemd-warning/2012-06-24-gdm-systemd-warning.en.txt b/metadata/news/2012-06-24-gdm-systemd-warning/2012-06-24-gdm-systemd-warning.en.txt
- new file mode 100644
- index 0000000..bd26ca0
- --- /dev/null
- +++ b/metadata/news/2012-06-24-gdm-systemd-warning/2012-06-24-gdm-systemd-warning.en.txt
- @@ -0,0 +1,11 @@
- +Title: gdm[systemd] without session management
- +Author: Paul Seidler <sepek@exherbo.org>
- +Content-Type: text/plain
- +Posted: 2012-06-24
- +Revision: 1
- +News-Item-Format: 1.0
- +Display-If-Installed: gnome-desktop/gdm[>=3.4][-consolekit][systemd]
- +
- +GDM doesn't have integrated systemd session management, so it won't work sane
- +without consolekit. We recommend you to enable the ConsoleKit support.
- +
- --
- 1.7.10.4
- From 5b9f5e6e3a06937807bdef8b3074a57baf8e9ed0 Mon Sep 17 00:00:00 2001
- From: Paul Seidler <sepek@exherbo.org>
- Date: Sun, 24 Jun 2012 11:57:27 +0200
- Subject: [PATCH 3/5] unmask GNOME-3.4
- ---
- metadata/repository_mask.conf | 68 -----------------------------------------
- 1 file changed, 68 deletions(-)
- diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
- index a49e4c7..7d03549 100644
- --- a/metadata/repository_mask.conf
- +++ b/metadata/repository_mask.conf
- @@ -36,76 +36,8 @@
- ]]
- (
- - app-editors/gedit[>=3.3&<scm]
- - dev-libs/libcryptui[>=3.3&<scm]
- - dev-libs/libpeas[>=1.3&<scm]
- - dev-libs/gtkhtml[>=4.3&<scm]
- - dev-libs/vte[>=0.31&<scm]
- - gnome-bindings/gjs[>=1.31&<scm]
- - gnome-bindings/gtkmm[>=3.4&<scm]
- - gnome-bindings/pygobject[>=3.1&<scm]
- - gnome-desktop/brasero[>=3.3&<scm]
- - gnome-desktop/cheese[>=3.3&<scm]
- - gnome-desktop/devhelp[>=3.3&<scm]
- - gnome-desktop/eog[>=3.3&<scm]
- - gnome-desktop/evince[>=3.3&<scm]
- - gnome-desktop/evolution-data-server[>=3.3&<scm]
- - gnome-desktop/file-roller[>=3.3&<scm]
- - gnome-desktop/gcalctool[>=6.3&<scm]
- - gnome-desktop/gcr[>=3.3&<scm]
- - gnome-desktop/gdm[>=3.3&<scm]
- - gnome-desktop/gnome-backgrounds[>=3.3&<scm]
- - gnome-desktop/gnome-bluetooth[>=3.3&<scm]
- - gnome-desktop/gnome-color-manager[>=3.3&<scm]
- - gnome-desktop/gnome-contacts[>=3.3&<scm]
- - gnome-desktop/gnome-control-center[>=3.3&<scm]
- - gnome-desktop/gnome-desktop[>=3.3&<scm]
- gnome-desktop/gnome-dictionary[>=3.3&<scm]
- - gnome-desktop/gnome-disk-utility[>=3.3&<scm]
- - gnome-desktop/gnome-font-viewer[>=3.3&<scm]
- - gnome-desktop/gnome-icon-theme[>=3.3&<scm]
- - gnome-desktop/gnome-icon-theme-symbolic[>=3.3&<scm]
- - gnome-desktop/gnome-keyring[>=3.3&<scm]
- - gnome-desktop/gnome-menus[>=3.3&<scm]
- - gnome-desktop/gnome-online-accounts[>=3.3&<scm]
- - gnome-desktop/gnome-panel[>=3.3&<scm]
- - gnome-desktop/gnome-power-manager[>=3.3&<scm]
- - gnome-desktop/gnome-screensaver[>=3.3&<scm]
- - gnome-desktop/gnome-screenshot[>=3.3&<scm]
- - gnome-desktop/gnome-session[>=3.3&<scm]
- - gnome-desktop/gnome-settings-daemon[>=3.3&<scm]
- - gnome-desktop/gnome-shell[>=3.3&<scm]
- - gnome-desktop/gnome-system-monitor[>=3.3&<scm]
- - gnome-desktop/gnome-terminal[>=3.3&<scm]
- - gnome-desktop/gnome-themes-standard[>=3.3&<scm]
- - gnome-desktop/gnome-tweak-tool[>=3.3&<scm]
- - gnome-desktop/gobject-introspection[>=1.31&<scm]
- - gnome-desktop/gsettings-desktop-schemas[>=3.3&<scm]
- - gnome-desktop/gvfs[>=1.11&<scm]
- - gnome-desktop/libgdata[>=0.11&<scm]
- - gnome-desktop/libgnome-keyring[>=3.3&<scm]
- - gnome-desktop/libgnomekbd[>=3.3&<scm]
- - gnome-desktop/librsvg[>=2.35&<scm]
- - gnome-desktop/libsoup[>=2.37&<scm]
- - gnome-desktop/libwnck[>=3.3&<scm]
- - gnome-desktop/metacity[>=2.34.2&<scm]
- - gnome-desktop/mutter[>=3.3&<scm]
- - gnome-desktop/nautilus[>=3.3&<scm]
- - gnome-desktop/network-manager-applet[>=0.9.4.0&<scm]
- - gnome-desktop/seahorse[>=3.3&<scm]
- - gnome-desktop/seahorse-sharing[>=3.3&<scm]
- - gnome-desktop/totem[>=3.3&<scm]
- - gnome-desktop/totem-pl-parser[>=3.3&<scm]
- - gnome-desktop/vinagre[>=3.3&<scm]
- gnome-desktop/vino[>=3.3&<scm]
- - gnome-desktop/yelp[>=3.3.1&<scm]
- - gnome-desktop/yelp-xsl[>=3.3&<scm]
- - gnome-desktop/zenity[>=3.3&<scm]
- - mail-client/evolution[>=3.3&<scm]
- - net-libs/webkit[>=1.7&<scm]
- - net-im/empathy[>=3.3&<scm]
- - net-plugins/epiphany-extensions[>=3.3&<scm]
- - net-www/epiphany[>=3.3&<scm]
- ) [[
- *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
- *date = [ 29 Oct 2011 ]
- --
- 1.7.10.4
- From 6dfa0e1f7885740a069cdf1ac84c3e05bdae8aba Mon Sep 17 00:00:00 2001
- From: Paul Seidler <sepek@exherbo.org>
- Date: Sun, 24 Jun 2012 11:59:11 +0200
- Subject: [PATCH 4/5] consolidate GNOME-3.6 mask
- ---
- metadata/repository_mask.conf | 27 +++++++++------------------
- 1 file changed, 9 insertions(+), 18 deletions(-)
- diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
- index 7d03549..66a8883 100644
- --- a/metadata/repository_mask.conf
- +++ b/metadata/repository_mask.conf
- @@ -47,37 +47,28 @@
- (
- dev-libs/gtk-vnc[>=0.5&<scm]
- - gnome-desktop/gnome-desktop[>=3.5&<scm]
- - gnome-desktop/libgdata[>=0.13&<scm]
- -) [[
- - *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
- - *date = [ 14 Apr 2012 ]
- - *token = testing
- - *description = [ GNOME 3.6 Mask ]
- -]]
- -
- -net-libs/webkit-gtk[~>1.3] [[
- - author = [ Brett Witherspoon <spoonb@exherbo.org> ]
- - date = [ 16 Dec 2010 ]
- - token = testing
- - description = [ Development version ]
- -]]
- -
- -(
- gnome-desktop/eog[>=3.5&<scm]
- gnome-desktop/evolution-data-server[>=3.5&<scm]
- gnome-desktop/gnome-contacts[>=3.5&<scm]
- gnome-desktop/gnome-control-center[>=3.5&<scm]
- + gnome-desktop/gnome-desktop[>=3.5&<scm]
- gnome-desktop/gnome-disk-utility[>=3.5&<scm]
- gnome-desktop/gnome-online-accounts[>=3.5&<scm]
- gnome-desktop/gnome-settings-daemon[>=3.5&<scm]
- gnome-desktop/gnome-themes-standard[>=3.5&<scm]
- + gnome-desktop/libgdata[>=0.13&<scm]
- gnome-desktop/nautilus[>=3.5&<scm]
- net-libs/webkit[>=1.9&<scm]
- ) [[
- *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
- - *date = [ 15 May 2012 ]
- + *date = [ 14 Apr 2012 ]
- *token = testing
- *description = [ GNOME 3.6 Mask ]
- ]]
- +net-libs/webkit-gtk[~>1.3] [[
- + author = [ Brett Witherspoon <spoonb@exherbo.org> ]
- + date = [ 16 Dec 2010 ]
- + token = testing
- + description = [ Development version ]
- +]]
- --
- 1.7.10.4
- From d214151f904fdb0e604eb526e0d9d450881fd116 Mon Sep 17 00:00:00 2001
- From: Paul Seidler <sepek@exherbo.org>
- Date: Mon, 25 Jun 2012 19:31:33 +0200
- Subject: [PATCH 5/5] gnome-shell-3.4: update systemd dependencies
- ---
- ...{gnome-shell-3.4.1.exheres-0 => gnome-shell-3.4.1-r1.exheres-0} | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- rename packages/gnome-desktop/gnome-shell/{gnome-shell-3.4.1.exheres-0 => gnome-shell-3.4.1-r1.exheres-0} (98%)
- diff --git a/packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1.exheres-0 b/packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1-r1.exheres-0
- similarity index 98%
- rename from packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1.exheres-0
- rename to packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1-r1.exheres-0
- index d15dd7b..147f5ac 100644
- --- a/packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1.exheres-0
- +++ b/packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1-r1.exheres-0
- @@ -34,7 +34,7 @@ DEPENDENCIES="
- media-libs/gstreamer:0.10[>=0.10.16] [[ note = automagic ]]
- media-libs/libcanberra
- media-plugins/gst-plugins-base:0.10[>=0.10.16] [[ note = automagic ]]
- - media-sound/pulseaudio
- + media-sound/pulseaudio[systemd=]
- net-im/telepathy-glib[>=0.17.5][gobject-introspection]
- net-im/telepathy-logger:0.2[>=0.2.4][gobject-introspection]
- sys-auth/polkit:1[>=0.100][gobject-introspection]
- @@ -43,7 +43,7 @@ DEPENDENCIES="
- net-im/folks[>=0.5.2]
- x11-libs/libX11
- x11-libs/libXfixes
- - net-apps/NetworkManager[>=0.8.999][gobject-introspection]
- + net-apps/NetworkManager[>=0.8.999][gobject-introspection][systemd=]
- gnome-desktop/gnome-keyring:1
- gnome-desktop/gcr[>=3.3.90][gobject-introspection]
- x11-libs/startup-notification[>=0.11]
- --
- 1.7.10.4
Add Comment
Please, Sign In to add comment