[gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/, sys-apps/osinfo-db-tools/files/

2023-10-04 Thread Sam James 
commit: 40a2594278d50188df3336f48a2d9c6eae81cfc3
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  4 16:41:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  4 16:47:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a25942

sys-apps/osinfo-db-tools: don't redefine _FORTIFY_SOURCE

Closes: https://bugs.gentoo.org/892996
Signed-off-by: Sam James  gentoo.org>

 ...db-tools-1.10.0-no-clobber-fortify-source.patch | 13 ++
 .../osinfo-db-tools-1.10.0-r2.ebuild   | 52 ++
 2 files changed, 65 insertions(+)

diff --git 
a/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch
 
b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch
new file mode 100644
index ..512bddfbe8c2
--- /dev/null
+++ 
b/sys-apps/osinfo-db-tools/files/osinfo-db-tools-1.10.0-no-clobber-fortify-source.patch
@@ -0,0 +1,13 @@
+Don't clobber toolchain defaults.
+
+https://bugs.gentoo.org/892996
+--- a/meson.build
 b/meson.build
+@@ -204,7 +204,6 @@ osinfo_db_tools_check_cflags = [
+   '-Wjump-misses-init',
+   '-Wframe-larger-than=4096',
+   '-Wno-overlength-strings',
+-  '-Wp,-D_FORTIFY_SOURCE=2',
+   '--param=ssp-buffer-size=4',
+   '-fexceptions',
+   '-fasynchronous-unwind-tables',

diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild 
b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild
new file mode 100644
index ..220ff049a956
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/;
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/glib-2.44:2
+   dev-libs/json-glib
+   >=app-arch/libarchive-3.0.0:=
+   net-libs/libsoup:3.0
+   >=dev-libs/libxml2-2.6.0
+"
+# perl dep is for pod2man (manpages)
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   >=sys-devel/gettext-0.19.8
+   dev-lang/perl
+   test? (
+   $(python_gen_any_dep '
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   ')
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.10.0-no-clobber-fortify-source.patch
+)
+
+python_check_deps() {
+   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+   python_has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/, sys-apps/osinfo-db-tools/files/

2023-01-03 Thread Matt Turner 
commit: 0ac9e7601b4e9c67167fe00d65c9e3d197739460
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jan  3 03:59:32 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jan  3 14:07:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac9e760

sys-apps/osinfo-db-tools: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 .../files/1.10.0-use-libsoup-2.4.patch | 16 ---
 .../osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild  | 54 --
 2 files changed, 70 deletions(-)

diff --git a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch 
b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
deleted file mode 100644
index a59e451baed9..
--- a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1cc5ff5..72b18a8 100644
 a/meson.build
-+++ b/meson.build
-@@ -58,11 +58,7 @@ gobject_dep = dependency('gobject-2.0', version: 
glib_version_info)
- #  everything else
- json_glib_dep = dependency('json-glib-1.0')
- libarchive_dep = dependency('libarchive', version: '>= 3.0.0')
--libsoup_dep = dependency('libsoup-3.0', required: false)
--#fallback to libsoup2
--if not libsoup_dep.found()
-   libsoup_dep = dependency('libsoup-2.4')
--endif
- libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0')
- 
- #  common dependencies

diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild 
b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
deleted file mode 100644
index a551d9abca7c..
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/;
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/glib-2.44:2
-   dev-libs/json-glib
-   >=app-arch/libarchive-3.0.0:=
-   net-libs/libsoup:2.4
-   >=dev-libs/libxml2-2.6.0
-"
-# perl dep is for pod2man (manpages)
-DEPEND="${RDEPEND}"
-BDEPEND="
-   virtual/pkgconfig
-   >=sys-devel/gettext-0.19.8
-   dev-lang/perl
-   test? (
-   $(python_gen_any_dep '
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   ')
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PV}-use-libsoup-2.4.patch
-)
-
-python_check_deps() {
-   use test && \
-   python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-   python_has_version "dev-python/requests[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   use test && python-any-r1_pkg_setup
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/, sys-apps/osinfo-db-tools/files/

2022-10-09 Thread Matt Turner 
commit: fe2ea941d7ac1d5d4d04ef9bf71849d30ca970ca
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Oct  9 23:23:11 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Oct  9 23:25:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2ea941

sys-apps/osinfo-db-tools: Add patch to force libsoup:2.4

Signed-off-by: Matt Turner  gentoo.org>

 .../osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch   | 16 
 sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild   |  4 
 2 files changed, 20 insertions(+)

diff --git a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch 
b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
new file mode 100644
index ..a59e451baed9
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
@@ -0,0 +1,16 @@
+diff --git a/meson.build b/meson.build
+index 1cc5ff5..72b18a8 100644
+--- a/meson.build
 b/meson.build
+@@ -58,11 +58,7 @@ gobject_dep = dependency('gobject-2.0', version: 
glib_version_info)
+ #  everything else
+ json_glib_dep = dependency('json-glib-1.0')
+ libarchive_dep = dependency('libarchive', version: '>= 3.0.0')
+-libsoup_dep = dependency('libsoup-3.0', required: false)
+-#fallback to libsoup2
+-if not libsoup_dep.found()
+   libsoup_dep = dependency('libsoup-2.4')
+-endif
+ libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0')
+ 
+ #  common dependencies

diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild 
b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
index a202146e59fb..ab5d9f49f3fe 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PV}-use-libsoup-2.4.patch
+)
+
 python_check_deps() {
use test && \
has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \