From b1a95928e7b278b86e2ba8396bbec600b982a572 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 9 Apr 2019 19:05:22 +0200
Subject: xfce-extra/xfce4-screensaver: Remove dep on xscreensaver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/682874
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../xfce4-screensaver-0.1.4-r1.ebuild              | 74 +++++++++++++++++++++
 .../xfce4-screensaver-0.1.4.ebuild                 | 75 ----------------------
 2 files changed, 74 insertions(+), 75 deletions(-)
 create mode 100644 xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
 delete mode 100644 xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4.ebuild

diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..c0da1b1fec71
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="consolekit +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+RDEPEND="
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86misc:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	>=xfce-base/garcon-0.5.0:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/libxfce4util-4.12.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	consolekit? ( sys-auth/consolekit )
+	locking? (
+		pam? ( virtual/pam )
+	)
+	opengl? ( virtual/opengl )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/dbus
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		# disable docbook for now
+		ac_cv_path_XMLTO=no
+
+		# xscreensaver dirs autodetection doesn't seem to work
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+
+		$(use_with opengl libgl)
+		$(use_enable locking)
+		$(use_enable pam)
+		$(use_with consolekit console-kit)
+		$(use_with systemd)
+	)
+
+	if use pam; then
+
+	myconf+=( --with-pam-auth-type=system )
+
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4.ebuild
deleted file mode 100644
index 6df580273b15..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="consolekit +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	x11-misc/xscreensaver
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
-	locking? (
-		pam? ( virtual/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(use_with systemd)
-	)
-
-	if use pam; then
-
-	myconf+=( --with-pam-auth-type=system )
-
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-- 
cgit v1.2.3-65-gdbad