gentoo resync : 21.01.2020

13 files changed, 308 insertions, 64 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 80014dffc077..1f4bc594328d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 1978f2dd2f91..e6ee5ca8b1a4 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,9 @@
 DIST debhelper_12.7.2.tar.xz 511800 BLAKE2B e01bc5685c1e4803f2b1668973a6ee02c91dc6da0fd2c2ac1f1ddfce35531351ac38e8805667a23a4c63ea78403bf318957adad4c560771c58f4394fc691709c SHA512 b77b81a72d7c66f893fb6eae501c48fd80b49bdf19e691be74fdf8bcafd91a3f0d000c4ecd2aef80da18caaaa781eba9c8b37512ad260da708bc7b6ea3d7674d
 DIST debhelper_12.7.3.tar.xz 511396 BLAKE2B ac16bcb3aa6f3807ce29be4e1aa2db36e35fcbf0bfbe6b823bc8388cac8d0ecbba8062bd05a5c7a277a0e56f896923df78c9d6fe38b703b47e92a8901e63aab5 SHA512 802fccba95df5fcd04a5ec9d78610e77c2977d81e6b1e4eba6bb5d4f92e5943db2876e1b011d1822cbbc67c256895045408b7eaf285da2ac55bd8200b6c39fe3
+DIST debhelper_12.8.tar.xz 517508 BLAKE2B 2f72bde30638755787c93e2dabf5f60a013c58508c8872b2625e09c98dd64dca77b91063b24a5612ab7cd04ed0a94c533663cee1ef271783be5b27709008c9a3 SHA512 41c5f2e2362dc1b02c1ac60ec7c7b8e1826b9a5abd1a981f85bb90ef128362022228ba8778645492498d57676e5ba7a5563a8391ff5474065178f67f339bbb0e
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-12.7.2.ebuild 1534 BLAKE2B ed0daa11059dec73fd59525a40652eec26e3e3ce3501419b5acaf0785f39a130d05f43bead9c4fe565b8ba94e7a5a1c92a40e42654753d3db30329c84f256cb8 SHA512 c0b55b8dc50568b5cccabc80993a807c203d0401d282d349285ce1d12d06ba965bb4834ff22fbd37abd741db050f67173094b1bfc9a151fd9b28c82fbb0227b2
 EBUILD debhelper-12.7.3.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
+EBUILD debhelper-12.8.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
 EBUILD debhelper-9.20160814.ebuild 1532 BLAKE2B 6b9b3e12e88aad1ac2550ca77d2e35cb43f4a756f5501e1de8a6114da409ee9f58e5e5feb68b6ac2c3541745ed96d0a6e526b0cdf72f358b92fb2ea7661b93da SHA512 cbc6d7e14f396d1d1c877a68e05b70b390a3018adb106fffe0b76250dde578b782a35b6fb33f8aa6bb98c90aeed04536f85f7bde5bef217caf615fcf6bdce6dd
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.8.ebuild b/dev-util/debhelper/debhelper-12.8.ebuild
new file mode 100644
index 000000000000..f3567e709e9e
--- /dev/null
+++ b/dev-util/debhelper/debhelper-12.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
+
+NLS_DEPEND=$(
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="
+	${RDEPEND}
+	${NLS_DEPEND}
+	test? (
+		dev-perl/Test-Pod
+		sys-apps/fakeroot
+	)
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lang
+	for manfile in *.1 *.7 ; do
+		for lang in ${DH_LANGS[@]}; do
+			case ${manfile} in
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 1d1a55f0db9d..9e6681983e47 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -9,5 +9,5 @@ EBUILD dwarves-1.13.ebuild 1061 BLAKE2B 729f6f13b1b030171888139074499c0841ebbfa9
 EBUILD dwarves-1.15.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
 EBUILD dwarves-1.16-r1.ebuild 981 BLAKE2B 73d0c73c70e17641b914ac177c3423a02592bc555c876aa99b2f23bfbf79a8ae3a74b11d593ef28bf34ec47f2b6e9d28637a8f49db9f03f90d25974edf65d69e SHA512 54a0e1425ac72e753e8c70534617f84863897b74689ea1f08602601c490a130830eae1ba3f984cd5a77eb9637131ba7ff7384e27542870871b40f972b932d1e4
 EBUILD dwarves-1.16.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-9999.ebuild 856 BLAKE2B 72d49b4d7ef38a76d1da5e4445f3b2958015e35f14838a35cc9abfa1dd065f011f7f6aa3acc5f92b29144df6d53b5e9b8d8d8d4aada03081ba87f597b82387c6 SHA512 4529b4bcdef652fb4453e6a9a8e03a4508c5fe60f4bcfdba4a9b5bd5b2ff25393dcfb1cfff5e82409a48d70e9664004760cc9cb64d0628aae5e6348acd41db79
+EBUILD dwarves-9999.ebuild 873 BLAKE2B 6c4dc0062ccce7980ce8263cf7e15238c7e303f3419a95cfb6160b80aa4ef386f5b394f913d39b307921a0676c614e782541eee47694ff6968aa82089f85abf7 SHA512 00c0ad014b5805a9fa764416b2b5efcd6b5fb8b230d306ecdbc4f50af0e379c690b3b01f6bb8d434eb06902bcfcf6b55772778eaa823ba381b95cbacaa18838e
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index 75a15ff54a89..f9e4f9feeb3b 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,13 +18,16 @@ IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
+	>=dev-libs/elfutils-0.178
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
 DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+	"${FILESDIR}"/${PN}-1.16-no-libebl.patch
+)
 
 src_configure() {
 	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 480e18ee125c..db27230d5d72 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,5 +1,5 @@
 DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
 DIST gource-0.51.tar.gz 882783 BLAKE2B 86a95a55ef9e1ec50e19a4859163d7cdc2733b7c55a68e4d2db493e4c6587682b900b2c73525131972da4dde9fc4d9fa41ba728bdc56fd46fc6a559cb4d837f0 SHA512 f29326ffb2aa6f645fb941e08e41f0cbf8dd894d5a4d607b782caeb12a24e6446198027060b880e0ad14a36efbed19023620dd8c890cfc0c027fc90ac2d5be24
 EBUILD gource-0.49.ebuild 1067 BLAKE2B 239950d5088a2a7d8901b60b1b5514a27aae8b4065a1ed6db44d123236bc1bccdf200ed6d3371b331702cf49032aeb162e201d29febc3d552f991034e45efad3 SHA512 f8511d169bb3db902d7bd9f0aa4c0a33cae3d92123a234d516b0ce03044217cdd846241bc979151c683282c9f457eaeb5daf011d283592114135e2a117a5e8f4
-EBUILD gource-0.51.ebuild 1074 BLAKE2B 7f2c188a6a3ea4592021f4c0c0e2828041271648a6f1fc76b5aa3a3bc4093400b42b33131e3cec485bbaa5d259e42aa37ea97febf4cefe4fb3271f6750c19d47 SHA512 130c0c2a77a2503e7450e271f82e420ed9a087fa313bcec439fa8f1224d9ba1abba93038bc7e25f3d284d15b59eef9b0bdc910adb0722056a1842b6be5674060
+EBUILD gource-0.51.ebuild 1073 BLAKE2B e459bd452df402770251680f9831835dd8985e5cecda52314baa98d42375860ab5385b6193f97555ab44fa8083b4fd9a3549651bc7739c76ce40e8323f4b05df SHA512 9996810d53645f93a3049b1b93679c163f90d240901e07f8d232902e18bb222df0d61c09044fb869fe5cdc5f82ed0242844be487d9f59f2a5c28862b4b09ff0a
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.51.ebuild b/dev-util/gource/gource-0.51.ebuild
index 384186f7e6ea..ff545898e0dc 100644
--- a/dev-util/gource/gource-0.51.ebuild
+++ b/dev-util/gource/gource-0.51.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
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 @@
 	</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
+}