1 |
commit: ab268de78b5c9f952cfedfbd75eab2f249f175c2 |
2 |
Author: Alex Legler <alex <AT> a3li <DOT> li> |
3 |
AuthorDate: Sun Jan 31 00:56:23 2016 +0000 |
4 |
Commit: Alex Legler <a3li <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 00:56:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/sites/www.git/commit/?id=ab268de7 |
7 |
|
8 |
Deprecate herds |
9 |
|
10 |
_plugins/herds.rb | 43 -------------------------- |
11 |
bin/update-herds.sh | 6 ---- |
12 |
bin/update.sh | 1 - |
13 |
inside-gentoo/developers/herds.html | 60 ++++++------------------------------- |
14 |
4 files changed, 9 insertions(+), 101 deletions(-) |
15 |
|
16 |
diff --git a/_plugins/herds.rb b/_plugins/herds.rb |
17 |
deleted file mode 100644 |
18 |
index 971f1e2..0000000 |
19 |
--- a/_plugins/herds.rb |
20 |
+++ /dev/null |
21 |
@@ -1,43 +0,0 @@ |
22 |
-module Gentoo |
23 |
- class HerdsGenerator < Jekyll::Generator |
24 |
- XML = '_data/herds.xml' |
25 |
- |
26 |
- def generate(site) |
27 |
- xml = Nokogiri::XML(File.open(XML)) |
28 |
- |
29 |
- site.data['herds'] ||= {} |
30 |
- |
31 |
- xml.xpath('/herds/herd').each do |item| |
32 |
- item_data = {} |
33 |
- |
34 |
- name = item.xpath('./name').first.text |
35 |
- |
36 |
- item_data['email'] = item.xpath('./email/text()').first.content |
37 |
- item_data['description'] = item.xpath('./description/text()').first.text |
38 |
- |
39 |
- ns_maint = item.xpath('./maintainer') |
40 |
- item_data['maintainers'] = [] if ns_maint.size > 0 |
41 |
- ns_maint.each do |maint| |
42 |
- maint_data = { |
43 |
- 'email' => maint.xpath('./email/text()').first.text, |
44 |
- 'name' => nil, |
45 |
- 'role' => nil |
46 |
- } |
47 |
- |
48 |
- ns_name = maint.xpath('./name/text()') |
49 |
- maint_data['name'] = ns_name.first.text if ns_name.size > 0 |
50 |
- |
51 |
- ns_role = maint.xpath('./role/text()') |
52 |
- maint_data['role'] = ns_role.first.text if ns_role.size > 0 |
53 |
- |
54 |
- item_data['maintainers'] << maint_data |
55 |
- end |
56 |
- |
57 |
- ns_maintproj = item.xpath('./maintainingproject/text()') |
58 |
- item_data['proj'] = ns_maintproj.first.text if ns_maintproj.size > 0 |
59 |
- |
60 |
- site.data['herds'][name] = item_data |
61 |
- end |
62 |
- end |
63 |
- end |
64 |
-end |
65 |
|
66 |
diff --git a/bin/update-herds.sh b/bin/update-herds.sh |
67 |
deleted file mode 100755 |
68 |
index 5e21b08..0000000 |
69 |
--- a/bin/update-herds.sh |
70 |
+++ /dev/null |
71 |
@@ -1,6 +0,0 @@ |
72 |
-#!/bin/bash |
73 |
- |
74 |
-echo -n 'Updating herd information...' |
75 |
-wget 'https://api.gentoo.org/packages/herds.xml' -O _data/herds.xml.tmp 2>/dev/null |
76 |
-[ $? -eq 0 ] && mv _data/herds.xml.tmp _data/herds.xml |
77 |
-echo 'done.' |
78 |
|
79 |
diff --git a/bin/update.sh b/bin/update.sh |
80 |
index 35fd32c..5e8068d 100755 |
81 |
--- a/bin/update.sh |
82 |
+++ b/bin/update.sh |
83 |
@@ -3,7 +3,6 @@ |
84 |
bin/update-devaway.sh || exit 1 |
85 |
bin/update-downloads.sh || exit 1 |
86 |
bin/update-glsa.sh || exit 1 |
87 |
-bin/update-herds.sh || exit 1 |
88 |
bin/update-mirrors.sh || exit 1 |
89 |
bin/update-packages.sh || exit 1 |
90 |
bin/update-planet.sh || exit 1 |
91 |
|
92 |
diff --git a/inside-gentoo/developers/herds.html b/inside-gentoo/developers/herds.html |
93 |
index 84f30e0..31a118d 100644 |
94 |
--- a/inside-gentoo/developers/herds.html |
95 |
+++ b/inside-gentoo/developers/herds.html |
96 |
@@ -7,59 +7,17 @@ nav1: inside-gentoo |
97 |
nav2: developers |
98 |
|
99 |
nav3: herds |
100 |
-nav3-show: true |
101 |
+nav3-show: false |
102 |
nav3-weight: 40 |
103 |
|
104 |
layout: page-nav3 |
105 |
--- |
106 |
|
107 |
-<p> |
108 |
- This page lists all package maintenance groups (herds) in the Gentoo project. |
109 |
-</p> |
110 |
- |
111 |
-{% for entry in site.data.herds %} |
112 |
-<h3 id="{{ entry[0] | xml_escape }}">{{ entry[0] | xml_escape }}</h3> |
113 |
- |
114 |
-<table class="table"> |
115 |
- <tr> |
116 |
- <th class="herd-desc-col">Description</th> |
117 |
- <td>{{ entry[1].description | xml_escape }}</td> |
118 |
- </tr> |
119 |
- <tr> |
120 |
- <th>Contact</th> |
121 |
- <td><a href="mailto:{{ entry[1].email | xml_escape }}">{{ entry[1].email | xml_escape }}</a></td> |
122 |
- </tr> |
123 |
- <tr> |
124 |
- <th>Maintainers</th> |
125 |
- <td> |
126 |
- {% if entry[1].maintainers %} |
127 |
- <table class="table table-condensed"> |
128 |
- <tr> |
129 |
- <th class="herd-maint-col">Maintainer</th> |
130 |
- <th>Roles</th> |
131 |
- </tr> |
132 |
- {% for maint in entry[1].maintainers %} |
133 |
- <tr> |
134 |
- <td> |
135 |
- {% if maint.name %} |
136 |
- <a href="mailto:{{ maint.email | xml_escape }}">{{ maint.name | xml_escape }}</a> |
137 |
- {% else %} |
138 |
- <a href="mailto:{{ maint.email | xml_escape }}">{{ maint.email | xml_escape }}</a> |
139 |
- {% endif %} |
140 |
- </td> |
141 |
- <td> |
142 |
- {{ maint.role | xml_escape }} |
143 |
- </td> |
144 |
- </tr> |
145 |
- {% endfor %} |
146 |
- </table> |
147 |
- {% endif %} |
148 |
- |
149 |
- {% if entry[1].proj %} |
150 |
- A Gentoo project is (also) listed as participating in the maintenance of packages in this herd. |
151 |
- Listing maintainers of this project is currently not possible. |
152 |
- {% endif %} |
153 |
- </td> |
154 |
- </tr> |
155 |
-</table> |
156 |
-{% endfor %} |
157 |
+<div class="alert alert-warning"> |
158 |
+ <strong>This page is deprecated.</strong> |
159 |
+ <br> |
160 |
+ With <a class="alert-link" href="https://wiki.gentoo.org/wiki/GLEP:67">GLEP 67</a>, the concept of <em>herds</em> has been deprecated. |
161 |
+ <br> |
162 |
+ Packages are now maintained by Gentoo projects and their respective members. |
163 |
+ For a list of projects, please see our <a class="alert-link" href="https://wiki.gentoo.org/wiki/Project:Gentoo">Wiki</a>. |
164 |
+</div> |