[gentoo-commits] repo/gentoo:master commit in: net-libs/libsignon-glib/files/, net-libs/libsignon-glib/

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsignon-glib/files/, net-libs/libsignon-glib/

[Johannes Huber]

commit:     b25ff8de385a6a27c23237fa8ec1880b461af68e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 12:24:48 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 12:24:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25ff8de

net-libs/libsignon-glib: New package

Initial ebuild by Igor Poboiko <igor.poboiko <AT> gmail.com>. Updates by me.

Gentoo-Bug: 557546
Reported-by: David E. Narváez <david.narvaez <AT> computer.org>

Package-Manager: portage-2.2.20.1

 net-libs/libsignon-glib/Manifest                   |  1 +
 .../files/libsignon-glib-1.12-doc-disable.patch    | 25 +++++++
 net-libs/libsignon-glib/libsignon-glib-1.12.ebuild | 76 ++++++++++++++++++++++
 net-libs/libsignon-glib/metadata.xml               |  5 ++
 4 files changed, 107 insertions(+)

diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
new file mode 100644
index 0000000..48c9856
--- /dev/null
+++ b/net-libs/libsignon-glib/Manifest
@@ -0,0 +1 @@
+DIST libsignon-glib-1.12.tar.xz 42384 SHA256 bd7e3be291e3173f20dda5376e1387be5d1705b12a00885e93f2cc900a9b4463 SHA512 5d5a3918898dce9d8b10597ac95428bef4753a1c626b6e7fef54e9024327b0849ddb628b25801504c336cf6fe2ebc16e5264bb576ecab16457ccf17918f042cf WHIRLPOOL 5766ad1fe50a6637d2f8e5fe6b092599112c9b6fb56dd44502568d41d61d3208d8d5a00ce1c698848f3fbeb0eb0a1ee82bcbebaff74428a97f634589e56d9def

diff --git a/net-libs/libsignon-glib/files/libsignon-glib-1.12-doc-disable.patch b/net-libs/libsignon-glib/files/libsignon-glib-1.12-doc-disable.patch
new file mode 100644
index 0000000..1ef64e6
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-1.12-doc-disable.patch
@@ -0,0 +1,25 @@
+diff -Naur libsignon-glib-1.12.old/configure.ac libsignon-glib-1.12/configure.ac
+--- libsignon-glib-1.12.old/configure.ac	2014-12-09 11:52:37.000000000 +0300
++++ libsignon-glib-1.12/configure.ac	2015-08-27 13:00:54.501123031 +0300
+@@ -100,9 +100,6 @@
+ 	Makefile
+ 	libsignon-glib/Makefile
+ 	libsignon-glib.pc
+-	docs/Makefile
+-	docs/reference/Makefile
+-	docs/reference/version.xml
+ 	tests/Makefile
+ 	pygobject/Makefile
+ ])
+diff -Naur libsignon-glib-1.12.old/Makefile.am libsignon-glib-1.12/Makefile.am
+--- libsignon-glib-1.12.old/Makefile.am	2014-12-09 11:52:37.000000000 +0300
++++ libsignon-glib-1.12/Makefile.am	2015-08-27 13:00:42.101237854 +0300
+@@ -2,7 +2,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \
+ 	--enable-introspection=yes
+-SUBDIRS = libsignon-glib docs
++SUBDIRS = libsignon-glib
+ 
+ if ENABLE_PYTHON
+ SUBDIRS += pygobject

diff --git a/net-libs/libsignon-glib/libsignon-glib-1.12.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.12.ebuild
new file mode 100644
index 0000000..c5f085e
--- /dev/null
+++ b/net-libs/libsignon-glib/libsignon-glib-1.12.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit autotools python-r1
+
+DESCRIPTION="GLib binding for the D-Bus API provided by signond"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc python test"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	dev-libs/check
+	python? ( ${PYTHON_DEPS} )
+	doc? ( dev-util/gtk-doc )
+"
+
+DOCS=( AUTHORS NEWS README )
+
+# needs more love
+RESTRICT="test"
+
+src_prepare() {
+	if ! use doc; then
+		epatch "${FILESDIR}/${P}-doc-disable.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	myconfigure() {
+		local myeconfargs=(
+			$(use_enable debug)
+			$(use_enable doc gtk-doc)
+			$(use_enable python)
+			$(use_enable test tests)
+		)
+
+		econf "${myeconfargs[@]}"
+	}
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl run_in_build_dir myconfigure
+	else
+		myconfigure
+	fi
+}
+
+src_compile() {
+	# fails to compile with more than one thread
+	MAKEOPTS="${MAKEOPTS} -j1"
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+}

