From 77aee18277b221d0030e95d8823a53ad93794869 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Wed, 17 Nov 2021 09:29:33 -0500
Subject: Change toolbox to keep what we expect

getToolbox and the hooks are deprecated and set to be removed

Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 TyrianTemplate.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/TyrianTemplate.php b/TyrianTemplate.php
index 30f9f11..c889284 100644
--- a/TyrianTemplate.php
+++ b/TyrianTemplate.php
@@ -305,12 +305,18 @@ class TyrianTemplate extends BaseTemplate {
 			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-cog"></i> <?php $this->msg( 'toolbox' ) ?> <span class="caret"></span></a>
 			<ul class="dropdown-menu" role="menu">
 				<?php
-					foreach ( $this->getToolbox() as $key => $tbitem) {
+					$toolbox = $this->getSkin()->makeToolbox(
+							$this->data['nav_urls'],
+							$this->data['feeds']
+						   );
+
+					// Merge content that might be added to the toolbox section by hook
+					if ( isset( $this->data['sidebar']['TOOLBOX'] ) ) {
+						$toolbox = array_merge( $toolbox, $this->data['sidebar']['TOOLBOX'] ?? [] );
+					}
+					foreach ( $toolbox as $key => $tbitem) {
 						echo $this->makeListItem( $key, $tbitem );
 					}
-
-					Hooks::Run( 'MonoBookTemplateToolboxEnd', [&$this] );
-					Hooks::Run( 'SkinTemplateToolboxEnd', [ &$this, true ] );
 				?>
 			</ul>
 		</li>
-- 
cgit v1.2.3-65-gdbad


From e9bb44924ce0454e372b7d442e8bd0c6168b1be8 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Tue, 26 Nov 2019 14:55:23 +0100
Subject: Update license in template to CC-BY-SA-4.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See GLEP 76. Also change copyright holder to "Gentoo Authors".

Bug: https://bugs.gentoo.org/664112
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Signed-off-by: Matthew Marchese <maffblaster@gentoo.org>
---
 TyrianTemplate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TyrianTemplate.php b/TyrianTemplate.php
index c889284..a11fd4c 100644
--- a/TyrianTemplate.php
+++ b/TyrianTemplate.php
@@ -177,11 +177,11 @@ class TyrianTemplate extends BaseTemplate {
 					</ul>
 				</div>
 				<div class="col-xs-9 col-md-9">
-					<strong>&copy; 2001&ndash;<?=$currentYear ?> Gentoo Foundation, Inc.</strong><br />
+					<strong>&copy; 2001&ndash;<?=$currentYear ?> Gentoo Authors</strong><br />
 					<small>
 						Gentoo is a trademark of the Gentoo Foundation, Inc.
 						The contents of this document, unless otherwise expressly stated, are licensed under the
-						<a href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license.
+						<a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="license">CC-BY-SA-4.0</a> license.
 						The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.
 					</small>
 				</div>
-- 
cgit v1.2.3-65-gdbad