[gentoo-commits] repo/gentoo:master commit in: app-emulation/libguestfs/files/1.36/, app-emulation/libguestfs/
commit: 04f7e992bebab5eb33872a7a77d4872067c406b0 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri Dec 7 12:38:03 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri Dec 7 13:02:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f7e992 app-emulation/libguestfs: 1.36.13 → 1.36.15 Do not RDEPEND on bash-completion and drop unused USE flag. Fix static-libs USE flag to actually do something. Fix build failure with USE=-ocaml, bug #670968. Make libvirt support optional, bug #672452. Remove unused debug USE flag. Switch from versionator eclass to eapi7-ver. gjs is a test dependency only. Fix sandbox issues, bug #653104. Closes: https://bugs.gentoo.org/653104 Closes: https://bugs.gentoo.org/670968 Closes: https://bugs.gentoo.org/672452 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Gilles Dartiguelongue gentoo.org> app-emulation/libguestfs/Manifest | 1 + ...-failure-when-not-built-with-OCaml-suppor.patch | 40 + ...build-time-requirement-on-bash-completion.patch | 45 ++ app-emulation/libguestfs/libguestfs-1.36.15.ebuild | 178 + app-emulation/libguestfs/metadata.xml | 5 +- 5 files changed, 267 insertions(+), 2 deletions(-) diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index 6dd41368a28..7a661171f96 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -1,3 +1,4 @@ DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae595 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb +DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7 DIST libguestfs-1.36.5.tar.gz 23012703 BLAKE2B 31dcbef2ae1c287c4a353f671e6073cdb4eb2c7173666ff9589ed0e0ce909c2dfa00f2da14b40a0a6a9384dd830082f1f721b0c1dafabe2862391f0f75ff3f3d SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6 diff --git a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch new file mode 100644 index 000..093a53f1163 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch @@ -0,0 +1,40 @@ +From dc35ce2ba774a9284360bfd6532acb527a2f73d7 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 7 Dec 2018 11:21:25 +0100 +Subject: [PATCH 3/4] Fix install failure when not built with OCaml support + +Makefile rules in po/ require builder/index-parse.c to be generated to +allow translation utilities to work on it, however builder/ is +completely masked behind OCaml conditional build even if some tools do +not require it and proper guards are in place already. + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502 +--- + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 7eefacbeb..c0a68151f 100644 +--- a/Makefile.am b/Makefile.am +@@ -155,7 +155,6 @@ if HAVE_OCAML + SUBDIRS += \ + mllib \ + customize \ +- builder builder/templates \ + get-kernel \ + resize \ + sparsify \ +@@ -169,6 +168,9 @@ SUBDIRS += dib + endif + endif + ++# Tools mixed with more OCAML based tools ++SUBDIRS += builder builder/templates ++ + # Perl tools. + if HAVE_TOOLS + SUBDIRS += tools +-- +2.19.2 + diff --git a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch new file mode 100644 index 000..9bce9b05b05 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch @@ -0,0 +1,45 @@ +From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Fri, 7 Dec 2018 12:14:15 +0100 +Subject: [PATCH 4/5] Loosen build time requirement on bash-completion + +Distributions might avoid pulling bash-completion during build as it is
[gentoo-commits] repo/gentoo:master commit in: app-emulation/libguestfs/files/1.36/, app-emulation/libguestfs/
commit: 059fe975e1dc08ecf9eb3cb6a66919ac3ba47bfa Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Aug 30 11:23:22 2017 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Aug 30 12:26:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059fe975 app-emulation/libguestfs: version bump 1.28.5-r3 → 1.36.5, bug #601162. Fix build with newer glibc, bug #610998. Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-emulation/libguestfs/Manifest | 1 + .../1.36/0001-Update-libtool-initialization.patch | 29 ...port-for-Gentoo-in-distribution-detection.patch | 25 +++ ...ound-autotools-utils-detection-of-gtk-doc.patch | 42 + app-emulation/libguestfs/libguestfs-1.36.5.ebuild | 171 + 5 files changed, 268 insertions(+) diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index e78b08d0c89..31c3fafc085 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -1 +1,2 @@ DIST libguestfs-1.28.5.tar.gz 12747537 SHA256 e9f38c6ad15cefe18b096a86334a60fc7df6367358f2641d8c5c5f3122ad9d91 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 WHIRLPOOL cbbac5cce87dd41ad05b13732d0f5a3442c980152d8864522f5df47ffed7a260a131c819ceb40edd07cd74454fc9f4c0c7eb41fe734509a4e123d28bc58d813f +DIST libguestfs-1.36.5.tar.gz 23012703 SHA256 c2f7c10c42de04567a9b5cfd8345a995fb951ded9a7fbe72fae061d66dfe8f98 SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6 WHIRLPOOL aec77d2f3070722d6f39b172054ae1f526f731757a7d539ad1b7dc93c328259560172c91b77ca182526b73f1cbebfd037dea441a7c386f8398a0628145580502 diff --git a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch b/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch new file mode 100644 index 000..24da76fbab5 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch @@ -0,0 +1,29 @@ +From a5fd133e001bb62d13c47ebc392fbb696a513640 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue+Date: Wed, 30 Aug 2017 11:30:56 +0200 +Subject: [PATCH 1/3] Update libtool initialization + +Use the recommanded macro post libtool-2 release. +--- + m4/guestfs_misc.m4 | 5 + + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/m4/guestfs_misc.m4 b/m4/guestfs_misc.m4 +index 5dce207d7..a2bb39c0d 100644 +--- a/m4/guestfs_misc.m4 b/m4/guestfs_misc.m4 +@@ -17,10 +17,7 @@ + + dnl Miscellaneous configuration that doesn't fit anywhere else. + +-dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files +-dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html +-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool' +-AC_SUBST([LIBTOOL]) ++LT_INIT + + dnl Only build boot-analysis program on x86-64 and aarch64. It + dnl requires custom work to port to each architecture. +-- +2.14.1 + diff --git a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch b/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch new file mode 100644 index 000..bf265f718c7 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch @@ -0,0 +1,25 @@ +From 9c423cd2d24b6de924afc6e0d715594bb056288d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 30 Aug 2017 11:27:50 +0200 +Subject: [PATCH 2/3] Add support for Gentoo in distribution detection + +--- + m4/guestfs_appliance.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4 +index 890b1999c..9b79e1a41 100644 +--- a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4 +@@ -114,6 +114,8 @@ elif test -f /etc/frugalware-release; then + DISTRO=FRUGALWARE + elif test -f /etc/mageia-release; then + DISTRO=MAGEIA ++elif test -f /etc/gentoo-release; then ++DISTRO=GENTOO + else + dnl fallback option + DISTRO=REDHAT +-- +2.14.1 + diff --git a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch new file mode 100644 index 000..087708db396 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch @@ -0,0 +1,42 @@ +From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 30 Aug 2017 11:33:58 +0200 +Subject: [PATCH 3/3] Workaround autotools-utils detection of gtk-doc + +--- + configure.ac