public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2021-10-07  6:11 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-10-07  6:11 UTC (permalink / raw
  To: gentoo-commits

commit:     2f353f4394f0dc967de6b2af2c193ae15fd592bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 06:05:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 06:11:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f353f43

app-emulation/guestfs-tools: initial import (split from libguestfs)

Bug: https://bugs.gentoo.org/816693
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/Manifest               |   1 +
 .../guestfs-tools/guestfs-tools-1.46.1.ebuild      | 150 +++++++++++++++++++++
 app-emulation/guestfs-tools/metadata.xml           |   5 +
 3 files changed, 156 insertions(+)

diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest
new file mode 100644
index 00000000000..3961908b067
--- /dev/null
+++ b/app-emulation/guestfs-tools/Manifest
@@ -0,0 +1 @@
+DIST guestfs-tools-1.46.1.tar.gz 12665804 BLAKE2B 7800954dfa961900035b127f6ac2556f584dd2d156143bf82fd1ba9fd1f327091706987192d91cb4251295d9565e56f769ab06bdac677160ac31d2e8f9d9a488 SHA512 d2bd0790343d54a2517237e56d1b982cd41335654fd205cfeec42a1b7cbbf4c0923597b767b8769dfe74766e078a817d520db251895990b922522030806d0b85

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.46.1.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.46.1.ebuild
new file mode 100644
index 00000000000..61f45828177
--- /dev/null
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.46.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+# Keyword with newer libguestfs, bug #816693
+#KEYWORDS="~amd64"
+IUSE="doc +ocaml +perl test"
+RESTRICT="!test? ( test )"
+
+# Failures - doc
+COMMON_DEPEND="
+	app-arch/cpio
+	app-arch/lzma
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-crypt/gnupg
+	>=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
+	app-emulation/libvirt:=
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
+	dev-lang/perl:=
+	dev-libs/libpcre2:=
+	dev-libs/libxml2:2
+	dev-libs/jansson:=
+	>=sys-apps/fakechroot-2.8
+	sys-fs/squashfs-tools:*
+	sys-libs/libxcrypt:=
+	virtual/libcrypt:=
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	perl? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Getopt-Long
+		dev-perl/Module-Build
+		dev-perl/libintl-perl
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		dev-perl/String-ShellQuote
+		test? ( virtual/perl-Test-Simple )
+	)
+"
+# Some OCaml is always required
+# bug #729674
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
+	ocaml? (
+		dev-ml/ounit2[ocamlopt]
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+	)
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+#PATCHES=(
+#	"${FILESDIR}"/${MY_PV_1}/
+#)
+
+pkg_setup() {
+	CONFIG_CHECK="~KVM ~VIRTIO"
+	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
+}
+
+src_configure() {
+	# bug #794877
+	tc-export AR
+
+	if use test ; then
+		# Skip Bash test
+		# (See 13-test-suite.log in linked bug)
+		# bug #794874
+		export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
+
+		# This test requires libvirt support in libguestfs and it makes
+		# no difference at runtime. Just gracefully skip it to make life
+		# easier for e.g. arch testing.
+		if ! has_version 'app-emulation/libguestfs[libvirt]' ; then
+			export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
+		fi
+
+		# Needed for the inspector tests. Provided by libguestfs-appliance.
+		#export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/
+		# But the inspector tests seem fragile anyway...
+		export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1
+		export SKIP_TEST_VIRT_INSPECTOR_SH=1
+	fi
+
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this
+	# doesn't become stale.
+	# bug #703118, bug #789354
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	econf \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable perl)
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use perl ; then
+		perl_delete_localpod
+	fi
+}
+
+pkg_postinst() {
+	if ! use ocaml ; then
+		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
+	fi
+
+	if ! use perl ; then
+		einfo "Perl based tools NOT built"
+	fi
+}

diff --git a/app-emulation/guestfs-tools/metadata.xml b/app-emulation/guestfs-tools/metadata.xml
new file mode 100644
index 00000000000..115e9d64a66
--- /dev/null
+++ b/app-emulation/guestfs-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2021-10-08  1:53 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-10-08  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     fa6833b3cb389b562f0b32155ba60feed5d8361d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 01:52:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 01:52:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6833b3

