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

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

[Mart Raudsepp]

commit:     b3caa4962fd17ce21393f8f80eafb0a6fc5e7625
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  4 13:25:13 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jul  4 15:05:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3caa496

dev-libs/libmanette: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 dev-libs/libmanette/Manifest                       |   1 -
 .../files/0.2.3-optional-introspection-vapi.patch  | 114 ---------------------
 dev-libs/libmanette/libmanette-0.2.3.ebuild        |  44 --------
 3 files changed, 159 deletions(-)

diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 664fce41680..c594bc23b75 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,2 +1 @@
-DIST libmanette-0.2.3.tar.xz 33620 BLAKE2B ec811e0a939713e99eb931a2aa0c1b67a2de1fad4c4e399e47975b795da7672ab56a217cda94f4642f749aed1ff4379c67b58da349f8ac8434c95a80c7909980 SHA512 23d3feae3b0ba81deb75b0ff911eb37f3d0d767a0ae65815d34cadf69f78ca7f081177a2161105ea3979ba9222b3641e6b776bf4fcf3e46a9de716bdce475df6
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792

diff --git a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch b/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch
deleted file mode 100644
index 15558b47be3..00000000000
--- a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From b561bd29d8797ae2e72d45df8fc122164fc88b6c Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 20 Oct 2019 14:57:43 +0300
-Subject: [PATCH] build: Support disabling introspection and vapi generation
-
----
- meson_options.txt | 14 +++++++++++
- src/meson.build   | 64 ++++++++++++++++++++++++++---------------------
- 2 files changed, 49 insertions(+), 29 deletions(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index a7ce738..c794d4b 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,3 +4,17 @@ option (
-   description: 'Find devices via udev',
-   value: 'auto'
- )
-+
-+option (
-+  'introspection',
-+  type: 'boolean',
-+  description: 'Generate introspection data (requires gobject-introspection)',
-+  value: true
-+)
-+
-+option (
-+  'vapi',
-+  type: 'boolean',
-+  description: 'Generate vapi data (requires vapigen and introspection option)',
-+  value: true
-+)
-diff --git a/src/meson.build b/src/meson.build
-index 7ac916b..50cad92 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -90,39 +90,45 @@ if gudev.found()
-   libmanette_gir_includes += [ 'GUdev-1.0' ]
- endif
- 
--libmanette_gir = gnome.generate_gir(
--  libmanette_lib,
--  extra_args: libmanette_gir_args,
--  export_packages: libmanette_module,
--  sources: libmanette_headers + libmanette_sources,
--  nsversion: api_version,
--  namespace: 'Manette',
--  identifier_prefix: 'Manette',
--  includes: libmanette_gir_includes,
--  header: libmanette_main_header,
--  install: true,
--  symbol_prefix: 'manette',
--)
--
--libmanette_vapi_packages = [
--  'gobject-2.0',
--  'gio-2.0',
--]
--
--if gudev.found()
--  libmanette_vapi_packages += [ 'gudev-1.0' ]
-+built_girs = []
-+if get_option('introspection')
-+  libmanette_gir = gnome.generate_gir(
-+    libmanette_lib,
-+    extra_args: libmanette_gir_args,
-+    export_packages: libmanette_module,
-+    sources: libmanette_headers + libmanette_sources,
-+    nsversion: api_version,
-+    namespace: 'Manette',
-+    identifier_prefix: 'Manette',
-+    includes: libmanette_gir_includes,
-+    header: libmanette_main_header,
-+    install: true,
-+    symbol_prefix: 'manette',
-+  )
-+  built_girs += [ libmanette_gir ]
-+
-+  if get_option('vapi')
-+    libmanette_vapi_packages = [
-+      'gobject-2.0',
-+      'gio-2.0',
-+    ]
-+
-+    if gudev.found()
-+      libmanette_vapi_packages += [ 'gudev-1.0' ]
-+    endif
-+
-+    gnome.generate_vapi(
-+      libmanette_module,
-+      install: true,
-+      packages: libmanette_vapi_packages,
-+      sources: libmanette_gir[0],
-+    )
-+  endif
- endif
- 
--gnome.generate_vapi(
--  libmanette_module,
--  install: true,
--  packages: libmanette_vapi_packages,
--  sources: libmanette_gir[0],
--)
--
- libmanette_dep = declare_dependency(
-   link_with: libmanette_lib,
--  sources: libmanette_gir,
-+  sources: built_girs,
-   include_directories: confinc,
-   dependencies: libmanette_deps,
- )
--- 
-2.20.1
-

diff --git a/dev-libs/libmanette/libmanette-0.2.3.ebuild b/dev-libs/libmanette/libmanette-0.2.3.ebuild
deleted file mode 100644
index e936a0a38c1..00000000000
--- a/dev-libs/libmanette/libmanette-0.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple GObject game controller library"
-HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+introspection +udev +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	udev? ( dev-libs/libgudev[introspection?] )
-	dev-libs/libevdev
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${DEPEND}
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://gitlab.gnome.org/aplazas/libmanette/merge_requests/18
-	"${FILESDIR}"/${PV}-optional-introspection-vapi.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature udev gudev)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}