Guest User

Untitled

a guest
Nov 18th, 2018
117
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.43 KB | None | 0 0
  1. From e989ad40361b52a71858e87d4e30ae4541a9b910 Mon Sep 17 00:00:00 2001
  2. From: Paul Seidler <sepek@exherbo.org>
  3. Date: Sun, 24 Jun 2012 11:41:52 +0200
  4. Subject: [PATCH 1/5] gdm[systemd]: only install service files if CK
  5.  
  6. ---
  7. .../gdm/{gdm-3.4.1-r1.exheres-0 => gdm-3.4.1-r2.exheres-0} | 7 +++++--
  8. 1 file changed, 5 insertions(+), 2 deletions(-)
  9. rename packages/gnome-desktop/gdm/{gdm-3.4.1-r1.exheres-0 => gdm-3.4.1-r2.exheres-0} (89%)
  10.  
  11. 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
  12. similarity index 89%
  13. rename from packages/gnome-desktop/gdm/gdm-3.4.1-r1.exheres-0
  14. rename to packages/gnome-desktop/gdm/gdm-3.4.1-r2.exheres-0
  15. index b673863..ad6b809 100644
  16. --- a/packages/gnome-desktop/gdm/gdm-3.4.1-r1.exheres-0
  17. +++ b/packages/gnome-desktop/gdm/gdm-3.4.1-r2.exheres-0
  18. @@ -42,11 +42,13 @@ DEPENDENCIES="
  19. run:
  20. gnome-desktop/gnome-session
  21. gnome-desktop/gnome-settings-daemon
  22. - systemd? ( x11-server/xorg-server[>=1.12] ) [[ note = [ for multi-seat ] ]]
  23. + consolekit? ( gnome-desktop/gnome-session[-systemd] )
  24. + !consolekit? ( systemd? ( x11-server/xorg-server[>=1.12] ) [[ note = [ for multi-seat ] ]] )
  25. test:
  26. dev-libs/check[>=0.9.4]
  27. recommendation:
  28. gnome-desktop/gnome-shell
  29. + consolekit? ( gnome-desktop/gnome-shell[-systemd] )
  30. "
  31.  
  32. DEFAULT_SRC_PREPARE_PATCHES=(
  33. @@ -59,7 +61,8 @@ src_configure() {
  34. $(option_with xdmcp) \
  35. $(option_with tcpd tcp-wrappers) \
  36. $(option_with consolekit console-kit) \
  37. - $(option_with systemd) \
  38. + $(option systemd && ! option consolekit && echo '--with-systemd' \
  39. + || echo '--without-systemd' ) \
  40. $(option_enable gobject-introspection introspection) \
  41. "--with-default-path=/bin:/usr/bin" \
  42. "--with-lang-file=/etc/env.d/02locale" \
  43. --
  44. 1.7.10.4
  45.  
  46.  
  47. From 1d87f2c203ed7cbd9b31b57b7bd1ec596dc65b3a Mon Sep 17 00:00:00 2001
  48. From: Paul Seidler <sepek@exherbo.org>
  49. Date: Sun, 24 Jun 2012 11:42:39 +0200
  50. Subject: [PATCH 2/5] news: add warning for gdm[systemd]
  51.  
  52. ---
  53. .../2012-06-24-gdm-systemd-warning.en.txt | 11 +++++++++++
  54. 1 file changed, 11 insertions(+)
  55. create mode 100644 metadata/news/2012-06-24-gdm-systemd-warning/2012-06-24-gdm-systemd-warning.en.txt
  56.  
  57. 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
  58. new file mode 100644
  59. index 0000000..bd26ca0
  60. --- /dev/null
  61. +++ b/metadata/news/2012-06-24-gdm-systemd-warning/2012-06-24-gdm-systemd-warning.en.txt
  62. @@ -0,0 +1,11 @@
  63. +Title: gdm[systemd] without session management
  64. +Author: Paul Seidler <sepek@exherbo.org>
  65. +Content-Type: text/plain
  66. +Posted: 2012-06-24
  67. +Revision: 1
  68. +News-Item-Format: 1.0
  69. +Display-If-Installed: gnome-desktop/gdm[>=3.4][-consolekit][systemd]
  70. +
  71. +GDM doesn't have integrated systemd session management, so it won't work sane
  72. +without consolekit. We recommend you to enable the ConsoleKit support.
  73. +
  74. --
  75. 1.7.10.4
  76.  
  77.  
  78. From 5b9f5e6e3a06937807bdef8b3074a57baf8e9ed0 Mon Sep 17 00:00:00 2001
  79. From: Paul Seidler <sepek@exherbo.org>
  80. Date: Sun, 24 Jun 2012 11:57:27 +0200
  81. Subject: [PATCH 3/5] unmask GNOME-3.4
  82.  
  83. ---
  84. metadata/repository_mask.conf | 68 -----------------------------------------
  85. 1 file changed, 68 deletions(-)
  86.  
  87. diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
  88. index a49e4c7..7d03549 100644
  89. --- a/metadata/repository_mask.conf
  90. +++ b/metadata/repository_mask.conf
  91. @@ -36,76 +36,8 @@
  92. ]]
  93.  
  94. (
  95. - app-editors/gedit[>=3.3&<scm]
  96. - dev-libs/libcryptui[>=3.3&<scm]
  97. - dev-libs/libpeas[>=1.3&<scm]
  98. - dev-libs/gtkhtml[>=4.3&<scm]
  99. - dev-libs/vte[>=0.31&<scm]
  100. - gnome-bindings/gjs[>=1.31&<scm]
  101. - gnome-bindings/gtkmm[>=3.4&<scm]
  102. - gnome-bindings/pygobject[>=3.1&<scm]
  103. - gnome-desktop/brasero[>=3.3&<scm]
  104. - gnome-desktop/cheese[>=3.3&<scm]
  105. - gnome-desktop/devhelp[>=3.3&<scm]
  106. - gnome-desktop/eog[>=3.3&<scm]
  107. - gnome-desktop/evince[>=3.3&<scm]
  108. - gnome-desktop/evolution-data-server[>=3.3&<scm]
  109. - gnome-desktop/file-roller[>=3.3&<scm]
  110. - gnome-desktop/gcalctool[>=6.3&<scm]
  111. - gnome-desktop/gcr[>=3.3&<scm]
  112. - gnome-desktop/gdm[>=3.3&<scm]
  113. - gnome-desktop/gnome-backgrounds[>=3.3&<scm]
  114. - gnome-desktop/gnome-bluetooth[>=3.3&<scm]
  115. - gnome-desktop/gnome-color-manager[>=3.3&<scm]
  116. - gnome-desktop/gnome-contacts[>=3.3&<scm]
  117. - gnome-desktop/gnome-control-center[>=3.3&<scm]
  118. - gnome-desktop/gnome-desktop[>=3.3&<scm]
  119. gnome-desktop/gnome-dictionary[>=3.3&<scm]
  120. - gnome-desktop/gnome-disk-utility[>=3.3&<scm]
  121. - gnome-desktop/gnome-font-viewer[>=3.3&<scm]
  122. - gnome-desktop/gnome-icon-theme[>=3.3&<scm]
  123. - gnome-desktop/gnome-icon-theme-symbolic[>=3.3&<scm]
  124. - gnome-desktop/gnome-keyring[>=3.3&<scm]
  125. - gnome-desktop/gnome-menus[>=3.3&<scm]
  126. - gnome-desktop/gnome-online-accounts[>=3.3&<scm]
  127. - gnome-desktop/gnome-panel[>=3.3&<scm]
  128. - gnome-desktop/gnome-power-manager[>=3.3&<scm]
  129. - gnome-desktop/gnome-screensaver[>=3.3&<scm]
  130. - gnome-desktop/gnome-screenshot[>=3.3&<scm]
  131. - gnome-desktop/gnome-session[>=3.3&<scm]
  132. - gnome-desktop/gnome-settings-daemon[>=3.3&<scm]
  133. - gnome-desktop/gnome-shell[>=3.3&<scm]
  134. - gnome-desktop/gnome-system-monitor[>=3.3&<scm]
  135. - gnome-desktop/gnome-terminal[>=3.3&<scm]
  136. - gnome-desktop/gnome-themes-standard[>=3.3&<scm]
  137. - gnome-desktop/gnome-tweak-tool[>=3.3&<scm]
  138. - gnome-desktop/gobject-introspection[>=1.31&<scm]
  139. - gnome-desktop/gsettings-desktop-schemas[>=3.3&<scm]
  140. - gnome-desktop/gvfs[>=1.11&<scm]
  141. - gnome-desktop/libgdata[>=0.11&<scm]
  142. - gnome-desktop/libgnome-keyring[>=3.3&<scm]
  143. - gnome-desktop/libgnomekbd[>=3.3&<scm]
  144. - gnome-desktop/librsvg[>=2.35&<scm]
  145. - gnome-desktop/libsoup[>=2.37&<scm]
  146. - gnome-desktop/libwnck[>=3.3&<scm]
  147. - gnome-desktop/metacity[>=2.34.2&<scm]
  148. - gnome-desktop/mutter[>=3.3&<scm]
  149. - gnome-desktop/nautilus[>=3.3&<scm]
  150. - gnome-desktop/network-manager-applet[>=0.9.4.0&<scm]
  151. - gnome-desktop/seahorse[>=3.3&<scm]
  152. - gnome-desktop/seahorse-sharing[>=3.3&<scm]
  153. - gnome-desktop/totem[>=3.3&<scm]
  154. - gnome-desktop/totem-pl-parser[>=3.3&<scm]
  155. - gnome-desktop/vinagre[>=3.3&<scm]
  156. gnome-desktop/vino[>=3.3&<scm]
  157. - gnome-desktop/yelp[>=3.3.1&<scm]
  158. - gnome-desktop/yelp-xsl[>=3.3&<scm]
  159. - gnome-desktop/zenity[>=3.3&<scm]
  160. - mail-client/evolution[>=3.3&<scm]
  161. - net-libs/webkit[>=1.7&<scm]
  162. - net-im/empathy[>=3.3&<scm]
  163. - net-plugins/epiphany-extensions[>=3.3&<scm]
  164. - net-www/epiphany[>=3.3&<scm]
  165. ) [[
  166. *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
  167. *date = [ 29 Oct 2011 ]
  168. --
  169. 1.7.10.4
  170.  
  171.  
  172. From 6dfa0e1f7885740a069cdf1ac84c3e05bdae8aba Mon Sep 17 00:00:00 2001
  173. From: Paul Seidler <sepek@exherbo.org>
  174. Date: Sun, 24 Jun 2012 11:59:11 +0200
  175. Subject: [PATCH 4/5] consolidate GNOME-3.6 mask
  176.  
  177. ---
  178. metadata/repository_mask.conf | 27 +++++++++------------------
  179. 1 file changed, 9 insertions(+), 18 deletions(-)
  180.  
  181. diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
  182. index 7d03549..66a8883 100644
  183. --- a/metadata/repository_mask.conf
  184. +++ b/metadata/repository_mask.conf
  185. @@ -47,37 +47,28 @@
  186.  
  187. (
  188. dev-libs/gtk-vnc[>=0.5&<scm]
  189. - gnome-desktop/gnome-desktop[>=3.5&<scm]
  190. - gnome-desktop/libgdata[>=0.13&<scm]
  191. -) [[
  192. - *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
  193. - *date = [ 14 Apr 2012 ]
  194. - *token = testing
  195. - *description = [ GNOME 3.6 Mask ]
  196. -]]
  197. -
  198. -net-libs/webkit-gtk[~>1.3] [[
  199. - author = [ Brett Witherspoon <spoonb@exherbo.org> ]
  200. - date = [ 16 Dec 2010 ]
  201. - token = testing
  202. - description = [ Development version ]
  203. -]]
  204. -
  205. -(
  206. gnome-desktop/eog[>=3.5&<scm]
  207. gnome-desktop/evolution-data-server[>=3.5&<scm]
  208. gnome-desktop/gnome-contacts[>=3.5&<scm]
  209. gnome-desktop/gnome-control-center[>=3.5&<scm]
  210. + gnome-desktop/gnome-desktop[>=3.5&<scm]
  211. gnome-desktop/gnome-disk-utility[>=3.5&<scm]
  212. gnome-desktop/gnome-online-accounts[>=3.5&<scm]
  213. gnome-desktop/gnome-settings-daemon[>=3.5&<scm]
  214. gnome-desktop/gnome-themes-standard[>=3.5&<scm]
  215. + gnome-desktop/libgdata[>=0.13&<scm]
  216. gnome-desktop/nautilus[>=3.5&<scm]
  217. net-libs/webkit[>=1.9&<scm]
  218. ) [[
  219. *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
  220. - *date = [ 15 May 2012 ]
  221. + *date = [ 14 Apr 2012 ]
  222. *token = testing
  223. *description = [ GNOME 3.6 Mask ]
  224. ]]
  225.  
  226. +net-libs/webkit-gtk[~>1.3] [[
  227. + author = [ Brett Witherspoon <spoonb@exherbo.org> ]
  228. + date = [ 16 Dec 2010 ]
  229. + token = testing
  230. + description = [ Development version ]
  231. +]]
  232. --
  233. 1.7.10.4
  234.  
  235.  
  236. From d214151f904fdb0e604eb526e0d9d450881fd116 Mon Sep 17 00:00:00 2001
  237. From: Paul Seidler <sepek@exherbo.org>
  238. Date: Mon, 25 Jun 2012 19:31:33 +0200
  239. Subject: [PATCH 5/5] gnome-shell-3.4: update systemd dependencies
  240.  
  241. ---
  242. ...{gnome-shell-3.4.1.exheres-0 => gnome-shell-3.4.1-r1.exheres-0} | 4 ++--
  243. 1 file changed, 2 insertions(+), 2 deletions(-)
  244. rename packages/gnome-desktop/gnome-shell/{gnome-shell-3.4.1.exheres-0 => gnome-shell-3.4.1-r1.exheres-0} (98%)
  245.  
  246. 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
  247. similarity index 98%
  248. rename from packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1.exheres-0
  249. rename to packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1-r1.exheres-0
  250. index d15dd7b..147f5ac 100644
  251. --- a/packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1.exheres-0
  252. +++ b/packages/gnome-desktop/gnome-shell/gnome-shell-3.4.1-r1.exheres-0
  253. @@ -34,7 +34,7 @@ DEPENDENCIES="
  254. media-libs/gstreamer:0.10[>=0.10.16] [[ note = automagic ]]
  255. media-libs/libcanberra
  256. media-plugins/gst-plugins-base:0.10[>=0.10.16] [[ note = automagic ]]
  257. - media-sound/pulseaudio
  258. + media-sound/pulseaudio[systemd=]
  259. net-im/telepathy-glib[>=0.17.5][gobject-introspection]
  260. net-im/telepathy-logger:0.2[>=0.2.4][gobject-introspection]
  261. sys-auth/polkit:1[>=0.100][gobject-introspection]
  262. @@ -43,7 +43,7 @@ DEPENDENCIES="
  263. net-im/folks[>=0.5.2]
  264. x11-libs/libX11
  265. x11-libs/libXfixes
  266. - net-apps/NetworkManager[>=0.8.999][gobject-introspection]
  267. + net-apps/NetworkManager[>=0.8.999][gobject-introspection][systemd=]
  268. gnome-desktop/gnome-keyring:1
  269. gnome-desktop/gcr[>=3.3.90][gobject-introspection]
  270. x11-libs/startup-notification[>=0.11]
  271. --
  272. 1.7.10.4
Add Comment
Please, Sign In to add comment