app-emulation/guestfs-tools: block older libguestfs

Bug: https://bugs.gentoo.org/816693
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{guestfs-tools-1.46.1.ebuild => guestfs-tools-1.46.1-r1.ebuild}      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.46.1.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
similarity index 99%
rename from app-emulation/guestfs-tools/guestfs-tools-1.46.1.ebuild
rename to app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
index 61f45828177..1ac17ff9fb4 100644
--- a/app-emulation/guestfs-tools/guestfs-tools-1.46.1.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 
 # Failures - doc
 COMMON_DEPEND="
+	!<app-emulation/libguestfs-1.46.0-r1
 	app-arch/cpio
 	app-arch/lzma
 	app-arch/unzip[natspec]


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2021-10-22  2:47 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-10-22  2:47 UTC (permalink / raw
  To: gentoo-commits

commit:     87d2af1042f5fe0992765fb76402ae9c04b9623f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 02:45:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 02:47:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d2af10

app-emulation/guestfs-tools: keyword 1.46.1-r1 (new libguestfs split)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
index 1ac17ff9fb4..ed65ee9489f 100644
--- a/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild
@@ -15,8 +15,7 @@ SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
-# Keyword with newer libguestfs, bug #816693
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 IUSE="doc +ocaml +perl test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2022-04-10 10:01 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-04-10 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     24ef58daecb018a4d6ee186982f499b9d0797d5b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 09:52:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 09:58:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ef58da

app-emulation/guestfs-tools: add 1.48.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/Manifest               |   1 +
 .../guestfs-tools/guestfs-tools-1.48.0.ebuild      | 153 +++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest
index 3961908b067e..4547aa0ebc0b 100644
--- a/app-emulation/guestfs-tools/Manifest
+++ b/app-emulation/guestfs-tools/Manifest
@@ -1 +1,2 @@
 DIST guestfs-tools-1.46.1.tar.gz 12665804 BLAKE2B 7800954dfa961900035b127f6ac2556f584dd2d156143bf82fd1ba9fd1f327091706987192d91cb4251295d9565e56f769ab06bdac677160ac31d2e8f9d9a488 SHA512 d2bd0790343d54a2517237e56d1b982cd41335654fd205cfeec42a1b7cbbf4c0923597b767b8769dfe74766e078a817d520db251895990b922522030806d0b85
+DIST guestfs-tools-1.48.0.tar.gz 12682919 BLAKE2B 27b4e5c47af222691b067c19e997112acaf0360cc9c089dedb0327959ff8d80ff929e2fea369f9895ed6e1fc80a339ca89db3b9eb32cf23328fc71972447a13e SHA512 8576ef0e283a02a112f785e8f1656b41c93be29e12617ee8c83033b90758736ea3c2d4ecfb446a86c7913e2c0b39a7c5666e8ad22682419cc877543a3825c489

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
new file mode 100644
index 000000000000..84ae94b176aa
--- /dev/null
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with app-emulation/libguestfs and app-emulation/libguestfs-appliance (if any new release there)
+
+inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+KEYWORDS="~amd64"
+IUSE="doc +ocaml +perl test"
+RESTRICT="!test? ( test )"
+
+# Failures - doc
+COMMON_DEPEND="
+	!<app-emulation/libguestfs-1.46.0-r1
+	app-arch/cpio
+	app-arch/lzma
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-crypt/gnupg
+	>=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
+	app-emulation/libvirt:=
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
+	dev-lang/perl:=
+	dev-libs/libpcre2:=
+	dev-libs/libxml2:2
+	dev-libs/jansson:=
+	>=sys-apps/fakechroot-2.8
+	sys-fs/squashfs-tools:*
+	sys-libs/ncurses:=
+	sys-libs/libxcrypt:=
+	virtual/libcrypt:=
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	perl? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Getopt-Long
+		dev-perl/Module-Build
+		dev-perl/libintl-perl
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		dev-perl/String-ShellQuote
+		test? ( virtual/perl-Test-Simple )
+	)
+"
+# Some OCaml is always required
+# bug #729674
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
+	ocaml? (
+		dev-ml/ounit2[ocamlopt]
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+	)
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+#PATCHES=(
+#	"${FILESDIR}"/${MY_PV_1}/
+#)
+
+pkg_setup() {
+	CONFIG_CHECK="~KVM ~VIRTIO"
+	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
+}
+
+src_configure() {
+	# bug #794877
+	tc-export AR
+
+	if use test ; then
+		# Skip Bash test
+		# (See 13-test-suite.log in linked bug)
+		# bug #794874
+		export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
+
+		# This test requires libvirt support in libguestfs and it makes
+		# no difference at runtime. Just gracefully skip it to make life
+		# easier for e.g. arch testing.
+		if ! has_version 'app-emulation/libguestfs[libvirt]' ; then
+			export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
+		fi
+
+		# Needed for the inspector tests. Provided by libguestfs-appliance.
+		#export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/
+		# But the inspector tests seem fragile anyway...
+		export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1
+		export SKIP_TEST_VIRT_INSPECTOR_SH=1
+	fi
+
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this
+	# doesn't become stale.
+	# bug #703118, bug #789354
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	econf \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable perl)
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use perl ; then
+		perl_delete_localpod
+	fi
+}
+
+pkg_postinst() {
+	if ! use ocaml ; then
+		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
+	fi
+
+	if ! use perl ; then
+		einfo "Perl based tools NOT built"
+	fi
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2022-05-31  8:43 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-05-31  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4c66d36aaa72be34108ced6b30a329c8d187bbb9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 08:42:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 08:42:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c66d36a

app-emulation/guestfs-tools: add 1.48.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/Manifest               |   1 +
 .../guestfs-tools/guestfs-tools-1.48.2.ebuild      | 154 +++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest
index 5626fdc34c99..f6beef729b99 100644
--- a/app-emulation/guestfs-tools/Manifest
+++ b/app-emulation/guestfs-tools/Manifest
@@ -1 +1,2 @@
 DIST guestfs-tools-1.48.0.tar.gz 12682919 BLAKE2B 27b4e5c47af222691b067c19e997112acaf0360cc9c089dedb0327959ff8d80ff929e2fea369f9895ed6e1fc80a339ca89db3b9eb32cf23328fc71972447a13e SHA512 8576ef0e283a02a112f785e8f1656b41c93be29e12617ee8c83033b90758736ea3c2d4ecfb446a86c7913e2c0b39a7c5666e8ad22682419cc877543a3825c489
+DIST guestfs-tools-1.48.2.tar.gz 12691067 BLAKE2B 305f281c19975f160c435b995d71ef2e18d09fc95f31e92efe8f79d811fc0a7efab27d14f766d5f6ee477fd43977167a3aabe5cc40498f125f925507fd2574d5 SHA512 e11cd5a38a1681e8b2fd56419d38ca0aaab659cb59d409b3572cadcd04fd4da3078fa33e7f21c99d11854ad08797ae24a8d71c041b1b7769fc36c1391b6eb162

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
new file mode 100644
index 000000000000..c6a2bf8d214b
--- /dev/null
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with app-emulation/libguestfs and app-emulation/libguestfs-appliance (if any new release there)
+
+inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+KEYWORDS="~amd64"
+IUSE="doc +ocaml +perl test"
+RESTRICT="!test? ( test )"
+
+# Failures - doc
+COMMON_DEPEND="
+	!<app-emulation/libguestfs-1.46.0-r1
+	app-arch/cpio
+	app-arch/lzma
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-crypt/gnupg
+	>=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
+	app-emulation/libvirt:=
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
+	dev-lang/perl:=
+	dev-libs/libpcre2:=
+	dev-libs/libxml2:2
+	dev-libs/jansson:=
+	>=sys-apps/fakechroot-2.8
+	sys-fs/squashfs-tools:*
+	sys-libs/ncurses:=
+	sys-libs/libxcrypt:=
+	virtual/libcrypt:=
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	perl? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Getopt-Long
+		dev-perl/Module-Build
+		dev-perl/libintl-perl
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		dev-perl/String-ShellQuote
+		test? ( virtual/perl-Test-Simple )
+	)
+"
+# Some OCaml is always required
+# bug #729674
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
+	ocaml? (
+		dev-ml/ounit2[ocamlopt]
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+	)
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+#PATCHES=(
+#	"${FILESDIR}"/${MY_PV_1}/
+#)
+
+pkg_setup() {
+	CONFIG_CHECK="~KVM ~VIRTIO"
+	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
+}
+
+src_configure() {
+	# bug #794877
+	tc-export AR
+
+	if use test ; then
+		# Skip Bash test
+		# (See 13-test-suite.log in linked bug)
+		# bug #794874
+		export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
+
+		# This test requires libvirt support in libguestfs and it makes
+		# no difference at runtime. Just gracefully skip it to make life
+		# easier for e.g. arch testing.
+		if ! has_version 'app-emulation/libguestfs[libvirt]' ; then
+			export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
+		fi
+
+		# Needed for the inspector tests. Provided by libguestfs-appliance.
+		#export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/
+		# But the inspector tests seem fragile anyway...
+		export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1
+		export SKIP_TEST_VIRT_INSPECTOR_SH=1
+	fi
+
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this
+	# doesn't become stale.
+	# bug #703118, bug #789354
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	# Test suite at least has a bunch of bashisms
+	SHELL="${BROOT}"/bin/bash CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable perl)
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use perl ; then
+		perl_delete_localpod
+	fi
+}
+
+pkg_postinst() {
+	if ! use ocaml ; then
+		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
+	fi
+
+	if ! use perl ; then
+		einfo "Perl based tools NOT built"
+	fi
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2023-10-07 13:41 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2023-10-07 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     0669ac964d320e92a9d7c5907342fd2c07e7be90
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 13:40:07 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 13:40:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0669ac96

app-emulation/guestfs-tools: Stabilize 1.48.2 amd64, #915321

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
index c6a2bf8d214b..6fe7b676fdfc 100644
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc +ocaml +perl test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2023-10-08  1:58 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-10-08  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     0f90fb0a98d5ac1d87bb836a42abaec55015c9a5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 01:53:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 01:53:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f90fb0a

app-emulation/guestfs-tools: needs bison+flex

Closes: https://bugs.gentoo.org/915339
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
index 6fe7b676fdfc..8521e3d06afd 100644
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
@@ -55,7 +55,8 @@ COMMON_DEPEND="
 "
 # Some OCaml is always required
 # bug #729674
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
 	dev-ml/findlib[ocamlopt]
 	doc? ( app-text/po4a )
@@ -67,8 +68,13 @@ DEPEND="${COMMON_DEPEND}
 		)
 	)
 "
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 "
 
