commit: 68f3096fbb5c987b2a2dcb65377595256ad3742f Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> AuthorDate: Fri Jan 12 12:55:08 2018 +0000 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> CommitDate: Fri Jan 12 12:55:08 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=68f3096f
gnome-base/gnome-session: drop old Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../gnome-session/gnome-session-3.20.0.ebuild | 123 --------------------- gnome-base/gnome-session/gnome-session-9999.ebuild | 3 +- gnome-base/gnome-session/metadata.xml | 12 +- 3 files changed, 5 insertions(+), 133 deletions(-) diff --git a/gnome-base/gnome-session/gnome-session-3.20.0.ebuild b/gnome-base/gnome-session/gnome-session-3.20.0.ebuild deleted file mode 100644 index 016129fc..00000000 --- a/gnome-base/gnome-session/gnome-session-3.20.0.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~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 ) - - virtual/opengl - 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/gnome-themes-standard-2.91.92 - sys-apps/dbus[X] - !systemd? ( - sys-auth/consolekit - >=dev-libs/dbus-glib-0.76 - ) -" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=sys-devel/gettext-0.10.40 - dev-libs/libxslt - >=dev-util/intltool-0.40.6 - 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 kde-base/kdm; 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-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild index f4f5ad62..1c0186cc 100644 --- a/gnome-base/gnome-session/gnome-session-9999.ebuild +++ b/gnome-base/gnome-session/gnome-session-9999.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="5" GCONF_DEBUG="yes" diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml index 06d13a57..996e7cac 100644 --- a/gnome-base/gnome-session/metadata.xml +++ b/gnome-base/gnome-session/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="gconf">Optional support for <pkg>gnome-base/gconf</pkg> - configuration storage system</flag> -</use> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> </pkgmetadata>
