[gentoo-commits] repo/proj/guru:master commit in: x11-drivers/OpenTabletDriver-bin/files/, x11-drivers/OpenTabletDriver-bin/

[Theo Anderson]

commit:     46c2c356c2345bf16a721730be396b91eb0c2981
Author:     Ethan Nijmeh <ethannij <AT> gmail <DOT> com>
AuthorDate: Sun May  2 06:05:11 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sun May  2 06:07:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=46c2c356

x11-drivers/OpenTabletDriver-bin: fixed formatting

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ethan Nijmeh <ethannij <AT> gmail.com>

 x11-drivers/OpenTabletDriver-bin/Manifest          |  4 +-
 .../OpenTabletDriver-bin-0.5.3.1.ebuild            | 52 +++++++++++++---------
 x11-drivers/OpenTabletDriver-bin/files/otd         |  2 +-
 x11-drivers/OpenTabletDriver-bin/files/otd-gui     |  4 +-
 x11-drivers/OpenTabletDriver-bin/metadata.xml      |  1 +
 5 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/x11-drivers/OpenTabletDriver-bin/Manifest b/x11-drivers/OpenTabletDriver-bin/Manifest
index c167f9078..de81ddd4c 100644
--- a/x11-drivers/OpenTabletDriver-bin/Manifest
+++ b/x11-drivers/OpenTabletDriver-bin/Manifest
@@ -1,2 +1,2 @@
-DIST OpenTabletDriver.tar.gz 4040912 BLAKE2B 0d0a05cfc5ed0339e65e43acddf701f26b12021f82c9d69db494887b71032a64be0f740f03ba518dda09c9cff79fc97d8b1599fbef5aba694fd5ad1f184d3020 SHA512 88e84cd3ea1722e4e7a252bb371455e3eb61f8ddf30cfd83d24149b92c33cf18112cbbabb0b7b7d443060b7742ac1910bd046b5489d685c5f60156c214f56f19
-DIST v0.5.3.1.tar.gz 174676 BLAKE2B a599aa070a8153ff9a63d0f4c717ac6bd62a03c0ca962612ad804908b686bbe80114c1b79a49fd43200963084ea6f68c5dbc349248509c4705792982c2e48f66 SHA512 55415e50559c6203f808c411a6111771d4639f3e1db67388da2f01068312afd744bd98a8c9fbf4d59f8ad94e1c71887dedcb032c354ec9d1f192fd091cd71426
+DIST OpenTabletDriver-0.5.3.1.tar.gz 4040912 BLAKE2B 0d0a05cfc5ed0339e65e43acddf701f26b12021f82c9d69db494887b71032a64be0f740f03ba518dda09c9cff79fc97d8b1599fbef5aba694fd5ad1f184d3020 SHA512 88e84cd3ea1722e4e7a252bb371455e3eb61f8ddf30cfd83d24149b92c33cf18112cbbabb0b7b7d443060b7742ac1910bd046b5489d685c5f60156c214f56f19
+DIST OpenTabletDriver-source-0.5.3.1.tar.gz 174676 BLAKE2B a599aa070a8153ff9a63d0f4c717ac6bd62a03c0ca962612ad804908b686bbe80114c1b79a49fd43200963084ea6f68c5dbc349248509c4705792982c2e48f66 SHA512 55415e50559c6203f808c411a6111771d4639f3e1db67388da2f01068312afd744bd98a8c9fbf4d59f8ad94e1c71887dedcb032c354ec9d1f192fd091cd71426

diff --git a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild
index f738e58a3..59c20366d 100644
--- a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild
+++ b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild
@@ -1,19 +1,21 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 EAPI=7
 
 inherit desktop
 
-DESCRIPTION="A cross platform tablet driver (binary package)"
-HOMEPAGE="https://github.com/OpenTabletDriver"
+MY_PN=OpenTabletDriver
 
-SRC_URI="https://github.com/OpenTabletDriver/OpenTabletDriver/archive/refs/tags/v${PV}.tar.gz https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${PV}/OpenTabletDriver.linux-x64.tar.gz -> OpenTabletDriver.tar.gz"
+DESCRIPTION="Cross platform tablet driver (binary package)"
+HOMEPAGE="https://github.com/OpenTabletDriver"
+SRC_URI="https://github.com/OpenTabletDriver/OpenTabletDriver/archive/refs/tags/v${PV}.tar.gz -> OpenTabletDriver-source-${PV}.tar.gz https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${PV}/OpenTabletDriver.linux-x64.tar.gz -> OpenTabletDriver-${PV}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="GPL-3+"
-
-SP="otd"
-
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE=""
+
 DEPEND="
 	x11-libs/libX11
 	x11-libs/libXrandr
