2020-01-21 08:26:19 UTC

7 files changed, 39 insertions, 17 deletions

diff --git a/metadata/md5-cache/dev-util/ostree-2018.5 b/metadata/md5-cache/dev-util/ostree-2018.5
deleted file mode 100644
index ddc079a14654..000000000000
--- a/metadata/md5-cache/dev-util/ostree-2018.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-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:* ) sys-devel/bison sys-devel/flex
-DESCRIPTION=Operating system and container binary deployment and upgrades
-EAPI=6
-HOMEPAGE=https://ostree.readthedocs.io/en/latest/
-IUSE=grub selinux soup systemd zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=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:* )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.5/libostree-2018.5.tar.xz -> ostree-2018.5.tar.xz
-_md5_=4224e2b933e18c659e602446a949532c
diff --git a/metadata/md5-cache/dev-util/ostree-2018.9 b/metadata/md5-cache/dev-util/ostree-2018.9
index a9d039a79a03..ce5fa6d818ff 100644
--- a/metadata/md5-cache/dev-util/ostree-2018.9
+++ b/metadata/md5-cache/dev-util/ostree-2018.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-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:= 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:* ) app-text/docbook-xsl-stylesheets sys-devel/bison dev-libs/libxslt || ( dev-util/glib-utils <dev-libs/glib-2.56.2:2 ) sys-devel/bison sys-devel/flex virtual/pkgconfig curl? ( net-misc/curl:= ) introspection? ( dev-libs/gobject-introspection ) doc? ( dev-util/gtk-doc )
+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:= 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:* ) 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 )
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=6
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
@@ -10,4 +10,4 @@ RDEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassua
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.9/libostree-2018.9.tar.xz -> ostree-2018.9.tar.xz
-_md5_=1675c2a33288a7a56f4e3b4cf396e008
+_md5_=384927619ebef2e106cfc2f4de603007
diff --git a/metadata/md5-cache/dev-util/ostree-2018.9-r1 b/metadata/md5-cache/dev-util/ostree-2018.9-r1
new file mode 100644
index 000000000000..6b05a44a79b7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ostree-2018.9-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=7
+HOMEPAGE=https://ostree.readthedocs.io/en/latest/
+IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=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] )
+REQUIRED_USE=httpd? ( || ( curl soup ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.9/libostree-2018.9.tar.xz -> ostree-2018.9.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0e0ffbc6577a65e9a6c2e10162f921df
diff --git a/metadata/md5-cache/dev-util/ostree-2019.5 b/metadata/md5-cache/dev-util/ostree-2019.5
new file mode 100644
index 000000000000..bed8db4a9f4b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ostree-2019.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=7
+HOMEPAGE=https://ostree.readthedocs.io/en/latest/
+IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=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] )
+REQUIRED_USE=httpd? ( || ( curl soup ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2019.5/libostree-2019.5.tar.xz -> ostree-2019.5.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1c984ac83807048ce3c055a9b403965b
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 5231400b47fa..05aaffd58b13 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -10611,7 +10611,7 @@ dev-util/objconv 2.51: object code file converted (COFF, ELF, OMF, MACHO)
 dev-util/omake 0.9.8.6.0_rc1 0.10.2 0.10.3: Make replacement
 dev-util/open-vcdiff 0.8.4-r1: An encoder/decoder for the VCDIFF (RFC3284) format
 dev-util/oprofile 1.3.0: A transparent low-overhead system-wide profiler
-dev-util/ostree 2018.5 2018.9: Operating system and container binary deployment and upgrades
+dev-util/ostree 2018.9 2018.9-r1 2019.5: Operating system and container binary deployment and upgrades
 dev-util/packer 1.3.5 1.4.0 1.4.1 1.4.4 1.4.5: A tool to create identical machine images for multiple platforms
 dev-util/patchbin 20160208 99999999: Apply binary patches without git
 dev-util/patchelf 0.10: Small utility to modify the dynamic linker and RPATH of ELF executables
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ad7465b328dc..2d18af1fec41 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jan 2020 07:46:35 +0000
+Tue, 21 Jan 2020 08:26:19 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3a15706dd3e1..e562e530b22b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2983,7 +2983,10 @@ dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger
 dev-util/nvidia-cuda-toolkit:eclipse - Install plugins for eclipse
 dev-util/nvidia-cuda-toolkit:profiler - Installs the NVIDIA CUDA visual profiler
 dev-util/ostree:archive - Use libarchive
+dev-util/ostree:dracut - Install dracut module
 dev-util/ostree:grub - Enable grub configuration generator
+dev-util/ostree:http2 - Use http2
+dev-util/ostree:httpd - Enable ostree trivial-httpd entrypoint
 dev-util/ostree:libmount - Use libmount
 dev-util/ostree:soup - Use libsoup for networking
 dev-util/perf:clang - Enable builtin clang and LLVM support