gentoo resync : 05.12.2021

3 files changed, 30 insertions, 28 deletions

diff --git a/dev-embedded/lpc21isp/Manifest b/dev-embedded/lpc21isp/Manifest
index 91013b211a8e..9b36d0f7164c 100644
--- a/dev-embedded/lpc21isp/Manifest
+++ b/dev-embedded/lpc21isp/Manifest
@@ -1,3 +1,3 @@
-DIST lpc21isp_185.tar.gz 54735 BLAKE2B 0ba04fca994891ccd68a2d6b6c981bb6e2cf91a70eaa2ba576eccaad328591665b53ad551d349a59c7b86e2636504c09276a16f3f5a34953d643b4f1fa4628ff SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954
-EBUILD lpc21isp-1.85.ebuild 498 BLAKE2B 34c312187a2fb9394c571ab349edea83f5d43e0731ced1b56e4a993521a1f5c8aecb1c87c53a16621a7b06e8917bae3ae509b53ed3804598c9451d49771d4e71 SHA512 83254c1be307b30ae41bf91c3271e26ffa940c59d0e0866be93cd5b68fb3f26c0033b90bf4acdaac1cd5309ea838cedbc1128eeae63877388969ab670b77f62b
+DIST lpc21isp-1.97.tar.gz 62171 BLAKE2B 0c01e35c4006f6b106651629f82a025fa15810e0b809adc8d672d1e8a8bde0e81b897bfd2fab88b770ac5527ded537567c1e8b3eb16f938752c56779f5435aa3 SHA512 bd4644352b9d4f3c24f93d8fe68274e2d238d9c91d3d0d6a0c06b878d31099cada772b35ce94885bccd309f5e2e56bc881a0a5302901349046a51537cfebb795
+EBUILD lpc21isp-1.97.ebuild 650 BLAKE2B 3639baa7f2ed79deab68747d94616d37c922d48bbd7761e83b1dd017c97e30b1e9c9b2e8203ba552581ca1479c1d6db5d91c8802d08fbf5cb3a5885a6cbb31ce SHA512 5bff48c8c7196526236f4c74d878397f03965a46280ad5f363f928fe1cc54bda01d1f7f8aadcb0d6204bac8e8fd3cf531749d44d06e708fbdb43a16e08b082a2
 MISC metadata.xml 429 BLAKE2B 90078e26349fa08b044a46975e2cdf36dec0161218850f286e552e33ca2d4b310452592db548c9ee0fd53ff8ec68797d989055f2f7a9e7c7df5073a583e1089b SHA512 88a89938b6abc3bc76e684497800b96824ef19c483c2e2bc7f0c1e6858e739f8beb79f517a3563b9e2e2029178a85c3f0093e026c08b67c49c525c4e903300a1
diff --git a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild b/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
deleted file mode 100644
index fd08a385c1e2..000000000000
--- a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PN="${PN}_$(delete_all_version_separators)"
-
-DESCRIPTION="In-circuit programming (ISP) tool for the NXP microcontrollers"
-HOMEPAGE="https://sourceforge.net/projects/lpc21isp/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	dobin lpc21isp
-}
diff --git a/dev-embedded/lpc21isp/lpc21isp-1.97.ebuild b/dev-embedded/lpc21isp/lpc21isp-1.97.ebuild
new file mode 100644
index 000000000000..081ebfcad4fe
--- /dev/null
+++ b/dev-embedded/lpc21isp/lpc21isp-1.97.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}_$(ver_rs 1- '')"
+
+DESCRIPTION="In-circuit programming (ISP) tool for the NXP microcontrollers"
+HOMEPAGE="https://sourceforge.net/projects/lpc21isp/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+
+	# Upstream makefile has got DOS line endings so using patches there is fragile,
+	# see Bug #827018.
+	sed -i -e 's#^\(CC \?\)=#\1?=#' Makefile || die
+}
+
+src_install() {
+	dobin lpc21isp
+}