8 files changed, 59 insertions, 62 deletions
diff --git a/app-crypt/trezord-go/Manifest b/app-crypt/trezord-go/Manifest
deleted file mode 100644
index 9326040d..00000000
--- a/app-crypt/trezord-go/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST trezord-go-2.0.6.tar.gz 730293 BLAKE2B 3de9054d3a78af2ee95e31300123e6f308487ca10d59a531ba2ebfc3a21e2f556985e546b878c0c067d458a04fc0ee6c95e97fcbc0e85e0d2a0dcc601f8d7eeb SHA512 d60bd27d9638d078e8db7e12650e80862b4ce9ba90dc604b0e4b4fea2978127b907e75babb40a895f51587186aa6a715b19dd1110d561dfbb20e2b928760d8be
diff --git a/app-crypt/trezord-go/files/51-trezor.rules b/app-crypt/trezord-go/files/51-trezor.rules
deleted file mode 100644
index 43b61e66..00000000
--- a/app-crypt/trezord-go/files/51-trezor.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# From https://github.com/trezor/trezor-common/blob/master/udev/51-trezor.rules
-
-# TREZOR
-SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001",  MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-
-# TREZOR v2
-SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
diff --git a/app-crypt/trezord-go/files/trezord-go.service b/app-crypt/trezord-go/files/trezord-go.service
deleted file mode 100644
index 7c4dd22a..00000000
--- a/app-crypt/trezord-go/files/trezord-go.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=TREZOR Communication Daemon aka TREZOR Bridge
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/trezord-go
-
-[Install]
-WantedBy=default.target
diff --git a/app-crypt/trezord-go/trezord-go-2.0.6.ebuild b/app-crypt/trezord-go/trezord-go-2.0.6.ebuild
deleted file mode 100644
index fcb06ab0..00000000
--- a/app-crypt/trezord-go/trezord-go-2.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build udev systemd
-
-DESCRIPTION="TREZOR Communication Daemon aka TREZOR Bridge"
-HOMEPAGE="https://trezor.io/"
-SRC_URI="https://github.com/trezor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-lang/go"
-
-EGO_GH="github.com/trezor"
-EGO_PN="${EGO_GH}/${PN}"
-EGO_S="${WORKDIR}/src/${EGO_PN}"
-
-DOCS=(
-	"src/${EGO_PN}/README.md"
-)
-
-src_unpack () {
-	mkdir -p "${WORKDIR}/src"
-	mkdir -p "${S}/src/${EGO_GH}"
-
-	cd "${WORKDIR}/src"
-	unpack ${A}
-	mv "${P}" "${S}/src/${EGO_PN}"
-}
-
-src_install () {
-	dobin "${PN}"
-
-	udev_dorules "${FILESDIR}/51-trezor.rules"
-	systemd_douserunit "${FILESDIR}/${PN}.service"
-
-	default
-}
diff --git a/app-crypt/trezord/Manifest b/app-crypt/trezord/Manifest
new file mode 100644
index 00000000..b12b26c6
--- /dev/null
+++ b/app-crypt/trezord/Manifest
@@ -0,0 +1 @@
+DIST trezord-2.0.7.tar.gz 731503 BLAKE2B 90c9caf62056e9591696fe3b9794ae92a654881adff28fa181692007de544726337af7300aa84194c5c3add86968bc44377d1bcf39016bae9c227896ac6388a7 SHA512 2f65f1ed4dfefd05268324116c57dcf5486dde515039f2c976ed3cc2a48b575ee08f90f22729e2259567942bcfd27e4b378324ca063fe8c709b5937a75e5fcef
diff --git a/app-crypt/trezord/files/trezord.service b/app-crypt/trezord/files/trezord.service
new file mode 100644
index 00000000..294af0bb
--- /dev/null
+++ b/app-crypt/trezord/files/trezord.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TREZOR Bridge
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/trezord
+
+[Install]
+WantedBy=default.target
diff --git a/app-crypt/trezord-go/metadata.xml b/app-crypt/trezord/metadata.xml
index 82f7232e..82f7232e 100644
--- a/app-crypt/trezord-go/metadata.xml
+++ b/app-crypt/trezord/metadata.xml
diff --git a/app-crypt/trezord/trezord-2.0.7.ebuild b/app-crypt/trezord/trezord-2.0.7.ebuild
new file mode 100644
index 00000000..e8ded599
--- /dev/null
+++ b/app-crypt/trezord/trezord-2.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build udev systemd
+
+MY_PN="trezord-go"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="TREZOR Communication Daemon aka TREZOR Bridge"
+HOMEPAGE="https://trezor.io/"
+SRC_URI="https://github.com/trezor/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-lang/go"
+
+EGO_GH="github.com/trezor"
+EGO_PN="${EGO_GH}/${MY_PN}"
+EGO_S="${S}/src/${EGO_PN}"
+
+DOCS=(
+	"src/${EGO_PN}/README.md"
+)
+
+src_unpack () {
+	mkdir -p "${WORKDIR}/src" || die
+	mkdir -p "${S}/src/${EGO_GH}" || die
+
+	cd "${WORKDIR}/src" || die
+	unpack ${A}
+	mv "${MY_P}" "${EGO_S}" || die
+}
+
+src_install () {
+	newbin "${MY_PN}" "${PN}"
+
+	if use kernel_linux ; then
+		udev_newrules "${EGO_S}/release/linux/trezor.rules" 51-trezor.rules
+		systemd_douserunit "${FILESDIR}/${PN}.service"
+	fi
+
+	default
+}