gentoo resync : 22.01.2019

10 files changed, 244 insertions, 3 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 59a11482fbef..beb3c5012c8f 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 52cf5bda337e..c682bb9c5872 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-core-apps-3.24.2.ebuild 1508 BLAKE2B d28ee34bb83608702334297815bb57bc0d7609fbd22140853c15ee620f226c932a302e9d837b3e0e434167ed6651e04cd00083fcebebd89db0028e849c2e7437 SHA512 4ef8de35566aeff15124d332e9d4a8d020782edde45a51aae4b5fc6edec90b5172feb592bf16fd80cfb81efc6687f06ca5544f0718d3a2080fa54b0529cd4b9e
+EBUILD gnome-core-apps-3.26.2.ebuild 1521 BLAKE2B 75f9bb1a1c56c85cc62949743301363fd7b83f5b62becf5ceab0b6dd029e78a82d799e380984563702393b85d51ddc76a061b6eabb6cf72d27b4d4104dd412a7 SHA512 f0f9bb9e0e0178bb884fe2fe37a733d7a4615515712a1104c75f7ee530af0c6a91190d6bc505d22995975ece2d67fecaa893fec120d609d8536e24a73a2f1e37
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.26.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.26.2.ebuild
new file mode 100644
index 000000000000..f963ab41aba9
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.26.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+bluetooth cups"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# Note to developers:
+# This is a wrapper for the core apps tightly integrated with GNOME 3
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+
+	>=gnome-base/gnome-session-3.26.1
+	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
+	>=gnome-base/gnome-control-center-${PV}[cups?]
+
+	>=app-crypt/gcr-3.20.0
+	>=gnome-base/nautilus-${PV}
+	>=gnome-base/gnome-keyring-3.20.1
+	>=gnome-extra/evolution-data-server-3.26.2.1
+
+	>=app-crypt/seahorse-3.20.0
+	>=app-editors/gedit-3.22.1
+	>=app-text/evince-3.26.0
+	>=gnome-extra/gnome-contacts-3.26.0
+	>=media-gfx/eog-3.26.1
+	>=media-video/totem-3.26.0
+	>=x11-terms/gnome-terminal-${PV}
+
+	>=gnome-extra/gnome-user-docs-${PV}
+	>=gnome-extra/yelp-3.26.0
+
+	>=x11-themes/adwaita-icon-theme-3.26.0
+	>=x11-themes/gnome-themes-standard-3.22.3
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.26.1 )
+"
+DEPEND=""
+
+# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
+# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
+# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index b35cfc764173..6c4769ffe777 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95
+EBUILD gnome-extra-apps-3.26.2.ebuild 2602 BLAKE2B 91ce08bd256637451ac3233f3edc63f2239ee947d55810d79d20ba6db7f6f0a2d9443f52cfcabc3c493e1b22df2fd48bf2acfa5a88c920bd73f190aa8d6c9989 SHA512 4146aeca0ade2e5b7a73cc2948e975951d9460e038e8bd99d22b3bda852f937ec5f48f77f0bee83d28c66d54782c6507ac71f4db508108d7aabd4a64da8a693e
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
new file mode 100644
index 000000000000..2930116ade94
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sub-meta package for the applications of GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+games +share +shotwell +tracker"
+
+KEYWORDS="~amd64 ~x86"
+
+# Note to developers:
+# This is a wrapper for the extra apps integrated with GNOME 3
+# Keep pkg order within a USE flag as upstream releng versions file
+# TODO: Should we keep these here: gnome-power-manager, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters?
+# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time)
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}
+
+	>=sys-apps/baobab-3.26.1
+	>=media-video/cheese-3.26.0
+	>=www-client/epiphany-${PV}
+	>=app-arch/file-roller-3.26.1
+	>=gnome-extra/gnome-calculator-3.26.0
+	>=gnome-extra/gnome-calendar-${PV}
+	>=gnome-extra/gnome-characters-${PV}
+	>=sys-apps/gnome-disk-utility-${PV}
+	>=media-gfx/gnome-font-viewer-3.26.0
+	>=gnome-extra/gnome-power-manager-3.26.0
+	>=media-gfx/gnome-screenshot-3.26.0
+	>=gnome-extra/gnome-system-monitor-3.26.0
+	>=gnome-extra/gnome-weather-3.26.0
+	>=gnome-extra/gucharmap-10.0.3:2.90
+	>=gnome-extra/sushi-3.24.0
+	>=media-sound/sound-juicer-3.24.0
+	>=net-misc/vino-3.22.0
+
+	>=gnome-base/dconf-editor-${PV}
+	>=app-dicts/gnome-dictionary-3.26.1
+	>=mail-client/evolution-${PV}
+	>=net-analyzer/gnome-nettool-3.8.1
+	>=gnome-extra/gnome-tweak-tool-3.26.3
+	>=gnome-extra/nautilus-sendto-3.8.6
+	>=net-misc/vinagre-3.22.0
+
+	games? (
+		>=games-puzzle/five-or-more-3.26.0
+		>=games-board/four-in-a-row-3.22.2
+		>=games-board/gnome-chess-3.26.0
+		>=games-puzzle/gnome-klotski-3.22.2
+		>=games-board/gnome-mahjongg-3.22.0
+		>=games-board/gnome-mines-3.26.0
+		>=games-arcade/gnome-nibbles-3.24.0
+		>=games-arcade/gnome-robots-3.22.2
+		>=games-puzzle/gnome-sudoku-3.26.0
+		>=games-puzzle/gnome-taquin-3.26.1
+		>=games-puzzle/gnome-tetravex-3.22.0
+		>=games-puzzle/hitori-3.22.4
+		>=games-board/iagno-3.26.1
+		>=games-puzzle/lightsoff-3.26.0
+		>=games-puzzle/quadrapassel-3.22.0
+		>=games-puzzle/swell-foop-3.26.0
+		>=games-board/tali-3.22.0
+	)
+	share? ( >=gnome-extra/gnome-user-share-3.18.3 )
+	shotwell? ( >=media-gfx/shotwell-0.26 )
+	tracker? (
+		>=app-misc/tracker-1.12
+		>=media-gfx/gnome-photos-${PV}
+		>=media-sound/gnome-music-3.24.2 )
+" # tracker and gnome-music versions kept back for now, to handle tracker-2 migration separately
+DEPEND=""
+S=${WORKDIR}
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 8fec82200cf2..b86d78f230ff 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,3 +1,4 @@
 EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
 EBUILD gnome-light-3.24.2.ebuild 1711 BLAKE2B bb5e48a4346beb4e4fb7e4237ea684fa4bbfb4fc3e57783ef7020282a54baa68a0dc56d06f730e915d55628a10c0e6a66510e96b8ba54fa6b54ba0b93d28d02f SHA512 a1a9d02b0eea870d92084193173042351bb9b7c1110d18accf98c0852be66f27c0f1f6c79e45da7f9946d00c2c78ba9729588106dae51e723b00e9ba01284f4d
