gentoo resync : 10.11.2019

3 files changed, 39 insertions, 9 deletions

diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 5d10cd2a0bf2..3ccd32a55e79 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,2 +1,4 @@
-EBUILD nanovna-saver-9999.ebuild 624 BLAKE2B b1e4f0267e973e44ba3d8a6c5f8a91acdc617687e3fb557e2a1809cb61e708d14cb097ffab96b69a530adb975e7132b2f2bac69a94a54260a9d74de1f380d67b SHA512 bba9f097ca18a344c5da2195f9c1facf2cc43dbdc692786a4466ba872dc37d8d0089ffcbba281dc70d93f29e7889a53642fab282610dd75f8873dc3cbef526c3
+DIST nanovna-saver-0.1.5.tar.gz 96346 BLAKE2B e3ae93df4c732f27dc7781068b6fba3abda81b84b1663953ddf5cbc043e45c273ccc1f25c81f0c02180ebfad8e0cd0d65411fc75f2c7124cfeed8b7ff0b71aff SHA512 cb230f17f45bff77bb60700e5a32d8fd577cfa2603a3bde03dbdebd20bc0c5c2acc1546560a08d0cb3c1abce5e7e6aef067e3805d5ec09e70aefb9e1a1f3a164
+EBUILD nanovna-saver-0.1.5.ebuild 713 BLAKE2B c1f93aac370127d2674fe24199416559e1d1753af4a50385ab45dd0e181c9317f30bbec4041a574ab1c93eb05bdaf9c45c05d1e2415653d2c93012ed4684ddbf SHA512 dedfad56370e346869ef44ecad4ccc7a3ba947f383026ba77d55a88c8055751141bf296ba2f016314db866dfd355c0e5d3fde8e7c1bf13635187eb42d7a28f06
+EBUILD nanovna-saver-9999.ebuild 713 BLAKE2B c1f93aac370127d2674fe24199416559e1d1753af4a50385ab45dd0e181c9317f30bbec4041a574ab1c93eb05bdaf9c45c05d1e2415653d2c93012ed4684ddbf SHA512 dedfad56370e346869ef44ecad4ccc7a3ba947f383026ba77d55a88c8055751141bf296ba2f016314db866dfd355c0e5d3fde8e7c1bf13635187eb42d7a28f06
 MISC metadata.xml 432 BLAKE2B a8869193d052dd0ec1fcae10641b19f61fe2faa2bfde6e60f9758b4da9620a316e9b318d11c778fcb0c1de1a2537f98587a8ec928bb814ae53b0160deef18be7 SHA512 0727e758f3cfd75ee8b54ac05636228fe6422ae5b8a0b0eb37f475abc075d30765b3452a05c9e99c56b8a25c378bebfce69462906910c86254f586203640dffe
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
new file mode 100644
index 000000000000..eeb9302e2479
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+SRC_URI=""
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index 96b4a3691d7b..eeb9302e2479 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_7 )
-inherit git-r3 distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
 HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
@@ -11,8 +11,13 @@ SRC_URI=""
 
 LICENSE="GPL-3+"
 SLOT="0"
-EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-KEYWORDS=""
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE=""
 
 DEPEND=""
@@ -21,8 +26,3 @@ RDEPEND="${DEPEND}
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND=""
-
-src_prepare() {
-	sed -i 's#==5.11.2##' setup.py
-	default
-}