summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-05-30 15:25:17 -0700
committerMatt Turner <mattst88@gentoo.org>2021-05-30 18:57:30 -0700
commitc17a2be571782d1321c0eda6b379a9e94f8172b8 (patch)
treef3120d64929770fbf1697ed3d43f910796bd4593 /app-crypt/gcr
parentapp-cdr/brasero: Drop old versions (diff)
downloadgentoo-c17a2be571782d1321c0eda6b379a9e94f8172b8.tar.gz
gentoo-c17a2be571782d1321c0eda6b379a9e94f8172b8.tar.bz2
gentoo-c17a2be571782d1321c0eda6b379a9e94f8172b8.zip
app-crypt/gcr: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'app-crypt/gcr')
-rw-r--r--app-crypt/gcr/Manifest1
-rw-r--r--app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch52
-rw-r--r--app-crypt/gcr/gcr-3.38.1.ebuild84
3 files changed, 0 insertions, 137 deletions
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 31be3b955dcb..cc0e9da4b4eb 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,2 +1 @@
-DIST gcr-3.38.1.tar.xz 1030360 BLAKE2B 474b501a5f6c339b0b4fb460a094dec6d5a297ca44daf050c6c88bc05ee822358309f57490f92c42f84a1e9f36a1d3c09c4b2788d7142ee5e86e2acf7987ea14 SHA512 4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21
DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
diff --git a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch b/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch
deleted file mode 100644
index 5bb7da0fa787..000000000000
--- a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b938b0b658852c682ae17d56e0ad9322611e9516 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Wed, 11 Mar 2020 11:49:08 +0100
-Subject: [PATCH 1/2] meson: allow building without gpg(2) installed
-
-This avoids circular dependencies, such as gcr -> gpg2 -> pinentry -> gcr
----
- meson.build | 7 +++++--
- meson_options.txt | 5 +++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a26a0f9..02b4c3c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
- gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
- gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
- glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
--gpg_bin = find_program('gpg2', 'gpg')
-+gpg_path = get_option('gpg_path')
-+if gpg_path == ''
-+ gpg_path = find_program('gpg2', 'gpg').path()
-+endif
- libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
- p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
- p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules')
-@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true)
- conf.set('HAVE_LOCALE_H', cc.has_header('locale.h'))
- conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
- conf.set('HAVE_MLOCK', cc.has_function('mlock'))
--conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path())
-+conf.set_quoted('GPG_EXECUTABLE', gpg_path)
- conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
- config_file = configure_file(
- output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index bbdc8e3..ae0f524 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,8 @@ option('gtk_doc',
- value: true,
- description: 'Build the reference documentation (requires gtk-doc)',
- )
-+option('gpg_path',
-+ type: 'string',
-+ value: '',
-+ description: 'Path to gpg, autodetected if not set',
-+)
---
-2.26.2
-
diff --git a/app-crypt/gcr/gcr-3.38.1.ebuild b/app-crypt/gcr/gcr-3.38.1.ebuild
deleted file mode 100644
index 0a9c7d827500..000000000000
--- a/app-crypt/gcr/gcr-3.38.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
-
-IUSE="gtk gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-DEPEND="
- >=dev-libs/glib-2.44.0:2
- >=dev-libs/libgcrypt-1.2.2:0=
- >=app-crypt/p11-kit-0.19.0
- gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
- >=sys-apps/dbus-1
- introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="app-crypt/gnupg"
-BDEPEND="
- ${PYTHON_DEPS}
- gtk? ( dev-libs/libxml2:2 )
- dev-util/gdbus-codegen
- dev-util/glib-utils
- gtk-doc? (
- >=dev-util/gtk-doc-1.9
- app-text/docbook-xml-dtd:4.1.2
- )
- >=sys-devel/gettext-0.19.8
- test? ( app-crypt/gnupg )
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/3.38.0-avoid-gnupg-circular-dep.patch
- "${FILESDIR}"/3.38.0-optional-vapi.patch
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use introspection)
- $(meson_use gtk)
- $(meson_use gtk-doc gtk_doc)
- -Dgpg_path="${EPREFIX}"/usr/bin/gpg
- $(meson_use vala vapi)
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}