From 55b3546a751fc4f566c5e2499220e1737acaab35 Mon Sep 17 00:00:00 2001 From: MadMaurice Date: Sun, 17 Nov 2019 21:21:44 +0100 Subject: [PATCH] dev-python/bob: Download version 0.15.1 from pypi instead --- dev-python/bob/Manifest | 5 +++-- dev-python/bob/bob-0.15.1.ebuild | 32 +++++++++++++++++++++----------- dev-python/bob/bob-9999.ebuild | 26 ++++++++++++++++---------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/dev-python/bob/Manifest b/dev-python/bob/Manifest index c6a0b1d..62e80cf 100644 --- a/dev-python/bob/Manifest +++ b/dev-python/bob/Manifest @@ -1,2 +1,3 @@ -EBUILD bob-0.15.1.ebuild 715 BLAKE2B bda09f0b0646e9a53fb7003215b760160db5de836935a5d474eb5152384fb43f583b049fbe369252b45fa15d4f80b3ae332a9a4c49af7b9a87b1833a219019af SHA512 40d786b8447a8145c0af6c640b6d3f7b33df5c69e43c9f7b4a52b3cb2e3224947819145452bbd5b7f14642ac3e4b5724d5238eadda9d25cedc6b26bd036b6bee -EBUILD bob-9999.ebuild 830 BLAKE2B e041ad9a0fff1fed2e5ecd0276027c8773f8549d6996f0d00a4fb594874c6fbd3307f9122460eb2e29b7883504212f56eeb1cbe8f0e010d9340575371f9c534e SHA512 99ae16d1c759d6e2c46c407fdebdcdfd579c06cf795edc4f954269af463db9bd4e23c3bde9b85e09618158e50e9860fdc449af22295401309d1ee59dcfc1ee76 +DIST BobBuildTool-0.15.1.tar.gz 585957 BLAKE2B 7850cc0bb61ca876bbb069aa61f64446ed06ff5adc22cd92946f2c7348cf7408360eb02c7dc299ec25e73a0dd0cf33a7b966a6efbda9607dae584a5eb5044c10 SHA512 9608587ab5ee9e72f1fcabe420b80a0bbc1321b970d6415f9b41bcf2c547c071def213b59a295cdda004a6125b11454a82da996d920399cc746d9586e334478e +EBUILD bob-0.15.1.ebuild 938 BLAKE2B 47297077044eb9492a21b6112130de0f604066bb03803e57d99be9f38b914d5012277920ac0c55e54acd117544700ac398bdb763ea05e4e1a20b259aa68d834a SHA512 55f92410742ea8c16560a56cf8fc64fda86cf470c53ecc030e6ff3986a48c54c77b6f542bc152a81687117b2cffa5e8dec3801b357ce157969170f25f5675cc3 +EBUILD bob-9999.ebuild 939 BLAKE2B 10dc7f7240c6a5895b63e68fbab34b83c01c0ff5f38244bebca50c563d71610b7e219bfd09cef3817b1cbf8f0243a95441d56404fa6ff95c16800e94eea87058 SHA512 bb06c0894827695a9c907e2c3ac51633c58a2b705354a02112c2197e52bc561f6cf6c079cad68f3416f45ab63a80388af07d67540f9c4192c7e3bf9aca2538f4 diff --git a/dev-python/bob/bob-0.15.1.ebuild b/dev-python/bob/bob-0.15.1.ebuild index 99e574d..c76745a 100644 --- a/dev-python/bob/bob-0.15.1.ebuild +++ b/dev-python/bob/bob-0.15.1.ebuild @@ -3,10 +3,19 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit distutils-r1 git-r3 +inherit distutils-r1 -EGIT_REPO_URI="https://github.com/BobBuildTool/${PN}.git" -EGIT_COMMIT="v${PV}" + +if [[ "${PV}" = 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/bob.git" +else + # pypi uses a different software name than github. We want to use the github one. + MY_PN="BobBuildTool" + MY_P="${MY_PN}-${PV}" + SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" +fi DESCRIPTION="Functional cross platform build-automation tool" HOMEPAGE="https://bobbuildtool.dev" @@ -15,12 +24,13 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ~x86" -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/schema[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - sys-apps/hexdump-esr - net-misc/curl" +RDEPEND=" + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/schema[${PYTHON_USEDEP}] + dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + sys-apps/hexdump-esr + net-misc/curl" DEPEND="${RDEPEND} - dev-python/setuptools_scm[${PYTHON_USEDEP}]" + dev-python/setuptools_scm[${PYTHON_USEDEP}]" diff --git a/dev-python/bob/bob-9999.ebuild b/dev-python/bob/bob-9999.ebuild index 2a1656f..6d75941 100644 --- a/dev-python/bob/bob-9999.ebuild +++ b/dev-python/bob/bob-9999.ebuild @@ -5,11 +5,16 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) inherit distutils-r1 + if [[ "${PV}" = 9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/BobBuildTool/${PN}.git" + EGIT_REPO_URI="https://github.com/${PN}/bob.git" else - SRC_URI="https://github.com/BobBuildTool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + # pypi uses a different software name than github. We want to use the github one. + MY_PN="BobBuildTool" + MY_P="${MY_PN}-${PV}" + SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Functional cross platform build-automation tool" @@ -19,12 +24,13 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/schema[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - sys-apps/hexdump-esr - net-misc/curl" +RDEPEND=" + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/schema[${PYTHON_USEDEP}] + dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + sys-apps/hexdump-esr + net-misc/curl" DEPEND="${RDEPEND} - dev-python/setuptools_scm[${PYTHON_USEDEP}]" + dev-python/setuptools_scm[${PYTHON_USEDEP}]"