xfce-base/xfce4-session: Remove redundant version

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 95f0da8a358384031a66b2b94f9b9956062a3a84..3fd800cd30a4f565703e58cce7baa1a62eb23f5a 100644 (file)
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,2 +1 @@
-DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.14.0.tar.bz2 826950 BLAKE2B 164fd9f61f03a61e705abf1f7ab82e81eccbd5269d28d66f6da7234ba073d38a1b38d1be0ddb5f3c055e829adf12673611a2b0ea0585f9fd1d2806b17cf0e761 SHA512 fba79ef9727d47514c5e4223376c49057b714f9be9bda6031a1220f4840abb257d31517252180c0af2e7cd6969bbc4e6f525b00cac594e1a3b80f09f3f2335cb

diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
deleted file mode 100644 (file)
index aac01cf..0000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/scripts/xflock4  2016-02-02 10:40:15.726495183 -0700
-+++ b/scripts/xflock4  2016-02-02 10:43:17.548061336 -0700
-@@ -24,10 +24,12 @@
- PATH=/bin:/usr/bin
- export PATH
- 
--# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-+# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective
-+# daemon is running
- for lock_cmd in \
-     "xscreensaver-command -lock" \
--    "gnome-screensaver-command --lock"
-+    "gnome-screensaver-command --lock" \
-+    "light-locker-command --lock"
- do
-     $lock_cmd >/dev/null 2>&1 && exit
- done

diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
deleted file mode 100644 (file)
index 5c7c886..0000000
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="elogind nls policykit systemd upower +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-       x11-apps/iceauth
-       x11-libs/libSM:=
-       >=x11-libs/libwnck-2.30:1=
-       x11-libs/libX11:=
-       >=xfce-base/libxfce4util-4.11:=
-       >=xfce-base/libxfce4ui-4.12.1:=
-       >=xfce-base/xfconf-4.10:=
-       policykit? ( >=sys-auth/polkit-0.102:= )
-       upower? ( >=sys-power/upower-0.9.23 )"
-RDEPEND="${COMMON_DEPEND}
-       x11-apps/xrdb
-       nls? ( x11-misc/xdg-user-dirs )
-       !systemd? ( upower? ( sys-power/pm-utils ) )
-       xscreensaver? ( || (
-               >=x11-misc/xscreensaver-5.26
-               x11-misc/light-locker
-               >=x11-misc/xlockmore-5.43
-               x11-misc/slock
-               x11-misc/alock[pam]
-       ) )"
-DEPEND="${COMMON_DEPEND}
-       dev-util/intltool
-       sys-devel/gettext
-       virtual/pkgconfig"
-
-REQUIRED_USE="elogind? ( policykit )
-       systemd? ( policykit )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-       "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
-       local myconf=(
-               $(use_enable policykit polkit)
-               --with-xsession-prefix="${EPREFIX}"/usr
-       )
-       use upower && myconf+=( --enable-upower )
-
-       econf "${myconf[@]}"
-}
-
-src_install() {
-       default
-       find "${ED}" -name '*.la' -delete || die
-
-       local sessiondir=/etc/X11/Sessions
-       echo startxfce4 > "${T}"/Xfce4 || die
-       exeinto ${sessiondir}
-       doexe "${T}"/Xfce4
-       dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
-       gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-       gnome2_icon_cache_update
-}