+EBUILD gnome-light-3.26.2.ebuild 1687 BLAKE2B 1c9653e9db01731fee9fd6f2a125709594aa91c7935223fc816198afa79512518e137c09be2cc800946b794e51ea9241f37e9535aafb49c2850c824180b2b919 SHA512 a8ea19af5c79b17f6db88c01f11e4393e7a60b98094595355924ada26830188ca8a6b419156399449354b863b101480306e1a07fa11e2bdcd921e5b24d441828
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.26.2.ebuild b/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
new file mode 100644
index 000000000000..96a74b14c9c8
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+P_RELEASE="$(ver_cut 1-2)"
+
+DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="2.0"
+IUSE="cups +gnome-shell"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# XXX: Note to developers:
+# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
+# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
+# any apps, but shouldn't be used by users unless they know what they are doing.
+RDEPEND="!gnome-base/gnome
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+
+	>=gnome-base/gnome-session-3.26.1
+	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
+	>=gnome-base/gnome-control-center-${PV}[cups?]
+
+	>=gnome-base/nautilus-${PV}
+
+	gnome-shell? (
+		>=x11-wm/mutter-${PV}
+		>=gnome-base/gnome-shell-${PV} )
+
+	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
+	>=x11-themes/gnome-themes-standard-3.22.3
+	>=x11-themes/gnome-backgrounds-${PV}
+
+	>=x11-terms/gnome-terminal-${PV}
+"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.34.1"
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if ! use gnome-shell; then
+		# Users probably want to use e16, sawfish, etc
+		ewarn "You're not installing GNOME Shell"
+		ewarn "You will have to install and manage a window manager by yourself"
+	fi
+}
+
+pkg_postinst() {
+	# Remember people where to find our project information
+	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+	elog "for information about the project and documentation."
+}
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 2f11f92b5e37..65ffc56c02e4 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,3 +1,4 @@
 EBUILD gnome-3.20.0.ebuild 1456 BLAKE2B 9acd17a4f24ff1220bcb3caf32bebf2b625150e02175c60b30390d5577b000de8f97f33ec88ca690afdaad20ba921f11d0b48ae4211f825f713c7eed5a634a6f SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f
-EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 2a83d561ded9713019c9e7360eeff82bcd01c4405fcae85202c6fc736fc7fff9ed5d31a1afedf224e756fb43c30d6784911e0fafd4e74f716bc44b4a7fb6595f SHA512 698c330c27fe7ecdbf8aead2d5e32ccb9e983ac2428c8f383654e057742f649bb0e543a24a723a36961a20e9d637d1bf8fbd7456c39c76bc9f4b0e968cab8ea2
+EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 29117a5b89410ca8ae065439fd532d65caba552b12dce826fa03d21db0b3e4abbda77ac5791050c5939b40dd993d616f1cb7f42d576072b7e30b2a7366207682 SHA512 a6ebd8d7b3b6099daac6d426d253a007cde83951a60db279d4b95053135d3b1c96750d59871e48906f0ce0b5ade85ddf2e840566ae330d61103c254a20abf959
+EBUILD gnome-3.26.2.ebuild 1392 BLAKE2B 143894b7cda9b8537b575df5258aa290274a4cd1a116a8d50e686b963c45371c25e5ef2a79b6157b09d89000d5fc92119aee17bd9af4a7fa064e5866f2cca273 SHA512 a4de0898490c699dd92aba111f7b47df16a04de63a8cacfb4935584acc49771648852fbe2afedf54c31709e8249dfa1cc2c627e34093ce883c4e59df9b9aacda
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.24.2.ebuild b/gnome-base/gnome/gnome-3.24.2.ebuild
index cbf8482f077a..e5213f355a9f 100644
--- a/gnome-base/gnome/gnome-3.24.2.ebuild
+++ b/gnome-base/gnome/gnome-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ S=${WORKDIR}
 # TODO: check accessibility completeness
 RDEPEND="
 	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
+	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr(+)?]
 
 	>=gnome-base/gdm-${PV}
 
diff --git a/gnome-base/gnome/gnome-3.26.2.ebuild b/gnome-base/gnome/gnome-3.26.2.ebuild
new file mode 100644
index 000000000000..ee23006a4774
--- /dev/null
+++ b/gnome-base/gnome/gnome-3.26.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Meta package for GNOME 3, merge this package to install"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="metapackage"
+SLOT="2.0" # Cannot be installed at the same time as gnome-2
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="accessibility +bluetooth +classic cups +extras"
+
+S=${WORKDIR}
+
+# TODO: check accessibility completeness
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?]
+
+	>=gnome-base/gdm-${PV}
+
+	>=x11-wm/mutter-${PV}
+	>=gnome-base/gnome-shell-${PV}[bluetooth?]
+
+	>=x11-themes/gnome-backgrounds-${PV}
+	x11-themes/sound-theme-freedesktop
+
+	accessibility? (
+		>=app-accessibility/at-spi2-atk-2.26.1
+		>=app-accessibility/at-spi2-core-2.26.2
+		>=app-accessibility/caribou-0.4.21
+		>=app-accessibility/orca-3.26.0
+		>=gnome-extra/mousetweaks-3.12.0 )
+	classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
+	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
+"
+
+DEPEND=""
+
+PDEPEND=">=gnome-base/gvfs-1.34.1[udisks]"
+
+pkg_postinst() {
+	# Remember people where to find our project information
+	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+	elog "for information about the project and documentation."
+}