gentoo resync : 20.03.2021

3 files changed, 5 insertions, 56 deletions

diff --git a/x11-misc/svkbd/Manifest b/x11-misc/svkbd/Manifest
index bb7ca68ab8a8..78addeb84966 100644
--- a/x11-misc/svkbd/Manifest
+++ b/x11-misc/svkbd/Manifest
@@ -1,5 +1,3 @@
 DIST svkbd-0.2.1.tar.gz 19476 BLAKE2B 8bb33195f82e0ce6c348d0526d8c07d75bbb44f96c133b44020037e312b04197b449cb2dbe586d0e7cd0dca022da1847cc472122a16b764787b46f4d14419b0d SHA512 c6b6f8e4cff4c8aa4ab5cc9369bacbfa226bee3cf7008351d9873a33a59751106b8cd21242c9d13ce463e68968a920459162bbd73173928acf68c067ac81e736
-DIST svkbd-0.2.tar.gz 19470 BLAKE2B 3b97cfe37439474a31f382f86706b47effab82a1ef5ba0a278e0e7241b304b2cd096c01d88a60fc8ed2c25fb4c019b3fbe18645378b4508f339e69739381f22f SHA512 320f212c21163bd143e468bc541f79bc290e695704db1f7912112b07e673b6cde9766768c1e153a88962a8385ff9ac6cb78c2da5ca8ffb1b57be5eac26d46553
-EBUILD svkbd-0.2.1.ebuild 886 BLAKE2B 0dc2d2e8165b9eeed559e01c33996583a5761c925e509f4566845c409c26bd06a605989fa6ee304787a8ce49419414e47a241601444bff649343d27c3cc30ffd SHA512 6cddd2d5278cd22f520bc5a390dd155ac5ef5f9e67cfd4d20b88f41246bf833068853d6d4b1198594eefae82e864e3a101440bd50f4af89b81ed2641d4069d7e
-EBUILD svkbd-0.2.ebuild 870 BLAKE2B 87e2cbf849bd5a8b2ed5a3c77e7303486747e475f87541cbb5990685b6f1be4250de473cc50210ab97d15496d90baf7f685455b28ef06ba36f45b6f0fbb31fb2 SHA512 5659c665a88fe7ea5aa72cc81470516e3ba3b3322cd36597a1a520ead73d5e7f794500643fb7491b3fb603a237af0af9787dd0f58795ec858faf0ed250169de3
+EBUILD svkbd-0.2.1-r1.ebuild 898 BLAKE2B b12f9f32bbc97b9554805bb8e32fee732c531b275d29aa8fb2bc7421da2189d1607e631a97b151bd7a79eba29047d82a14c10085f421af91aec1005a61f2530f SHA512 78b5cb227c31ad59a8fbacb6fd9b3cb3aa14de5927016fd6fe1b9decc414556995d1299e794804b13fbf7617f064c45beef279f8abc3afdb03251d6f21b4603f
 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/svkbd/svkbd-0.2.1.ebuild b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild
index bf864ebe3875..8542e85bf182 100644
--- a/x11-misc/svkbd/svkbd-0.2.1.ebuild
+++ b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit savedconfig toolchain-funcs
 
 DESCRIPTION="Simple Virtual Keyboard"
@@ -19,7 +20,7 @@ RDEPEND="
 	x11-libs/libXtst
 "
 DEPEND="
-	${DEPEND}
+	${RDEPEND}
 	x11-base/xorg-proto
 "
 
@@ -28,7 +29,7 @@ src_prepare() {
 
 	restore_config config.def.h
 
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile config.mk || die
 }
 
 src_compile() {
diff --git a/x11-misc/svkbd/svkbd-0.2.ebuild b/x11-misc/svkbd/svkbd-0.2.ebuild
deleted file mode 100644
index a6f135c3de90..000000000000
--- a/x11-misc/svkbd/svkbd-0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Simple Virtual Keyboard"
-HOMEPAGE="https://tools.suckless.org/x/svkbd/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXtst
-"
-DEPEND="
-	${DEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-
-	restore_config config.def.h
-
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_compile() {
-	for i in layout*.h; do
-		i=${i/layout.}; i=${i/.h}
-		emake \
-			CC="$(tc-getCC)" \
-			PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-			LAYOUT=${i}
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	doman ${PN}.1
-
-	save_config config.def.h
-}