x11-misc/xkb-switch: Bump and add live

Package-Manager: Portage-3.0.14, Repoman-3.0.2

5 files changed, 86 insertions, 20 deletions

diff --git a/x11-misc/xkb-switch/Manifest b/x11-misc/xkb-switch/Manifest
index 23fec39..ae4ef61 100644
--- a/x11-misc/xkb-switch/Manifest
+++ b/x11-misc/xkb-switch/Manifest
@@ -1 +1 @@
-DIST xkb-switch-1.6.0.tar.gz 20458 BLAKE2B ea63938ab9deda50cc5ec47c5d5760d0227d48106aa248ede3f79aacbf87aabaeeb194db0ab8f1d4138fc0b0ef7e7cbc30a5eb0a74c25465fbfcd07f8cc5a88f SHA512 38703829fdfdcc2e84ce8d516446173266314ee0116a2263b6c9f22b3d07485248951ceabe70964a20b7a21157fd53bb2ab9d5750e995a45d7450e704100d5c3
+DIST xkb-switch-1.8.5.tar.gz 21356 BLAKE2B d8efc108f708516c393deda610e23314fab96d0c27acd84fa721d7d0301f2a4403c040a3664cb425a312e86e7f7a4f58c4c49af5724c2d4aa22b17d67c9cd2c1 SHA512 bc71b668e56fae3c1ce1ce306dea062ade4a58a53c52b27d1353c4444e6c56fc8fbb57ac7920fb5cf0ac6baf9263de86194f277721e37913b8198b9726d084cd
diff --git a/x11-misc/xkb-switch/metadata.xml b/x11-misc/xkb-switch/metadata.xml
index 7869e07..6ecd36c 100644
--- a/x11-misc/xkb-switch/metadata.xml
+++ b/x11-misc/xkb-switch/metadata.xml
@@ -5,4 +5,7 @@
 		<email>azahi@teknik.io</email>
 		<name>azahi</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">grwlf/xkb-switch</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xkb-switch/xkb-switch-1.6.0.ebuild b/x11-misc/xkb-switch/xkb-switch-1.6.0.ebuild
deleted file mode 100644
index f12864f..0000000
--- a/x11-misc/xkb-switch/xkb-switch-1.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib
-
-DESCRIPTION="Switch your X keyboard layouts from the command line"
-HOMEPAGE="https://github.com/ierton/xkb-switch"
-SRC_URI="https://github.com/ierton/xkb-switch/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libxkbfile"
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/x11-misc/xkb-switch/xkb-switch-1.8.5.ebuild b/x11-misc/xkb-switch/xkb-switch-1.8.5.ebuild
new file mode 100644
index 0000000..b9c52a0
--- /dev/null
+++ b/x11-misc/xkb-switch/xkb-switch-1.8.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ierton/xkb-switch.git"
+fi
+
+inherit cmake multilib ${SCM}
+
+DESCRIPTION="Switch your X keyboard layouts from the command line"
+HOMEPAGE="https://github.com/ierton/xkb-switch"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ierton/xkb-switch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libxkbfile
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+		-i CMakeLists.txt
+
+	cmake_src_prepare
+	default
+}
diff --git a/x11-misc/xkb-switch/xkb-switch-9999.ebuild b/x11-misc/xkb-switch/xkb-switch-9999.ebuild
new file mode 100644
index 0000000..b9c52a0
--- /dev/null
+++ b/x11-misc/xkb-switch/xkb-switch-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ierton/xkb-switch.git"
+fi
+
+inherit cmake multilib ${SCM}
+
+DESCRIPTION="Switch your X keyboard layouts from the command line"
+HOMEPAGE="https://github.com/ierton/xkb-switch"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ierton/xkb-switch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libxkbfile
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+		-i CMakeLists.txt
+
+	cmake_src_prepare
+	default
+}