6 files changed, 33 insertions, 145 deletions
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 0ab3122baebc..a7a2a2274840 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,2 +1,2 @@
-DIST glade-3.38.0.tar.xz 2706872 BLAKE2B a9933c0d0f2e6f64468819bdca68b0397913160fb71ad3b4cb3aca23745eec9555490921e5bd9d846329de70a86633f9071db9650d3e8078db56a20d8f24385b SHA512 d3b2f52d92773130daec080a269da91f8cdd7f9269fe97168d9fb29ba2d0dde3126656e15b12f099041e258572d75f6a5aa07642cd633fa717504270b650cc83
+DIST glade-3.38.1.tar.xz 2708852 BLAKE2B 63d826cc9ac11e1e7de1ecd744e058eb2a9a9f9c33397cb310708b67f39de93630e4064be9edbad2bfe381a8c99e9f22d0a7044340ea41c705d27ee01f9a5d1b SHA512 ecfe549ae7d2e99e4fdaafbd6ce59a50ae1aa38d14551c38039de5101dee99f947967ea1ed082d57fd8c5b7ef5e60fb410549f47411d89a038abf263f264782b
 DIST glade-3.39.0.tar.gz 4663738 BLAKE2B 05acecd53561ca3b83754d683d0f6f234d110a7421671021be6026d9a66cfe18fdfe0c03d3cbfd62ca7049cffd7d0705c1715e36c408f6e6375875098bac5351 SHA512 02338e3edd5f95d0c5b5f20da9c36f00963f494ca54e3ffbd7fdadd85e8507af1fbc4ce47f422cf595ab0e657bc7fbe37675d279c178570a537129c28e4b2744
diff --git a/dev-util/glade/files/glade-3.14.1-doc-version.patch b/dev-util/glade/files/glade-3.14.1-doc-version.patch
new file mode 100644
index 000000000000..39c9641719a4
--- /dev/null
+++ b/dev-util/glade/files/glade-3.14.1-doc-version.patch
@@ -0,0 +1,29 @@
+From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 6 May 2012 22:40:47 -0400
+Subject: [PATCH] Version glade documentation
+
+Rename gnome help files to prevent collision with other versions.
+
+Avoid loading glade-3.8's devhelp files.
+---
+ help/Makefile.am   |    5 ++++-
+ src/glade-window.c |    2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 89a4549..4eb8be5 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
+ {
+   if (glade_util_have_devhelp ())
+     {
+-      glade_util_search_devhelp ("gladeui", NULL, NULL);
++      glade_util_search_devhelp ("gladeui-2", NULL, NULL);
+       return;
+     }
+ 
+-- 
+1.7.8.6
+
diff --git a/dev-util/glade/glade-3.38.0.ebuild b/dev-util/glade/glade-3.38.1.ebuild
index 859d5ea8041b..859d5ea8041b 100644
--- a/dev-util/glade/glade-3.38.0.ebuild
+++ b/dev-util/glade/glade-3.38.1.ebuild
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index efa90df5b752..a0d1025bb602 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,2 +1,2 @@
-DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
 DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
+DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538
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-2018.9-r1.ebuild b/dev-util/ostree/ostree-2020.6.ebuild
index 77065eb10dda..68c74d15f958 100644
--- a/dev-util/ostree/ostree-2018.9-r1.ebuild
+++ b/dev-util/ostree/ostree-2020.6.ebuild
@@ -23,16 +23,16 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	curl? ( net-misc/curl )
 	soup? ( net-libs/libsoup )
-	dev-libs/glib:2
 	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:0
+	>=sys-fs/fuse-2.9.2:0
 	sys-libs/zlib
 	libmount? ( sys-apps/util-linux )
 	selinux? ( sys-libs/libselinux )
@@ -57,39 +57,6 @@ 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
 }