diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-01-21 08:25:52 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-01-21 08:25:52 +0000 |
commit | 5b7cb373bfee7d16498d9686a2f0cf921d12d28c (patch) | |
tree | b3778b4aeb3f213d8b8fc7fd0a2892fe1b8d5aa2 | |
parent | 2020-01-21 07:46:35 UTC (diff) | |
parent | dev-util/ostree: bump to 2019.5 (diff) | |
download | gentoo-5b7cb373bfee7d16498d9686a2f0cf921d12d28c.tar.gz gentoo-5b7cb373bfee7d16498d9686a2f0cf921d12d28c.tar.bz2 gentoo-5b7cb373bfee7d16498d9686a2f0cf921d12d28c.zip |
Merge updates from master
-rw-r--r-- | dev-util/ostree/Manifest | 2 | ||||
-rw-r--r-- | dev-util/ostree/metadata.xml | 3 | ||||
-rw-r--r-- | dev-util/ostree/ostree-2018.5.ebuild | 52 | ||||
-rw-r--r-- | dev-util/ostree/ostree-2018.9-r1.ebuild | 123 | ||||
-rw-r--r-- | dev-util/ostree/ostree-2018.9.ebuild | 2 | ||||
-rw-r--r-- | dev-util/ostree/ostree-2019.5.ebuild | 90 |
6 files changed, 218 insertions, 54 deletions
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest index 87e278a57a80..efa90df5b752 100644 --- a/dev-util/ostree/Manifest +++ b/dev-util/ostree/Manifest @@ -1,2 +1,2 @@ -DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8 DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5 +DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912 diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml index 4fb7a62d6f22..da0ad42b602f 100644 --- a/dev-util/ostree/metadata.xml +++ b/dev-util/ostree/metadata.xml @@ -31,7 +31,10 @@ </longdescription> <use> <flag name="archive">Use libarchive</flag> + <flag name="dracut">Install dracut module</flag> <flag name="grub">Enable grub configuration generator</flag> + <flag name="http2">Use http2</flag> + <flag name="httpd">Enable ostree trivial-httpd entrypoint</flag> <flag name="libmount">Use libmount</flag> <flag name="soup">Use libsoup for networking</flag> </use> diff --git a/dev-util/ostree/ostree-2018.5.ebuild b/dev-util/ostree/ostree-2018.5.ebuild deleted file mode 100644 index a625a9af6c8f..000000000000 --- a/dev-util/ostree/ostree-2018.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 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="grub selinux soup systemd zeroconf" -RESTRICT="test" - -S="${WORKDIR}/lib${P}" -COMMON_DEPEND=" - app-arch/libarchive:= - app-arch/xz-utils:= - app-crypt/gpgme:= - dev-libs/glib:= - dev-libs/libassuan:= - dev-libs/libgpg-error:= - dev-libs/openssl:0= - net-misc/curl:= - sys-apps/util-linux:= - sys-fs/fuse:= - sys-libs/zlib:= - - grub? ( sys-boot/grub:* ) - selinux? ( sys-libs/libselinux:= ) - soup? ( net-libs/libsoup:= ) - systemd? ( sys-apps/systemd:= ) - zeroconf? ( net-dns/avahi:* ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-devel/bison - sys-devel/flex -" -RDEPEND="${COMMON_DEPEND}" - -src_configure() { - unset ${!XDG_*} #657346 g-ir-scanner sandbox violation - econf \ - --with-crypto=openssl \ - --with-curl \ - --with-openssl \ - $(use_with soup) \ - $(use_with selinux ) \ - $(use_with zeroconf avahi) -} diff --git a/dev-util/ostree/ostree-2018.9-r1.ebuild b/dev-util/ostree/ostree-2018.9-r1.ebuild new file mode 100644 index 000000000000..e781b9044638 --- /dev/null +++ b/dev-util/ostree/ostree-2018.9-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2019 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 index a0ebb8afb288..697debf6f192 100644 --- a/dev-util/ostree/ostree-2018.9.ebuild +++ b/dev-util/ostree/ostree-2018.9.ebuild @@ -42,7 +42,7 @@ DEPEND=" app-text/docbook-xsl-stylesheets sys-devel/bison dev-libs/libxslt - || ( dev-util/glib-utils <dev-libs/glib-2.56.2:2 ) + || ( dev-util/glib-utils dev-libs/glib:2 ) sys-devel/bison sys-devel/flex virtual/pkgconfig diff --git a/dev-util/ostree/ostree-2019.5.ebuild b/dev-util/ostree/ostree-2019.5.ebuild new file mode 100644 index 000000000000..6c6f7f200276 --- /dev/null +++ b/dev-util/ostree/ostree-2019.5.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2019 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:* + 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) + $(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 +} |