diff options
Diffstat (limited to 'net-vpn/eduvpn-common')
| -rw-r--r-- | net-vpn/eduvpn-common/Manifest | 15 | ||||
| -rw-r--r-- | net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild | 74 | ||||
| -rw-r--r-- | net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild (renamed from net-vpn/eduvpn-common/eduvpn-common-1.99.1.ebuild) | 29 | ||||
| -rw-r--r-- | net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild | 92 |
4 files changed, 112 insertions, 98 deletions
diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest index a4e9a4977a16..840a00830d29 100644 --- a/net-vpn/eduvpn-common/Manifest +++ b/net-vpn/eduvpn-common/Manifest @@ -1,12 +1,13 @@ -DIST eduvpn-common-1.1.2-deps.tar.xz 7517364 BLAKE2B a6bd2c11d5056170d88ca8c35d054cd6d529462af6595fe31c535640cdf59a25ae4811c04bc738832fa4c28d2d3308ca5615170547b0c93edf7c4dd3f475978b SHA512 ce167298a76df4e22b23e3cfb7640f0272ea546dc5767f66baab900029c2a4850b383521d2f74ae0d77c53f47ba6eb51d80ab122362e4a7470e69a1fc3ac423f -DIST eduvpn-common-1.1.2.gh.tar.gz 208300 BLAKE2B 8cb7e96d4a6a5032a1696aa57a6322f6a861aebba8b1f653d8be98e0044eacb3f23dc400ac9a8598dd83f30ca2140394ee2aa5733a27547f2a0378ad03ab422d SHA512 dbc290e48bc045456ad83e58e63c223cef5a7e1c7178537a44ed306a423276e644fb0f5607a7d8ddc5014b48ae11b57e365068d72887062277f8ab4f6f1ae660 DIST eduvpn-common-1.2.0-deps.tar.xz 7583176 BLAKE2B af35dd134a77753448fc9e7f91bde9d52fe05c20339eea637d0d0c5e9564f19cae6e294723adf1ef6c516ae05bc0495be2f316b2560b9d1860d9ce509517e04b SHA512 83e88038a6b5cb39917f9b892ac8783ef273c9e606173aad68125702a70a70dc9c61f54f0078d92214d6e1ec3e92cbdff3d10f18caf889cd603a2d75fa70c209 DIST eduvpn-common-1.2.0.tar.xz 738836 BLAKE2B 85a10cee1a18e88a8f19bae8c8273cc2993b4dfa29106804342079739c5549e517194f2f4b52225e7f557cce45cffbc74b110f82c4cfd9d8141096d97445938d SHA512 8858e85b1422340a87ee8df2a8392bdf910fb282c6a80c171a89cd535bb119958c46576a17c57cf9a02bf9946ed749e01bacdbd9c45fa8623c7d6dfa9272aa36 DIST eduvpn-common-1.2.0.tar.xz.asc 228 BLAKE2B 6b9de0767b9f755235556ab15447a639930447bea91c7880b9248844eac7600ad22ff2828a3e73176c65fb824a0b870604d53e68964850b5e8239dbd5ffd1fff SHA512 6d54112f22ba6272ca56cea3ad82d0de1b24365a9d61f8ac9f1708741d491ff3184b47bc86845f8ace0a5f44fb5ad7614535ce665b71dd56510445c1d4777d34 -DIST eduvpn-common-1.99.1-deps.tar.xz 24548260 BLAKE2B 59065c553899cbabd1a867e77d907489deecaea4c279c24e0390ce7cf9e8b067ab972e390d9df3d7fb85a6057319002db20c7a3b2370835fb24994691ef803e3 SHA512 d1cbc8ab1823b51d5e1ea8ebe24cf94efcd431cc068569dd9dbf27e649e790662374600fdb9144fa4321c655d96ee3260de37edaa3870049c508630cc3208aa0 -DIST eduvpn-common-1.99.1.tar.xz 843316 BLAKE2B 53ff3518d7450f8c414d94291c22479464dbe810de4d5971aca61462782a615a82133e461f688b2975763f867464eac6a70bd946a75ab4085322ba5289717571 SHA512 757f05f391bde1be0b1d57a92d21138d96659052bee2922814d612950b0d3e8c8ebf21178b8d8d27263765870328057b69ca58db7629c5c092b3637957060be7 -DIST eduvpn-common-1.99.1.tar.xz.asc 228 BLAKE2B 9af5f284ca4e096cd291e7b387be302282e841fb9beb0b0715d781f38ebb5dc66f23b98f502610dcc23dc4faf24cf158a8e9ebb90ad06113fc83b8756cf70452 SHA512 24561e484fd3b66e2bb2ce4e275db9a125370dbd7113f2c8a1a6a267b016c2d793701b2e89f6c8835e662cec6a2ceb11e5d287312b30c93e57d2104b67beb2ed -EBUILD eduvpn-common-1.1.2.ebuild 1421 BLAKE2B ef5534f84867f5ca4bb8cc85bc8c96268d5de0307ee520180f7654f3f74fab6e3a5619b4664bdadab67a5035e46f85c7a34c87b4a9167c6267cfca8cb18932a8 SHA512 573fe8c374474e58a3460d23aa3b5cbe6ffb7005ff3c530f46abc14650a4ba8f81ed34a338782e6675f279df222fdca2f0c21233895e605838b50219f61a6fb5 +DIST eduvpn-common-2.0.2-deps.tar.xz 24632288 BLAKE2B 9796543c814e0a01dd06813d9a0fec2f78e4ce8f04260058842cb8626d3bcc5ae7d47621f5b9670969cd1a4428066e592fdb3753ebc82a2a8074ee6b9e962382 SHA512 d66043e2c68906b08c8d805f88d6bab30ee611a5c01756aa7d130ccf09e259d91c1ce1818a1b9413ba37138f1f871169925f56d010248d39d75330efc41522ec +DIST eduvpn-common-2.0.2.tar.xz 992676 BLAKE2B 0fa633dcd6e8c0e1153f928187e988806a08e5591704763251759c373581eeee70c46eef82f12e709e479f219483185ff670b18e502f8b1b2d18028054217195 SHA512 566b113752b72e59c40f704f69c8a39e0af65a3c25639d56119ee9c1c5640f75a4d1f25f5d3a899d2a95fa222bd5943e502cb81d81346d568ffa4c58325d44cb +DIST eduvpn-common-2.0.2.tar.xz.asc 228 BLAKE2B 7fd6f4b95137c5bd309352add49c1c6f2e82a19e0067d46423aadb06915fcd08789b63ac3719e78703916163cd18eaa395943596a0fb864cee051264407b7729 SHA512 bb8a2b17b8b4feb834df0b584fbe1cbb40bbb9a33eef2d8bf5d083d8c901d5c519b065c4c8f97ed3df2a943af9a8eb26ef3b1801ad159e11952129f87724b889 +DIST eduvpn-common-2.1.0-deps.tar.xz 24538240 BLAKE2B 669184809f8aefdd7f1015c3c4ee3d6f932842a44be1c2d585840f46cff80054cf795959498f14222322495f90a8c07f7f597659c372f91e836ad51db4927790 SHA512 6c215ac2806b97da12fdaff8a317d66ec1b2a8a96b23cad67d65d0fdaba464d4003a0ae0115e6b898a8d61c874e0116f425009a3560e0b9b7d8aceae2398afdc +DIST eduvpn-common-2.1.0.tar.xz 993108 BLAKE2B 80dd41db49a4c3d334ca7112204cdbf709bd3020285f168c411dad4b3fcbef2968a3b6a4de95849537e1dfbfdbb81e42d07c9531804472781eacd10590d2cbe9 SHA512 40ee1f5ab99b1b743c0fcf647fa2973b2abceb3fde46305c091409e24cf1b87d9159e90e4839d42f4f186c37663e61f494f461343959eddf3bba8606e5bd1112 +DIST eduvpn-common-2.1.0.tar.xz.asc 228 BLAKE2B b0bb3b74b19b9274b4bc08cfa108b693f79c30ba2ae3a567e57b673a41c72fc920afc16cce6a1c173634e0f5e82016efcecb9dd71ba397723df82e0193efd814 SHA512 26eff9c19896176bb65afc1596bbb0d74e9a71e4cd756b284ae296203fe9db2952b9a778e9d558b1e390f35c5639e59c04a004927375e964bfe888ad019ebf11 EBUILD eduvpn-common-1.2.0.ebuild 1930 BLAKE2B 5d2e8eb49ad048b1e642c6c62a5d8328894d9795fbe7ddeb6f280161f390a8f8357c4b708df513ffe5e4ed55ffa772a8deb6fde8718e23e90f6837c6cf5a4f38 SHA512 155f73a05849cdfa250de843eb944b830ae35a9410c9cbd592dbd81a90e7e406f140b1a1b6cbbe7574aefff9119e950009a5e15cbc88046552d03bc1bd513e38 -EBUILD eduvpn-common-1.99.1.ebuild 2141 BLAKE2B 6a71a681bb4f108de26fdd1521dcb9f6d758259a464ae57325e753c35edb54240f85a9315b78800a330ba26bdd4a3da1c87129250c9c3bed6bfc2c12ad7712b9 SHA512 e7903f8843ec89cabe11b63af87e698dba006cd5c4cd28cd02f834dec6b233254f9294f1e67d0661086543a325e85e1c7f1a49f2cf99ade8d25e373b10296ecb +EBUILD eduvpn-common-2.0.2.ebuild 2065 BLAKE2B 024b3b19789cb021a7ef5147eda77e5a1d2cb46cff8e7b23ef5732d8bdcbf9f3d96a1c9d58337bcf0cf1a175c4aeb41f3511c0cbaa48c1fdeab5340c963b87fd SHA512 e287cf6d36281de95a18c15d45c3422e597e48b06843e6cadb87e10210d9d2802b77e83a522530572513b1d6155a96bc154d6102e75e2436f519996cfb46d808 +EBUILD eduvpn-common-2.1.0.ebuild 2065 BLAKE2B 024b3b19789cb021a7ef5147eda77e5a1d2cb46cff8e7b23ef5732d8bdcbf9f3d96a1c9d58337bcf0cf1a175c4aeb41f3511c0cbaa48c1fdeab5340c963b87fd SHA512 e287cf6d36281de95a18c15d45c3422e597e48b06843e6cadb87e10210d9d2802b77e83a522530572513b1d6155a96bc154d6102e75e2436f519996cfb46d808 MISC metadata.xml 999 BLAKE2B 258c481ed43a5d388677aa7a5029201a01364059045c4285ba8b8da49c8c105832d59aa357a3a2dcaa36474ee206c8c1e7855ad7d8b0e402722c6cb50d6175ef SHA512 73b524373d8268083d9e5c979a8dee7fb52e54fbe27cac54219bd14a3851755e2c5aced686ff08e24d5cf08330cc6485a97734aea89d2de2b45bbe682a1e2f8a diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild b/net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild deleted file mode 100644 index 21519b3a39d0..000000000000 --- a/net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_EXT=1 -inherit distutils-r1 go-module linux-info - -DESCRIPTION="Linux client and Python client API for eduVPN" -HOMEPAGE="https://www.eduvpn.org/" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/eduvpn/eduvpn-common.git" -else - SRC_URI=" - https://github.com/eduvpn/eduvpn-common/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz - https://www-user.tu-chemnitz.de/~hamari/eduvpn/${P}-deps.tar.xz - " - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="openvpn wireguard" -RESTRICT="test" - -RDEPEND=" - openvpn? ( net-vpn/openvpn ) -" - -wrap_python() { - local phase=$1 - shift - - pushd wrappers/python >/dev/null || die - distutils-r1_${phase} "$@" - popd >/dev/null || die -} - -pkg_pretend() { - if use wireguard; then - CONFIG_CHECK="~WIREGUARD" - WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard." - check_extra_config - fi -} - -src_prepare() { - default - - mkdir -p wrappers/python/eduvpn_common/lib || die - - wrap_python ${FUNCNAME} -} - -src_compile() { - default - wrap_python ${FUNCNAME} -} - -src_test() { - default - wrap_python ${FUNCNAME} -} - -src_install() { - # The shared library is installed within the python package. There is no - # need to call the default routine. - wrap_python ${FUNCNAME} -} diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.99.1.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild index 55b6e50c9900..9612e2b38c22 100644 --- a/net-vpn/eduvpn-common/eduvpn-common-1.99.1.ebuild +++ b/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_EXT=1 @@ -28,12 +28,12 @@ else verify-sig? ( https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz.asc ) https://www-user.tu-chemnitz.de/~hamari/eduvpn/${P}-deps.tar.xz " - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-3+" SLOT="0" -IUSE="openvpn wireguard" +IUSE="openvpn" RESTRICT="test" RDEPEND=" @@ -54,11 +54,9 @@ wrap_python() { } pkg_pretend() { - if use wireguard; then - CONFIG_CHECK="~WIREGUARD" - WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard." - check_extra_config - fi + CONFIG_CHECK="~WIREGUARD" + WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard." + check_extra_config } src_unpack() { @@ -72,16 +70,15 @@ src_unpack() { default_src_unpack } -src_prepare() { +src_compile() { default - mkdir -p wrappers/python/eduvpn_common/lib || die - - wrap_python ${FUNCNAME} -} + # Install shared library into the python directory so the python packaging + # magic can find it. + pushd wrappers/python >/dev/null || die + emake install-lib + popd >/dev/null || die -src_compile() { - default wrap_python ${FUNCNAME} } @@ -91,7 +88,5 @@ src_test() { } src_install() { - # The shared library is installed within the python package. There is no - # need to call the default routine. wrap_python ${FUNCNAME} } diff --git a/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild new file mode 100644 index 000000000000..9612e2b38c22 --- /dev/null +++ b/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +inherit distutils-r1 go-module linux-info + +DESCRIPTION="Linux client and Python client API for eduVPN" +HOMEPAGE="https://www.eduvpn.org/" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/eduvpn/eduvpn-common.git" +else + # Development Versions use a different release signing key + if [[ $(ver_cut 2) == 99 || $(ver_cut 3) == 99 ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn-dev.asc + else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc + fi + inherit verify-sig + SRC_URI=" + https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz + verify-sig? ( https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz.asc ) + https://www-user.tu-chemnitz.de/~hamari/eduvpn/${P}-deps.tar.xz + " + KEYWORDS="amd64 x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="openvpn" +RESTRICT="test" + +RDEPEND=" + openvpn? ( net-vpn/openvpn ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eduvpn-20240307 )" +fi + +wrap_python() { + local phase=$1 + shift + + pushd wrappers/python >/dev/null || die + distutils-r1_${phase} "$@" + popd >/dev/null || die +} + +pkg_pretend() { + CONFIG_CHECK="~WIREGUARD" + WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard." + check_extra_config +} + +src_unpack() { + # go dependencies are not signed + if use verify-sig; then + pushd "${DISTDIR}" > /dev/null || die + verify-sig_verify_detached \ + ${P}.tar.xz{,.asc} + popd > /dev/null || die + fi + default_src_unpack +} + +src_compile() { + default + + # Install shared library into the python directory so the python packaging + # magic can find it. + pushd wrappers/python >/dev/null || die + emake install-lib + popd >/dev/null || die + + wrap_python ${FUNCNAME} +} + +src_test() { + default + wrap_python ${FUNCNAME} +} + +src_install() { + wrap_python ${FUNCNAME} +} |