From 946d90d08f29094153142056a1778cd595e568a3 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 23 Jul 2012 09:45:44 -0500
Subject: Add '410 Gone' support for packages moved out of repositories

This allows us to do better than a generic 404 handler when we know a
package previously existed in a given repository, and should also make
things a bit nicer when getting sent in from a search engine to a page
that no longer exists.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/removed.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 templates/packages/removed.html

(limited to 'templates/packages/removed.html')

diff --git a/templates/packages/removed.html b/templates/packages/removed.html
new file mode 100644
index 00000000..17b1f989
--- /dev/null
+++ b/templates/packages/removed.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% load package_extras %}
+
+{% block title %}Arch Linux - Not Available - {{ update.pkgname }} {{ update.old_version }} ({{ update.arch.name }}){% endblock %}
+{% block navbarclass %}anb-packages{% endblock %}
+
+{% block content %}
+<div id="pkg-gone" class="box">
+    <h2>{{ update.pkgname }} {{ update.old_version }} is no longer available</h2>
+
+    <p>{{ update.pkgname }} {{ update.old_version }} has been removed from the [{{ update.repo.name|lower }}] repository.</p>
+
+    {% with update.elsewhere as elsewhere %}{% if elsewhere %}
+    <p>However, this package is available in other repositories:</p>
+    <ul>
+        {% for pkg in elsewhere %}
+        <li>{% pkg_details_link pkg %} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
+        {% endfor %}
+    </ul>
+    {% else %}
+    <p>Unfortunately, this package cannot be found in any other repositories.
+    Try using the <a href="{% url 'packages-search' %}?name={{ update.pkgname|urlencode }}">package search page</a>,
+    or try <a href="https://aur.archlinux.org/packages.php?K={{ update.pkgname|urlencode }}">searching the AUR</a>
+    to see if the package can be found there.</p>
+    {% endif %}{% endwith %}
+</div>
+{% endblock %}
-- 
cgit v1.2.3-2-g168b


From 5f85a1240da14e57760c2ba6585ae943d7a1d8c2 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 31 Jul 2012 19:31:44 -0500
Subject: Reuse removed template for packages with multiple replacements

For example, bitcoin-git in the Arch repos is currently marked replaced
by both bitcoin-qt and bitcoin-daemon. This allows us to show a page
with both options listed instead of a blank 404 page.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/removed.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates/packages/removed.html')

diff --git a/templates/packages/removed.html b/templates/packages/removed.html
index 17b1f989..ea20ce80 100644
--- a/templates/packages/removed.html
+++ b/templates/packages/removed.html
@@ -2,17 +2,17 @@
 {% load url from future %}
 {% load package_extras %}
 
-{% block title %}Arch Linux - Not Available - {{ update.pkgname }} {{ update.old_version }} ({{ update.arch.name }}){% endblock %}
+{% block title %}Arch Linux - Not Available - {{ name }} {{ version }} ({{ arch.name }}){% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div id="pkg-gone" class="box">
-    <h2>{{ update.pkgname }} {{ update.old_version }} is no longer available</h2>
+    <h2>{{ name }} {{ version }} is no longer available</h2>
 
-    <p>{{ update.pkgname }} {{ update.old_version }} has been removed from the [{{ update.repo.name|lower }}] repository.</p>
+    <p>{{ name }} {{ version }} has been removed from the [{{ repo.name|lower }}] repository.</p>
 
-    {% with update.elsewhere as elsewhere %}{% if elsewhere %}
-    <p>However, this package is available in other repositories:</p>
+    {% if elsewhere %}
+    <p>However, this package or replacements are available elsewhere:</p>
     <ul>
         {% for pkg in elsewhere %}
         <li>{% pkg_details_link pkg %} {{ pkg.full_version }} [{{ pkg.repo.name|lower }}] ({{ pkg.arch.name }})</li>
@@ -23,6 +23,6 @@
     Try using the <a href="{% url 'packages-search' %}?name={{ update.pkgname|urlencode }}">package search page</a>,
     or try <a href="https://aur.archlinux.org/packages.php?K={{ update.pkgname|urlencode }}">searching the AUR</a>
     to see if the package can be found there.</p>
-    {% endif %}{% endwith %}
+    {% endif %}
 </div>
 {% endblock %}
-- 
cgit v1.2.3-2-g168b


From 10462425f989dc74653179f0845978a6b5e30045 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 16 Jan 2013 16:10:24 -0600
Subject: Remove {% load url from future %} from templates

This is now the default in Django 1.5.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/removed.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'templates/packages/removed.html')

diff --git a/templates/packages/removed.html b/templates/packages/removed.html
index ea20ce80..f188b6db 100644
--- a/templates/packages/removed.html
+++ b/templates/packages/removed.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load url from future %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - Not Available - {{ name }} {{ version }} ({{ arch.name }}){% endblock %}
-- 
cgit v1.2.3-2-g168b