From f29eb0598f62fc3b5f09f2de5a89c0437c6164d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 Jan 2020 18:52:40 +0000 Subject: gentoo resync : 21.01.2020 --- dev-util/ostree/Manifest | 9 +-- dev-util/ostree/metadata.xml | 3 + dev-util/ostree/ostree-2018.5.ebuild | 52 -------------- dev-util/ostree/ostree-2018.9-r1.ebuild | 123 ++++++++++++++++++++++++++++++++ dev-util/ostree/ostree-2018.9.ebuild | 2 +- dev-util/ostree/ostree-2019.5.ebuild | 90 +++++++++++++++++++++++ 6 files changed, 222 insertions(+), 57 deletions(-) delete mode 100644 dev-util/ostree/ostree-2018.5.ebuild create mode 100644 dev-util/ostree/ostree-2018.9-r1.ebuild create mode 100644 dev-util/ostree/ostree-2019.5.ebuild (limited to 'dev-util/ostree') diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest index 898ee5834578..cb1138c5ecff 100644 --- a/dev-util/ostree/Manifest +++ b/dev-util/ostree/Manifest @@ -1,5 +1,6 @@ -DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8 DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5 -EBUILD ostree-2018.5.ebuild 1181 BLAKE2B cf819151f25f2a120dc83de957e7d60ec96eaeb95fc0dbfac7b8a86f374acda1e84c23f76156a9a60808a5a45ba99a27ffe5439900d630b1b2f9f213ba3f51f2 SHA512 1a6c195dfdf50bbd810c44b725bf74339bf82e3beec9dbda68d01ad0cb08064b0e0955985149242711015cac7553fa5d31b176db9255124af9237ca2712ca2ca -EBUILD ostree-2018.9.ebuild 3273 BLAKE2B aa9248a88fa9cdf9a3e8bc9ca9094c14414e5e89eb1da4417cd4aa8b2ff4f1b4f8e524f9d8622f528ff3fe5a08077258af41963ef9566d3a231e44880374218f SHA512 a615a7e34213dd06c1f8bb65c2e2d26f070609c7a3b607c29f02d892650a99ece6b196893983276a12e4ba657a6acb5b247ac5faf692f88ef9d2c8f860040535 -MISC metadata.xml 1733 BLAKE2B 81ec9a732f50e49d589e385e6f88a99a629098d2f172aa398ac819fb4e343d2c172c86f92c778d402623f8b7b1143ca8f19f3f3c9ff30fab7fe89dd20ce1428f SHA512 56f083cd71d111275d59dc2759da9ec7685deb01890476da499b56ed82d873bdbe0a0e76f5c07a8c9f2efc3219c34884df2fe4c6b7407363abcc2b6ce066ddbd +DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912 +EBUILD ostree-2018.9-r1.ebuild 3497 BLAKE2B 72a0acc3dd8dfd73485c64e84c36cb6e1921a2bab5050c1435a29b1c67ab9f0367bd88ebdf96ceae985d556f0ba238ec1718dbb7d5cf1bb14fcfef387ca77bd9 SHA512 2299a796d6a6aa04678bccc5480a28da60e0836e1cd01a006780e9b177cf0b0d8fb7a37ed66fb47b7374f340e6bdaee32e0984782d65e7c32ada20a92418f350 +EBUILD ostree-2018.9.ebuild 3265 BLAKE2B 332d18bc35108add63e9f43137d1239ed0c6c22ad6b077afd324b0c748463ef570f4aa4f490d39421d9f9990c0e6bc24ae6a1fcd35cf917c959b7a63a219c02c SHA512 7d5e9d903576de26aab5b8b4f574939fd78ac9bdfb7203b2b820a7aa6dfb632c2adf434b40dfd6906f2f8749c13f69c1d61c2de0283f2d6ad91bb4ac67cfa288 +EBUILD ostree-2019.5.ebuild 2212 BLAKE2B ca09c63427689ddb6ed9eb732cd367a3e5190153d949d4a2c2729719af0f096c4837c589cd6e14c7754e22268c2947630998097ccba13d389d702f308e8ed1a4 SHA512 26f41728cc7b181a623930d58713c2471d3137b344eb07e0c52cdccc003a5ecbfcb5efc4146fd2a99e3d19cbc831055cf29e62e17b1164aeb35fe3fb3142ac8c +MISC metadata.xml 1889 BLAKE2B 58b5a7ce03d273da942cc88468ccc1e8758c2f1e3004a0424567f56e5e6fb589f457e50a1edc759e77b9177aa9472441f68911c8cc5ed39c2c4d5b8b56839521 SHA512 697a3f44a7df7b1e7425afedece72693c77821a6c55a3d5bf735a724ccb1a6655dfabd4262b3136b7af0856eeaf8404adb0c203826f0f8422035c6d66ebb11d4 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 @@ Use libarchive + Install dracut module Enable grub configuration generator + Use http2 + Enable ostree trivial-httpd entrypoint Use libmount Use libsoup for networking 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