From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-util/ostree/Manifest | 9 +-- dev-util/ostree/metadata.xml | 2 + dev-util/ostree/ostree-2018.9-r1.ebuild | 123 -------------------------------- dev-util/ostree/ostree-2018.9.ebuild | 108 ---------------------------- dev-util/ostree/ostree-2020.6.ebuild | 90 +++++++++++++++++++++++ dev-util/ostree/ostree-2020.7.ebuild | 103 ++++++++++++++++++++++++++ 6 files changed, 200 insertions(+), 235 deletions(-) delete mode 100644 dev-util/ostree/ostree-2018.9-r1.ebuild delete mode 100644 dev-util/ostree/ostree-2018.9.ebuild create mode 100644 dev-util/ostree/ostree-2020.6.ebuild create mode 100644 dev-util/ostree/ostree-2020.7.ebuild (limited to 'dev-util/ostree') diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest index a4a2e4940a00..0e4a1753993b 100644 --- a/dev-util/ostree/Manifest +++ b/dev-util/ostree/Manifest @@ -1,6 +1,7 @@ -DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5 DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912 -EBUILD ostree-2018.9-r1.ebuild 3497 BLAKE2B b4a027cf64a64083caec1a5c48538d73194366a1e46e4ded6aff322c7007eb5a13b2247295ce59ab5b40e54ffdce3201646ec250778a0247845e1a9e0ecb4b55 SHA512 46a2e9cb4e2d962fb5fb330a7412d9c651c13fc965e800c6d92cb8cc15a4b98b8843e5b6d37d791b7235402a11a192909ac621070c30bd559878039d537375ff -EBUILD ostree-2018.9.ebuild 3266 BLAKE2B b433adf09f65abdc163f517b97731790a7c2ef9570dc14cedfba8ffd151990c9a3cee2977ff17862228d3547e831c0aecc80446068f4787ca1f0d704d921a56b SHA512 cfc839b02b9007498d7b3ded28c651bc52c1015c4b7fc3e5e3cc7f4a0ef072d15a55fc962b76282e331ef26c99700457317d216cb37f4a48fcb30ce73adc350f +DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538 +DIST ostree-2020.7.tar.xz 2022004 BLAKE2B 2113117ce8553b7ffcfea17e1cb3a9c697d39b4933b48c30729af72fc833bb00f39e7e3a327efeebaac1df307b1f62ccf16a7772e12ad77737e2219c87623824 SHA512 f42dca3c9e1810c0421ab99588f27c625733b71ef811534b66e0c0c4afafbad5bf475e08feaf87c2f8414c38f127fd344adbb57a4b75001077aedbfe92af3706 EBUILD ostree-2019.5.ebuild 2220 BLAKE2B c56fbde79b750df4de06f3ed175ad15011070c9b36bacc7bad3d2efc676b485c3c72b5b138e69ef0bf1f43293ef23f71699d5b9609a94d1a8aef4a267c81a3ef SHA512 829b080ab7ec39f2de945ef3c0ae23bdba3b17b544e2556809e4a25537e454ff5eee26674068eab80e8c326688020d26ba43c01f2059fc4aaaee67538d929ded -MISC metadata.xml 1889 BLAKE2B 58b5a7ce03d273da942cc88468ccc1e8758c2f1e3004a0424567f56e5e6fb589f457e50a1edc759e77b9177aa9472441f68911c8cc5ed39c2c4d5b8b56839521 SHA512 697a3f44a7df7b1e7425afedece72693c77821a6c55a3d5bf735a724ccb1a6655dfabd4262b3136b7af0856eeaf8404adb0c203826f0f8422035c6d66ebb11d4 +EBUILD ostree-2020.6.ebuild 2248 BLAKE2B 94d7161089cac60244f39487f9ce2af3e231f0f312f4807f68b1bfc54b8719870b13f025060c76a8219aad10b57f5a08d6a4cee1164307e565235404bf226c1a SHA512 6db643fa64b224e5df5b6422ab420319f63e7a67d02c66fc4f976d4b2067dfadd98e4cf54bde6d3701c1554ae06a826fe1f411ae5f8d494f757fad50c7dcda09 +EBUILD ostree-2020.7.ebuild 2595 BLAKE2B afbac77b5c3c5e5167bb1cb0396a488c8b90185a0ca8f34bd2f53849d4978417f664110649452001aa3867b4b81972de872b9431e95e14c799298736dd8cff29 SHA512 f1a0b6b50c44ee0c6899a477e58f463c4ba6597a560f05cfdd437193a6d73a3bd81377485ad62d72f7fa3f5de3418d744592fbdb8c9a43d1729bae49264be198 +MISC metadata.xml 1989 BLAKE2B 783f5a34c80ba2bb20cb1660a72741d8f0275dce984b67038cdd7b05fe144fe97a134562dabaa53263c378d7f2bb0459f8cdc31fb13884cc03136133116c672b SHA512 31f848aeca7afb1b3f2d5f4e1d1ddea40715acf7835ae2e1dd8111153087ffdb02c3e423a9418fb790e4459385b19b16609cc413d70443f49030111a9df760c8 diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml index da0ad42b602f..6aff9bd9b75d 100644 --- a/dev-util/ostree/metadata.xml +++ b/dev-util/ostree/metadata.xml @@ -32,10 +32,12 @@ Use libarchive Install dracut module + Enable GPG support Enable grub configuration generator Use http2 Enable ostree trivial-httpd entrypoint Use libmount + Use libsodium for ed25519 Use libsoup for networking diff --git a/dev-util/ostree/ostree-2018.9-r1.ebuild b/dev-util/ostree/ostree-2018.9-r1.ebuild deleted file mode 100644 index 77065eb10dda..000000000000 --- a/dev-util/ostree/ostree-2018.9-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostree.readthedocs.io/en/latest/" -SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz" - -KEYWORDS="~amd64 ~x86" -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf" -RESTRICT="test" -REQUIRED_USE="httpd? ( || ( curl soup ) )" - -COMMON_DEPEND=" - archive? ( app-arch/libarchive ) - app-crypt/gpgme - app-arch/xz-utils - curl? ( net-misc/curl ) - soup? ( net-libs/libsoup ) - dev-libs/glib:2 - dev-libs/libassuan - dev-libs/libgpg-error - dracut? ( sys-kernel/dracut ) - grub? ( sys-boot/grub:2= ) - introspection? ( dev-libs/gobject-introspection ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl:0= ) ) - sys-fs/fuse:0 - sys-libs/zlib - libmount? ( sys-apps/util-linux ) - selinux? ( sys-libs/libselinux ) - systemd? ( sys-apps/systemd:0= ) - zeroconf? ( net-dns/avahi[dbus] )" - -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - doc? ( dev-util/gtk-doc )" - -RDEPEND="${COMMON_DEPEND}" -BDEPEND=" - dev-util/glib-utils - sys-devel/flex - sys-devel/bison - virtual/pkgconfig" - -S="${WORKDIR}/lib${P}" - -src_prepare() { - sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \ - -i Makefile.in Makefile-man.am || die - - # The ostree-finalize-staged.path file is missing in ostree-2018.9.tar.xz. - [ -e src/boot/ostree-finalize-staged.path ] && die - cat > src/boot/ostree-finalize-staged.path <<-EOF - # Copyright (C) 2018 Red Hat, Inc. - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either - # version 2 of the License, or (at your option) any later version. - # - # This library is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - # Lesser General Public License for more details. - # - # You should have received a copy of the GNU Lesser General Public - # License along with this library; if not, write to the - # Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - - # For some implementation discussion, see: - # https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html - [Unit] - Description=OSTree Monitor Staged Deployment - Documentation=man:ostree(1) - - [Path] - PathExists=/run/ostree/staged-deployment - - [Install] - WantedBy=multi-user.target - EOF - - eautoreconf - default -} - -src_configure() { - local econfargs=( - --enable-man - --enable-shared - $(use_with archive libarchive) - $(use_with curl) - $(use_with dracut) - $(use_enable doc gtk-doc) - $(use_enable introspection) - $(use_enable http2) - $(use_enable httpd trivial-httpd-cmdline) - $(use_with selinux ) - $(use_with soup) - $(use_with libmount) - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) - $(use_with systemd libsystemd) - $(use_with zeroconf avahi) - ) - - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf ${econfargs[*]} -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild deleted file mode 100644 index 6f86406b9deb..000000000000 --- a/dev-util/ostree/ostree-2018.9.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Operating system and container binary deployment and upgrades" -HOMEPAGE="https://ostree.readthedocs.io/en/latest/" -SRC_URI="https://github.com/ostreedev/${PN}/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="archive curl doc gnutls grub introspection libmount selinux ssl soup systemd zeroconf" -RESTRICT="test" - -S="${WORKDIR}/lib${P}" -COMMON_DEPEND=" - app-arch/xz-utils:= - app-crypt/gpgme:= - dev-libs/glib:2= - dev-libs/libassuan:= - dev-libs/libgpg-error:= - dev-libs/openssl:0= - sys-apps/util-linux:= - sys-fs/fuse:0= - sys-libs/zlib:= - - archive? ( app-arch/libarchive:= ) - grub? ( sys-boot/grub:* ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) - libmount? ( sys-apps/util-linux:= ) - selinux? ( sys-libs/libselinux:= ) - soup? ( net-libs/libsoup:= ) - systemd? ( sys-apps/systemd:= ) - zeroconf? ( net-dns/avahi:* ) -" -DEPEND=" - ${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - sys-devel/bison - dev-libs/libxslt - || ( dev-util/glib-utils dev-libs/glib:2 ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - curl? ( net-misc/curl:= ) - introspection? ( dev-libs/gobject-introspection ) - doc? ( dev-util/gtk-doc ) -" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - default - sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \ - -i Makefile.in Makefile-man.am || die - - # The ostree-finalize-staged.path file is missing in ostree-2018.9.tar.xz. - [[ -e src/boot/ostree-finalize-staged.path ]] && die - cat > src/boot/ostree-finalize-staged.path <<-EOF - # Copyright (C) 2018 Red Hat, Inc. - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public - # License as published by the Free Software Foundation; either - # version 2 of the License, or (at your option) any later version. - # - # This library is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - # Lesser General Public License for more details. - # - # You should have received a copy of the GNU Lesser General Public - # License along with this library; if not, write to the - # Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - - # For some implementation discussion, see: - # https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html - [Unit] - Description=OSTree Monitor Staged Deployment - Documentation=man:ostree(1) - - [Path] - PathExists=/run/ostree/staged-deployment - - [Install] - WantedBy=multi-user.target - EOF -} - -src_configure() { - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf \ - --enable-man \ - $(use_with archive libarchive) \ - $(use_with curl) \ - $(use_enable doc gtk-doc) \ - $(use_enable introspection) \ - $(use_with selinux ) \ - $(use_with soup) \ - $(use_with libmount) \ - $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) \ - $(use_with systemd libsystemd) \ - $(use_with zeroconf avahi) -} diff --git a/dev-util/ostree/ostree-2020.6.ebuild b/dev-util/ostree/ostree-2020.6.ebuild new file mode 100644 index 000000000000..9e56361e7f19 --- /dev/null +++ b/dev-util/ostree/ostree-2020.6.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +DESCRIPTION="Operating system and container binary deployment and upgrades" +HOMEPAGE="https://ostree.readthedocs.io/en/latest/" +SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz" + +KEYWORDS="~amd64 ~x86" +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf" +RESTRICT="test" +REQUIRED_USE="httpd? ( || ( curl soup ) )" + +COMMON_DEPEND=" + archive? ( app-arch/libarchive ) + app-crypt/gpgme + app-arch/xz-utils + curl? ( net-misc/curl ) + soup? ( net-libs/libsoup ) + dev-libs/libassuan + dev-libs/libgpg-error + dev-libs/glib:2 + dracut? ( sys-kernel/dracut ) + grub? ( sys-boot/grub:2= ) + introspection? ( dev-libs/gobject-introspection ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl:0= ) ) + >=sys-fs/fuse-2.9.2:0 + sys-libs/zlib + libmount? ( sys-apps/util-linux ) + selinux? ( sys-libs/libselinux ) + systemd? ( sys-apps/systemd:0= ) + zeroconf? ( net-dns/avahi[dbus] )" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + doc? ( dev-util/gtk-doc )" + +RDEPEND="${COMMON_DEPEND}" +BDEPEND=" + dev-util/glib-utils + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +S="${WORKDIR}/lib${P}" + +src_prepare() { + sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \ + -i Makefile.in Makefile-man.am || die + + eautoreconf + default +} + +src_configure() { + local econfargs=( + --enable-man + --enable-shared + $(use_with archive libarchive) + $(use_with curl) + $(use_with dracut) + $(use_enable doc gtk-doc) + $(usex introspection --enable-introspection={,} yes no) + $(use_enable http2) + $(use_enable httpd trivial-httpd-cmdline) + $(use_with selinux ) + $(use_with soup) + $(use_with libmount) + $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) + $(use_with systemd libsystemd) + $(use_with zeroconf avahi) + ) + + unset ${!XDG_*} #657346 g-ir-scanner sandbox violation + econf ${econfargs[*]} +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-util/ostree/ostree-2020.7.ebuild b/dev-util/ostree/ostree-2020.7.ebuild new file mode 100644 index 000000000000..65675eb0f6bb --- /dev/null +++ b/dev-util/ostree/ostree-2020.7.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +DESCRIPTION="Operating system and container binary deployment and upgrades" +HOMEPAGE="https://ostreedev.github.io/ostree/" +SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount libressl selinux sodium ssl soup systemd zeroconf" +RESTRICT="test" +REQUIRED_USE="httpd? ( || ( curl soup ) )" + +COMMON_DEPEND=" + archive? ( app-arch/libarchive ) + app-arch/xz-utils + curl? ( net-misc/curl ) + soup? ( net-libs/libsoup ) + dev-libs/libassuan + dev-libs/glib:2 + dracut? ( sys-kernel/dracut ) + gpg? ( + app-crypt/gpgme + dev-libs/libgpg-error + ) + grub? ( sys-boot/grub:2= ) + introspection? ( dev-libs/gobject-introspection ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + >=sys-fs/fuse-2.9.2:0 + sys-libs/zlib + libmount? ( sys-apps/util-linux ) + selinux? ( sys-libs/libselinux ) + sodium? ( >=dev-libs/libsodium-1.0.14 ) + systemd? ( sys-apps/systemd:0= ) + zeroconf? ( net-dns/avahi[dbus] )" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + doc? ( dev-util/gtk-doc )" + +RDEPEND="${COMMON_DEPEND}" +BDEPEND=" + dev-util/glib-utils + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +S="${WORKDIR}/lib${P}" + +src_prepare() { + sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \ + -i Makefile.in Makefile-man.am || die + eautoreconf + default +} + +src_configure() { + local econfargs=( + --enable-man + --enable-shared + $(use_with archive libarchive) + $(use_with curl) + $(use_with dracut) + $(use_enable doc gtk-doc) + $(usex introspection --enable-introspection={,} yes no) + $(use_with gpg gpgme) + $(use_enable http2) + $(use_enable httpd trivial-httpd-cmdline) + $(use_with selinux ) + $(use_with soup) + $(use_with libmount) + $(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) + $(use_with sodium ed25519-libsodium) + $(use_with systemd libsystemd) + $(use_with zeroconf avahi) + ) + + if use systemd; then + econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)") + fi + + unset ${!XDG_*} #657346 g-ir-scanner sandbox violation + econf ${econfargs[*]} +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + rm -f "${ED}/etc/grub.d/15_ostree" +} -- cgit v1.2.3