From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-crypt/gcr/Manifest | 5 +- app-crypt/gcr/files/3.34.0-fix-desktop-files.patch | 61 ----------------- app-crypt/gcr/gcr-3.34.0-r1.ebuild | 80 ---------------------- app-crypt/gcr/gcr-3.36.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 146 deletions(-) delete mode 100644 app-crypt/gcr/files/3.34.0-fix-desktop-files.patch delete mode 100644 app-crypt/gcr/gcr-3.34.0-r1.ebuild (limited to 'app-crypt/gcr') diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest index afa546f1f5bb..8d6b4a147a9a 100644 --- a/app-crypt/gcr/Manifest +++ b/app-crypt/gcr/Manifest @@ -1,12 +1,9 @@ -AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a AUX 3.36.0-avoid-gnupg-circular-dep.patch 1994 BLAKE2B 371e3124e2fb53c5a8a2b66920d65741a3e9238783a64c9d055a8efc5132958b41ab8576885dc08e92aab3454d2f65ff3e8f8b28779b65b8b92c1547ee02d52e SHA512 6702a7318f3be324f3938b1f838a4d4cc1908502162bcedc96b965934aaf87f6540b91b8a5f9b6bdddadf6d1043ac7788669cb06142af78a81e6774148f8b528 AUX 3.36.0-fix-gck-slot-test.patch 1337 BLAKE2B 7a6a6f62df7967c15cd413da75262c072165aef1923553e2d214743a837b7b166178c400a1f753d945f7c0904de840a748d4c2057ed9ddb9b2530d66ba544d52 SHA512 f76a7bd687281ac299310fddef4fc0a1b1d3955a097a56dd52d57ed42e9a25c1b865959d5ea4c8bed0d472f30fb8dd4660d60e50f4d3352c119e13562ba0a361 AUX 3.36.0-meson-enum-race.patch 870 BLAKE2B 66913d68fd8d5c6af776b90077070d126e91313571519e187dc9a551e63b5ba9869549f567c8b68e9bdf34cda4e6a11904676315cd8bc80eaf409afdc9aee00c SHA512 026371b5710a5544f107563963361abaa2fedfde617eed09c1651c745dbd8f1adcac78578644ef0e8b95331b8836758990d4bb84ee90493789a16f701f40a93e AUX 3.36.0-meson-fix-gtk-doc-without-ui.patch 654 BLAKE2B b929e5112ec488bc70dd50c63d8e35bbfdb311833d2f896d8a79520e0e4334c6ea84f543f14ce7d03b0a1c86840274f2485cd4a1924eaf6ba67a82e5173b0083 SHA512 afea6074440a4763d54b5662adb2e934595d5e289a6d2e0f6d6e8440283abcf6b5ddf8ce0a6246fbfc75ffb3a66efd7d53b727b9b2c849cc72eea4f31405bdd3 AUX 3.36.0-meson-vapi-deps.patch 1658 BLAKE2B 98796051a8b2983dfa82ed6d56c033e70676988462cf3d8fdce255e729ffc6f7def12207e64079895b99af941655804fd1f06d861c950e0cccac3cfcffa585aa SHA512 6bda1adef741699271f55ac33644f5762f8a5ba6c9f15a12870c78a9cafd2e61f350e4732335b51e0f4969a7fc2aaea7f93fda32fe5fbfe2be7ec62f3deddb5f AUX 3.36.0-optional-vapi.patch 2278 BLAKE2B 3492fc70397ee07b04dc156070b153bacc50c9f4a641fba430a27b5b84d788b5f9e2528697bb36f0145607184f233d37676411558b5fc252e7284f46785b2f89 SHA512 f9dd41ee5b7e876f347c2d9130816d5203b64615400b331fd4b5abf95eba6c8bdb3ae59a0b2dacb34ceb7ae778ef7b32c08964f8a1bef1734fbb6522830ff480 -DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093 DIST gcr-3.36.0.tar.xz 1025760 BLAKE2B 03f0d0ed40b600ed80e894111fedff3efcbbaaf6f261d6a44a3649a1acb50c4f35f3dc9a7ddb60f56cab241f68fef83aa5a02a94036e70a6556b35300f2c8fb5 SHA512 0431e7971b73accc62869c9497fcff7c111c453aa6a8ff25b42f19ceae1be0aec52e0e4eb504676f967c6e4f179198c15c521278690822e3457dbc5fe512fd5e -EBUILD gcr-3.34.0-r1.ebuild 1892 BLAKE2B 99121cf56e5e2c42105e70e0211c5e0df823bad896b28e786ef79f771f4a5a56f23648cc520044e8f8340ef9ce583efdefde7736c1be09ab4ed3920e59fd7b7e SHA512 31f67170d9129e9133607b6b0f3d16c5bb6e1eda2cbfe9571a40b0b02b97a93d03155ec04ff3bbb825c6efb3fa087a4d0286bbaa259ea0063c16049f486d93fa -EBUILD gcr-3.36.0.ebuild 1965 BLAKE2B 9b3067377661b71db99e9dc148a204ca8f75c3eece1c6de699c8185875a06bebb7306a2b00e7755d2218d3ff694d662bd683cc3996b8fef7622ee9a574efa3a3 SHA512 20a102057d6339a9dc42f9b064e89c95b43657b20eb894c6d6507b7c2308155f2e81c330eb57d2f46d3895ade77241a72db934f5f4a367890edd7bf3850d172b +EBUILD gcr-3.36.0.ebuild 1962 BLAKE2B 7fdb1e2ddf27c1815bd7946850c71c2822831115eee4e5302c3f40d4e6b2a1851af4bc8c6d9cba3750c974c0e8642165c94fc9b0a3a372cb603877ac8a687263 SHA512 bfea4b3a7d52ab80678c5d5d066e858f74a1e31e51e6e6ff4790226da4f1c3cac89cb79b50f28c424d675208bb2634ae152558a51d7fa188637776dfaa4960ee MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch deleted file mode 100644 index 0678937fcc0e..000000000000 --- a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a69dc44e11270ce092babfa57fe3aab31da9619c Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Mon, 21 Oct 2019 12:02:05 +0200 -Subject: [PATCH] build: Use sed for .desktop variables substitution - -We can't do that with configure, as it leaves ${exec_prefix}. ---- - configure.ac | 2 -- - ui/Makefile.am | 6 ++++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1ba43d6..6286f16 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -423,8 +423,6 @@ gcr/gcr-version.h - po/Makefile.in - ui/gcr.pc - ui/gcr-ui.pc --ui/gcr-prompter.desktop.in --ui/gcr-viewer.desktop.in - ui/icons/16x16/Makefile - ui/icons/22x22/Makefile - ui/icons/24x24/Makefile -diff --git a/ui/Makefile.am b/ui/Makefile.am -index 29c33e7..7594621 100644 ---- a/ui/Makefile.am -+++ b/ui/Makefile.am -@@ -209,6 +209,8 @@ gcr_viewer_LDADD = \ - viewer_desktop_in_in = ui/gcr-viewer.desktop.in.in - viewer_desktop_in = $(viewer_desktop_in_in:.desktop.in.in=.desktop.in) - viewer_desktop = $(viewer_desktop_in:.desktop.in=.desktop) -+$(viewer_desktop_in): $(viewer_desktop_in_in) -+ $(AM_V_GEN) sed 's|@bindir[@]|$(bindir)|g' $< > $@ - $(viewer_desktop): $(viewer_desktop_in) - $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ - -@@ -231,9 +233,12 @@ gcr_prompter_LDADD = \ - prompter_desktop_in_in = ui/gcr-prompter.desktop.in.in - prompter_desktop_in = $(prompter_desktop_in_in:.desktop.in.in=.desktop.in) - prompter_desktop = $(prompter_desktop_in:.desktop.in=.desktop) -+$(prompter_desktop_in): $(prompter_desktop_in_in) -+ $(AM_V_GEN) sed 's|@libexecdir[@]|$(libexecdir)|g' $< > $@ - $(prompter_desktop): $(prompter_desktop_in) - $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ - -+desktop_in_in_files = $(viewer_desktop_in_in) $(prompter_desktop_in_in) - desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) - desktopdir = $(datadir)/applications - desktop_DATA = \ -@@ -247,6 +252,7 @@ EXTRA_DIST += \ - ui/gcr.gresource.xml \ - $(ui_RESOURCES) \ - $(mime_DATA) \ -+ $(desktop_in_in_files) \ - ui/fixtures - - CLEANFILES += \ --- -2.24.1 - diff --git a/app-crypt/gcr/gcr-3.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild deleted file mode 100644 index 5bc0674f0a90..000000000000 --- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{6,7,8} ) -GNOME2_EAUTORECONF="yes" - -inherit gnome2 python-any-r1 vala virtualx - -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-3 - -IUSE="debug gtk +introspection +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -COMMON_DEPEND=" - >=app-crypt/p11-kit-0.19 - >=dev-libs/glib-2.38:2 - >=dev-libs/libgcrypt-1.2.2:0= - >=dev-libs/libtasn1-1:= - >=sys-apps/dbus-1 - gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) - introspection? ( >=dev-libs/gobject-introspection-1.34:= ) -" -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-libs/gobject-introspection-common - dev-libs/libxml2:2 - dev-libs/libxslt - dev-libs/vala-common - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.9 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -# eautoreconf needs: -# dev-libs/gobject-introspection-common -# dev-libs/vala-common - -PATCHES=( - "${FILESDIR}"/${PV}-fix-desktop-files.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid flag changes - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with gtk) \ - $(use_enable introspection) \ - $(use_enable vala) \ - $(usex debug --enable-debug=yes --enable-debug=default) \ - --disable-update-icon-cache \ - --disable-update-mime -} - -src_test() { - virtx emake check -} diff --git a/app-crypt/gcr/gcr-3.36.0.ebuild b/app-crypt/gcr/gcr-3.36.0.ebuild index 083725870e4d..bf87187f6fc5 100644 --- a/app-crypt/gcr/gcr-3.36.0.ebuild +++ b/app-crypt/gcr/gcr-3.36.0.ebuild @@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-base-3 and co IUSE="gtk gtk-doc +introspection +vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +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 -- cgit v1.2.3