@@ -22,15 +24,16 @@ DEPEND="
 	|| ( dev-dotnet/dotnet-sdk-bin dev-dotnet/dotnet-runtime-bin )
 "
 
-pkgname=OpenTabletDriver
-S=${WORKDIR}/${pkgname}
-LP=opentabletdriver
+S="${WORKDIR}/${MY_PN}"
 src_install() {
-	cd "${S}"
+	local LP=opentabletdriver
+	local SP="otd"
+
+	cd "${S}" || die
 
 	# install -do root "${D}/usr/share/${PN}"
 
-	exeinto "/usr/share/${pkgname}"
+	exeinto "/usr/share/${MY_PN}"
 	exeopts -o root -Dm755
 
 	for binary in *.dll *.json; do
@@ -44,23 +47,28 @@ src_install() {
 		doexe "$bin"
 	done
 
-	insinto "/usr/share/${pkgname}"
+	insinto "/usr/share/${MY_PN}"
 	doins -r "Configurations"
 
-	install -Dm 644 -o root "${S}/99-${LP}.rules" -t "${D}/usr/lib/udev/rules.d"
-	udevadm control --reload
-
-	cd "${FILESDIR}"
-	install -Dm 755 -o root "${SP}" -t "${D}/usr/bin"
-	install -Dm 755 -o root "${SP}-gui" -t "${D}/usr/bin"
+	doins "${S}/99-${LP}.rules" "/usr/lib/udev/rules.d"
+	#install -Dm 644 -o root "${S}/99-${LP}.rules" -t "${D}/usr/lib/udev/rules.d"
+	udevadm control --reload || die
 
+	cd "${FILESDIR}" || die
+	#install -Dm 755 -o root "${SP}" -t "${D}/usr/bin"
+	dobin "${SP}"
+	#install -Dm 755 -o root "${SP}-gui" -t "${D}/usr/bin"
+	dobin "${SP}-gui"
 
-	cd ${WORKDIR}/OpenTabletDriver-${PV}/OpenTabletDriver.UX/Assets
+	cd "${WORKDIR}/${MY_PN}-${PV}/${MY_PN}.UX/Assets" || die
 	doicon "otd.png"
 	make_desktop_entry /usr/bin/otd-gui OpenTabletDriver otd Settings
 }
 
 pkg_postinst() {
-	ewarn "If this is your first time installing,"
-	ewarn "please replug your tablet."
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please replug your tablet before attempting to use the driver"
+	fi
+	#ewarn "If this is your first time installing,"
+	#ewarn "please replug your tablet."
 }

diff --git a/x11-drivers/OpenTabletDriver-bin/files/otd b/x11-drivers/OpenTabletDriver-bin/files/otd
old mode 100755
new mode 100644
index 0f85bbe46..76d0b66e4
--- a/x11-drivers/OpenTabletDriver-bin/files/otd
+++ b/x11-drivers/OpenTabletDriver-bin/files/otd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /usr/bin/env bash
 cd /usr/share/opentabletdriver-bin
 if [ $# -eq 0 ]
 then

diff --git a/x11-drivers/OpenTabletDriver-bin/files/otd-gui b/x11-drivers/OpenTabletDriver-bin/files/otd-gui
old mode 100755
new mode 100644
index 1cdefe9d4..f507003c4
--- a/x11-drivers/OpenTabletDriver-bin/files/otd-gui
+++ b/x11-drivers/OpenTabletDriver-bin/files/otd-gui
@@ -1,3 +1,3 @@
-#!/bin/bash
+#! /usr/bin/env bash
 cd /usr/share/opentabletdriver-bin
-dotnet ./OpenTabletDriver.UX.Gtk.dll "$@"
+dotnet ./OpenTabletDriver.UX.Gtk.dll "$@"
\ No newline at end of file

diff --git a/x11-drivers/OpenTabletDriver-bin/metadata.xml b/x11-drivers/OpenTabletDriver-bin/metadata.xml
index 0f1124053..4eb0050fd 100644
--- a/x11-drivers/OpenTabletDriver-bin/metadata.xml
+++ b/x11-drivers/OpenTabletDriver-bin/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>ethannij@×××××.com</email>
+		<name>Ethan Nijmeh</name>
 	</maintainer>
 </pkgmetadata>