diff options
Diffstat (limited to 'gnome-base')
46 files changed, 3 insertions, 3253 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex 6be376cd2f2f..4da778041b53 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest index 9fb48265a8c2..8ef0066a6143 100644 --- a/gnome-base/dconf-editor/Manifest +++ b/gnome-base/dconf-editor/Manifest @@ -1,5 +1,3 @@ -DIST dconf-editor-3.22.3.tar.xz 394760 BLAKE2B 9270d75f64bb0426de2667f7f40d6ec862c3486cc25df7f5103fc3ca4ab6692aaa41b18434a77c7dcb26b0cff4d65f73a0ebb15b07aa48e7e3eb21924a8cf8c6 SHA512 0e1ddce6e970ea23329c6233ed87e6d4541b6f1e991e3159bda44c43b8092a4d983acbca18bbedb88304ac1afb541a15073a261dab9ffe94c94cfd06e3e412dc DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361 -EBUILD dconf-editor-3.22.3.ebuild 737 BLAKE2B 08a39097a3b99a70c08f8ab13ab956d3b482d7c513256e31feb003f10f1869864dd65d86a7235fa00616cc054275287b93c2ccf4368bbb4a60619aa7bc25b767 SHA512 98c32c0c2d72a9ee208bccb0c8ed6b0896b2a84d0931d4fd4819271892b74332c98ff0e62bacdc62bfbe32d87bd028f767a1699818ec4828489af7315fb83d54 EBUILD dconf-editor-3.24.3.ebuild 720 BLAKE2B e172d4b725df1313465113df6b9c3e2a3147c751b80546ed76bb5d895799ce6e6ed8d747cc268bb6cfb80977edf30f21587b169bee7e1fc53bb8b3fb5c584577 SHA512 8092ff30e165e70ce074f3cd5ca08b6a8bb5f1717bdc467ab498a8716c59c750a5c968e99e0b876cc1ae829636a30f15567e7cf9543f5d6fa67835f7b3aef1fb MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild deleted file mode 100644 index 66f2f23f1549..000000000000 --- a/gnome-base/dconf-editor/dconf-editor-3.22.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2 - -DESCRIPTION="Graphical tool for editing the dconf configuration database" -HOMEPAGE="https://git.gnome.org/browse/dconf-editor" - -LICENSE="LGPL-2.1+" -SLOT="0" - -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" - -COMMON_DEPEND=" - dev-libs/appstream-glib - >=dev-libs/glib-2.46.0:2 - >=gnome-base/dconf-0.25.1 - >=x11-libs/gtk+-3.22.0:3 -" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50 - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - !<gnome-base/dconf-0.22[X] -" - -src_configure() { - gnome2_src_configure \ - VALAC="$(type -P true)" -} diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 6d86b280c590..78be7b40b54d 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,14 +1,9 @@ AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21 AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd -AUX gdm-3.22.1-pam-module-dir.patch 1565 BLAKE2B ba47933229197cc5d58db61e0ec2ccf4f349f12ff11681774458cc1cd8d8aeecc63dda38d942a9d682d182211cf0e4c6afa54dfdd03ee5f1e87e005d14d206cd SHA512 ccb0e16f6e10501b10fbdbe28d06d14b261db4f66a4b5ed5092005e5b34f10938bfb0124f98e2fb2c793259da44b2fb14e6dd45d227b9a40886e275d6e45cfc3 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2 -DIST gdm-3.22.3.tar.xz 1110740 BLAKE2B 9b41a5e4a01acf14037622ee344613f80d6fc6ef352f8b655e9ec1ce939ca2d20de43f982aa54a24763695c612da5b3d9de8d0ce6080f487ccf1d644df95cbef SHA512 b87acfca13c1d71ed1d7390625d1c36d58cfcde0ea969fa29cde5cabcb2fdf386e30e3b4d3ca057c2cdb99c202dca19d2a478b55083c468c7fb595e69881aebf -DIST gdm-3.24.2.tar.xz 1113644 BLAKE2B 597187008b8ef0ce05d0d3641550a0738a1eabc6d9f683b37bfd49bf71bcfa0b41f46951fe95bcbf18169c9a846df4ed63dda27a3c55dfabf8b5386f5023808a SHA512 6e2649bce5520532a2976bac8a47629fc4c852d7127b913c29a9c43a7dba26d75472a083cbfff7b64bab56deb38ed13d8387d4d302d55f263c80120255a4a270 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 -EBUILD gdm-3.22.3-r1.ebuild 6173 BLAKE2B 7da9f2ced8335995dfbf121d4be3225405fd9d02590a8bbed1aa7243ea345c78995beab829b65be26ad6042c2e92ea87e360600e25058b05e89922fc168bcffc SHA512 8bb19f74b768ae4a03da42d0bceb9c9d61ecab486419ffae552d6976c5177d0764318d4f5361b024322725f26367edd5f4147a570f7fbfd6d09a194faeca3756 -EBUILD gdm-3.24.2.ebuild 6053 BLAKE2B ce39f0c78046843ab811cf7925d74dc3d58e793bd5fc87492835cc5f6c4a1148c790a63fa38c502e2d34dee1c6060d1f90d65859fb55522b55a5e00517012fe6 SHA512 2c8f15ea34137391cbc33e580f348d43cb50b56cefb58eb2e0b0d643e3c1b1141fc00d985bcb32513fceb0d76274696f66955d6ddf843044f87ae1700c2b4a8e EBUILD gdm-3.24.3.ebuild 6051 BLAKE2B b90e06dadb05634f0afe218571c2ebcabc611f6f41ca01a8d40cfea2c35f17457f4181ec6c6a158a7f7c81acadbfc577661285b70ee40cc168d56b2c4dc4ad42 SHA512 b147cc536c6cc94513af5e57422e322a77453225f66b0b9deae9c0ef70a4622f818efa2e53e6d7ba09ffc05c598ded4a608466ff32c56d858aa8fb033fad0997 MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844 diff --git a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch deleted file mode 100644 index 7dc4392e41cb..000000000000 --- a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4fc9023bb86689f1391651fa744d9e63ee1d7bbc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Mon, 21 Nov 2016 08:18:32 +0100 -Subject: [PATCH] pam_gdm: allow setting pam module dir at configure time - -Code taken almost verbatim from gnome-keyring. ---- - configure.ac | 10 +++++++++- - pam_gdm/Makefile.am | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dd98992..e0074dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,7 +476,7 @@ dnl --------------------------------------------------------------------------- - dnl - Check for PAM stuff - dnl --------------------------------------------------------------------------- - --dnl PAM prefix -+dnl PAM prefix (configuration files) - withval="" - AC_ARG_WITH(pam-prefix, - AS_HELP_STRING([--with-pam-prefix=<prefix>], -@@ -492,6 +492,14 @@ else - fi - AC_SUBST(PAM_PREFIX) - -+dnl PAM dir (dynamic modules) -+AC_ARG_WITH([pam-dir], -+ [AC_HELP_STRING([--with-pam-dir=DIR], -+ [directory to install pam modules in])], -+ [], [with_pam_dir='${libdir}/security']) -+PAM_DEST_DIR="$with_pam_dir" -+AC_SUBST(PAM_DEST_DIR) -+ - have_pam=no - AC_CHECK_LIB(pam, pam_start, have_pam=yes) - -diff --git a/pam_gdm/Makefile.am b/pam_gdm/Makefile.am -index 61d672b..980b31c 100644 ---- a/pam_gdm/Makefile.am -+++ b/pam_gdm/Makefile.am -@@ -36,4 +36,4 @@ pam_gdm_LTLIBRARIES = \ - pam_gdm.la \ - $(END_OF_LIST) - --pam_gdmdir = $(libdir)/security -+pam_gdmdir = $(PAM_DEST_DIR) --- -2.10.2 - diff --git a/gnome-base/gdm/gdm-3.22.3-r1.ebuild b/gnome-base/gdm/gdm-3.22.3-r1.ebuild deleted file mode 100644 index ea15676a90dc..000000000000 --- a/gnome-base/gdm/gdm-3.22.3-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 pam readme.gentoo-r1 systemd user versionator - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM" - -SRC_URI="${SRC_URI} - branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-BY-SA-4.0 ) -" - -SLOT="0" - -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86" - -# 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 -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0:1.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.12 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -pkg_setup() { - 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() { - # ssh-agent handling must be done at xinitrc.d, bug #220603 - eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" - - # allow setting pam module dir, bug #599714 - eapply "${FILESDIR}/${PN}-3.22.1-pam-module-dir.patch" - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - local myconf - # 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 - # Xevie is obsolete, bug #482304 - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - ! use plymouth && myconf="${myconf} --with-initial-vt=7" - - gnome2_src_configure \ - --enable-gdm-xsession \ - --enable-user-display-server \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-pam-dir=$(getpam_mod_dir) \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --without-xevie \ - --enable-systemd-journal \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_with audit libaudit) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable wayland wayland-support) \ - $(use_with xinerama) \ - ${myconf} -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}/49-keychain-r1" 49-keychain - newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - local d ret - - gnome2_pkg_postinst - - # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do - [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - - readme.gentoo_print_elog -} diff --git a/gnome-base/gdm/gdm-3.24.2.ebuild b/gnome-base/gdm/gdm-3.24.2.ebuild deleted file mode 100644 index 98e6db80fbba..000000000000 --- a/gnome-base/gdm/gdm-3.24.2.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM" - -SRC_URI="${SRC_URI} - branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-BY-SA-4.0 ) -" - -SLOT="0" - -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" - -# 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 -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0:1.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.35 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -pkg_setup() { - 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() { - # ssh-agent handling must be done at xinitrc.d, bug #220603 - eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" - - gnome2_src_prepare -} - -src_configure() { - local myconf - # 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 - # Xevie is obsolete, bug #482304 - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - ! use plymouth && myconf="${myconf} --with-initial-vt=7" - - gnome2_src_configure \ - --enable-gdm-xsession \ - --enable-user-display-server \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-pam-mod-dir=$(getpam_mod_dir) \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --without-xevie \ - --enable-systemd-journal \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_with audit libaudit) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable wayland wayland-support) \ - $(use_with xinerama) \ - ${myconf} -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}/49-keychain-r1" 49-keychain - newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - local d ret - - gnome2_pkg_postinst - - # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do - [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - - readme.gentoo_print_elog -} diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index f8cc3f75d6c1..315ee2530c02 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,9 +1,4 @@ -DIST gnome-control-center-3.22.2-patchset.tar.xz 8204 BLAKE2B 5e0c32a2bc48d620def362967ec064772060f9a7d313998c2e970485ff99daf61841532335cb6fa987cf9319a5142b6731173fe400e5081df73ea505e4688dda SHA512 f20b4e53f82fcf31c635aa070e1af7f69a125eb4f67b1ac9e1e9f594da4649031d9e4cc6021a674abfee0046fe1af944f73ed68451db9fc7b168dcd6e765afe7 -DIST gnome-control-center-3.22.2.tar.xz 7277380 BLAKE2B 0966189d3f1e791e11920261bfc37c6ae77af0a4f312263b6623850becd3ba1ad22e886d6a96cc3cdfccc492dc998c6891d583ce8d55f9a4e08daa5de829f55e SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a DIST gnome-control-center-3.24.2-patchset.tar.xz 8496 BLAKE2B 8bdbfcef3917ec12e82e7a5ea163f14954f9793b806c4a827620d1f693220527540f1b8a8ac0f121dae0bc8fc687f1974544b35cccd0b9e50474386c28d9ddbf SHA512 967258cf003c013881a2555be7624bad227d898cff72fe2899243692f7a06730e5dc79a849728cce6f9a7234a74b2b8433d1689c2846e8389eb9813fe5df1da1 -DIST gnome-control-center-3.24.2.tar.xz 7269112 BLAKE2B 41049a7176eb3de146d8ac8034cce9cdc7365eec11f6db9a1bd21964c5a30b73c22debcd48058ad72cf6ac24bf60e1956ec203502a3dadcceb83350461302387 SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb -EBUILD gnome-control-center-3.22.2-r1.ebuild 5245 BLAKE2B 141297b816965b48778e6bf62ef84e395fd3c3075bfbd5d11c97e4e98840792f4e6841dc577a34c14cb43c788993d8389d662aa7fe4102e450c6f1e37fd32c5b SHA512 44612716ac751b1e73f9fc7526c93e154843bfe78f5a302bcc9ef7f881c94535f02e39b38dbd0d4bc9f970554f51bbc76a61fcf42f4278e90671fcae11a0c39b -EBUILD gnome-control-center-3.24.2.ebuild 5309 BLAKE2B cd087cde303cf9255f6086831cae71725954b3836ae3e910ff844f3ade9c42c4953299d2b4fb2b5e199cb65dc2c33e29e2d97f1ddb0a07aaa355d5b67ecf4c41 SHA512 cdff94b284057745e2abee9c8ff1756fbfe138c6a377d7137f929c34ab25deef145cbe2ac52a7a4a209cb543f3aef206216f01ab789d9c845b3516125264c2c3 EBUILD gnome-control-center-3.24.3.ebuild 5402 BLAKE2B f964d533504d01348b00859128c7b072de5df21519a80e4ef9311b4ceb6db4a80c874305ad4d4ae1f1b12e1e5bc3f90fb3a3239fd75c4014a8a45a9b463893fd SHA512 9a742f54d74c7cc66c6a010e430694eaf42b8a05bd3532c8a7abd50f3c1a17f2856c6e505d0c7bd86b22cbe7c051a11393d4ba5cd82710f59ef1e554efb5da01 MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild deleted file mode 100644 index 0ac1e28bd663..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit bash-completion-r1 gnome2 - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" -SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 -# kerberos unfortunately means mit-krb5; build fails with heimdal -# udev could be made optional, only conditions gsd-device-panel -# (mouse, keyboards, touchscreen, etc) -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.22.0:3[X,wayland?] - >=gnome-base/gsettings-desktop-schemas-3.21.4 - >=gnome-base/gnome-desktop-3.21.2:3= - >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] - - >=dev-libs/libpwquality-1.2.2 - dev-libs/libxml2:2 - gnome-base/libgtop:2= - media-libs/fontconfig - >=sys-apps/accountsservice-0.6.39 - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - - virtual/libgudev - x11-apps/xmodmap - x11-libs/cairo - x11-libs/libX11 - x11-libs/libXxf86misc - >=x11-libs/libXi-1.2 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - colord? ( - net-libs/libsoup:2.4 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/colord-gtk-0.1.24 ) - cups? ( - >=net-print/cups-1.4[dbus] - >=net-fs/samba-4.0.0[client] - ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.21.5:= ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - v4l? ( - media-libs/clutter-gtk:1.0 - >=media-video/cheese-3.5.91 ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=media-libs/clutter-1.11.3:1.0 - media-libs/clutter-gtk:1.0 - >=x11-libs/libXi-1.2 ) -" -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -# libgnomekbd needed only for gkbd-keyboard-display tool -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${COMMON_DEPEND} - || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) - x11-themes/adwaita-icon-theme - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - app-admin/system-config-printer - net-print/cups-pk-helper ) - input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) - >=gnome-base/libgnomekbd-3 - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) - - !<gnome-base/gdm-2.91.94 - !<gnome-extra/gnome-color-manager-3.1.2 - !gnome-extra/gnome-media[pulseaudio] - !<gnome-extra/gnome-media-2.32.0-r300 - !<net-wireless/gnome-bluetooth-3.3.2 -" -# 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 - - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common - sys-devel/autoconf-archive -" -# Needed for autoreconf -# gnome-base/gnome-common -# sys-devel/autoconf-archive - -PATCHES=( - # From gnome-3-22 branch - "${WORKDIR}"/${P}-patchset/${PV}-fix-build-without-wayland.patch # bug 613192 - "${WORKDIR}"/${P}-patchset/${PV}-fix-dual-gpu-crash.patch - # Make some panels and dependencies optional; requires eautoreconf - # https://bugzilla.gnome.org/686840, 697478, 700145 - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-optional.patch - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-wayland-optional.patch - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-keep-panels-optional.patch - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-networkmanager-optional.patch - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-gentoo-paths.patch -) - -src_configure() { - gnome2_src_configure \ - --disable-update-mimedb \ - --disable-static \ - --enable-documentation \ - $(use_enable bluetooth) \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable ibus) \ - $(use_enable kerberos) \ - $(use_enable networkmanager) \ - $(use_with v4l cheese) \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable wayland) -} - -src_install() { - gnome2_src_install completiondir="$(get_bashcompdir)" -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild deleted file mode 100644 index 553249321083..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit bash-completion-r1 gnome2 - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" -SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 -# kerberos unfortunately means mit-krb5; build fails with heimdal -# udev could be made optional, only conditions gsd-device-panel -# (mouse, keyboards, touchscreen, etc) -# display panel requires colord -# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.22.0:3[X,wayland?] - >=gnome-base/gsettings-desktop-schemas-3.21.4 - >=gnome-base/gnome-desktop-3.21.2:3= - >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit] - >=x11-misc/colord-0.1.34:0= - - >=dev-libs/libpwquality-1.2.2 - dev-libs/libxml2:2 - gnome-base/libgtop:2= - media-libs/fontconfig - >=sys-apps/accountsservice-0.6.39 - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - - virtual/libgudev - x11-apps/xmodmap - x11-libs/cairo - x11-libs/libX11 - x11-libs/libXxf86misc - >=x11-libs/libXi-1.2 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - colord? ( - net-libs/libsoup:2.4 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/colord-gtk-0.1.24 ) - cups? ( - >=net-print/cups-1.4[dbus] - >=net-fs/samba-4.0.0[client] - ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.21.5:= ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - v4l? ( - media-libs/clutter-gtk:1.0 - >=media-video/cheese-3.5.91 ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=media-libs/clutter-1.11.3:1.0 - media-libs/clutter-gtk:1.0 - >=x11-libs/libXi-1.2 ) -" -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -# libgnomekbd needed only for gkbd-keyboard-display tool -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${COMMON_DEPEND} - || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) - x11-themes/adwaita-icon-theme - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - app-admin/system-config-printer - net-print/cups-pk-helper ) - input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) - >=gnome-base/libgnomekbd-3 - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) - - !<gnome-base/gdm-2.91.94 - !<gnome-extra/gnome-color-manager-3.1.2 - !gnome-extra/gnome-media[pulseaudio] - !<gnome-extra/gnome-media-2.32.0-r300 - !<net-wireless/gnome-bluetooth-3.3.2 -" -# 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 - - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common - sys-devel/autoconf-archive -" -# Needed for autoreconf -# gnome-base/gnome-common -# sys-devel/autoconf-archive - -PATCHES=( - # Make some panels and dependencies optional; requires eautoreconf - # https://bugzilla.gnome.org/686840, 697478, 700145 - "${WORKDIR}"/${P}-patchset/${PV}-optional.patch - "${WORKDIR}"/${P}-patchset/${PV}-optional-wayland.patch - "${WORKDIR}"/${P}-patchset/${PV}-optional-networkmanager.patch - "${WORKDIR}"/${P}-patchset/${PV}-optional-cups.patch - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/${P}-patchset/${PV}-gentoo-paths.patch - # https://bugzilla.gnome.org/show_bug.cgi?id=780544 - "${WORKDIR}"/${P}-patchset/${PV}-fix-without-gdkwayland.patch -) - -src_configure() { - gnome2_src_configure \ - --disable-update-mimedb \ - --disable-static \ - --enable-documentation \ - $(use_enable bluetooth) \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable ibus) \ - $(use_enable kerberos) \ - $(use_enable networkmanager) \ - $(use_with v4l cheese) \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable wayland) -} - -src_install() { - gnome2_src_install completiondir="$(get_bashcompdir)" -} diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest index 302fe9695254..501616c677ef 100644 --- a/gnome-base/gnome-core-apps/Manifest +++ b/gnome-base/gnome-core-apps/Manifest @@ -1,5 +1,3 @@ EBUILD gnome-core-apps-3.20.0.ebuild 1446 BLAKE2B f14dc6f63582ab8f9a11c55e780d3a56a3e9642ed8ebd6c109e9aaabf8f95910c266e124a16adf14f8b4af367fa74c27ac30a4c198c1fb779fd226e6dbd64daa SHA512 265e62a1341dc6dcd4da66ae67e11ae43a5b434fac1b18c329646871201663cee4c7fa1cb1b16526193057d7da9345a38d62e9f82c2f64be8323b2411ef3bd8f -EBUILD gnome-core-apps-3.22.2.ebuild 1577 BLAKE2B 49c557127cb74dcdf1f0ad52019dcb6078167183135fc336e013839e28b8d54d71187de8065f5e25827ddfde924814ded30f7dccad6086ceada629717b598aaa SHA512 cd1d1c939e04a1b6850b25c7c0a8a0279a5b90f490b61b9b0015fc4eea0e40926cb9e9e9164fd59bab071cb2caba7ae55233a3d47f3c95e95819e6f2a98954d2 -EBUILD gnome-core-apps-3.24.0.ebuild 1571 BLAKE2B 5f93c5c018c2f08f10216036eede44951ca4eebc2a6e119b4a18e2ebe5f42e43d9dd767071ecaba4311834c36da31dd1a5e9016720ff55bb0e37167200487ea6 SHA512 e33c6f3231804e2b764b4ec9b4ca8adf1197913820a4a6743c4462e907e22736191bb4c9e1dd40b6d005173247ec7e0a5fd1f9bb0fb515d51cd49ddc2d824069 EBUILD gnome-core-apps-3.24.2.ebuild 1506 BLAKE2B 514feee02bfe57ff00f83db8a0beb317a6be0678a066658b39b7740000625ba647410a90384769b7041aa19ea681803124fd492dde4209089a65e769dbe11f59 SHA512 5e7f9285e94ca98f1ea51d17d91f994a657b4a25f41e64357130e40aa287bc10106376b5f98f67fc44664ceb82519886a03d9ff218008ee85a1de4bba191476a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild deleted file mode 100644 index e286334dd136..000000000000 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.22.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 +cdr 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 -# gtk-engines:2 is still around because it's needed for gtk2 apps -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=gnome-base/gnome-session-${PV} - >=gnome-base/gnome-settings-daemon-3.22.1[cups?] - >=gnome-base/gnome-control-center-3.22.1[cups?] - - >=app-crypt/gcr-3.20.0 - >=gnome-base/nautilus-3.22.1 - >=gnome-base/gnome-keyring-3.20.0 - >=gnome-extra/evolution-data-server-${PV} - - >=app-crypt/seahorse-3.20.0 - >=app-editors/gedit-3.22.0 - >=app-text/evince-3.22.1 - >=gnome-extra/gnome-contacts-3.22.1 - >=media-gfx/eog-3.20.5 - >=media-video/totem-3.22.0 - >=x11-terms/gnome-terminal-3.22.1 - - >=gnome-extra/gnome-user-docs-3.22.0 - >=gnome-extra/yelp-3.22.0 - - >=x11-themes/adwaita-icon-theme-3.22.0 - >=x11-themes/gnome-themes-standard-${PV} - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) - cdr? ( >=app-cdr/brasero-3.12.1 ) - - !gnome-base/gnome-applets -" -DEPEND="" - -# >=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-core-apps/gnome-core-apps-3.24.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild deleted file mode 100644 index cbe71dc74215..000000000000 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 +cdr 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 -# gtk-engines:2 is still around because it's needed for gtk2 apps -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=gnome-base/gnome-session-${PV} - >=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.0 - >=gnome-extra/evolution-data-server-${PV} - - >=app-crypt/seahorse-3.20.0 - >=app-editors/gedit-3.22.1 - >=app-text/evince-${PV} - >=gnome-extra/gnome-contacts-3.22.1 - >=media-gfx/eog-${PV} - >=media-video/totem-${PV} - >=x11-terms/gnome-terminal-${PV} - - >=gnome-extra/gnome-user-docs-${PV} - >=gnome-extra/yelp-3.22.0 - - >=x11-themes/adwaita-icon-theme-${PV} - >=x11-themes/gnome-themes-standard-3.22.3 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) - cdr? ( >=app-cdr/brasero-3.12.1 ) - - !gnome-base/gnome-applets -" -DEPEND="" - -# >=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-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest index ce8d1cfe7c2d..2ab84d652d38 100644 --- a/gnome-base/gnome-core-libs/Manifest +++ b/gnome-base/gnome-core-libs/Manifest @@ -1,4 +1,2 @@ -EBUILD gnome-core-libs-3.22.2.ebuild 1087 BLAKE2B 604caa643e1f198e35c8e753b27e539d925fd349cf5fd5e6d643204ae5fa399d47ff08111a8a325ac5ecba66b75dfa5f838150af97f9b6591f93328eec8ffcbe SHA512 4e69a5b10cffe7e9aca337371d6c105ae6d3dcf802b074bbb4477b3586b0d447baaea4027f204c8c04c22bbde9c1ca762fdb17a73c669a4245dd788688bbd844 -EBUILD gnome-core-libs-3.24.0.ebuild 1083 BLAKE2B 47ca35d840526083ec93a128632f549c0dc8ff0a3606bf5e92d22a72c53899bdb5b956da6b653aab099e354ec4f691bbdcbabfa928b1c23ceaf5e32f6f196bf1 SHA512 1d07361fcd70ce3d90ff0fd02b8619161810f19fb1c1be7bca51509085ccb4ba36406e675e10a85023bee1bbf67a71c14879e670d29d773e9b8cb37d46645275 EBUILD gnome-core-libs-3.24.2.ebuild 1053 BLAKE2B baea5363a73c2a7ea9f77417d3e224d24983405572d4aaa48fdf41198b489aee0ca9c5df2820a8f676adf2b28b28bc31c9154e8dcab1deee390782b5c14c46d9 SHA512 48301a8470a7d2179ee9a8b639cf449d7493b41abfe48a33f454fe66f88eb67d888827d15f2bccbc63a93923bcbca074ade6e185251a93eac2cc374506284ac0 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild deleted file mode 100644 index b3dc6e221e02..000000000000 --- a/gnome-base/gnome-core-libs/gnome-core-libs-3.22.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Sub-meta package for the core libraries of GNOME 3" -HOMEPAGE="https://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="cups python" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -# Note to developers: -# This is a wrapper for the core libraries used by GNOME 3 -RDEPEND=" - >=dev-libs/glib-2.50.2:2 - >=x11-libs/gdk-pixbuf-2.36.0:2 - >=x11-libs/pango-1.40.3 - >=media-libs/clutter-1.26.0:1.0 - >=x11-libs/gtk+-3.22.3:3[cups?] - >=dev-libs/atk-2.22.0 - >=gnome-base/librsvg-2.40.16 - >=gnome-base/gnome-desktop-3.22.2:3 - >=x11-libs/startup-notification-0.12 - - >=gnome-base/gvfs-1.30.2 - >=gnome-base/dconf-0.26.0 - - >=media-libs/gstreamer-1.8.3:1.0 - >=media-libs/gst-plugins-base-1.8.3:1.0 - >=media-libs/gst-plugins-good-1.8.3:1.0 - - python? ( >=dev-python/pygobject-3.22.0:3 ) -" -DEPEND="" - -# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore - -S="${WORKDIR}" diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild deleted file mode 100644 index af22bc2b50b7..000000000000 --- a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Sub-meta package for the core libraries of GNOME 3" -HOMEPAGE="https://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="cups python" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# Note to developers: -# This is a wrapper for the core libraries used by GNOME 3 -RDEPEND=" - >=dev-libs/glib-2.52:2 - >=x11-libs/gdk-pixbuf-2.36.6:2 - >=x11-libs/pango-1.40.9 - >=media-libs/clutter-1.26.2:1.0 - >=x11-libs/gtk+-3.22.16:3[cups?] - >=dev-libs/atk-2.24 - >=gnome-base/librsvg-2.40.18 - >=gnome-base/gnome-desktop-${PV}:3 - >=x11-libs/startup-notification-0.12 - - >=gnome-base/gvfs-1.32 - >=gnome-base/dconf-0.26 - - >=media-libs/gstreamer-1.10.5:1.0 - >=media-libs/gst-plugins-base-1.10.5:1.0 - >=media-libs/gst-plugins-good-1.10.5:1.0 - - python? ( >=dev-python/pygobject-${PV}:3 ) -" -DEPEND="" - -# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore - -S="${WORKDIR}" diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest index f107f33a9f02..03a7703fdfa5 100644 --- a/gnome-base/gnome-desktop/Manifest +++ b/gnome-base/gnome-desktop/Manifest @@ -1,9 +1,7 @@ AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 -DIST gnome-desktop-3.22.2.tar.xz 1064496 BLAKE2B 51c4420f7d6c37ee516f1d4c87828f7f3317b51d767b1c2956a4953142f1e8c9bc78497a8b1e0cff63544dd18246336d175e26e56a46fb430ade003df63706a3 SHA512 11ca2e8f6d8c104e11faee614d52039576a69a0e701cde296ec8ce0cdfdedf29a820771b1ee08dafa37f20612f06201875365c9976b48d8b82a137c7e5438046 DIST gnome-desktop-3.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2 EBUILD gnome-desktop-2.32.1-r2.ebuild 2321 BLAKE2B 36bbc9ad0c5fadd3eb323e20cdb7bcfcc2a90acaed43c2319f4dc7c6835dd113e8eeeb6fa9a15468320e30a2b549a59e055fde416a9376248cf30b8261080316 SHA512 2631840d679cfdd6522a073012093a9cf532b990016ed6b4317d2a505c1c4dbdfe3b6a80deda8c7f37a69cd4a9edf718266e7c5ffac95f6e3378bc43212b9234 -EBUILD gnome-desktop-3.22.2.ebuild 1599 BLAKE2B 767473a884ce2e4f8c67579a0d9b0b4559ac2be65b7fc3a79b586c47e90696f88613c7fa86d51e58456d178e7b228c52164b4ac96f0a3cd12c4be8a9052c7276 SHA512 95b56cad878377f21fa2acf7892c0c4c01b8b9bb33881a33aaa117276893c7f97d2114b6f00efb0e14d74fb2c84da75161e1e4a793772076ce19005745b3ffd8 EBUILD gnome-desktop-3.24.2.ebuild 1599 BLAKE2B 320d3099a184f6a2dcb148c74fdc3af8e447877a33af8f8c532dee9e4627f7da6e95e3aa884bad7270ad150d9e2c1082514d7092df34782254b89833b812d70a SHA512 bccc39c9205f7cb40d40dd9456f0abc795fba003215b60f25cc6337d58569fdaf3cdce1a12a4df9d64a3927eedfdfdc1f435a035b968a775f9a11dc99048db6f MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild deleted file mode 100644 index 2ef37f4cb330..000000000000 --- a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 virtualx - -DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" -HOMEPAGE="https://git.gnome.org/browse/gnome-desktop" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="3/12" # subslot = libgnome-desktop-3 soname version -IUSE="debug +introspection udev" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" - -# cairo[X] needed for gnome-bg -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?] - >=x11-libs/gtk+-3.3.6:3[X,introspection?] - x11-libs/cairo:=[X] - x11-libs/libX11 - x11-misc/xkeyboard-config - >=gnome-base/gsettings-desktop-schemas-3.5.91 - introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) - udev? ( - sys-apps/hwids - virtual/libudev:= ) -" -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.6 - dev-util/itstool - sys-devel/gettext - x11-proto/xproto - virtual/pkgconfig -" - -# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --with-gnome-distributor=Gentoo \ - --enable-desktop-docs \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable debug debug-tools) \ - $(use_enable introspection) \ - $(use_enable udev) -} - -src_test() { - virtx emake check -} diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest index 24be7d9c98ec..b35cfc764173 100644 --- a/gnome-base/gnome-extra-apps/Manifest +++ b/gnome-base/gnome-extra-apps/Manifest @@ -1,4 +1,2 @@ -EBUILD gnome-extra-apps-3.22.2.ebuild 2294 BLAKE2B 3f0454bbccdb639b285d775c3abc0576d5f0f88db10319d53cf7c09abea58cbb74fe6e9fcdcd869fac0f522133225bbb7d2419c1340d488a5857f60249718dbc SHA512 3621f7dd842bf43f6f53fa84816796b32510250de026fd8bb9d028ee392c48d1797d61d2b1a610ea4540959ce22e4ac2e4d8af58a685bcfa38e51c05a515041a -EBUILD gnome-extra-apps-3.24.0.ebuild 2271 BLAKE2B cf08ccb749f4447fa49fa7aba6ba792fde0187363f12baeba8ba19d4db9e5b1866778c609a24b929f5e9f525ea1a23e7e5085f232dbab418fbc3f94a5618c7f6 SHA512 9bba68301ecb21e31e582a21b3f1403c088ca6ca86969232d2f472e2ea31adf4dbbb4f5473f3273224184a00564a33fde060a331d295303d32d87b16ae146a91 EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild deleted file mode 100644 index 1936ed666835..000000000000 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.22.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV} - - >=sys-apps/baobab-3.22.1 - >=media-video/cheese-3.22.1 - >=www-client/epiphany-3.22.2 - >=app-arch/file-roller-3.22.1 - >=gnome-extra/gnome-calculator-${PV} - >=gnome-extra/gnome-calendar-3.22.1 - >=gnome-extra/gnome-characters-3.22.0 - >=sys-apps/gnome-disk-utility-3.22.1 - >=media-gfx/gnome-font-viewer-3.22.0 - >=gnome-extra/gnome-power-manager-${PV} - >=media-gfx/gnome-screenshot-3.22.0 - >=gnome-extra/gnome-system-monitor-${PV} - >=gnome-extra/gnome-weather-3.20.2 - >=gnome-extra/gucharmap-9.0.2:2.90 - >=gnome-extra/sushi-3.21.91 - >=media-sound/sound-juicer-3.22.1 - >=net-misc/vino-3.22.0 - - >=gnome-base/dconf-editor-3.22.1 - >=app-dicts/gnome-dictionary-3.20.0 - >=mail-client/evolution-${PV} - >=net-analyzer/gnome-nettool-3.8.1 - >=gnome-extra/gnome-tweak-tool-3.22.0 - >=gnome-extra/nautilus-sendto-3.8.4 - >=net-misc/vinagre-3.22.0 - - games? ( - >=games-puzzle/five-or-more-${PV} - >=games-board/four-in-a-row-3.22.1 - >=games-board/gnome-chess-${PV} - >=games-puzzle/gnome-klotski-3.22.1 - >=games-board/gnome-mahjongg-3.22.0 - >=games-board/gnome-mines-${PV} - >=games-arcade/gnome-nibbles-3.22.1 - >=games-arcade/gnome-robots-3.22.1 - >=games-puzzle/gnome-sudoku-3.22.2 - >=games-puzzle/gnome-taquin-3.22.0 - >=games-puzzle/gnome-tetravex-3.22.0 - >=games-puzzle/hitori-3.22.0 - >=games-board/iagno-3.22.0 - >=games-puzzle/lightsoff-3.22.2 - >=games-puzzle/quadrapassel-3.22.0 - >=games-puzzle/swell-foop-${PV} - >=games-board/tali-3.22.0 - ) - share? ( >=gnome-extra/gnome-user-share-3.18.3 ) - shotwell? ( >=media-gfx/shotwell-0.24 ) - tracker? ( - >=app-misc/tracker-1.10.1 - >=gnome-extra/gnome-documents-3.22.0 - >=media-gfx/gnome-photos-${PV} - >=media-sound/gnome-music-3.22.1 ) -" -DEPEND="" -S=${WORKDIR} diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild deleted file mode 100644 index e7fe28b82abb..000000000000 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV} - - >=sys-apps/baobab-${PV} - >=media-video/cheese-${PV} - >=www-client/epiphany-${PV} - >=app-arch/file-roller-${PV} - >=gnome-extra/gnome-calculator-${PV} - >=gnome-extra/gnome-calendar-${PV} - >=gnome-extra/gnome-characters-${PV} - >=sys-apps/gnome-disk-utility-${PV} - >=media-gfx/gnome-font-viewer-${PV} - >=gnome-extra/gnome-power-manager-${PV} - >=media-gfx/gnome-screenshot-3.22.0 - >=gnome-extra/gnome-system-monitor-${PV} - >=gnome-extra/gnome-weather-${PV} - >=gnome-extra/gucharmap-10:2.90 - >=gnome-extra/sushi-${PV} - >=media-sound/sound-juicer-${PV} - >=net-misc/vino-3.22.0 - - >=gnome-base/dconf-editor-3.22.3 - >=app-dicts/gnome-dictionary-${PV} - >=mail-client/evolution-${PV} - >=net-analyzer/gnome-nettool-3.8.1 - >=gnome-extra/gnome-tweak-tool-${PV} - >=gnome-extra/nautilus-sendto-3.8.4 - >=net-misc/vinagre-3.22.0 - - games? ( - >=games-puzzle/five-or-more-3.22.2 - >=games-board/four-in-a-row-3.22.1 - >=games-board/gnome-chess-${PV} - >=games-puzzle/gnome-klotski-3.22.1 - >=games-board/gnome-mahjongg-3.22.0 - >=games-board/gnome-mines-${PV} - >=games-arcade/gnome-nibbles-${PV} - >=games-arcade/gnome-robots-3.22.1 - >=games-puzzle/gnome-sudoku-${PV} - >=games-puzzle/gnome-taquin-3.22.0 - >=games-puzzle/gnome-tetravex-3.22.0 - >=games-puzzle/hitori-3.22.0 - >=games-board/iagno-3.22.0 - >=games-puzzle/lightsoff-$PV - >=games-puzzle/quadrapassel-3.22.0 - >=games-puzzle/swell-foop-${PV} - >=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 - >=gnome-extra/gnome-documents-${PV} - >=media-gfx/gnome-photos-${PV} - >=media-sound/gnome-music-${PV} ) -" -DEPEND="" -S=${WORKDIR} diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest index b853b43fc0bf..b3d80a61b66b 100644 --- a/gnome-base/gnome-light/Manifest +++ b/gnome-base/gnome-light/Manifest @@ -1,5 +1,3 @@ EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5 -EBUILD gnome-light-3.22.2.ebuild 1708 BLAKE2B 7baebff7de3ebd4e9d23277900092da05d778478207e81f4353e8492905f84937a9885498bd38341e25dbe5d0e11cd7dd36ac76c2ed7f4da0bf71192245a947b SHA512 5ed974788a11b4e11fb196f66488a3ab59133ad0ee10ed813878124da6f8c790d1299f71ba9da7d5c7b41ef292f1f436b92e81586cf24cc6568ec01368880fa7 -EBUILD gnome-light-3.24.0.ebuild 1709 BLAKE2B addf0fbfbaab3ee6dee5990daead095913fa2440c4791727a7015ad45d9d16cee6a59b0f617d39f5ab1b3c93988caf27cc50248d21f6bd56b7cfa163165bdd20 SHA512 1dde665871cc76cc788f30db21faad8a24bed02fd8a7d0b7eed70f391c4c91c564086a4eae6e04d97a67af756a340638d2ff5460e56039fc83d66227f1d4b898 EBUILD gnome-light-3.24.2.ebuild 1709 BLAKE2B a95ca9100ad9842d54fff566dfd4088adf709636eb5a1458446c400ff1f55b807a7a8eef295002ea798c94a064dc7af93de5d693445dfeb1586e5913286c068e SHA512 5a79223238c824c08a835bb6e35036d5ef0d3244a92c04684d716b35a89220830a0a59a19ea44af108b54bbc650b2e85140adf042c81d5fe6a377e28520a4f1e MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047 diff --git a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild b/gnome-base/gnome-light/gnome-light-3.22.2.ebuild deleted file mode 100644 index f1799dbcd4bb..000000000000 --- a/gnome-base/gnome-light/gnome-light-3.22.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -P_RELEASE="$(get_version_components 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-${PV} - >=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-${PV} - >=x11-themes/gnome-backgrounds-${P_RELEASE} - - >=x11-terms/gnome-terminal-${PV} -" -DEPEND="" -PDEPEND=">=gnome-base/gvfs-1.30.2" -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-light/gnome-light-3.24.0.ebuild b/gnome-base/gnome-light/gnome-light-3.24.0.ebuild deleted file mode 100644 index 8c7d85930318..000000000000 --- a/gnome-base/gnome-light/gnome-light-3.24.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -P_RELEASE="$(get_version_components 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-${PV} - >=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-${P_RELEASE} - - >=x11-terms/gnome-terminal-${PV} -" -DEPEND="" -PDEPEND=">=gnome-base/gvfs-1.32" -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-session/Manifest b/gnome-base/gnome-session/Manifest index 4580218302bd..5a1bfe04695c 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,16 +1,10 @@ AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de56631d06b888292b96fd7179e60593c3b9c6c2da86a589a45ae35ccb0e03f169895462044b9fb3e1d600e768a65da1 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc -AUX 3.22.3-wayland-login-shell.patch 1253 BLAKE2B 8d9a78caf20da8fbd070b1427fbc2df6afd49ad0e68f65443d74582ec46d71c4c1d6187a43c9cfa39ffc9516dc800f68aceea6e896afa6be3c07449338bd0de6 SHA512 3abcdf697b3d1160b37031232e223759e24aff23b97dd1b8e4f1347071bf1575832ac00eae0414d2b9839636b85aaceb028bfbc2e488e38ff5fd17d3497a1b6e -AUX 3.22.3-xorg-default-translations.patch 15908 BLAKE2B bd3192bc608d7247d51ecc5f5ddb5147cf211c3185bd64eb7aa9af4eec4ce79d415131ecd77eb2931c7dd8b03a20d0f5fdf03c4165b6be3f76546ee2f18b333e SHA512 e71b0dc296b4fd43b6bdc2251d8f1d9eb9d5f5e369100e66427254038de7e2e8e6cc8fed3173a618cf1a2677dc4346c1061a99926f3d8e2f40e2789d4f32f7a3 AUX 3.22.3-xorg-default.patch 1929 BLAKE2B 0af17b6f73c4c431c4815dd3f1f23a7aef81727ddc179f3f8ad5aa10875562ecc6904e35ccdc55aae76dc956423bd30c4469768a5797023ab79da7e84d125599 SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 AUX defaults.list-r3 18178 BLAKE2B 77d04148ddb7a1ad76b4c59e3d1bd216791c88bc8b25b6f506e36000279610a8742e9a30b1cda5ad364f562e3ac043a2e887d95dfa82c1aa2f8ed2d255aeb2a7 SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3 -DIST gnome-session-3.22.3.tar.xz 777420 BLAKE2B 34d438e1fefcd197f2c51ce9c2866a6d10848c28c2f2cab24ae9ca7b69a6b149aa698fa62c34415ee3c34e72f153b5f62028047604a332ebad73b8f05fbfae66 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd -DIST gnome-session-3.24.1.tar.xz 780632 BLAKE2B efd1c297d4af08e9bbf47e74aa28b4899b22d00248eb4d786afdd688f5c6117f4865561ca5cf4a47bb6fb003e1d9c365a585f7009f24992fe9752391607a3cfb SHA512 507f9f1cddab37f1b66c72291e1885397f7e8b6bfb7c365f6f1ff827649a71380706fe0e3a8c6e74c3c159349a0eea0aabe3d5c7bbae5b29aeb2d49ae715affb DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27 -EBUILD gnome-session-3.22.3.ebuild 4478 BLAKE2B 5300ef756f4547eb290858caf3ae3962a03f4a0e44d17cef37f8a1ec216339909ad45801ea4655d00acdc6dc7febf9bbc2e29c77d63007ab191d1854362c6496 SHA512 90e4d7df11c52df4f6d5b5c13e37a1b2c704b8e21b69f643486d59e95263f9ae5e38cceea12bdabd453ad4b1d4097ec2553eb53c7c79371a5c771da6dcf8277c -EBUILD gnome-session-3.24.1.ebuild 3593 BLAKE2B 29398b30cbfb735ad5cf85b667b09ebb68e353de2a2578c0c00e151a7f1f9faf5df15b40f2f7b4c85841d1d2a91a6ca59a24280b50e50cefb5fee3e16b93f9f3 SHA512 8c7bfdae77e91973aa0a4517a28843b3ee1a6eb0ac969ce6b1a63e5c6fca10be8de5b692b4597c99c7613ef744fcb168f668a26d71c6d2f136af5cc8c2232545 EBUILD gnome-session-3.24.2-r1.ebuild 4552 BLAKE2B c5aee03290d0fb718777313002f2a3fe2c7df2d6403e00ca1bbcb3105f21fad2eede1f487e1e9b2b06f2554b436d73310ae3fad994a42f92ca64be81b18f5e11 SHA512 e2ebe3cb856799af58998e74a9d642eb0599bfc0ebed80c7e5047977a8337c925c909ed8fb19bea33ffcd93bf7b5f587bb2ec97f4d97942f6b263bb58c866e89 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch deleted file mode 100644 index f82825f4822e..000000000000 --- a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Thu, 5 Jan 2017 10:02:58 -0500 -Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login - shell - -Users expect their shell profiles to get sourced at startup, which -doesn't happen with wayland sessions. - -This commit brings back that feature, by making the gnome-session -wrapper script run a login shell. - -https://bugzilla.gnome.org/show_bug.cgi?id=736660 ---- - gnome-session/gnome-session.in | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index 530299d..04ea741 100644 ---- a/gnome-session/gnome-session.in -+++ b/gnome-session/gnome-session.in -@@ -1,5 +1,18 @@ - #!/bin/sh - -+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && -+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && -+ [ -n "$SHELL" ] && -+ grep -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | grep -q "false") && -+ ! (echo "$SHELL" | grep -q "nologin"); then -+ if [ "$1" != '-l' ]; then -+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" -+ else -+ shift -+ fi -+fi -+ - SETTING=$(gsettings get org.gnome.system.locale region) - REGION=${SETTING#\'} - REGION=${REGION%\'} --- -2.10.1 - diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch deleted file mode 100644 index 8c259de9d157..000000000000 --- a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch +++ /dev/null @@ -1,619 +0,0 @@ -From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 18 Mar 2017 11:42:40 +0200 -Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations - ---- - po/POTFILES.in | 2 +- - po/bg.po | 4 ++++ - po/cs.po | 4 ++++ - po/da.po | 4 ++++ - po/de.po | 4 ++++ - po/el.po | 4 ++++ - po/es.po | 4 ++++ - po/eu.po | 4 ++++ - po/fa.po | 4 ++++ - po/fi.po | 4 ++++ - po/fr.po | 4 ++++ - po/fur.po | 4 ++++ - po/gd.po | 4 ++++ - po/gl.po | 4 ++++ - po/gu.po | 4 ++++ - po/he.po | 4 ++++ - po/hr.po | 4 ++++ - po/hu.po | 4 ++++ - po/id.po | 4 ++++ - po/is.po | 4 ++++ - po/it.po | 4 ++++ - po/kk.po | 4 ++++ - po/ko.po | 4 ++++ - po/lt.po | 4 ++++ - po/lv.po | 4 ++++ - po/nb.po | 4 ++++ - po/pl.po | 4 ++++ - po/pt.po | 4 ++++ - po/pt_BR.po | 4 ++++ - po/ru.po | 4 ++++ - po/sk.po | 4 ++++ - po/sr.po | 4 ++++ - po/sr@latin.po | 4 ++++ - po/sv.po | 4 ++++ - po/tr.po | 4 ++++ - po/uk.po | 4 ++++ - po/vi.po | 4 ++++ - po/zh_CN.po | 4 ++++ - 38 files changed, 149 insertions(+), 1 deletion(-) - -diff --git a/po/POTFILES.in b/po/POTFILES.in -index cc1170a..0feb5cf 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -2,9 +2,9 @@ - # Please keep this file sorted alphabetically. - data/gnome-custom-session.desktop.in - data/gnome.desktop.in --data/gnome-xorg.desktop.in - data/gnome-dummy.session.desktop.in.in - data/gnome.session.desktop.in.in -+data/gnome-wayland.desktop.in - [type: gettext/glade]data/session-selector.ui - gnome-session/gsm-fail-whale-dialog.c - gnome-session/gsm-manager.c -diff --git a/po/bg.po b/po/bg.po -index 7d243fc..7bb73b6 100644 ---- a/po/bg.po -+++ b/po/bg.po -@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg" - msgid "GNOME dummy" - msgstr "GNOME — фиктивна" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME с Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Друга сесия" -diff --git a/po/cs.po b/po/cs.po -index a9acc59..4efd144 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME na Waylandu" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Vlastní sezení" -diff --git a/po/da.po b/po/da.po -index de709ac..62a49c3 100644 ---- a/po/da.po -+++ b/po/da.po -@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg" - msgid "GNOME dummy" - msgstr "GNOME-attrap" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME på Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Tilpasset session" -diff --git a/po/de.po b/po/de.po -index 051c9ee..a283114 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg" - msgid "GNOME dummy" - msgstr "GNOME Platzhalter" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME unter Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Benutzerdefinierte Sitzung" -diff --git a/po/el.po b/po/el.po -index 99f92ba..9f1d419 100644 ---- a/po/el.po -+++ b/po/el.po -@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg" - msgid "GNOME dummy" - msgstr "Εικονικό GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME σε Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Προσαρμοσμένη συνεδρία" -diff --git a/po/es.po b/po/es.po -index 79e3a6d..a9b73b2 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg" - msgid "GNOME dummy" - msgstr "GNOME «dummy»" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME en Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sesión personalizada" -diff --git a/po/eu.po b/po/eu.po -index da3969d..6b57df1 100644 ---- a/po/eu.po -+++ b/po/eu.po -@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean" - msgid "GNOME dummy" - msgstr "Probako GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME Wayland gainean" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Saio pertsonalizatua" -diff --git a/po/fa.po b/po/fa.po -index 1737204..8b1b6e5 100644 ---- a/po/fa.po -+++ b/po/fa.po -@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg" - msgid "GNOME dummy" - msgstr "گنوم ساختگی" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "گنوم بر روی Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "نشست سفارشی" -diff --git a/po/fi.po b/po/fi.po -index a3cd0ca..8b5025c 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen" - msgid "GNOME dummy" - msgstr "Gnome-malli-istunto (dummy)" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "Gnome Waylandia käyttäen" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Omavalintainen istunto" -diff --git a/po/fr.po b/po/fr.po -index e209804..5fe647a 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg" - msgid "GNOME dummy" - msgstr "GNOME factice" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME sur Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Session personnalisée" -diff --git a/po/fur.po b/po/fur.po -index 8245a6f..1dc5f85 100644 ---- a/po/fur.po -+++ b/po/fur.po -@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME su Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Session personalizade" -diff --git a/po/gd.po b/po/gd.po -index beb1618..ebb67bc 100644 ---- a/po/gd.po -+++ b/po/gd.po -@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg" - msgid "GNOME dummy" - msgstr "Caochag GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME air Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Seisean gnàthaichte" -diff --git a/po/gl.po b/po/gl.po -index 02b9879..2d9c944 100644 ---- a/po/gl.po -+++ b/po/gl.po -@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg" - msgid "GNOME dummy" - msgstr "GNOME de proba" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME en Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sesión personalizada" -diff --git a/po/gu.po b/po/gu.po -index c83ed6b..fa92f6a 100644 ---- a/po/gu.po -+++ b/po/gu.po -@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME" - msgid "GNOME dummy" - msgstr "GNOME ડમી" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "Wayland પર GNOME" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "વૈવિધ્ય સત્ર" -diff --git a/po/he.po b/po/he.po -index 22045b6..c197658 100644 ---- a/po/he.po -+++ b/po/he.po -@@ -45,6 +45,10 @@ msgstr "GNOME על גבי Xorg" - msgid "GNOME dummy" - msgstr "מדומה של GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME על גבי Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "הפעלה מותאמת אישית" -diff --git a/po/hr.po b/po/hr.po -index db64d1a..46ba1af 100644 ---- a/po/hr.po -+++ b/po/hr.po -@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu" - msgid "GNOME dummy" - msgstr "GNOME lažno" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME na Waylandu" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Prilagođena sesija" -diff --git a/po/hu.po b/po/hu.po -index 403b0a1..f207056 100644 ---- a/po/hu.po -+++ b/po/hu.po -@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon" - msgid "GNOME dummy" - msgstr "GNOME példa" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME Wayland-en" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Egyéni környezet" -diff --git a/po/id.po b/po/id.po -index 04848d8..3519b35 100644 ---- a/po/id.po -+++ b/po/id.po -@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME pada Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sesi Gubahan" -diff --git a/po/is.po b/po/is.po -index 5cfbfa2..a95c1e7 100644 ---- a/po/is.po -+++ b/po/is.po -@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg" - msgid "GNOME dummy" - msgstr "GNOME sýnishorn" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME á Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sérsniðin seta" -diff --git a/po/it.po b/po/it.po -index 3a95eff..6119ff2 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME su Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sessione personalizzata" -diff --git a/po/kk.po b/po/kk.po -index 7168f0d..8fede72 100644 ---- a/po/kk.po -+++ b/po/kk.po -@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME" - msgid "GNOME dummy" - msgstr "GNOME жалған сессиясы" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "Wayland негізіндегі GNOME" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Таңдауыңызша сесия" -diff --git a/po/ko.po b/po/ko.po -index 8c90323..359a65d 100644 ---- a/po/ko.po -+++ b/po/ko.po -@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)" - msgid "GNOME dummy" - msgstr "그놈 더미" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "그놈, 웨일랜드" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "사용자 지정 세션" -diff --git a/po/lt.po b/po/lt.po -index 9a4bfb9..221c293 100644 ---- a/po/lt.po -+++ b/po/lt.po -@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje" - msgid "GNOME dummy" - msgstr "GNOME netikra" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME Wayland aplinkoje" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Pasirinktinis seansas" -diff --git a/po/lv.po b/po/lv.po -index 14e4180..688efe2 100644 ---- a/po/lv.po -+++ b/po/lv.po -@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg" - msgid "GNOME dummy" - msgstr "GNOME makets" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME ar Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Pielāgota sesija" -diff --git a/po/nb.po b/po/nb.po -index afad648..471fb14 100644 ---- a/po/nb.po -+++ b/po/nb.po -@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME på Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Egendefinert økt" -diff --git a/po/pl.po b/po/pl.po -index 92b0cfe..1b92056 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)" - msgid "GNOME dummy" - msgstr "Pusta sesja GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME (Wayland)" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Niestandardowa sesja" -diff --git a/po/pt.po b/po/pt.po -index fc4bb99..573908d 100644 ---- a/po/pt.po -+++ b/po/pt.po -@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg" - msgid "GNOME dummy" - msgstr "GNOME de teste" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME no Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sessão personalizada" -diff --git a/po/pt_BR.po b/po/pt_BR.po -index 6a2a88a..7d6a66a 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg" - msgid "GNOME dummy" - msgstr "GNOME experimental" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME sobre Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Sessão personalizada" -diff --git a/po/ru.po b/po/ru.po -index 4378126..52eda37 100644 ---- a/po/ru.po -+++ b/po/ru.po -@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg" - msgid "GNOME dummy" - msgstr "Фиктивный сеанс GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME на Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Другой сеанс" -diff --git a/po/sk.po b/po/sk.po -index 0f75b10..49fbf5d 100644 ---- a/po/sk.po -+++ b/po/sk.po -@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg" - msgid "GNOME dummy" - msgstr "Fingované GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME cez Wayland" -+ - # GtkWindow title - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" -diff --git a/po/sr.po b/po/sr.po -index 7ec002a..2a71f45 100644 ---- a/po/sr.po -+++ b/po/sr.po -@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу" - msgid "GNOME dummy" - msgstr "Гномов лажњак" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "Гном на Вејланду" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Прилагођена сесија" -diff --git a/po/sr@latin.po b/po/sr@latin.po -index 677444e..b148d70 100644 ---- a/po/sr@latin.po -+++ b/po/sr@latin.po -@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru" - msgid "GNOME dummy" - msgstr "Gnomov lažnjak" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "Gnom na Vejlandu" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Prilagođena sesija" -diff --git a/po/sv.po b/po/sv.po -index 2894eec..3072075 100644 ---- a/po/sv.po -+++ b/po/sv.po -@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg" - msgid "GNOME dummy" - msgstr "GNOME-attrapp" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME med Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Anpassad session" -diff --git a/po/tr.po b/po/tr.po -index 3ede169..87bba43 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "Wayland üzerinde GNOME" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Özel Oturum" -diff --git a/po/uk.po b/po/uk.po -index de980dc..c98fd8d 100644 ---- a/po/uk.po -+++ b/po/uk.po -@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg" - msgid "GNOME dummy" - msgstr "Несправжній GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME через Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Власний сеанс" -diff --git a/po/vi.po b/po/vi.po -index 1cdee0a..cf249e3 100644 ---- a/po/vi.po -+++ b/po/vi.po -@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg" - msgid "GNOME dummy" - msgstr "Giả lập GNOME" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "GNOME trên Wayland" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "Phiên làm việc tự chọn" -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 6f07716..8d36444 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME" - msgid "GNOME dummy" - msgstr "GNOME dummy" - -+#: ../data/gnome-wayland.desktop.in.h:1 -+msgid "GNOME on Wayland" -+msgstr "基于 Wayland 的 GNOME" -+ - #: ../data/session-selector.ui.h:1 - msgid "Custom Session" - msgstr "自定义会话" --- -2.10.1 - diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild deleted file mode 100644 index 311a3798511f..000000000000 --- a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 - -DESCRIPTION="Gnome session manager" -HOMEPAGE="https://git.gnome.org/browse/gnome-session" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="doc elibc_FreeBSD ipv6 systemd" - -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). -# gdk-pixbuf used in the inhibit dialog -COMMON_DEPEND=" - >=dev-libs/glib-2.46.0:2[dbus] - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.18.0:3 - >=dev-libs/json-glib-0.10 - >=gnome-base/gnome-desktop-3.18:3= - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) - - media-libs/mesa[egl,gles2] - - media-libs/libepoxy - x11-libs/libSM - x11-libs/libICE - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk - x11-apps/xdpyinfo - - systemd? ( >=sys-apps/systemd-183:0= ) -" -# Pure-runtime deps from the session files should *NOT* be added here -# Otherwise, things like gdm pull in gnome-shell -# gnome-themes-standard is needed for the failwhale dialog themeing -# sys-apps/dbus[X] is needed for session management -RDEPEND="${COMMON_DEPEND} - gnome-base/gnome-settings-daemon - >=gnome-base/gsettings-desktop-schemas-0.1.7 - x11-themes/adwaita-icon-theme - sys-apps/dbus[X] - !systemd? ( - sys-auth/consolekit - >=dev-libs/dbus-glib-0.76 - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig - !<gnome-base/gdm-2.20.4 - doc? ( - app-text/xmlto - dev-libs/libxslt ) - gnome-base/gnome-common -" -# gnome-common needed for eautoreconf -# gnome-base/gdm does not provide gnome.desktop anymore - -PATCHES=( - # Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110 - "${FILESDIR}/${PV}-wayland-login-shell.patch" - # Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146 - "${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24 - "${FILESDIR}/${PV}-xorg-default-translations.patch" -) - -src_configure() { - # 1. Avoid automagic on old upower releases - # 2. xsltproc is always checked due to man configure - # switch, even if USE=-doc - # 3. Disable old gconf support as other distributions did long time - # ago - gnome2_src_configure \ - --disable-deprecation-flags \ - --disable-gconf \ - --enable-session-selector \ - $(use_enable doc docbook-docs) \ - $(use_enable ipv6) \ - $(use_enable systemd) \ - $(use_enable !systemd consolekit) \ - UPOWER_CFLAGS="" \ - UPOWER_LIBS="" - # gnome-session-selector pre-generated man page is missing - #$(usex !doc XSLTPROC=$(type -P true)) -} - -src_install() { - gnome2_src_install - - dodir /etc/X11/Sessions - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/Gnome" - - insinto /usr/share/applications - newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list - - dodir /etc/X11/xinit/xinitrc.d/ - exeinto /etc/X11/xinit/xinitrc.d/ - newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome - - # This should be done here as discussed in bug #270852 - newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome - - # Set XCURSOR_THEME from current dconf setting instead of installing - # default cursor symlink globally and affecting other DEs (bug #543488) - # https://bugzilla.gnome.org/show_bug.cgi?id=711703 - newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome -} - -pkg_postinst() { - gnome2_pkg_postinst - - ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of" - ewarn "Wayland for GNOME 3.22 stable version, even if USE=wayland is set on applicable" - ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if" - ewarn "desired. GNOME 3.24 will default to Wayland again as upstream GNOME does, if" - ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice." - - if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then - ewarn "If you use a custom .xinitrc for your X session," - ewarn "make sure that the commands in the xinitrc.d scripts are run." - fi -} diff --git a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild deleted file mode 100644 index ccbcf8130268..000000000000 --- a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Gnome session manager" -HOMEPAGE="https://git.gnome.org/browse/gnome-session" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="doc elibc_FreeBSD ipv6 systemd" - -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). -# gdk-pixbuf used in the inhibit dialog -COMMON_DEPEND=" - >=dev-libs/glib-2.46.0:2[dbus] - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.18.0:3 - >=dev-libs/json-glib-0.10 - >=gnome-base/gnome-desktop-3.18:3= - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) - - media-libs/mesa[egl,gles2] - - media-libs/libepoxy - x11-libs/libSM - x11-libs/libICE - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk - x11-apps/xdpyinfo - - systemd? ( >=sys-apps/systemd-183:0= ) -" -# Pure-runtime deps from the session files should *NOT* be added here -# Otherwise, things like gdm pull in gnome-shell -# gnome-themes-standard is needed for the failwhale dialog themeing -# sys-apps/dbus[X] is needed for session management -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-settings-daemon-3.23.2 - >=gnome-base/gsettings-desktop-schemas-0.1.7 - x11-themes/adwaita-icon-theme - sys-apps/dbus[X] - !systemd? ( - sys-auth/consolekit - >=dev-libs/dbus-glib-0.76 - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig - !<gnome-base/gdm-2.20.4 - doc? ( - app-text/xmlto - dev-libs/libxslt ) -" -# gnome-common needed for eautoreconf -# gnome-base/gdm does not provide gnome.desktop anymore - -src_configure() { - # 1. Avoid automagic on old upower releases - # 2. xsltproc is always checked due to man configure - # switch, even if USE=-doc - # 3. Disable old gconf support as other distributions did long time - # ago - gnome2_src_configure \ - --disable-deprecation-flags \ - --disable-gconf \ - --enable-session-selector \ - $(use_enable doc docbook-docs) \ - $(use_enable ipv6) \ - $(use_enable systemd) \ - $(use_enable !systemd consolekit) \ - UPOWER_CFLAGS="" \ - UPOWER_LIBS="" - # gnome-session-selector pre-generated man page is missing - #$(usex !doc XSLTPROC=$(type -P true)) -} - -src_install() { - gnome2_src_install - - dodir /etc/X11/Sessions - exeinto /etc/X11/Sessions - doexe "${FILESDIR}/Gnome" - - insinto /usr/share/applications - newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list - - dodir /etc/X11/xinit/xinitrc.d/ - exeinto /etc/X11/xinit/xinitrc.d/ - newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome - - # This should be done here as discussed in bug #270852 - newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome - - # Set XCURSOR_THEME from current dconf setting instead of installing - # default cursor symlink globally and affecting other DEs (bug #543488) - # https://bugzilla.gnome.org/show_bug.cgi?id=711703 - newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then - ewarn "If you use a custom .xinitrc for your X session," - ewarn "make sure that the commands in the xinitrc.d scripts are run." - fi -} diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 36ba1673f91c..4a0a14869b6e 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,12 +1,8 @@ -AUX 3.22.2-udevrulesdir-configure.patch 1858 BLAKE2B babac28f3c55ea6d320106fddc35987e87041804174c3518162cd5ec16c95a891f9bc80af5f36188e31d45492d6ae4911b4274fb456ea23bdc1226b6fd9d5ca5 SHA512 f2435821bedcf8858c7017053ce0a55591d75da741ee00a1ba54ce70ab6839fe34183425d07a0ebf6ceb18051bdc4d21dd3027b893acfb8eecf05d02d826a020 AUX 3.24.2-reduce-memory-usage.patch 6121 BLAKE2B 8420de9b07a1a3b5d882c5aae516350d4ea203d9205fe8e69329951e869c1fd8c120372c024407e5b057643e307835659040edf2268b79966468844211fcfdb0 SHA512 c6b172e171461d79f2dfc37b26a0f17a44b2bba0ce6392053129a9137b76c35956d9ab88e22e111d2613c0ff6ee2affc87756c8e0c4fd28d928d948feebd2a41 AUX 3.24.2-remove-unneeded-gtk-init.patch 2101 BLAKE2B 7983b10dd3ba55e15209640dd1edd822d8515bd7ee5ff4d7865529491ca26fcd3a852f5af3589a715d118fa8bf86e8ea70e89244b5ebbc37e8dc3f9bc587fb96 SHA512 6da74748bbee31bb2b98ba090927c0e787552cabe2ef028781f3e12ccf9b444bf41480f561a307cc71777efaca23ce2f65e2ebb559a33b6a0d9a4270e9da5016 AUX 3.24.2-udevrulesdir-configure.patch 1918 BLAKE2B 3e831c580ac4348c2d528c5162d821eee42283360651c802be6467bfe6868ac6e51802639e2bf7fd22d1326f46457f697d5ed8ad9bf77d0c9e41ac6de095ad60 SHA512 4d30c85add1c667a4c2fd712c7bf208f358a9313baf29172407eab4236817c86b30d8fca0141541abf8ff0ccd09f51065ceee12a2dbb39827d4facac255c8564 AUX 3.24.3-fix-wayland-build.patch 1836 BLAKE2B 32bae28672ca5e779826dd908ca2349a0c90898de77138c1ad73157590d51638311640ab59025d2196302d0c60de52ece2d60422536a28967ffbd3c60306b26b SHA512 edf8bcea8fa705cc0a212c1523ebc948751aba61fd2060245439fbf9825b2416bb79c35b1873b49deddb77eff21ee41644e2c6bf311f88607343227ca3526193 AUX 3.24.3-optional.patch 5311 BLAKE2B d2f9f7dd3e58f88b23604703773f1bb783798d48f81388043bce3c288535d48e14de0dca33c4ddb9ccf266ffc43f772b58f999ed460789b0f6803a566fd12038 SHA512 a466e658f5c02070620aaf6b96f1c2516664d20092ba555f5fa3cd01e5738e79ba4418062380923401c9e8b7b52478b3468335100757babe4326102d55eb4717 -AUX gnome-settings-daemon-3.22.0-optional.patch 4101 BLAKE2B 34bfc06d2a37a8567dc4cf2cd16befe537d83513cc8991dca6ef4b303e7b5e0cc3be44a4faa884de7e0e885a4952ad3b1552fb9bd9e1b597a8a0526049a09167 SHA512 0f064dd2ea491f725eca74e2efe9534459719f8bccd8ba03f381a6f4979624c157ef299b805a38fcd11244232eeb66fb7074f57d0803b0781e458b5a47bfe765 -DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 BLAKE2B 4582793b2c13b4cecb1e93ff5053f94af16dc72436fbfe83a74b21b21c4bf8473409f52acae30e717176b01fd60165e43a69ae16787883ee862fe7fa3b9c448c SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 -EBUILD gnome-settings-daemon-3.22.2-r1.ebuild 4185 BLAKE2B 74666ed2940c5e35e4c178b239ef05e190284ed5c63b92dd0408217fe46b04d3a1bfe30b18657a582ab559c62b62231af8fd1818362aaeb1e173d827b32af4d1 SHA512 676d36c8d9bd465792a1e1cb911ad727d4e6d00458507cb083a266f4e6bb8b2ca7a8c6a92247eeec152d77f78f6af6555a9c89ad8d150d54809e5b8b948c1ac4 EBUILD gnome-settings-daemon-3.24.3.ebuild 4904 BLAKE2B 8b38af85f86bd9f4b694f9b4dad4d4ade3da5cda4241cc5ce70e0882567555eb3ec6d5a8b711b0a1be9a71375efc8947f4afd07e9c000ff49602add3510f4ace SHA512 5f60a54dfd9c0eb1eeedc18692be773916e4e62442e02441f45a657d5060caee941ae157526635b3c942ffb702c43612f5fbfdacfae838d956074ed262ca0695 MISC metadata.xml 591 BLAKE2B 6dfcef2c04291096bef621cb68ed9f2fa2c379920fb2072783b6245673fb37a6b6903d80ac8da46439a6a6be81372a3474585abbe4234559b558f48c3e23a1a6 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a diff --git a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch deleted file mode 100644 index d0436ecdc6e1..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Tue, 21 Mar 2017 01:30:52 +0200 -Subject: [PATCH] build: Get udevrulesdir from pkg-config - -Use the standard way to find the udev rules directory via pkg-config by default, -and support specifying it, should it be necessary. -This is the same logic as in colord. ---- - configure.ac | 9 +++++++++ - plugins/rfkill/Makefile.am | 1 - - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d4f5cb..5390404 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -135,6 +135,15 @@ fi - AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) - - dnl --------------------------------------------------------------------------- -+dnl - Where to install udev rules -+dnl --------------------------------------------------------------------------- -+AC_ARG_WITH([udevrulesdir], -+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), -+ [], -+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) -+AC_SUBST([udevrulesdir], [$with_udevrulesdir]) -+ -+dnl --------------------------------------------------------------------------- - dnl - ALSA integration (default enabled) - dnl --------------------------------------------------------------------------- - ALSA_PKG="" -diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am -index fed7adc..05f2c78 100644 ---- a/plugins/rfkill/Makefile.am -+++ b/plugins/rfkill/Makefile.am -@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in - - plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) - --udevrulesdir = $(prefix)/lib/udev/rules.d - udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules - - EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA) --- -2.10.1 - diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch deleted file mode 100644 index 9b5369bb3462..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001 -From: Ole Reifschneider <mail@ole-reifschneider.de> -Date: Sat, 11 Apr 2015 23:10:21 +0200 -Subject: [PATCH] Make colord and wacom support optional - ---- - configure.ac | 41 ++++++++++++++++++++++++++++++----------- - plugins/Makefile.am | 9 +++++++-- - 2 files changed, 37 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6d9408a..628af0e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -245,7 +245,17 @@ dnl --------------------------------------------------------------------------- - dnl - color - dnl --------------------------------------------------------------------------- - --PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) -+AC_ARG_ENABLE([color], -+ AS_HELP_STRING([--disable-color], -+ [turn off color plugin]), -+ [], -+ [enable_color=yes]) -+ -+AS_IF([test "$enable_color" = "yes"], -+ [PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+ ]) -+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") - - dnl --------------------------------------------------------------------------- - dnl - datetime -@@ -270,22 +280,31 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- if test x$enable_gudev != xno; then -- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -- else -- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) -- fi -- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -- have_wacom=yes -+ have_wacom=no -+ AS_IF([test "$enable_gudev" != "no"], -+ [AC_ARG_ENABLE([wacom], -+ AS_HELP_STRING([--disable-wacom], -+ [turn off wacom plugin]), -+ [], -+ [enable_wacom=no]) dnl Default value -+ AS_IF([test "x$enable_wacom" = "xyes"], -+ [ -+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ have_wacom=yes -+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -+ ]) -+ ], [ -+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) -+ ]) - fi - ;; - *) - have_wacom=no - ;; - esac --AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) -+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) - - dnl ============================================== - dnl smartcard section -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 9324b40..ee78d6d 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -4,7 +4,6 @@ enabled_plugins = \ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - datetime \ - dummy \ - power \ -@@ -22,13 +21,19 @@ enabled_plugins = \ - - disabled_plugins = $(NULL) - -+if BUILD_COLOR -+enabled_plugins += color -+else -+disabled_plugins += color -+endif -+ - if SMARTCARD_SUPPORT - enabled_plugins += smartcard - else - disabled_plugins += smartcard - endif - --if HAVE_WACOM -+if BUILD_WACOM - enabled_plugins += wacom - else - disabled_plugins += wacom --- -2.10.1 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild deleted file mode 100644 index 76625b33ba7b..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.22.2-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit gnome2 python-any-r1 systemd udev virtualx - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" -REQUIRED_USE=" - input_devices_wacom? ( udev ) - smartcard? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=dev-libs/glib-2.37.7:2[dbus] - >=x11-libs/gtk+-3.15.3:3 - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.20 - >=gnome-base/librsvg-2.36.2:2 - media-fonts/cantarell - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/libnotify-0.7.3:= - x11-libs/libX11 - x11-libs/libxkbfile - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/libXxf86misc - x11-misc/xkeyboard-config - - >=app-misc/geoclue-2.3.1:2.0 - >=dev-libs/libgweather-3.9.5:2= - >=sci-geosciences/geocode-glib-3.10 - >=sys-auth/polkit-0.103 - - colord? ( - >=media-libs/lcms-2.2:2 - >=x11-misc/colord-1.0.2:= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20 - x11-drivers/xf86-input-wacom - virtual/libgudev:= ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( virtual/libgudev:= ) - wayland? ( dev-libs/wayland ) -" -# 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 -# systemd needed for power and session management, bug #464944 -RDEPEND="${COMMON_DEPEND} - gnome-base/dconf - !openrc-force? ( sys-apps/systemd ) - !<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 -# FIXME: tests require dbus-mock -DEPEND="${COMMON_DEPEND} - cups? ( sys-apps/sed ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - gnome-base/gnome-session ) - app-text/docbook-xsl-stylesheets - dev-libs/libxml2:2 - dev-libs/libxslt - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - x11-proto/inputproto - x11-proto/xf86miscproto - >=x11-proto/xproto-7.0.15 -" - -PATCHES=( - # Make colord and wacom optional; requires eautoreconf - "${FILESDIR}"/${PN}-3.22.0-optional.patch - # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf - "${FILESDIR}"/${PV}-udevrulesdir-configure.patch -) - -python_check_deps() { - if use test; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-man \ - --with-udevrulesdir="$(get_udevdir)"/rules.d \ - $(use_enable colord color) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable debug more-warnings) \ - $(use_enable networkmanager network-manager) \ - $(use_enable smartcard smartcard-support) \ - $(use_enable udev gudev) \ - $(use_enable input_devices_wacom wacom) \ - $(use_enable wayland) -} - -src_test() { - virtx emake check -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow the this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd" - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index f4ae6b08f650..17309bd4334d 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,10 +1,8 @@ -AUX 3.22.3-CVE-2017-8288.patch 1501 BLAKE2B 6c41df368d6561303857754f61255f426b62093e8373c769030baa94d11a64cee5f390992a10c153b7d64fffd3ecd48931b31119e5e46149f4355051b52a0875 SHA512 d077946918b5b7aa3e863e017dc71644c2a63220eb21589c0790ff34f35b2545e6fe2a4e19549f0fc1dc0a46104c766826bb3c98fade6e1c54eb7ba67fe33311 AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5 AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d1381326ad2059a59b3ff9579475b160d9c6fa715acfcf0f3d9d3544bc435b13fcdd45cf420b761ea6681718e540a39533f615b7aa0214 SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213 DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15 -EBUILD gnome-shell-3.22.3-r2.ebuild 6637 BLAKE2B 2a911e1af1ad874225a07a64c50a16677fd6f1e4399f1f155e0e9ab4a52ef124cb44b47c2e5369aac3cfa9d20929d588b241174baacc5666f38e8706e86e3d6b SHA512 60914c7e4931a73e174ad470fa8581f519c68bee9cf98bc6fb499f483b52af0efc9ca818d8b0f09fd2500177588ab2f1f05472a27eeee0498ad23f2380dc93c6 -EBUILD gnome-shell-3.22.3.ebuild 6865 BLAKE2B 5c13185446bec0e28a319d0a56dfd05dd087706433f4efaf1fe4aadeb61573f89c333c944be55a24ba444f908f9b2031556a4cf86867701c3f10515f6169d133 SHA512 c454e77fda925908ff497818dc1559217628b0b4830fe8a8d70b3251c888f6d5e7c375e57bb2eacec8a6e25af01cfafc0ec6a7f3944a0cd6eb6853fcea9f06aa +EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3 EBUILD gnome-shell-3.24.3.ebuild 6568 BLAKE2B 6ecdb9b049a67d41d9051bfc606e480419e48e9eb84742901c7e022d7aadfc7ab9d83e82c3a00e49c17a3b4c52efd4f61180717035eb6819d2df1924443f0b84 SHA512 b7fa60c65c9c642d4da55803ad0d730ce5be3e5934cca34c83e076f4517e5b252f959b9bf40757ca8eaba434d48ed2bde7460bc72b7a1f250bdafc62706bc4ab MISC metadata.xml 738 BLAKE2B f379ab17d70d0241fffcef221940031cf797d3393c903fcc75c847e4bd985242c124b598e61ae50bce7e58ababe8595533bf3fb52fea47d75712eaa2af291492 SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b diff --git a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch b/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch deleted file mode 100644 index f9c74d62fddd..000000000000 --- a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 560e976ee9c59d75907b5ef6ed2bc336719e37d3 Mon Sep 17 00:00:00 2001 -From: Emilio Pozuelo Monfort <pochu27@gmail.com> -Date: Tue, 25 Apr 2017 17:27:42 +0200 -Subject: [PATCH] extensionSystem: handle reloading broken extensions - -Some extensions out there may fail to reload. When that happens, -we need to catch any exceptions so that we don't leave things in -a broken state that could lead to leaving extensions enabled in -the screen shield. - -https://bugzilla.gnome.org/show_bug.cgi?id=781728 ---- - js/ui/extensionSystem.js | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js -index ba33222..1feaa2f 100644 ---- a/js/ui/extensionSystem.js -+++ b/js/ui/extensionSystem.js -@@ -276,12 +276,20 @@ function _onVersionValidationChanged() { - // temporarily disable them all - enabledExtensions = []; - for (let uuid in ExtensionUtils.extensions) -- reloadExtension(ExtensionUtils.extensions[uuid]); -+ try { -+ reloadExtension(ExtensionUtils.extensions[uuid]); -+ } catch(e) { -+ logExtensionError(uuid, e); -+ } - enabledExtensions = getEnabledExtensions(); - - if (Main.sessionMode.allowExtensions) { - enabledExtensions.forEach(function(uuid) { -- enableExtension(uuid); -+ try { -+ enableExtension(uuid); -+ } catch(e) { -+ logExtensionError(uuid, e); -+ } - }); - } - } --- -2.10.1 - diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild deleted file mode 100644 index 66d73e5efc0e..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" -PYTHON_COMPAT=( python{3_4,3_5} ) - -inherit gnome2 multilib pax-utils python-r1 systemd - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -KEYWORDS="amd64 ~ia64 x86" - -# libXfixes-5.0 needed for pointer barriers -# FIXME: -# * gstreamer support is currently automagic -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=dev-libs/atk-2[introspection] - >=app-crypt/gcr-3.7.5[introspection] - >=dev-libs/glib-2.45.3:2[dbus] - >=dev-libs/gjs-1.39 - >=dev-libs/gobject-introspection-1.49.1:= - dev-libs/libical:= - >=x11-libs/gtk+-3.15.0:3[introspection] - >=dev-libs/libcroco-0.6.8:0.6 - >=gnome-base/gnome-desktop-3.7.90:3=[introspection] - >=gnome-base/gsettings-desktop-schemas-3.21.3 - >=gnome-extra/evolution-data-server-3.17.2:= - >=media-libs/gstreamer-0.11.92:1.0 - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] - >=sys-auth/polkit-0.100[introspection] - >=x11-libs/libXfixes-5.0 - x11-libs/libXtst - >=x11-wm/mutter-3.22.1[introspection] - >=x11-libs/startup-notification-0.11 - - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - - dev-libs/dbus-glib - dev-libs/libxml2:2 - media-libs/libcanberra[gtk3] - media-libs/mesa - >=media-sound/pulseaudio-2 - >=net-libs/libsoup-2.40:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) - networkmanager? ( - app-crypt/libsecret - >=gnome-extra/nm-applet-0.9.8 - >=net-misc/networkmanager-0.9.8:=[introspection] ) - nsplugin? ( >=dev-libs/json-glib-0.13.2 ) -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Introspection stuff needed via imports.gi.* -# 2. gnome-session is needed for gnome-session-quit -# 3. Control shell settings -# 4. Systemd needed for suspending support -# 5. xdg-utils needed for xdg-open, used by extension tool -# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows -# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c -# 8. IBus is needed for nls integration -RDEPEND="${COMMON_DEPEND} - app-accessibility/at-spi2-core:2[introspection] - >=app-accessibility/caribou-0.4.8 - dev-libs/libgweather:2[introspection] - >=sys-apps/accountsservice-0.6.14[introspection] - >=sys-power/upower-0.99:=[introspection] - x11-libs/pango[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - !openrc-force? ( >=sys-apps/systemd-31 ) - - x11-misc/xdg-utils - - media-fonts/dejavu - >=x11-themes/adwaita-icon-theme-3.19.90 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection] - >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] - browser-extension? ( gnome-extra/chrome-gnome-shell ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - >=dev-util/gtk-doc-am-1.17 - gnome-base/gnome-common - sys-devel/autoconf-archive - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig -" - -PATCHES=( - # Change favorites defaults, bug #479918 - "${FILESDIR}"/${PN}-3.22.0-defaults.patch - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch - # Add missing path to libmutter-clutter when building .gir, bug #597842 - "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch - # Little bug when user has toggled version validation in the session, bug #616698 - "${FILESDIR}"/${PV}-CVE-2017-8288.patch -) - -src_configure() { - # Do not error out on warnings - gnome2_src_configure \ - --enable-man \ - $(use_enable !openrc-force systemd) \ - $(use_with bluetooth) \ - $(use_enable networkmanager) \ - $(use_enable nsplugin browser-plugin) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" - python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" - - # Required for gnome-shell on hardened/PaX, bug #398941 - # Future-proof for >=spidermonkey-1.8.7 following polkit's example - if has_version '<dev-lang/spidermonkey-1.8.7'; then - pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} - elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - # Required for gnome-shell on hardened/PaX #457146 and #457194 - # PaX EMUTRAMP need to be on - elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then - pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} - else - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd" - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild index f4a7da3a7451..9d87933477f9 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SLOT="0" IUSE="+bluetooth +ibus +networkmanager nsplugin -openrc-force" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha ~arm ~ia64 ~ppc ~ppc64" +KEYWORDS="~alpha ~arm" # libXfixes-5.0 needed for pointer barriers # FIXME: diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest index 2c29a6fc09c3..2f11f92b5e37 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,5 +1,3 @@ EBUILD gnome-3.20.0.ebuild 1456 BLAKE2B 9acd17a4f24ff1220bcb3caf32bebf2b625150e02175c60b30390d5577b000de8f97f33ec88ca690afdaad20ba921f11d0b48ae4211f825f713c7eed5a634a6f SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f -EBUILD gnome-3.22.2.ebuild 1399 BLAKE2B 47d213fa95e659599b6538ea598a2afe598a001abaff560927ab5b75e55bb5d4c08fa203e581f6e53c9ebdd2445c69dccae6c46b04ac720360783e8400db8d6e SHA512 2abf56bbadce04382eeabe6cac07027df60e9308d3de2d2d6a2089b8629cc257cecd24ea68b8646a105b33743558efb102270280544cd32e78ae5d674fc26842 -EBUILD gnome-3.24.0.ebuild 1400 BLAKE2B e0329908ea4bc3db4ee0a5ecea0da1cfe00030dd5a1b7ab83e0ef7d944c4e204b0ed5fdbc286c8f5273f83e8ab3351d44d0d43b0e749ed6f3dd7bb65835a3d9a SHA512 280e8de05c613e31cd33066f1f0745ad114ec1d627a02143a418464a87de43243a94f9348cd4d9b24954910950fc38b81acf231e907eac2d52810bc608e61681 EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 2a83d561ded9713019c9e7360eeff82bcd01c4405fcae85202c6fc736fc7fff9ed5d31a1afedf224e756fb43c30d6784911e0fafd4e74f716bc44b4a7fb6595f SHA512 698c330c27fe7ecdbf8aead2d5e32ccb9e983ac2428c8f383654e057742f649bb0e543a24a723a36961a20e9d637d1bf8fbd7456c39c76bc9f4b0e968cab8ea2 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a diff --git a/gnome-base/gnome/gnome-3.22.2.ebuild b/gnome-base/gnome/gnome-3.22.2.ebuild deleted file mode 100644 index 80e2e88c30f6..000000000000 --- a/gnome-base/gnome/gnome-3.22.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 +cdr cups +extras" - -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/gdm-${PV} - - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV}[bluetooth?] - - >=x11-themes/gnome-backgrounds-3.22.1 - x11-themes/sound-theme-freedesktop - - accessibility? ( - >=app-accessibility/at-spi2-atk-2.22 - >=app-accessibility/at-spi2-core-2.22 - >=app-accessibility/caribou-0.4.21 - >=app-accessibility/orca-${PV} - >=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.30.2[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." -} diff --git a/gnome-base/gnome/gnome-3.24.0.ebuild b/gnome-base/gnome/gnome-3.24.0.ebuild deleted file mode 100644 index a02534c8d1ab..000000000000 --- a/gnome-base/gnome/gnome-3.24.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 +cdr cups +extras" - -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/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.24 - >=app-accessibility/at-spi2-core-2.24 - >=app-accessibility/caribou-0.4.21 - >=app-accessibility/orca-${PV} - >=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.30.2[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." -} diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest index 134eb0aefd70..ae4f6f934439 100644 --- a/gnome-base/gsettings-desktop-schemas/Manifest +++ b/gnome-base/gsettings-desktop-schemas/Manifest @@ -1,7 +1,5 @@ DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 BLAKE2B 0249dfbdc7d574824ad6c34cdbafc7859eba4d78494c80d42b9b5a739cfaa8bb6d43e13093148253dedd0ae2762261750f791d809ba8058a78098fc7f8dad510 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1 -DIST gsettings-desktop-schemas-3.24.0.tar.xz 620780 BLAKE2B 0d1585c394d3c08e20eea763c14a3453e37a9a3d7706d27fa1f41f9ecea926734783421a7e68a6333bc37905ce5c1caa025b21c872cc6985a8e64a6875d0c25c SHA512 b19fb29da29a3fa114536c0ce94b160f9c589568b626e487b5eca008791e539de9a89a81c69e41f8070b0369e6cfc800fe8b70247ecbab1bc32f24db759037c1 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833 EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209 -EBUILD gsettings-desktop-schemas-3.24.0.ebuild 771 BLAKE2B 4ecee752265adaa2257e31458a154a9bd1201b3aa899d6f493db57566ef7b8a651e1f5eab46f0507fe133e705f0da43f3c186cc3f49d7aed07bed8af582ea8c7 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d EBUILD gsettings-desktop-schemas-3.24.1.ebuild 768 BLAKE2B 3c928ad01fc820f2a73b512744fe6fb21aae6040406c25e1da393ac75df7dfda0fefd2f3b965da73db3f9c211dde66c17f0c05e68ac6c7db1754b5c6698a5ccd SHA512 154a85cb25b1b6b284739c82b68175816aa87a408569e89bc84c536ad997175556e61bcd87be7f1138ae81c1d62b07884344cd1cc65824638b2361c8ea3253d4 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild deleted file mode 100644 index a22fd1f8239a..000000000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="+introspection" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.31:2 - introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) - !<gnome-base/gdm-3.8 -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure $(use_enable introspection) -} diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 68130753358a..bee165c1c92b 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -4,5 +4,4 @@ DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823 DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8 EBUILD gvfs-1.30.4.ebuild 3682 BLAKE2B 2d3d1ef263069a971b730ca70ca5719a67279b393381e14ea385fc677be382d7e81d68a81e89a1a8cfd288e56fb2cf52577cc55568a666aba89b64e247cc47d1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad EBUILD gvfs-1.32.1-r1.ebuild 3832 BLAKE2B 955d8c66cd0277c972f0178335b3d5f0440315502fa24e045adf46f7dde459a2ffa508653294612234e2273ca6f138e42576fca0d8fd587e9e3e917e973ca9eb SHA512 0dcb98cbc2ac85c087b7860de06fd34e0c234300f92f985963f8d2bb3979e182b179ea1989b614dcf8fd0842b999f3bcde8811a802fd65de4ed26f6d6970ac57 -EBUILD gvfs-1.32.1.ebuild 3621 BLAKE2B 2364de0783d0a1a5d3a4de00f9528ebed53a40aea3056211ad5349c726921304682314bf3c6b040edd41f4fc726415a25cf05a49074885c1dfff28d289a1b52a SHA512 00057451a01ede2cc50c271bc14bfd53c50f3d56a2d386c0106b3550c0d577e7aca11e39568d02a3821e6695602b74e6c094d5798a809f3b1aa60005c46c989e MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc diff --git a/gnome-base/gvfs/gvfs-1.32.1.ebuild b/gnome-base/gvfs/gvfs-1.32.1.ebuild deleted file mode 100644 index a105e360978f..000000000000 --- a/gnome-base/gvfs/gvfs-1.32.1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools gnome2 systemd - -DESCRIPTION="Virtual filesystem implementation for gio" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" -REQUIRED_USE=" - cdda? ( udev ) - google? ( gnome-online-accounts ) - mtp? ( udev ) - udisks? ( udev ) - systemd? ( udisks ) -" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - app-crypt/gcr:= - >=dev-libs/glib-2.51:2 - dev-libs/libxml2:2 - net-misc/openssh - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - archive? ( app-arch/libarchive:= ) - bluray? ( media-libs/libbluray:= ) - fuse? ( >=sys-fs/fuse-2.8.0:0 ) - gnome-keyring? ( app-crypt/libsecret ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) - google? ( - >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] - >=net-libs/gnome-online-accounts-3.17.1:= ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - gtk? ( >=x11-libs/gtk+-3.0:3 ) - http? ( >=net-libs/libsoup-2.42:2.4 ) - ios? ( - >=app-pda/libimobiledevice-1.2:= - >=app-pda/libplist-1:= ) - mtp? ( - >=dev-libs/libusb-1.0.21 - >=media-libs/libmtp-1.1.12 ) - nfs? ( >=net-fs/libnfs-1.9.8 ) - policykit? ( - sys-auth/polkit - sys-libs/libcap ) - samba? ( >=net-fs/samba-4[client] ) - systemd? ( >=sys-apps/systemd-206:0= ) - udev? ( - cdda? ( dev-libs/libcdio-paranoia ) - >=virtual/libgudev-147:= - virtual/libudev:= ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - zeroconf? ( >=net-dns/avahi-0.6 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig - dev-util/gdbus-codegen - dev-util/gtk-doc-am - test? ( - >=dev-python/twisted-core-12.3.0 - || ( - net-analyzer/netcat - net-analyzer/netcat6 ) ) - !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) -" -# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043 -# test dependencies needed per https://bugzilla.gnome.org/700162 - -# Tests with multiple failures, this is being handled upstream at: -# https://bugzilla.gnome.org/700162 -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234 -) - -src_prepare() { - if ! use udev; then - sed -e 's/gvfsd-burn/ /' \ - -e 's/burn.mount.in/ /' \ - -e 's/burn.mount/ /' \ - -i daemon/Makefile.am || die - - # Uncomment when eautoreconf stops being needed always - eautoreconf - fi - - gnome2_src_prepare -} - -src_configure() { - # --enable-documentation installs man pages - # --disable-obexftp, upstream bug #729945 - gnome2_src_configure \ - --disable-gdu \ - --enable-documentation \ - --enable-gcr \ - --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(use_enable afp) \ - $(use_enable archive) \ - $(use_enable bluray) \ - $(use_enable cdda) \ - $(use_enable fuse) \ - $(use_enable gnome-keyring keyring) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable google) \ - $(use_enable gphoto2) \ - $(use_enable gtk) \ - $(use_enable http) \ - $(use_enable ios afc) \ - $(use_enable mtp libmtp) \ - $(use_enable mtp libusb) \ - $(use_enable nfs) \ - $(use_enable policykit admin) \ - $(use_enable samba) \ - $(use_enable systemd libsystemd-login) \ - $(use_enable udev gudev) \ - $(use_enable udev) \ - $(use_enable udisks udisks2) \ - $(use_enable zeroconf avahi) -} diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 04f8953e80dc..5b35f7c42e18 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,7 +1,5 @@ DIST nautilus-3.20.4.tar.xz 3453376 BLAKE2B 47e09f45909f6abd735c976ea6ab0b90c918490193a931b186472d9be1d22f5c7314647ec14e36a88b9f8013f3784f7788b4d9ef136e139e1b1cb41b0167c378 SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e -DIST nautilus-3.22.3.tar.xz 5104800 BLAKE2B f8eaa735f9c7398de038e428acffef74c4dde2254fd9e7868823a93ef835817b907a4079b58f3e121959da730a8ca171709cc2716759ad1376aa9c5a98a2025e SHA512 abad02d2b36230348cec04bcc2650cc352e232008c4e628096880a93b647a0da86b43b9df6cbd621334e7292e2d00f68010783858dbfa38061ab7eafd3c4c912 DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07 EBUILD nautilus-3.20.4.ebuild 2842 BLAKE2B 4988a1517e443a73e86d915d6d4db7f76d0422887b8ec76f65d00bf5d1e0e044fd773df619344476e23d4a95fcd281b12cd4c6d181e85e69550e1529cb03fdb6 SHA512 82e8360fffd669cdc4d31c1af637b7e557d4f0f59b582890a0d842c2924c711c653fa4d7d3faaa6cc48def59b7ad59ea3da80705189ffb2c34cd60f9b62f58df -EBUILD nautilus-3.22.3.ebuild 2865 BLAKE2B 795785efc37c3b4a2dfb3c915b843eb95e3293eaecefe9b4f8682f3321fdefaffda4197f2717fe66bea91e6b87ab7bfa6d3e8d9f47f678670da61a032a6a3e10 SHA512 c646ecb222c89e6a3f151b741b7c4444b5b4f0a9ee895601dffc0cf53b640c1ca3d12b249888a8b9c9c6039eced09e88c535afbc0bb2c181046d32376ac377cb EBUILD nautilus-3.24.2.1.ebuild 2864 BLAKE2B 66e72d848e05218740554e9c924149d3e0d5e38e0894e1e21e8eee2296516e25f0d185bd7e30de499c35a9209397327b0c142241a39379d6d96a1cad1de621e5 SHA512 8b46aa27923ace87256aa0aeb2848f6621e0c048c3c7c59bcdaf1d4dc2ad4810c6ccb5c6784837ed05b1648c7c4625a91ea291aaf8d19564496a5125214e2e71 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668 diff --git a/gnome-base/nautilus/nautilus-3.22.3.ebuild b/gnome-base/nautilus/nautilus-3.22.3.ebuild deleted file mode 100644 index c45db7515f0c..000000000000 --- a/gnome-base/nautilus/nautilus-3.22.3.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' - -inherit gnome2 readme.gentoo-r1 virtualx - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" - -KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: tests fails under Xvfb, but pass when building manually -# "FAIL: check failed in nautilus-file.c, line 8307" -# need org.gnome.SessionManager service (aka gnome-session) but cannot find it -RESTRICT="test" - -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=" - >=app-arch/gnome-autoar-0.1 - >=dev-libs/glib-2.49.1:2[dbus] - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.21.6:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3:3= - - gnome-base/dconf - >=gnome-base/gsettings-desktop-schemas-3.8.0 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - - exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - selinux? ( >=sys-libs/libselinux-2 ) - tracker? ( >=app-misc/tracker-0.16:= ) - xmp? ( >=media-libs/exempi-2.1.0:2 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.10 - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-proto/xproto -" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) -" - -# For eautoreconf -# gnome-base/gnome-common -# dev-util/gtk-doc-am" - -PDEPEND=" - gnome? ( x11-themes/adwaita-icon-theme ) - tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) - previewer? ( >=gnome-extra/sushi-0.1.9 ) - sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) - >=gnome-base/gvfs-1.14[gtk] -" -# Need gvfs[gtk] for recent:/// support - -src_prepare() { - if use previewer; then - DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. - To activate the previewer, select a file and press space; to - close the previewer, press space again." - fi - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-desktop \ - --disable-profiling \ - --disable-update-mimedb \ - $(use_enable exif libexif) \ - $(use_enable introspection) \ - $(use_enable packagekit) \ - $(use_enable sendto nst-extension) \ - $(use_enable selinux) \ - $(use_enable tracker) \ - $(use_enable xmp) -} - -src_test() { - virtx emake check -} - -src_install() { - use previewer && readme.gentoo_create_doc - gnome2_src_install -} - -pkg_postinst() { - gnome2_pkg_postinst - - if use previewer; then - readme.gentoo_print_elog - else - elog "To preview media files, emerge nautilus with USE=previewer" - fi -} |