summaryrefslogtreecommitdiff
path: root/app-crypt/libsecret
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt/libsecret')
-rw-r--r--app-crypt/libsecret/Manifest3
-rw-r--r--app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch44
-rw-r--r--app-crypt/libsecret/libsecret-0.20.2-r1.ebuild89
-rw-r--r--app-crypt/libsecret/libsecret-0.20.3-r1.ebuild89
-rw-r--r--app-crypt/libsecret/libsecret-0.20.4-r1.ebuild97
5 files changed, 142 insertions, 180 deletions
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index a5df546..ba58b7a 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,2 +1 @@
-DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c256692754ef37c658e346a6cb6b91cdebe134516c3c8652c5ee502b8f7a070a8d519ed878b2f6dfc124ea7b032613f SHA512 89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857
-DIST libsecret-0.20.3.tar.xz 526388 BLAKE2B ae2e64af61c269eb109fa7840cc7ff2362ac69eab4b452074c2cb3a80b26cc88e8d341a7649e0f16fa73541943d968dfbd6f3cc802d99a37f3a7d91e8b20cfe3 SHA512 020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22
+DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
diff --git a/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch b/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
new file mode 100644
index 0000000..99e5f69
--- /dev/null
+++ b/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
@@ -0,0 +1,44 @@
+From 92fe125ee1b9f36bd69308c173e9d6147a5fc1e1 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 10 Dec 2020 23:19:55 -0500
+Subject: [PATCH] meson: build test-vala-unstable with -DSECRET_WITH_UNSTABLE
+
+Fixes: https://gitlab.gnome.org/GNOME/libsecret/-/issues/54
+---
+ libsecret/meson.build | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libsecret/meson.build b/libsecret/meson.build
+index f57e363..55e9d95 100644
+--- a/libsecret/meson.build
++++ b/libsecret/meson.build
+@@ -310,12 +310,12 @@ if get_option('introspection')
+ add_languages('vala')
+ valac = meson.get_compiler('vala')
+
+- valatest_names = [
+- 'test-vala-lang',
+- 'test-vala-unstable',
+- ]
++ valatests = {
++ 'test-vala-lang': [],
++ 'test-vala-unstable': ['-DSECRET_WITH_UNSTABLE'],
++ }
+
+- foreach _valatest : valatest_names
++ foreach _valatest, extra_cflags : valatests
+ test_bin = executable(_valatest,
+ '@0@.vala'.format(_valatest),
+ dependencies: [
+@@ -327,7 +327,7 @@ if get_option('introspection')
+ ],
+ link_with: mock_service_lib,
+ include_directories: config_h_dir,
+- c_args: test_cflags,
++ c_args: test_cflags + extra_cflags,
+ )
+
+ test(_valatest, test_bin,
+--
+2.26.2
+
diff --git a/app-crypt/libsecret/libsecret-0.20.2-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.2-r1.ebuild
deleted file mode 100644
index 0a3da68..0000000
--- a/app-crypt/libsecret/libsecret-0.20.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 multilib-minimal python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt +introspection test +vala"
-RESTRICT="!test? ( test )"
-# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
-REQUIRED_USE="test? ( introspection )
- vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
- crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.9
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- $(python_gen_any_dep '
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
- introspection? ( >=dev-libs/gjs-1.32 )
- )
- vala? ( $(vala_depend) )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-
- # Drop unwanted CFLAGS modifications
- sed -e 's/CFLAGS="$CFLAGS -\(g\|O0\|O2\)"//' -i configure || die
-}
-
-multilib_src_configure() {
- local ECONF_SOURCE=${S}
- gnome2_src_configure \
- --enable-manpages \
- --disable-strict \
- --disable-coverage \
- --disable-static \
- $(use_enable crypt gcrypt) \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_enable vala) \
- LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/reference/libsecret/html docs/reference/libsecret/html || die
- fi
-}
-
-multilib_src_test() {
- # tests fail without gobject-introspection
- multilib_is_native_abi && virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
diff --git a/app-crypt/libsecret/libsecret-0.20.3-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.3-r1.ebuild
deleted file mode 100644
index a78d8e1..0000000
--- a/app-crypt/libsecret/libsecret-0.20.3-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 multilib-minimal python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt +introspection test +vala"
-RESTRICT="!test? ( test )"
-# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
-REQUIRED_USE="test? ( introspection )
- vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
- crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.9
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- $(python_gen_any_dep '
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
- introspection? ( >=dev-libs/gjs-1.32 )
- )
- vala? ( $(vala_depend) )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-
- # Drop unwanted CFLAGS modifications
- sed -e 's/CFLAGS="$CFLAGS -\(g\|O0\|O2\)"//' -i configure || die
-}
-
-multilib_src_configure() {
- local ECONF_SOURCE=${S}
- gnome2_src_configure \
- --enable-manpages \
- --disable-strict \
- --disable-coverage \
- --disable-static \
- $(use_enable crypt gcrypt) \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_enable vala) \
- LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/docs/reference/libsecret/html docs/reference/libsecret/html || die
- fi
-}
-
-multilib_src_test() {
- # tests fail without gobject-introspection
- multilib_is_native_abi && virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
diff --git a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
new file mode 100644
index 0000000..12ea695
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 meson multilib-minimal python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ $(python_gen_any_dep '
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+ introspection? ( >=dev-libs/gjs-1.32 )
+ )
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
+)
+
+python_check_deps() {
+ if use introspection; then
+ has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+ fi
+ has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_src_prepare
+ default
+
+ # Remove @filename@ from the header template that would otherwise cause
+ # differences dependent on the ABI
+ sed -e '/enumerations from "@filename@"/d' \
+ -i libsecret/secret-enum-types.h.template || die
+}
+
+meson_multilib_native_use() {
+ multilib_native_usex "$1" "-D${2-$1}=true" "-D${2-$1}=false"
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use crypt gcrypt)
+
+ # Don't build docs multiple times
+ -Dmanpage=$(multilib_is_native_abi && echo true || echo false)
+ $(meson_multilib_native_use gtk-doc gtk_doc)
+
+ $(meson_multilib_native_use introspection)
+ $(meson_multilib_native_use vala vapi)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ virtx meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}