[gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/, dev-libs/libjcat/files/

[Lars Wendler]

commit:     c5440e66bb922ca2e6c46d78b633053c9ccd8824
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 15:41:42 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 15:41:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5440e66

dev-libs/libjcat: Removed old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libjcat/Manifest                          |  1 -
 .../libjcat-0.1.0-disable_installed_tests.patch    | 45 -----------------
 .../files/libjcat-0.1.0-use_right_python.patch     | 29 -----------
 dev-libs/libjcat/libjcat-0.1.0.ebuild              | 56 ----------------------
 4 files changed, 131 deletions(-)

diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index d0482c7ac39..aaf61a45435 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,3 +1,2 @@
-DIST libjcat-0.1.0.tar.gz 60808 BLAKE2B 384e5a846fb7c49c8a6d6ace5f2b17715693d7e9ecfce020859c6fb5d96f9b9398606a2161a2c9f795c16c90e8b7a0e9d08970c1f81e4412783097f4ca599083 SHA512 2172fd621c86b3a2d507c3bb8fcc5f40a46656a5352f4963a014c76642bb2c34e316bb8608c121fa7d728d63dc2593ed28d3e3478e1ec5bcf32daeffc43627fd
 DIST libjcat-0.1.1.tar.gz 62579 BLAKE2B fed33602d2b036605238945d09ede1c524847624f1be6301a7f5ff64d21ba27c7c765b37c522f81dfd49071db6339738ad82b2ad0b25f0494bf4fd806c64b5de SHA512 fd644c003ad3a317a9f8886c2bad6dcfabf953e61bcbf02b30a292e9a85a591f854f71d7ac17692d5d98d976a435cf53beba1394c662fa78836389d66d4a5824
 DIST libjcat-0.1.2.tar.gz 62630 BLAKE2B cb333098d984f840a80c4ea4b7feab32ca7d04882f2f4aa788c01dd13c616b85576af5bbcd0ca343a7f5b7221ab69b202c7a8cacb230eeeefab9a3a9a61d7d3f SHA512 9184b761cad5a43ac1f0b0cd4ff54c372ec067785c9b796d813aab6a936fbb522f419e965b70d4d71fbec9f7c25f9d185f957cf1e73cb0e5bdeca9492e11b0fd

diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch b/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch
deleted file mode 100644
index 823d713b791..00000000000
--- a/dev-libs/libjcat/files/libjcat-0.1.0-disable_installed_tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/data/tests/colorhug/meson.build
-+++ b/data/tests/colorhug/meson.build
-@@ -1,9 +1,11 @@
-+if false
- install_data([
-     'firmware.bin',
-     'firmware.bin.asc',
-   ],
-   install_dir: installed_test_datadir,
- )
-+endif
- 
- if get_option('pkcs7')
-   # generate self-signed detached signature
-@@ -16,7 +18,7 @@
-                         '--load-certificate', pkcs7_certificate,
-                         '--infile', '@INPUT@',
-                         '--outfile', '@OUTPUT@'],
--    install: true,
-+    install: false,
-     install_dir: installed_test_datadir,
-   )
- endif
---- a/data/tests/meson.build
-+++ b/data/tests/meson.build
-@@ -2,7 +2,7 @@
-   input : 'libjcat.test.in',
-   output : 'libjcat.test',
-   configuration : conf,
--  install: true,
-+  install: false,
-   install_dir: installed_test_datadir,
- )
- 
---- a/libjcat/meson.build
-+++ b/libjcat/meson.build
-@@ -225,7 +225,7 @@
-       '-DTESTDATADIR_SRC="' + testdatadir_src + '"',
-       '-DTESTDATADIR_DST="' + testdatadir_dst + '"',
-     ],
--    install : true,
-+    install : false,
-     install_dir : installed_test_bindir
-   )
-   test('jcat-self-test', e)

diff --git a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch b/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch
deleted file mode 100644
index 9cbc63a08c0..00000000000
--- a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-By default generate-version-script.py uses /usr/bin/python3, whatever
-version that may be - which causes problems if the default python3
-installation is one either built without XML support or not included
-in PYTHON_TARGETS of dev-python/setuptools. Make sure the script is
-invoked using the same interpreter as meson itself, as that one is
-already guaranteed to provide both 'xml' and 'pkg_resources'.
-
---- a/libjcat/meson.build
-+++ b/libjcat/meson.build
-@@ -129,6 +129,11 @@
-     install : true,
-   )
- 
-+  # Make sure generate-version-script.py is invoked by the same python as meson,
-+  # as that one must already have both XML support and setuptools.
-+  python = import('python')
-+  python_interpreter = python.find_installation()
-+
-   # Verify the map file is correct -- note we can't actually use the generated
-   # file for two reasons:
-   #
-@@ -141,6 +146,7 @@
-     input: jcat_gir[0],
-     output: 'jcat.map',
-     command: [
-+      python_interpreter,
-       join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'),
-       'LIBJCAT',
-       '@INPUT@',

diff --git a/dev-libs/libjcat/libjcat-0.1.0.ebuild b/dev-libs/libjcat/libjcat-0.1.0.ebuild
deleted file mode 100644
index 0956f965a22..00000000000
--- a/dev-libs/libjcat/libjcat-0.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib:=
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
-	pkcs7? ( net-libs/gnutls )
-	dev-lang/vala:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	man? ( sys-apps/help2man )
-	test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.0-disable_installed_tests.patch
-	"${FILESDIR}"/${PN}-0.1.0-use_right_python.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-# TODO: make vala optional
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gpg)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use pkcs7)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}