@@ -87,6 +93,9 @@ src_configure() {
 	# bug #794877
 	tc-export AR
 
+	# Needs both bison+flex (bug #915339, see configure too)
+	unset YACC LEX
+
 	if use test ; then
 		# Skip Bash test
 		# (See 13-test-suite.log in linked bug)


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2023-10-08  1:58 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-10-08  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     887474d29372a4c8b2d73dc886f38b151ef512c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 01:54:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 01:54:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=887474d2

app-emulation/guestfs-tools: drop 1.48.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/Manifest               |   1 -
 .../guestfs-tools/guestfs-tools-1.48.0.ebuild      | 153 ---------------------
 2 files changed, 154 deletions(-)

diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest
index f6beef729b99..f8739c8d818b 100644
--- a/app-emulation/guestfs-tools/Manifest
+++ b/app-emulation/guestfs-tools/Manifest
@@ -1,2 +1 @@
-DIST guestfs-tools-1.48.0.tar.gz 12682919 BLAKE2B 27b4e5c47af222691b067c19e997112acaf0360cc9c089dedb0327959ff8d80ff929e2fea369f9895ed6e1fc80a339ca89db3b9eb32cf23328fc71972447a13e SHA512 8576ef0e283a02a112f785e8f1656b41c93be29e12617ee8c83033b90758736ea3c2d4ecfb446a86c7913e2c0b39a7c5666e8ad22682419cc877543a3825c489
 DIST guestfs-tools-1.48.2.tar.gz 12691067 BLAKE2B 305f281c19975f160c435b995d71ef2e18d09fc95f31e92efe8f79d811fc0a7efab27d14f766d5f6ee477fd43977167a3aabe5cc40498f125f925507fd2574d5 SHA512 e11cd5a38a1681e8b2fd56419d38ca0aaab659cb59d409b3572cadcd04fd4da3078fa33e7f21c99d11854ad08797ae24a8d71c041b1b7769fc36c1391b6eb162

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
deleted file mode 100644
index 84ae94b176aa..000000000000
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Bump with app-emulation/libguestfs and app-emulation/libguestfs-appliance (if any new release there)
-
-inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/${MY_PV_1}"
-KEYWORDS="~amd64"
-IUSE="doc +ocaml +perl test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-COMMON_DEPEND="
-	!<app-emulation/libguestfs-1.46.0-r1
-	app-arch/cpio
-	app-arch/lzma
-	app-arch/unzip[natspec]
-	app-arch/xz-utils
-	app-crypt/gnupg
-	>=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
-	app-emulation/libvirt:=
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
-	dev-lang/perl:=
-	dev-libs/libpcre2:=
-	dev-libs/libxml2:2
-	dev-libs/jansson:=
-	>=sys-apps/fakechroot-2.8
-	sys-fs/squashfs-tools:*
-	sys-libs/ncurses:=
-	sys-libs/libxcrypt:=
-	virtual/libcrypt:=
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	perl? (
-		virtual/perl-Data-Dumper
-		virtual/perl-Getopt-Long
-		dev-perl/Module-Build
-		dev-perl/libintl-perl
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		dev-perl/String-ShellQuote
-		test? ( virtual/perl-Test-Simple )
-	)
-"
-# Some OCaml is always required
-# bug #729674
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/ocaml-4.03:=[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	doc? ( app-text/po4a )
-	ocaml? (
-		dev-ml/ounit2[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-	)
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-#PATCHES=(
-#	"${FILESDIR}"/${MY_PV_1}/
-#)
-
-pkg_setup() {
-	CONFIG_CHECK="~KVM ~VIRTIO"
-	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
-}
-
-src_configure() {
-	# bug #794877
-	tc-export AR
-
-	if use test ; then
-		# Skip Bash test
-		# (See 13-test-suite.log in linked bug)
-		# bug #794874
-		export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
-
-		# This test requires libvirt support in libguestfs and it makes
-		# no difference at runtime. Just gracefully skip it to make life
-		# easier for e.g. arch testing.
-		if ! has_version 'app-emulation/libguestfs[libvirt]' ; then
-			export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
-		fi
-
-		# Needed for the inspector tests. Provided by libguestfs-appliance.
-		#export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/
-		# But the inspector tests seem fragile anyway...
-		export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1
-		export SKIP_TEST_VIRT_INSPECTOR_SH=1
-	fi
-
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	# Give a nudge to help find libxcrypt[-system]
-	# We have a := dep on virtual/libcrypt to ensure this
-	# doesn't become stale.
-	# bug #703118, bug #789354
-	if ! has_version 'sys-libs/libxcrypt[system]' ; then
-		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-	fi
-
-	econf \
-		$(usex doc '' PO4A=no) \
-		$(use_enable ocaml) \
-		$(use_enable perl)
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use perl ; then
-		perl_delete_localpod
-	fi
-}
-
-pkg_postinst() {
-	if ! use ocaml ; then
-		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
-	fi
-
-	if ! use perl ; then
-		einfo "Perl based tools NOT built"
-	fi
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/
@ 2024-04-28  1:01 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-04-28  1:01 UTC (permalink / raw
  To: gentoo-commits

commit:     75045e86c14cba6e2250caccd48ac49e7c2e1854
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 01:00:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 01:00:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75045e86

app-emulation/guestfs-tools: only keyword stable releases, not development ones

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
index 3c326c7487eb..718c2b33d14b 100644
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
@@ -17,7 +17,9 @@ SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
-KEYWORDS="amd64"
+if [[ ${SD} == "stable" ]] ; then
+	KEYWORDS="amd64"
+fi
 IUSE="doc +ocaml +perl test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-04-28  1:01 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-28  1:01 [gentoo-commits] repo/gentoo:master commit in: app-emulation/guestfs-tools/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-10-08  1:58 Sam James
2023-10-08  1:58 Sam James
2023-10-07 13:41 Joonas Niilola
2022-05-31  8:43 Sam James
2022-04-10 10:01 Sam James
2021-10-22  2:47 Sam James
2021-10-08  1:53 Sam James
2021-10-07  6:11 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox