diff options
Diffstat (limited to 'sys-auth/authenticator')
6 files changed, 142 insertions, 19 deletions
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest index b69b1745e309..47f019690950 100644 --- a/sys-auth/authenticator/Manifest +++ b/sys-auth/authenticator/Manifest @@ -1,5 +1,9 @@ +AUX authenticator-0.2.4-disable-failing-tests.patch 423 BLAKE2B 02ca693fec700649cc0103f3de458c04e711b42eb4c0207a3c8dfcb747c565bf0afe1e673e8cb689ee568a9c5440d706514c5ea758e8a596687e5b7df336c206 SHA512 6406f5cb916f49abf909dabdd7df2b0096b1b4b300c2e0b8c1097155c1c52e6b54ce9e7ef526829e8e07e00ca8c52a6b30944c65bce37893c91ffab9cb6cae19 +AUX authenticator-0.2.4-support-use-of-gdlib-from-system.patch 638 BLAKE2B 76709f75b2d3cadddbb558938d8ef08d09b6d20f9008f513a44940f3b5847da784c52d382ab058ab91be084e98c1ba63ef450b41aa743a330b920e54cdec327a SHA512 0da21566e5913e99f78c6a7608a7b4a2da568c494dc7515d3d05993ddb8b611b607ef166d57be4ec949ca377848f474614d155068d2550ad6e7220ca46b5264a AUX disable-failing-tests.patch 784 BLAKE2B 67367ef35234046a2fdedd8d82c0c2037ecbe8005e9972d05c9654645225f42d23a4fbe0b819daa6fdf219d4852284fc068d24227a89bd4afc4c15e4792c2d8d SHA512 226bce7609fedf6cf9a3459d5945f0ca31004df595fd6717781dce142bd53f5c552821031b3de516964a97abc91efaadf902b943aa0a149ed3603ae26aa0355e DIST authenticator-0.2.1.tar.gz 147693 BLAKE2B b9f3a7fd5b3b7867120b9ed17b90cea4c07a271dc4d75a845ad539e15453a606d48e8637d44d12cecf9b91e5fb351d081c1add48c1a4a955444f39addd51b075 SHA512 aebf3ce147d5ccd404de6af52e130e9a85a3d5d86140d73026dac00219853652e7aa1e67db5838f9ac4d147021cd07b3ebfb86a1ab4b413ec3b98360097d1d6e +DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2 EBUILD authenticator-0.2.1.ebuild 1133 BLAKE2B 3dd8465ce850e81a2994472b4d73530a5e3982dde4899a776902bf30b733bea0d8036e441ecc11a19ce3cac2cbfb9d95746c165397ca84695aba50461c946ff0 SHA512 affef8c5c3dfa2890373cdc5cc9a3c9639db9e7a5e70487469c6b809ab64eb775516450cfd6e759e8aa24fe7e98bf4f06d41b24e580b8b2ea61ec5b8e0a50ceb -EBUILD authenticator-9999.ebuild 1133 BLAKE2B 3dd8465ce850e81a2994472b4d73530a5e3982dde4899a776902bf30b733bea0d8036e441ecc11a19ce3cac2cbfb9d95746c165397ca84695aba50461c946ff0 SHA512 affef8c5c3dfa2890373cdc5cc9a3c9639db9e7a5e70487469c6b809ab64eb775516450cfd6e759e8aa24fe7e98bf4f06d41b24e580b8b2ea61ec5b8e0a50ceb -MISC metadata.xml 615 BLAKE2B 6e7f20b374a19cf14cfaa2df3ffcc4f98df79bcdb2c2bd128482dbb9a44d118295b8ac76dd668c4675aa900ac24fc0d38115967ff73cbaa4b4771e62ca0434ac SHA512 9e6e905369b669cf8e2d337db0ea84f600bd874ca24d3624fd3a37a08ac5d132ca0f9b12bb1c80105fdc46a8a15bc85d4af2bd0681b128109de92536d83bd2e7 +EBUILD authenticator-0.2.4.ebuild 1601 BLAKE2B ed10f51da09d362100ba24c3e763d85ccad4b822ab42715d8b2511283723aaee8a24f027f1010dabc7ff7058e117cfb1f87248187417b5f29f1ad2f9894d75c6 SHA512 983334596bfe7bd96667f3c5cd6fac68fae3aca25d7f1b8e1ea1f43359848f1a60d78d84259651052299eb7572c2391e18cba34fc49a2224df349445e37a369f +EBUILD authenticator-9999.ebuild 1482 BLAKE2B 4c8ac81940894d8631c7ad879507093d97ba79c91f39b8653fea95b4b7438b4ea354f1348a0b190353b07144d2d8f35c019ca58f152e22ab95a6b7a8cbf498ca SHA512 8d790a3fe41b4341fadd5bd2b2314fd9a23cb5e9476fc8b3bc212aba79a744b163ea5b0c3c79f972936775e0f7e0de4f95dd63b6281f1123bf26b691c53bf094 +MISC metadata.xml 544 BLAKE2B fe9f1a1bba9cdf6c48644f526d9b2309773735143467192a007fe8e63e97480aff2bcbf04d442ab9bb61792386b6610a6fe874a52db5dd6dea9f51d0c174ee4b SHA512 112fb3e1bd3a559a4f6f29ae800365a77a5298aa572f089b7d52553851ba85603387c1b09d8a86ce039080520ed6fe473f953c345b6fe553d3ec415a3e6bbfb7 diff --git a/sys-auth/authenticator/authenticator-0.2.4.ebuild b/sys-auth/authenticator/authenticator-0.2.4.ebuild new file mode 100644 index 000000000000..f3d4d2cdf2b4 --- /dev/null +++ b/sys-auth/authenticator/authenticator-0.2.4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit gnome2-utils meson python-single-r1 virtualx xdg-utils + +DESCRIPTION="Two-factor authentication code generator for GNOME" +HOMEPAGE="https://gitlab.gnome.org/World/Authenticator" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + SRC_URI="" + EGIT_REPO_URI="${HOMEPAGE}" +else + SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Authenticator-${PV}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="test" +RDEPEND=" + ${PYTHON_DEPS} + app-crypt/libsecret + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyotp[${PYTHON_USEDEP}] + dev-python/python-gnupg[${PYTHON_USEDEP}] + dev-python/pyzbar[${PYTHON_USEDEP}] + media-libs/gd + x11-libs/gtk+:3 +" +DEPEND="${RDEPEND} + test? ( x11-apps/xhost )" +PATCHES=( + "${FILESDIR}/${P}-disable-failing-tests.patch" + "${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch" +) + +src_prepare() { + default + + sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang." + + rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder." +} + +pkg_preinst() { + gnome2_icon_savelist + gnome2_schemas_savelist +} + +src_test() { + xdg_environment_reset + virtx meson_src_test +} + +pkg_postinst() { + gnome2_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_icon_cache_update + gnome2_schemas_update +} diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild index f11556202d24..5d876f945946 100644 --- a/sys-auth/authenticator/authenticator-9999.ebuild +++ b/sys-auth/authenticator/authenticator-9999.ebuild @@ -1,44 +1,60 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) -inherit gnome2-utils meson python-r1 virtualx xdg-utils +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit gnome2-utils meson python-single-r1 virtualx xdg-utils DESCRIPTION="Two-factor authentication code generator for GNOME" -HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator" +HOMEPAGE="https://gitlab.gnome.org/World/Authenticator" if [[ ${PV} == *9999 ]]; then inherit git-r3 SRC_URI="" EGIT_REPO_URI="${HOMEPAGE}" else - SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/Authenticator-${PV}" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2+" SLOT="0" - -DEPEND=" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="test" +RDEPEND=" + ${PYTHON_DEPS} app-crypt/libsecret dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] dev-python/pyotp[${PYTHON_USEDEP}] + dev-python/python-gnupg[${PYTHON_USEDEP}] dev-python/pyzbar[${PYTHON_USEDEP}] - media-gfx/gnome-screenshot + media-libs/gd x11-libs/gtk+:3 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + test? ( x11-apps/xhost )" + +src_prepare() { + default -PATCHES=( "${FILESDIR}/disable-failing-tests.patch" ) + sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang." + + rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder." +} pkg_preinst() { gnome2_icon_savelist gnome2_schemas_savelist } +src_test() { + xdg_environment_reset + virtx meson_src_test +} + pkg_postinst() { gnome2_icon_cache_update gnome2_schemas_update @@ -48,8 +64,3 @@ pkg_postrm() { gnome2_icon_cache_update gnome2_schemas_update } - -src_test() { - xdg_environment_reset - virtx meson_src_test -} diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch new file mode 100644 index 000000000000..38b4b95464ad --- /dev/null +++ b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch @@ -0,0 +1,16 @@ +diff --git a/data/meson.build b/data/meson.build +index b646c11..884c5d0 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -50,10 +50,3 @@ endif + + appstreamcli = find_program('appstream-util', required:false) + +-if appstreamcli.found() +- test ( +- 'Validate appdata file', +- appstreamcli, +- args: ['validate-relax', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')] +- ) +-endif + diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch new file mode 100644 index 000000000000..ffbde3cf2f09 --- /dev/null +++ b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch @@ -0,0 +1,23 @@ +diff --git a/meson.build b/meson.build +index ed9c48e..6b20bf0 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,16 +35,7 @@ SERVICES_DIR = join_paths(get_option('datadir'), 'dbus-1', 'services') + SEARCH_PROVIDER_DIR = join_paths(get_option('datadir'), 'gnome-shell', 'search-providers') + LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir')) + +-subproject('libgd', +- default_options: [ +- 'with-introspection=true', +- 'with-notification=true', +- 'static=false', +- 'pkgdatadir=' + DATA_DIR, +- 'pkglibdir=' + LIB_DIR +- ] +-) +- ++libgd_dep = dependency('gdlib', required : true) + + + # Configuration params + diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml index 3950af1a3351..e1df662ac76a 100644 --- a/sys-auth/authenticator/metadata.xml +++ b/sys-auth/authenticator/metadata.xml @@ -10,10 +10,9 @@ <name>Proxy Maintainers</name> </maintainer> <upstream> - <remote-id type="github">bilelmoussaoui/Authenticator</remote-id> <maintainer> <name>Bilal Elmoussaoui</name> </maintainer> - <bugs-to>https://github.com/bilelmoussaoui/Authenticator/issues</bugs-to> + <bugs-to>https://gitlab.gnome.org/World/Authenticator/issues</bugs-to> </upstream> </pkgmetadata> |