From d749d42b2ef572969f0b7fb5016888f25cc28a8d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Apr 2024 00:30:44 +0100 Subject: gentoo auto-resync : 07:04:2024 - 00:30:43 --- net-libs/Manifest.gz | Bin 32000 -> 32003 bytes net-libs/accounts-qt/Manifest | 4 +- .../accounts-qt/accounts-qt-1.16_p20220803.ebuild | 127 --------------------- net-libs/accounts-qt/accounts-qt-1.17.ebuild | 111 ++++++++++++++++++ net-libs/libaccounts-glib/Manifest | 4 +- .../libaccounts-glib/libaccounts-glib-1.27.ebuild | 77 +++++++++++++ net-libs/libaccounts-glib/metadata.xml | 3 + 7 files changed, 196 insertions(+), 130 deletions(-) delete mode 100644 net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild create mode 100644 net-libs/accounts-qt/accounts-qt-1.17.ebuild create mode 100644 net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 538249fb6b2f..5d87ebda9b01 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest index 5613f964c319..a2383a0adc44 100644 --- a/net-libs/accounts-qt/Manifest +++ b/net-libs/accounts-qt/Manifest @@ -4,8 +4,8 @@ AUX 0003-Use-undeprecated-Account-value.patch 914 BLAKE2B 42b2483989abea47e96c6b AUX 0004-Don-t-access-a-QString-out-of-bounds.patch 1414 BLAKE2B 611ee017ba8db1440c9954bd6c58c724f8b790374a126658826157a61e4e5c5fe5493ee49371fbbb1e5abd638dbe1e8f26574d5266d80ca6a581870bd6f32c82 SHA512 5ccff28c1ab3951f093d4dcc0dad782b60118e7abc978564b60c1463efb683f9f495f6cf7e100d96fc28e60980ffd2a79ab6f1b471ff5fa15823c113003c0a7e AUX 0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch 4128 BLAKE2B 86f3a68616ee7919d8d0123ff3373583d5c6f52dd0a77d3fd480e8556d78a09643f0007d343a143c1c79005147a59febe80d23a0417446c4f62fb040ea0f2701 SHA512 5bb20f5086c10d68aae819314137b221c34fc8a57a7eed1c44b0e96e64e1cf973df82c19698487297c452f704769cb26ffeb799b8ec3e30c3d4741fb313b63fc AUX accounts-qt-1.16-libdir.patch 4809 BLAKE2B 50c73a04be62a4748278f7cf46a8c06286363b9929324863af079e4da2c487d36194231a06d15ccb159d0a1f668fcf1a1ad80330730bebc08f53d29bbaa499f0 SHA512 dde1e34655952e8ae0ade756d8ff8559b4049eed0d273c078043eafe24751edf57e66b6300ee875c28b56978ed502bef79186605b3bc73b752fb226ae2bda90d -DIST accounts-qt-1.16_p20220803.tar.bz2 55304 BLAKE2B 3143894e0b0887cbcd07391330a6c5fc423b2d1609c3057b2ee921a8c3ae78d9c149c39f74c29b50cc5e28428bef31d8ed598ca76beacd3946d6f99109d24aa0 SHA512 c919cc2b70de5a0a288a942297480ee68568ab5f708a504801ce953193a5d7e30be159a517f1566c283436663052e6d0fbd6eef1386376cb3cba0144505318df DIST accounts-qt-1.16a.tar.gz 64376 BLAKE2B 39abe10249efff2edeae1a8ce210be3ce06656311ed5a3a3fbcb847194ebbd8ec6e111ef070fb29a2a847591304cf22a7cb60e9d1178a201b886313c4c8aaadb SHA512 a2a65899a258ac41c67fe496ba14468a95615fe8cfc518b7aaf7d3e72e0088304c61f5d76d50bd26a95b5f56dea4d0191bf08ecead508286504161aa05b7a05b +DIST accounts-qt-1.17.tar.bz2 55907 BLAKE2B e13debd3f7bc9a17cf73c55777b62e904a6bf7791fe3ad0e1af25a72622a8c21cb56bf033afb50d17a1dd703be0af88de9e557d0947d9b7c12e1ac241b45b743 SHA512 ceab67d5db1acb68e391be0557e5fd4b9675f1401b1fe81ff431d5d1eb1d7124cd5170fde44658d7db8b46f721e9d3f7db719c5b727aa681a9e35ea026a71908 EBUILD accounts-qt-1.16.ebuild 1246 BLAKE2B c827ee70ba0344e152692559d76a6866840651083e509434c65cf997f4826669b6f173af24de9f58aa5f2690eee28a4150e7907655303ae654db113cdb7ff146 SHA512 bde1752c2640107c64286b5415294c71dab734eca555d259658d1d99ec89273a512f76396d02600b52fd54068b2a72c6497292a995a6453b967bc7f64d84cc93 -EBUILD accounts-qt-1.16_p20220803.ebuild 2967 BLAKE2B b380eb877d95f820de84466a2277d92ba4eb6cdcb055ea8a455bd041d754065f5129c39cb3347015a42867bd61afba7658b73c3b1774e9e574421e43a815e637 SHA512 b64f8268132e757305168ef7b48814f1b592d9131def5e4d7dab4fd97053cd7e403a4c48c9872759754f6f29fbe1d2b685eac6853ac75e3c8b8ff5543224b9d1 +EBUILD accounts-qt-1.17.ebuild 2400 BLAKE2B 8742fcd64e6ee1217e8437db4fe2b3bca20afff9edc094b870040df0c8a5f8f97b23f47528e0a0989e778ac6eb288564203082030188a4494c4531af438a6ad2 SHA512 bb0a827fc3df8dea5ce5e7aa27e8c117223b0cc851bf5665407a551346836291327bc799ccd9903e5cb4228d140dc97cb5571025accf96cec5e87537e22c3ddf MISC metadata.xml 342 BLAKE2B 220884a62a67c3bc3417a30099191a253c3af9144d30fb04bc6b495c9a665e167392d96421a707bdc9d7d3737781650e48839ec9db12047590a69e8b1704730f SHA512 2525b4cab71fe0a925d2acea96ec7a164f1df175f7699b9b26d30a2642559627790d264b147c40365162ce3dda67fbbde2ed8115bc42e4ed284b970658bb3779 diff --git a/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild b/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild deleted file mode 100644 index d90c6af12cdd..000000000000 --- a/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils multibuild - -if [[ ${PV} = *9999* ]] ; then - EGIT_REPO_URI="https://gitlab.com/nicolasfella/lib${PN}.git/" - EGIT_BRANCH="qt6" - inherit git-r3 -else - COMMIT=c86db79be389601bf6798f815ca5b8f78a524156 - if [[ -n ${COMMIT} ]] ; then - SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/${COMMIT}/lib${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/lib${PN}-${COMMIT}" - else - SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}a.tar.bz2" - S="${WORKDIR}/lib${PN}-VERSION_${PV}" - fi - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Qt bindings for libaccounts-glib" -HOMEPAGE="https://accounts-sso.gitlab.io" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc +qt5 qt6 test" -REQUIRED_USE="|| ( qt5 qt6 )" - -# dbus problems -RESTRICT="test" - -RDEPEND=" - dev-libs/glib:2 - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtxml:5 - ) - qt6? ( dev-qt/qtbase:6[xml] ) - >=net-libs/libaccounts-glib-1.23:= -" -DEPEND="${RDEPEND} - test? ( - qt5? ( dev-qt/qttest:5 ) - ) -" -BDEPEND=" - doc? ( - app-text/doxygen[dot] - || ( - dev-qt/qttools:6[assistant] - dev-qt/qthelp:5 - ) - ) -" - -PATCHES=( - "${FILESDIR}"/0001-Port-away-from-deprecated-QList-toSet.patch - "${FILESDIR}"/0002-Add-Qt6-CI.patch - "${FILESDIR}"/0003-Use-undeprecated-Account-value.patch - "${FILESDIR}"/0004-Don-t-access-a-QString-out-of-bounds.patch - "${FILESDIR}"/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch - "${FILESDIR}/${PN}-1.16-libdir.patch" -) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) -} - -src_prepare() { - default - - local qhelpgeneratorpath - if has_version "dev-qt/qttools:6[assistant]"; then - qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec" - elif has_version "dev-qt/qthelp:5"; then - qhelpgeneratorpath="$(qt5_get_bindir)" - else - eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)" - fi - - sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ - -i doc/doc.pri || die - sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \ - -i doc/doxy.conf || die - if ! use doc; then - sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die - fi - if ! use test; then - sed -e '/^SUBDIRS/s/tests//' \ - -i accounts-qt.pro || die "couldn't disable tests" - fi - - multibuild_copy_sources -} - -src_configure() { - my_src_configure() { - cd "${BUILD_DIR}" || die - - if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then - eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) - else - eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) - fi - } - - multibuild_foreach_variant my_src_configure -} - -src_compile() { - my_src_compile() { - emake -C "${BUILD_DIR}" - } - - multibuild_foreach_variant my_src_compile -} - -src_install() { - my_src_install() { - emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install - } - - multibuild_foreach_variant my_src_install -} diff --git a/net-libs/accounts-qt/accounts-qt-1.17.ebuild b/net-libs/accounts-qt/accounts-qt-1.17.ebuild new file mode 100644 index 000000000000..3cb5ade1897a --- /dev/null +++ b/net-libs/accounts-qt/accounts-qt-1.17.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils multibuild + +if [[ ${PV} = *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/accounts-sso/lib${PN}.git/" + inherit git-r3 +else + SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/lib${PN}-VERSION_${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Qt bindings for libaccounts-glib" +HOMEPAGE="https://accounts-sso.gitlab.io" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc +qt5 qt6 test" +REQUIRED_USE="|| ( qt5 qt6 )" + +# dbus problems +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtxml:5 + ) + qt6? ( dev-qt/qtbase:6[xml] ) + >=net-libs/libaccounts-glib-1.23:= +" +DEPEND="${RDEPEND} + test? ( qt5? ( dev-qt/qttest:5 ) ) +" +BDEPEND=" + doc? ( + app-text/doxygen[dot] + || ( + dev-qt/qttools:6[assistant] + dev-qt/qthelp:5 + ) + ) +" + +PATCHES=( "${FILESDIR}/${PN}-1.16-libdir.patch" ) + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_prepare() { + default + + local qhelpgeneratorpath + if has_version "dev-qt/qttools:6[assistant]"; then + qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec" + elif has_version "dev-qt/qthelp:5"; then + qhelpgeneratorpath="$(qt5_get_bindir)" + else + eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)" + fi + + sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ + -i doc/doc.pri || die + sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \ + -i doc/doxy.conf || die + if ! use doc; then + sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die + fi + if ! use test; then + sed -e '/^SUBDIRS/s/tests//' \ + -i accounts-qt.pro || die "couldn't disable tests" + fi + + multibuild_copy_sources +} + +src_configure() { + my_src_configure() { + cd "${BUILD_DIR}" || die + + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + eqmake6 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) + else + eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir) + fi + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + my_src_compile() { + emake -C "${BUILD_DIR}" + } + + multibuild_foreach_variant my_src_compile +} + +src_install() { + my_src_install() { + emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install + } + + multibuild_foreach_variant my_src_install +} diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest index 318b3f511cb8..e86c4eca0664 100644 --- a/net-libs/libaccounts-glib/Manifest +++ b/net-libs/libaccounts-glib/Manifest @@ -2,5 +2,7 @@ AUX libaccounts-glib-1.25-assert-failure.patch 743 BLAKE2B 5f0ebe2754f4d0b03bfab AUX libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch 1150 BLAKE2B c41449bddae028fb6a444a2d49884c7c53170494ed4fd699b589990a462f67112dc1f3c4359d26b39613456f6e9b5650db97fea39a90e87c007074c791d53b74 SHA512 76f99833910ce5095a3ccb09404ce371e95e40dc4e712a4cc3bdc0046c5a32693ff093956c73dcab9636f35fc83db8c361126ad1623c927cd525f94ffcaf941f AUX libaccounts-glib-1.26-project-version.patch 350 BLAKE2B 6a2115cd408e425e94b637e029f22ab9ada2739bcf29b7e20e80dfc89e571666f5ad909f5f89e7476d4456c9b2e4ad67287df1aacff86ffe8817a66360717871 SHA512 7755e629309017f69c4c9daf71b3df578739970c06d0193009d0bddaa659b5cbe3531b75d95e36cfbe957134aa9eee3707e8d6f9a5a23676f538c49fedfce429 DIST libaccounts-glib-1.26.tar.gz 117365 BLAKE2B a3c7bf4058372001079c9c153b30f947882521f1f9680a63db2883307e998335a1e646112dc8a51640824f238d871d96da2c18b4ef175c837cebfe056ded2cbb SHA512 c08a11087745ba771e539b61de57693390960ad6b4e8217c159be49d31bd7f8856fffa835e7a230f352049bbf7cec9184ff225e74bbc195964221d3d9d49743b +DIST libaccounts-glib-1.27.tar.bz2 88050 BLAKE2B 12d4ded072584150d9011e7c684301cf407d822e42ef131cf5b2d1c370cb5f59f00991a52c27d444dfe654f743984a9b5e9983f204a1a4172e8730f8020a7662 SHA512 3a4ccc9193e69dcab1b6618da0dc628f5a2a7c57174f99adf690bef71bbcec0bde3957077411d0528e85447e9f0d037e3ee93c2a3d3b2e6404b257de34a6493c EBUILD libaccounts-glib-1.26-r1.ebuild 1488 BLAKE2B 4966dd9ee9a1edb22952e893f7aec7abb58ff450874eb7bfb38420927828011ba565bf8eba34a4741e1549ca8b5a073daeacaa06c75d245fa95134b4bd0a6010 SHA512 eb0227ae2fd1a6d411e7369c689f874ccd4da329f7fa4f1b108ca4999acf5dd29bbc187fb21cc28827fe9c16a0eb7db6c337470f759860f3ab28d475af6b2aeb -MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f +EBUILD libaccounts-glib-1.27.ebuild 1766 BLAKE2B 77d186932226a4622f26c8b7927cafbf3afb2ecde7bf8e177639834c0611bf755e6e4a693fbc6148fa9d67ef0929000bd373ff9a6aeca9c787accb0e7dd8a2aa SHA512 fac3bc03b64b68c64b78379767254f23ee6212c7807f4d236d6abbabdac45fca3db2a971abc474250af076da80cbdbecc2814f92629ff34a77ceff06b6572b71 +MISC metadata.xml 344 BLAKE2B 2fed6fc22aedf54e56f9018264c721e64931d763ea26b8dcd3f0f237a883f85f1f66666423c4e75f09131780dd735385da99181bb3d9fa07edb77589137a92f8 SHA512 26fc1d0cef718001dbe653baa5000546d93694236db429944d66918a00225ba50ebff35959f2344cc06665c65a012853105e61450ad3dc8b1ef6f0d14d5b9547 diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild new file mode 100644 index 000000000000..64657ad3f041 --- /dev/null +++ b/net-libs/libaccounts-glib/libaccounts-glib-1.27.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson python-r1 vala + +DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications" +HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib" +SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${PN}-VERSION_${PV}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/gobject-introspection:= + dev-libs/libxml2 + dev-python/pygobject:3[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(vala_depend) + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + test? ( + dev-libs/check + dev-util/dbus-test-runner + ) +" + +src_prepare() { + default + vala_setup --ignore-use + + use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die + use test || sed -e "/^subdir('tests')$/d" -i meson.build || die + + # /tmp isn't accessible from sandbox + sed -i -e "s|/tmp/\(.*\)|${T}/\1|" tests/check_ag.c || die + sed -i -e "s|/tmp|${T}|" tests/meson.build || die +} + +src_configure() { + my_configure() { + local emesonargs=( + -Dinstall-py-overrides=true + ) + meson_src_configure + } + python_foreach_impl run_in_build_dir my_configure +} + +src_compile() { + python_foreach_impl run_in_build_dir meson_src_compile +} + +src_test() { + python_foreach_impl run_in_build_dir meson_src_test +} + +src_install() { + einstalldocs + python_foreach_impl run_in_build_dir meson_src_install + python_foreach_impl python_optimize +} diff --git a/net-libs/libaccounts-glib/metadata.xml b/net-libs/libaccounts-glib/metadata.xml index 8641e5bdd399..19b6674bc803 100644 --- a/net-libs/libaccounts-glib/metadata.xml +++ b/net-libs/libaccounts-glib/metadata.xml @@ -5,4 +5,7 @@ kde@gentoo.org Gentoo KDE Project + + accounts-sso/libaccounts-glib + -- cgit v1.2.3