Reimplement i3lock script handling

Now there is central package for my specific i3lock script and
pm trigger. Package background-lnxpcs is not solely for images and
background.

7 files changed, 49 insertions, 43 deletions

diff --git a/profiles/desktop/x/packages b/profiles/desktop/x/packages
index 3601a6d..1511065 100644
--- a/profiles/desktop/x/packages
+++ b/profiles/desktop/x/packages
@@ -1,7 +1,6 @@
 # i3
 x11-wm/i3
-sys-power/pm-i3lock
-x11-themes/background-lnxpcs
+x11-misc/myi3lock
 
 # My extensions
 x11-misc/xshot
diff --git a/sys-power/pm-i3lock/pm-i3lock-1.0.ebuild b/sys-power/pm-i3lock/pm-i3lock-1.0.ebuild
deleted file mode 100644
index e8e9072..0000000
--- a/sys-power/pm-i3lock/pm-i3lock-1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-EAPI=6
-
-DESCRIPTION="pm-utils hook to lock all i3 sessions on suspend"
-HOMEPAGE="http://git.cynerd.cz/gentoo-personal-overlay/"
-S="${WORKDIR}"
-
-LICENSE="GPL-3.0+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	x11-misc/i3lock
-	sys-power/pm-utils"
-
-src_install() {
-	exeinto /etc/pm/sleep.d
-	doexe "${FILESDIR}/10lock"
-}
diff --git a/x11-misc/myi3lock/files/myi3lock b/x11-misc/myi3lock/files/myi3lock
new file mode 100755
index 0000000..f466def
--- /dev/null
+++ b/x11-misc/myi3lock/files/myi3lock
@@ -0,0 +1,12 @@
+#!/bin/sh
+BACKS="/usr/share/backgrounds"
+
+# Set pidgin to offline
+purple-remote 'setstatus?status=offline'
+# Run lock in background and when unlocked switch pidgin back to online
+nohup /bin/sh -ec "
+i3lock -n -c 000000 -i $(shuf -n1 -e "$BACKS"/*)
+purple-remote 'setstatus?status=available'
+" >/dev/null 2>&1 &
+# Power off screen
+xset dpms force off
diff --git a/sys-power/pm-i3lock/files/10lock b/x11-misc/myi3lock/files/pm-utils-lock
index 109dbfe..901b1b1 100755
--- a/sys-power/pm-i3lock/files/10lock
+++ b/x11-misc/myi3lock/files/pm-utils-lock
@@ -5,7 +5,7 @@
 case "$1" in
 	hibernate|suspend)
 		for socket in $(find /run/user/*/i3 /tmp/i3-* -name ipc-socket\* 2>/dev/null); do
-			i3-msg -s $socket "exec i3lock-lnxpcs"
+			i3-msg -s $socket "exec myi3lock"
 		done
 	;;
 	*) exit $NA
diff --git a/x11-misc/myi3lock/myi3lock-1.0-r1.ebuild b/x11-misc/myi3lock/myi3lock-1.0-r1.ebuild
new file mode 100644
index 0000000..89dc0b0
--- /dev/null
+++ b/x11-misc/myi3lock/myi3lock-1.0-r1.ebuild
@@ -0,0 +1,22 @@
+EAPI=7
+
+DESCRIPTION="Script calling i3lock used to automate some tasks on lock"
+HOMEPAGE="https://git.cynerd.cz"
+
+LICENSE="GPL-3.0+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-misc/i3lock
+	x11-themes/background-lnxpcs
+	sys-power/pm-utils
+	x11-wm/i3"
+BDEPEND=""
+
+src_install() {
+	dobin "${FILESDIR}/myi3lock"
+
+	exeinto /etc/pm/sleep.d
+	newexe  "${FILESDIR}/pm-utils-lock" "10lock"
+}
diff --git a/x11-themes/background-lnxpcs/background-lnxpcs-0.3.ebuild b/x11-themes/background-lnxpcs/background-lnxpcs-0.3-r1.ebuild
index 511ee9d..78c334a 100644
--- a/x11-themes/background-lnxpcs/background-lnxpcs-0.3.ebuild
+++ b/x11-themes/background-lnxpcs/background-lnxpcs-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Background pictures from lnxpcs and relevant scripts"
 HOMEPAGE="https://gitlab.com/jstpcs/lnxpcs"
@@ -12,32 +12,27 @@ LICENSE="GPL-3.0+"
 SLOT="0"
 IUSE="1440p"
 
-DEPENDS="media-gfx/imagemagick[png]"
-RDEPEND="
-	x11-misc/i3lock
-	media-gfx/feh[xinerama]"
+RDEPEND="media-gfx/feh[xinerama]"
+BDEPEND="media-gfx/imagemagick[png]"
 
 WALLPAPERS="bash cron gcc gnu gnu-linux iptables kernel kill python root su sudo vim"
 
 src_compile() {
-	local RESOL="1920 1080"
-	if use 1440p; then
-		RESOL="2560 1440"
-	fi
-	for IMG in $WALLPAPERS; do
-		./makemywall $RESOL "cards/black/$IMG-card-black.png"
+	local resolution="1920 1080"
+	use 1440p && resolution="2560 1440"
+
+	for img in $WALLPAPERS; do
+		./makemywall $resolution "cards/black/$img-card-black.png"
 	done
 }
 
 src_install() {
-	local RES="1920x1080"
-	if use 1440p; then
-		RES="2560x1440"
-	fi
+	local resolution="1920x1080"
+	use 1440p && resolution="2560x1440"
+
 	insinto "/usr/share/backgrounds"
-	for IMG in $WALLPAPERS; do
-		doins "$IMG-card-black-$RES.png"
+	for img in $WALLPAPERS; do
+		doins "$img-card-black-$resolution.png"
 	done
 	dobin "${FILESDIR}/i3background"
-	dobin "${FILESDIR}/i3lock-lnxpcs"
 }
diff --git a/x11-themes/background-lnxpcs/files/i3lock-lnxpcs b/x11-themes/background-lnxpcs/files/i3lock-lnxpcs
deleted file mode 100755
index 7584750..0000000
--- a/x11-themes/background-lnxpcs/files/i3lock-lnxpcs
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-BACKS="/usr/share/backgrounds"
-i3lock -c 000000 -i $(shuf -n1 -e "$BACKS"/*)
-xset dpms force off