diff --git a/net-libs/libsignon-glib/metadata.xml b/net-libs/libsignon-glib/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/net-libs/libsignon-glib/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsignon-glib/files/, net-libs/libsignon-glib/

[Andreas Sturmlechner]

commit:     6187339fbad7ca56c3012ce6ec8f7f064b6b4748
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 19:15:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 19:20:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6187339f

net-libs/libsignon-glib: Support python3_11, EAPI-8

Fedora do it, so we can too.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libsignon-glib-2.1-docs-optional.patch   | 28 +++++++++++++++++++
 .../files/libsignon-glib-2.1-meson-0.61.patch      | 31 ++++++++++++++++++++++
 ...-2.1-r1.ebuild => libsignon-glib-2.1-r2.ebuild} | 14 ++++++----
 3 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
new file mode 100644
index 000000000000..b31bd46a825e
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-docs-optional.patch
@@ -0,0 +1,28 @@
+From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 2 Jan 2021 14:19:18 +0100
+Subject: [PATCH] build: make documentation really optional
+
+Build of the documentation only if the meson option for it is enabled.
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5d0de55..b10f80d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,9 @@ endif
+ root_dir = include_directories ('.')
+ 
+ subdir('libsignon-glib')
+-subdir('docs')
++if get_option('documentation')
++    subdir('docs')
++endif
+ 
+ if get_option('python')
+     subdir('pygobject')
+-- 
+GitLab
+

diff --git a/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
new file mode 100644
index 000000000000..66254e398029
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-2.1-meson-0.61.patch
@@ -0,0 +1,31 @@
+From 4fae9155a19aca601072f361768e0bf8ed556b1e Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 11 Jan 2022 22:05:11 +0100
+Subject: [PATCH] Fix build with meson >= 0.61.0
+
+Otherwise it fails with "docs/reference/meson.build:21:6: ERROR:
+gnome.gtkdoc keyword argument 'expand_content_files' was of type
+array[File] but should have been array[str]".
+---
+ docs/reference/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/meson.build b/docs/reference/meson.build
+index 654404b..3927109 100644
+--- a/docs/reference/meson.build
++++ b/docs/reference/meson.build
+@@ -47,9 +47,9 @@ gnome.gtkdoc(
+         'libsignon-glib.types',
+     ],
+     content_files: doc_content_files,
+-    expand_content_files: files(
++    expand_content_files: [
+         'migrating-1to2.xml'
+-    ),
++    ],
+     fixxref_args: [
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+         '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+-- 
+GitLab
+

diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
similarity index 91%
rename from net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
rename to net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
index 1fee6ac93428..7f697f3474bf 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-r1 vala
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
@@ -38,6 +38,11 @@ BDEPEND="$(python_gen_any_dep)
 	test? ( dev-libs/check )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-docs-optional.patch"
+	"${FILESDIR}/${P}-meson-0.61.patch"
+)
+
 python_check_deps() { return 0; }
 
 pkg_setup() {
@@ -46,9 +51,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	vala_src_prepare
-
-	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
+	vala_setup
 
 	cp libsignon-glib/*.xml libsignon-glib/interfaces || die
 }
@@ -57,6 +60,7 @@ src_configure() {
 	myconfigure() {
 		local emesonargs=(
 			-Ddebugging=$(usex debug true false)
+			-Ddocumentation=$(usex doc true false)
 			-Dintrospection=$(usex introspection true false)
 			-Dpython=$(usex python true false)
 			-Dtests=$(usex test true false)