commit: 575fbf6b62505f59d005827f6d99a985532701b8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Dec 10 12:50:56 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Dec 10 12:50:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=575fbf6b
gnome-base/libgnome-keyring: Remove last-rited pkg Closes: https://bugs.gentoo.org/751004 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> gnome-base/libgnome-keyring/Manifest | 1 - .../files/3.12.0-vala-0.42-compat.patch | 25 --------- .../libgnome-keyring-3.12.0-r1.ebuild | 60 ---------------------- gnome-base/libgnome-keyring/metadata.xml | 8 --- profiles/package.mask | 5 -- 5 files changed, 99 deletions(-) diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest deleted file mode 100644 index 31c7a41f69e..00000000000 --- a/gnome-base/libgnome-keyring/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd diff --git a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch deleted file mode 100644 index dd420c86732..00000000000 --- a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3766bcc482f9e02fb5f9c183e814833ad1fbf08a Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <[email protected]> -Date: Tue, 8 Jan 2019 12:19:36 +0100 -Subject: [PATCH] Fix vapi build with vala 0.42 - ---- - library/GnomeKeyring-1.0.metadata | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/GnomeKeyring-1.0.metadata b/library/GnomeKeyring-1.0.metadata -index 04662fb..d8451b9 100644 ---- a/library/GnomeKeyring-1.0.metadata -+++ b/library/GnomeKeyring-1.0.metadata -@@ -54,7 +54,7 @@ set_info skip=false - set_network_password skip=false - store_password skip=false - store_password_sync skip=false --unlock skip=false -+@unlock skip=false - - find_items*.callback type_arguments="GnomeKeyring.Found" - find_network_password*.callback type_arguments="GnomeKeyring.NetworkPasswordData" --- -2.18.1 - diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild deleted file mode 100644 index 7a5b74562aa..00000000000 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala multilib-minimal - -DESCRIPTION="Compatibility library for accessing secrets" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" - -LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2 -SLOT="0" -IUSE="debug +introspection vala" -REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" - -# tests need python2 -RESTRICT="test" - -RDEPEND=" - >=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] - >=sys-apps/dbus-1[${MULTILIB_USEDEP}] - >=gnome-base/gnome-keyring-3.1.92 - introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch - use vala && vala_src_prepare - gnome2_src_prepare - - # FIXME: Remove silly CFLAGS, report upstream - sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \ - -e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \ - -i configure.ac configure || die "sed failed" -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" gnome2_src_configure \ - $(usex debug --enable-debug=yes ' ') \ - $(multilib_native_use_enable vala) - - if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/gnome-keyring/html docs/reference/gnome-keyring/html || die - fi -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml deleted file mode 100644 index 39980802b1d..00000000000 --- a/gnome-base/libgnome-keyring/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 887c7bba779..129ff5e408e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -484,11 +484,6 @@ sci-geosciences/mapnik-world-boundaries # Removal in 30 days. Bug #638088. games-rpg/twclone -# Michał Górny <[email protected]> (2020-10-24) -# Deprecated GNOME2 era libraries with no reverse dependencies left. -# Removal in 30 days. Bug #751004. -gnome-base/libgnome-keyring - # Thomas Deutschmann <[email protected]> (2018-12-10) # Marek Szuba <[email protected]> (2020-10-13) # Ulrich Müller <[email protected]> (2020-11-06)
