Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/watchpid/, sys-fs/xfsdump/, sys-libs/libavc1394/, sys-apps/mawk/, ...
Date: Tue, 24 Nov 2015 22:02:02
Message-Id: 1448402487.9a534ce223034ddd735530712c7439ce8cf5b346.vapier@gentoo
1 commit: 9a534ce223034ddd735530712c7439ce8cf5b346
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 24 20:15:26 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 24 22:01:27 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a534ce2
7
8 standardize various metadata.xml style
9
10 sys-apps/acl/metadata.xml | 10 +++---
11 sys-apps/arrayprobe/metadata.xml | 7 ++--
12 sys-apps/attr/metadata.xml | 4 +--
13 sys-apps/baselayout/metadata.xml | 4 +--
14 sys-apps/byld/metadata.xml | 12 +++----
15 sys-apps/cciss_vol_status/metadata.xml | 19 ++++++-----
16 sys-apps/collectl/metadata.xml | 12 +++----
17 sys-apps/coreutils/metadata.xml | 12 +++----
18 sys-apps/cracklib-words/metadata.xml | 14 ++++----
19 sys-apps/debianutils/metadata.xml | 4 +--
20 sys-apps/diffutils/metadata.xml | 4 +--
21 sys-apps/dmapi/metadata.xml | 4 +--
22 sys-apps/dmidecode/metadata.xml | 4 +--
23 sys-apps/dnotify/metadata.xml | 4 +--
24 sys-apps/ed/metadata.xml | 4 +--
25 sys-apps/ethtool/metadata.xml | 6 ++--
26 sys-apps/fakeroot/metadata.xml | 4 +--
27 sys-apps/fbset/metadata.xml | 4 +--
28 sys-apps/file/metadata.xml | 4 +--
29 sys-apps/findutils/metadata.xml | 12 +++----
30 sys-apps/fwcrv/metadata.xml | 4 +--
31 sys-apps/gawk/metadata.xml | 6 ++--
32 sys-apps/gentoo-functions/metadata.xml | 34 ++++++++++----------
33 sys-apps/grep/metadata.xml | 6 ++--
34 sys-apps/groff/metadata.xml | 4 +--
35 sys-apps/gscanbus/metadata.xml | 12 +++----
36 sys-apps/gsmartcontrol/metadata.xml | 19 ++++++-----
37 sys-apps/hbaapi/metadata.xml | 12 +++----
38 sys-apps/hdparm/metadata.xml | 12 +++----
39 sys-apps/help2man/metadata.xml | 4 +--
40 sys-apps/hprofile/metadata.xml | 12 +++----
41 sys-apps/hwids/metadata.xml | 42 ++++++++++++------------
42 sys-apps/ifplugd/metadata.xml | 12 +++----
43 sys-apps/install-xattr/metadata.xml | 7 ++--
44 sys-apps/iproute2/metadata.xml | 4 +--
45 sys-apps/irqbalance/metadata.xml | 20 ++++++------
46 sys-apps/isapnptools/metadata.xml | 4 +--
47 sys-apps/iucode_tool/metadata.xml | 4 +--
48 sys-apps/kbd/metadata.xml | 10 +++---
49 sys-apps/keyutils/metadata.xml | 12 +++----
50 sys-apps/kmod/metadata.xml | 22 ++++++-------
51 sys-apps/lcdsplash/metadata.xml | 4 +--
52 sys-apps/lcdtest/metadata.xml | 10 +++---
53 sys-apps/less/metadata.xml | 4 +--
54 sys-apps/logwatch/metadata.xml | 12 +++----
55 sys-apps/lshw/metadata.xml | 4 +--
56 sys-apps/makedev/metadata.xml | 4 +--
57 sys-apps/man-db/metadata.xml | 4 +--
58 sys-apps/man-pages-posix/metadata.xml | 4 +--
59 sys-apps/man-pages/metadata.xml | 4 +--
60 sys-apps/man/metadata.xml | 4 +--
61 sys-apps/mawk/metadata.xml | 4 +--
62 sys-apps/memtest86+/metadata.xml | 4 +--
63 sys-apps/memtest86/metadata.xml | 4 +--
64 sys-apps/memtester/metadata.xml | 4 +--
65 sys-apps/microcode-ctl/metadata.xml | 4 +--
66 sys-apps/microcode-data/metadata.xml | 4 +--
67 sys-apps/minised/metadata.xml | 4 +--
68 sys-apps/miscfiles/metadata.xml | 4 +--
69 sys-apps/mlocate/metadata.xml | 11 +++----
70 sys-apps/modutils/metadata.xml | 4 +--
71 sys-apps/mtree/metadata.xml | 12 +++----
72 sys-apps/nawk/metadata.xml | 13 ++++----
73 sys-apps/net-tools/metadata.xml | 16 +++++-----
74 sys-apps/netboot-base/metadata.xml | 4 +--
75 sys-apps/netkit-base/metadata.xml | 4 +--
76 sys-apps/pciutils/metadata.xml | 16 +++++-----
77 sys-apps/qingy/metadata.xml | 21 ++++++------
78 sys-apps/readahead-list/metadata.xml | 8 ++---
79 sys-apps/rename/metadata.xml | 10 +++---
80 sys-apps/rescan-scsi-bus/metadata.xml | 6 ++--
81 sys-apps/rng-tools/metadata.xml | 31 +++++++++---------
82 sys-apps/sdparm/metadata.xml | 12 +++----
83 sys-apps/sed/metadata.xml | 10 +++---
84 sys-apps/setserial/metadata.xml | 10 +++---
85 sys-apps/sg3_utils/metadata.xml | 4 +--
86 sys-apps/shadow/metadata.xml | 6 ++--
87 sys-apps/smartmontools/metadata.xml | 18 +++++------
88 sys-apps/syscriptor/metadata.xml | 12 +++----
89 sys-apps/sysvinit/metadata.xml | 4 +--
90 sys-apps/tcp-wrappers/metadata.xml | 12 +++----
91 sys-apps/texinfo/metadata.xml | 6 ++--
92 sys-apps/ucspi-proxy/metadata.xml | 6 ++--
93 sys-apps/ucspi-unix/metadata.xml | 6 ++--
94 sys-apps/usbredir/metadata.xml | 4 +--
95 sys-apps/usbutils/metadata.xml | 10 +++---
96 sys-apps/utempter/metadata.xml | 8 ++---
97 sys-apps/util-linux/metadata.xml | 30 +++++++++---------
98 sys-apps/watchdog/metadata.xml | 18 +++++------
99 sys-apps/which/metadata.xml | 4 +--
100 sys-apps/x86info/metadata.xml | 12 +++----
101 sys-apps/xinetd/metadata.xml | 6 ++--
102 sys-apps/xmbmon/metadata.xml | 4 +--
103 sys-block/aoetools/metadata.xml | 12 +++----
104 sys-block/buffer/metadata.xml | 4 +--
105 sys-block/di/metadata.xml | 4 +--
106 sys-block/eject/metadata.xml | 10 +++---
107 sys-block/endpoint/metadata.xml | 18 +++++------
108 sys-block/fwdl/metadata.xml | 4 +--
109 sys-block/gpart/metadata.xml | 4 +--
110 sys-block/iscsitarget/metadata.xml | 19 ++++++-----
111 sys-block/mbuffer/metadata.xml | 4 +--
112 sys-block/mtx/metadata.xml | 12 +++----
113 sys-block/nbd/metadata.xml | 12 +++----
114 sys-block/noflushd/metadata.xml | 12 +++----
115 sys-block/open-iscsi/metadata.xml | 4 +--
116 sys-block/partimage/metadata.xml | 18 +++++------
117 sys-block/qla-fc-firmware/metadata.xml | 8 ++---
118 sys-block/smp_utils/metadata.xml | 4 +--
119 sys-block/tapecat/metadata.xml | 6 ++--
120 sys-block/thin-provisioning-tools/metadata.xml | 21 ++++++------
121 sys-block/vblade/metadata.xml | 12 +++----
122 sys-boot/grub/metadata.xml | 42 +++++++++++-------------
123 sys-boot/lilo/metadata.xml | 13 ++++----
124 sys-boot/mbr-gpt/metadata.xml | 6 ++--
125 sys-boot/syslinux/metadata.xml | 7 ++--
126 sys-devel/autoconf-archive/metadata.xml | 13 ++++----
127 sys-devel/autoconf-wrapper/metadata.xml | 4 +--
128 sys-devel/autoconf/metadata.xml | 6 ++--
129 sys-devel/automake-wrapper/metadata.xml | 4 +--
130 sys-devel/automake/metadata.xml | 4 +--
131 sys-devel/bc/metadata.xml | 4 +--
132 sys-devel/bin86/metadata.xml | 18 +++++------
133 sys-devel/bison/metadata.xml | 4 +--
134 sys-devel/cons/metadata.xml | 4 +--
135 sys-devel/flex/metadata.xml | 12 +++----
136 sys-devel/gettext/metadata.xml | 16 ++++++----
137 sys-devel/gnuconfig/metadata.xml | 6 ++--
138 sys-devel/libtool/metadata.xml | 4 +--
139 sys-devel/m4/metadata.xml | 4 +--
140 sys-devel/make/metadata.xml | 4 +--
141 sys-devel/patch/metadata.xml | 4 +--
142 sys-devel/remake/metadata.xml | 12 +++----
143 sys-fs/autorun/metadata.xml | 12 +++----
144 sys-fs/cramfs/metadata.xml | 12 +++----
145 sys-fs/cryptsetup/metadata.xml | 30 +++++++++---------
146 sys-fs/dd-rescue/metadata.xml | 4 +--
147 sys-fs/devfsd/metadata.xml | 4 +--
148 sys-fs/dmg2img/metadata.xml | 13 ++++----
149 sys-fs/dosfstools/metadata.xml | 12 +++----
150 sys-fs/e2fsprogs/metadata.xml | 14 ++++----
151 sys-fs/e2tools/metadata.xml | 4 +--
152 sys-fs/exfat-utils/metadata.xml | 28 ++++++++--------
153 sys-fs/extundelete/metadata.xml | 19 ++++++-----
154 sys-fs/fuse-exfat/metadata.xml | 28 ++++++++--------
155 sys-fs/lde/metadata.xml | 12 +++----
156 sys-fs/lsscsi/metadata.xml | 4 +--
157 sys-fs/lufs/metadata.xml | 12 +++----
158 sys-fs/mdadm/metadata.xml | 4 +--
159 sys-fs/mtools/metadata.xml | 4 +--
160 sys-fs/multipath-tools/metadata.xml | 4 +--
161 sys-fs/ntfs3g/metadata.xml | 44 +++++++++++++-------------
162 sys-fs/progsreiserfs/metadata.xml | 8 ++---
163 sys-fs/quota/metadata.xml | 20 ++++++------
164 sys-fs/quotatool/metadata.xml | 4 +--
165 sys-fs/reiser4progs/metadata.xml | 14 ++++----
166 sys-fs/reiserfsprogs/metadata.xml | 4 +--
167 sys-fs/static-dev/metadata.xml | 4 +--
168 sys-fs/sysfsutils/metadata.xml | 19 ++++++-----
169 sys-fs/udftools/metadata.xml | 12 +++----
170 sys-fs/xfsdump/metadata.xml | 4 +--
171 sys-fs/xfsprogs/metadata.xml | 4 +--
172 sys-libs/cracklib/metadata.xml | 14 ++++----
173 sys-libs/db/metadata.xml | 24 ++++++++------
174 sys-libs/e2fsprogs-libs/metadata.xml | 12 +++----
175 sys-libs/gdbm/metadata.xml | 8 ++---
176 sys-libs/gpm/metadata.xml | 4 +--
177 sys-libs/lib-compat/metadata.xml | 4 +--
178 sys-libs/libaal/metadata.xml | 14 ++++----
179 sys-libs/libavc1394/metadata.xml | 12 +++----
180 sys-libs/libcap-ng/metadata.xml | 15 +++++----
181 sys-libs/libcap/metadata.xml | 4 +--
182 sys-libs/libhugetlbfs/metadata.xml | 12 +++----
183 sys-libs/libieee1284/metadata.xml | 12 +++----
184 sys-libs/libraw1394/metadata.xml | 4 +--
185 sys-libs/libtermcap-compat/metadata.xml | 4 +--
186 sys-libs/libutempter/metadata.xml | 8 ++---
187 sys-libs/lrmi/metadata.xml | 12 +++----
188 sys-libs/ncurses/metadata.xml | 16 +++++-----
189 sys-libs/nss-db/metadata.xml | 4 +--
190 sys-libs/pwdb/metadata.xml | 4 +--
191 sys-libs/readline/metadata.xml | 12 +++----
192 sys-libs/zlib/metadata.xml | 18 +++++------
193 sys-power/apcupsd/metadata.xml | 21 ++++++------
194 sys-power/athcool/metadata.xml | 4 +--
195 sys-power/nvram-reboot/metadata.xml | 12 +++----
196 sys-power/nvram-wakeup/metadata.xml | 12 +++----
197 sys-process/acct/metadata.xml | 4 +--
198 sys-process/atop/metadata.xml | 4 +--
199 sys-process/daemontools-encore/metadata.xml | 8 ++---
200 sys-process/daemontools/metadata.xml | 6 ++--
201 sys-process/latencytop/metadata.xml | 4 +--
202 sys-process/lsof/metadata.xml | 6 ++--
203 sys-process/numactl/metadata.xml | 6 ++--
204 sys-process/numad/metadata.xml | 13 ++++----
205 sys-process/procps/metadata.xml | 20 ++++++------
206 sys-process/psmisc/metadata.xml | 12 +++----
207 sys-process/runit/metadata.xml | 10 +++---
208 sys-process/supervise-scripts/metadata.xml | 4 +--
209 sys-process/time/metadata.xml | 4 +--
210 sys-process/watchpid/metadata.xml | 4 +--
211 201 files changed, 967 insertions(+), 994 deletions(-)
212
213 diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
214 index 2dc91f5..073edc4 100644
215 --- a/sys-apps/acl/metadata.xml
216 +++ b/sys-apps/acl/metadata.xml
217 @@ -1,13 +1,11 @@
218 -<?xml version="1.0" encoding="UTF-8"?>
219 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
220 +<?xml version='1.0' encoding='UTF-8'?>
221 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
222 <pkgmetadata>
223 <herd>base-system</herd>
224 <use>
225 - <flag name='nfs'>
226 - add support for NFS acls
227 - </flag>
228 + <flag name='nfs'>add support for NFS acls</flag>
229 </use>
230 <upstream>
231 - <remote-id type="cpe">cpe:/a:xfs:acl</remote-id>
232 + <remote-id type='cpe'>cpe:/a:xfs:acl</remote-id>
233 </upstream>
234 </pkgmetadata>
235
236 diff --git a/sys-apps/arrayprobe/metadata.xml b/sys-apps/arrayprobe/metadata.xml
237 index d5dc80d..b2d9802 100644
238 --- a/sys-apps/arrayprobe/metadata.xml
239 +++ b/sys-apps/arrayprobe/metadata.xml
240 @@ -1,9 +1,8 @@
241 -<?xml version="1.0" encoding="UTF-8"?>
242 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
243 +<?xml version='1.0' encoding='UTF-8'?>
244 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
245 <pkgmetadata>
246 <herd>base-system</herd>
247 <maintainer>
248 - <email>chainsaw@g.o</email>
249 - <name>Tony Vroon</name>
250 + <email>chainsaw@g.o</email>
251 </maintainer>
252 </pkgmetadata>
253
254 diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
255 index 96a2d58..261fd29 100644
256 --- a/sys-apps/attr/metadata.xml
257 +++ b/sys-apps/attr/metadata.xml
258 @@ -1,5 +1,5 @@
259 -<?xml version="1.0" encoding="UTF-8"?>
260 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
261 +<?xml version='1.0' encoding='UTF-8'?>
262 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
263 <pkgmetadata>
264 <herd>base-system</herd>
265 </pkgmetadata>
266
267 diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
268 index 96a2d58..261fd29 100644
269 --- a/sys-apps/baselayout/metadata.xml
270 +++ b/sys-apps/baselayout/metadata.xml
271 @@ -1,5 +1,5 @@
272 -<?xml version="1.0" encoding="UTF-8"?>
273 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
274 +<?xml version='1.0' encoding='UTF-8'?>
275 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
276 <pkgmetadata>
277 <herd>base-system</herd>
278 </pkgmetadata>
279
280 diff --git a/sys-apps/byld/metadata.xml b/sys-apps/byld/metadata.xml
281 index b3c425a..6f8e77e 100644
282 --- a/sys-apps/byld/metadata.xml
283 +++ b/sys-apps/byld/metadata.xml
284 @@ -1,8 +1,8 @@
285 -<?xml version="1.0" encoding="UTF-8"?>
286 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
287 +<?xml version='1.0' encoding='UTF-8'?>
288 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
289 <pkgmetadata>
290 - <herd>base-system</herd>
291 - <upstream>
292 - <remote-id type="sourceforge">byld</remote-id>
293 - </upstream>
294 +<herd>base-system</herd>
295 +<upstream>
296 + <remote-id type='sourceforge'>byld</remote-id>
297 +</upstream>
298 </pkgmetadata>
299
300 diff --git a/sys-apps/cciss_vol_status/metadata.xml b/sys-apps/cciss_vol_status/metadata.xml
301 index 6bfcaeb..43e3ec8 100644
302 --- a/sys-apps/cciss_vol_status/metadata.xml
303 +++ b/sys-apps/cciss_vol_status/metadata.xml
304 @@ -1,12 +1,11 @@
305 -<?xml version="1.0" encoding="UTF-8"?>
306 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
307 +<?xml version='1.0' encoding='UTF-8'?>
308 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
309 <pkgmetadata>
310 - <herd>base-system</herd>
311 - <maintainer>
312 - <email>chainsaw@g.o</email>
313 - <name>Tony Vroon</name>
314 - </maintainer>
315 - <upstream>
316 - <remote-id type="sourceforge">cciss</remote-id>
317 - </upstream>
318 +<herd>base-system</herd>
319 +<maintainer>
320 + <email>chainsaw@g.o</email>
321 +</maintainer>
322 +<upstream>
323 + <remote-id type='sourceforge'>cciss</remote-id>
324 +</upstream>
325 </pkgmetadata>
326
327 diff --git a/sys-apps/collectl/metadata.xml b/sys-apps/collectl/metadata.xml
328 index 0fdbe9d..fc53e7e 100644
329 --- a/sys-apps/collectl/metadata.xml
330 +++ b/sys-apps/collectl/metadata.xml
331 @@ -1,8 +1,8 @@
332 -<?xml version="1.0" encoding="UTF-8"?>
333 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
334 +<?xml version='1.0' encoding='UTF-8'?>
335 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
336 <pkgmetadata>
337 - <herd>base-system</herd>
338 - <upstream>
339 - <remote-id type="sourceforge">collectl</remote-id>
340 - </upstream>
341 +<herd>base-system</herd>
342 +<upstream>
343 + <remote-id type='sourceforge'>collectl</remote-id>
344 +</upstream>
345 </pkgmetadata>
346
347 diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
348 index 02d1ba7..1ef77ad 100644
349 --- a/sys-apps/coreutils/metadata.xml
350 +++ b/sys-apps/coreutils/metadata.xml
351 @@ -1,11 +1,11 @@
352 -<?xml version="1.0" encoding="UTF-8"?>
353 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
354 +<?xml version='1.0' encoding='UTF-8'?>
355 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
356 <pkgmetadata>
357 <herd>base-system</herd>
358 -<upstream>
359 - <remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
360 -</upstream>
361 <use>
362 - <flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag>
363 + <flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag>
364 </use>
365 +<upstream>
366 + <remote-id type='cpe'>cpe:/a:gnu:coreutils</remote-id>
367 +</upstream>
368 </pkgmetadata>
369
370 diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
371 index 60405e4..3d1bb00 100644
372 --- a/sys-apps/cracklib-words/metadata.xml
373 +++ b/sys-apps/cracklib-words/metadata.xml
374 @@ -1,9 +1,9 @@
375 -<?xml version="1.0" encoding="UTF-8"?>
376 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
377 +<?xml version='1.0' encoding='UTF-8'?>
378 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
379 <pkgmetadata>
380 - <herd>base-system</herd>
381 - <upstream>
382 - <remote-id type="sourceforge">cracklib</remote-id>
383 - <remote-id type="github">cracklib/cracklib</remote-id>
384 - </upstream>
385 +<herd>base-system</herd>
386 +<upstream>
387 + <remote-id type='sourceforge'>cracklib</remote-id>
388 + <remote-id type='github'>cracklib/cracklib</remote-id>
389 +</upstream>
390 </pkgmetadata>
391
392 diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
393 index 96a2d58..261fd29 100644
394 --- a/sys-apps/debianutils/metadata.xml
395 +++ b/sys-apps/debianutils/metadata.xml
396 @@ -1,5 +1,5 @@
397 -<?xml version="1.0" encoding="UTF-8"?>
398 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
399 +<?xml version='1.0' encoding='UTF-8'?>
400 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
401 <pkgmetadata>
402 <herd>base-system</herd>
403 </pkgmetadata>
404
405 diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
406 index 96a2d58..261fd29 100644
407 --- a/sys-apps/diffutils/metadata.xml
408 +++ b/sys-apps/diffutils/metadata.xml
409 @@ -1,5 +1,5 @@
410 -<?xml version="1.0" encoding="UTF-8"?>
411 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
412 +<?xml version='1.0' encoding='UTF-8'?>
413 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
414 <pkgmetadata>
415 <herd>base-system</herd>
416 </pkgmetadata>
417
418 diff --git a/sys-apps/dmapi/metadata.xml b/sys-apps/dmapi/metadata.xml
419 index 96a2d58..261fd29 100644
420 --- a/sys-apps/dmapi/metadata.xml
421 +++ b/sys-apps/dmapi/metadata.xml
422 @@ -1,5 +1,5 @@
423 -<?xml version="1.0" encoding="UTF-8"?>
424 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
425 +<?xml version='1.0' encoding='UTF-8'?>
426 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
427 <pkgmetadata>
428 <herd>base-system</herd>
429 </pkgmetadata>
430
431 diff --git a/sys-apps/dmidecode/metadata.xml b/sys-apps/dmidecode/metadata.xml
432 index 96a2d58..261fd29 100644
433 --- a/sys-apps/dmidecode/metadata.xml
434 +++ b/sys-apps/dmidecode/metadata.xml
435 @@ -1,5 +1,5 @@
436 -<?xml version="1.0" encoding="UTF-8"?>
437 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
438 +<?xml version='1.0' encoding='UTF-8'?>
439 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
440 <pkgmetadata>
441 <herd>base-system</herd>
442 </pkgmetadata>
443
444 diff --git a/sys-apps/dnotify/metadata.xml b/sys-apps/dnotify/metadata.xml
445 index 96a2d58..261fd29 100644
446 --- a/sys-apps/dnotify/metadata.xml
447 +++ b/sys-apps/dnotify/metadata.xml
448 @@ -1,5 +1,5 @@
449 -<?xml version="1.0" encoding="UTF-8"?>
450 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
451 +<?xml version='1.0' encoding='UTF-8'?>
452 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
453 <pkgmetadata>
454 <herd>base-system</herd>
455 </pkgmetadata>
456
457 diff --git a/sys-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
458 index 96a2d58..261fd29 100644
459 --- a/sys-apps/ed/metadata.xml
460 +++ b/sys-apps/ed/metadata.xml
461 @@ -1,5 +1,5 @@
462 -<?xml version="1.0" encoding="UTF-8"?>
463 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
464 +<?xml version='1.0' encoding='UTF-8'?>
465 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
466 <pkgmetadata>
467 <herd>base-system</herd>
468 </pkgmetadata>
469
470 diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
471 index 5977c7f..2c21203 100644
472 --- a/sys-apps/ethtool/metadata.xml
473 +++ b/sys-apps/ethtool/metadata.xml
474 @@ -1,8 +1,8 @@
475 -<?xml version="1.0" encoding="UTF-8"?>
476 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
477 +<?xml version='1.0' encoding='UTF-8'?>
478 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
479 <pkgmetadata>
480 <herd>base-system</herd>
481 -<longdescription lang="en">
482 +<longdescription lang='en'>
483 ethtool is a Linux utility for controlling network drivers and hardware,
484 particularly for wired Ethernet devices. It can be used to:
485 * Get identification and diagnostic information
486
487 diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml
488 index 96a2d58..261fd29 100644
489 --- a/sys-apps/fakeroot/metadata.xml
490 +++ b/sys-apps/fakeroot/metadata.xml
491 @@ -1,5 +1,5 @@
492 -<?xml version="1.0" encoding="UTF-8"?>
493 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
494 +<?xml version='1.0' encoding='UTF-8'?>
495 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
496 <pkgmetadata>
497 <herd>base-system</herd>
498 </pkgmetadata>
499
500 diff --git a/sys-apps/fbset/metadata.xml b/sys-apps/fbset/metadata.xml
501 index 96a2d58..261fd29 100644
502 --- a/sys-apps/fbset/metadata.xml
503 +++ b/sys-apps/fbset/metadata.xml
504 @@ -1,5 +1,5 @@
505 -<?xml version="1.0" encoding="UTF-8"?>
506 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
507 +<?xml version='1.0' encoding='UTF-8'?>
508 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
509 <pkgmetadata>
510 <herd>base-system</herd>
511 </pkgmetadata>
512
513 diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
514 index d05cbc0..a6a3666 100644
515 --- a/sys-apps/file/metadata.xml
516 +++ b/sys-apps/file/metadata.xml
517 @@ -1,5 +1,5 @@
518 -<?xml version="1.0" encoding="UTF-8"?>
519 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
520 +<?xml version='1.0' encoding='UTF-8'?>
521 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
522 <pkgmetadata>
523 <herd>base-system</herd>
524 <upstream>
525
526 diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
527 index b122af8..7c26dcc 100644
528 --- a/sys-apps/findutils/metadata.xml
529 +++ b/sys-apps/findutils/metadata.xml
530 @@ -1,8 +1,8 @@
531 -<?xml version="1.0" encoding="UTF-8"?>
532 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
533 +<?xml version='1.0' encoding='UTF-8'?>
534 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
535 <pkgmetadata>
536 - <herd>base-system</herd>
537 - <upstream>
538 - <remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
539 - </upstream>
540 +<herd>base-system</herd>
541 +<upstream>
542 + <remote-id type='cpe'>cpe:/a:gnu:findutils</remote-id>
543 +</upstream>
544 </pkgmetadata>
545
546 diff --git a/sys-apps/fwcrv/metadata.xml b/sys-apps/fwcrv/metadata.xml
547 index 96a2d58..261fd29 100644
548 --- a/sys-apps/fwcrv/metadata.xml
549 +++ b/sys-apps/fwcrv/metadata.xml
550 @@ -1,5 +1,5 @@
551 -<?xml version="1.0" encoding="UTF-8"?>
552 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
553 +<?xml version='1.0' encoding='UTF-8'?>
554 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
555 <pkgmetadata>
556 <herd>base-system</herd>
557 </pkgmetadata>
558
559 diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
560 index 22beef6..8136e13 100644
561 --- a/sys-apps/gawk/metadata.xml
562 +++ b/sys-apps/gawk/metadata.xml
563 @@ -1,8 +1,8 @@
564 -<?xml version="1.0" encoding="UTF-8"?>
565 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
566 +<?xml version='1.0' encoding='UTF-8'?>
567 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
568 <pkgmetadata>
569 <herd>base-system</herd>
570 <use>
571 - <flag name='mpfr'>use mpfr for high precision arithmetic (-M / --bignum)</flag>
572 + <flag name='mpfr'>use mpfr for high precision arithmetic (-M / --bignum)</flag>
573 </use>
574 </pkgmetadata>
575
576 diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
577 index cf76494..b00ac3f 100644
578 --- a/sys-apps/gentoo-functions/metadata.xml
579 +++ b/sys-apps/gentoo-functions/metadata.xml
580 @@ -1,20 +1,18 @@
581 -<?xml version="1.0" encoding="UTF-8"?>
582 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
583 +<?xml version='1.0' encoding='UTF-8'?>
584 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
585 <pkgmetadata>
586 - <maintainer>
587 - <email>williamh@g.o</email>
588 - <name>William Hubbs</name>
589 - </maintainer>
590 - <maintainer>
591 - <email>blueness@g.o</email>
592 - <name>Anthony G. Basile</name>
593 - </maintainer>
594 - <herd>base-system</herd>
595 - <longdescription lang="en">
596 - This package contains base shell functions which are required by
597 - all Gentoo systems.
598 - </longdescription>
599 - <upstream>
600 - <remote-id type="github">gentoo/gentoo-functions</remote-id>
601 - </upstream>
602 +<herd>base-system</herd>
603 +<maintainer>
604 + <email>williamh@g.o</email>
605 +</maintainer>
606 +<maintainer>
607 + <email>blueness@g.o</email>
608 +</maintainer>
609 +<longdescription lang='en'>
610 + This package contains base shell functions which are required by
611 + all Gentoo systems.
612 +</longdescription>
613 +<upstream>
614 + <remote-id type='github'>gentoo/gentoo-functions</remote-id>
615 +</upstream>
616 </pkgmetadata>
617
618 diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
619 index c9e2840..a35e93d 100644
620 --- a/sys-apps/grep/metadata.xml
621 +++ b/sys-apps/grep/metadata.xml
622 @@ -1,8 +1,8 @@
623 -<?xml version="1.0" encoding="UTF-8"?>
624 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
625 +<?xml version='1.0' encoding='UTF-8'?>
626 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
627 <pkgmetadata>
628 <herd>base-system</herd>
629 <upstream>
630 - <remote-id type="cpe">cpe:/a:gnu:grep</remote-id>
631 + <remote-id type='cpe'>cpe:/a:gnu:grep</remote-id>
632 </upstream>
633 </pkgmetadata>
634
635 diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
636 index 96a2d58..261fd29 100644
637 --- a/sys-apps/groff/metadata.xml
638 +++ b/sys-apps/groff/metadata.xml
639 @@ -1,5 +1,5 @@
640 -<?xml version="1.0" encoding="UTF-8"?>
641 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
642 +<?xml version='1.0' encoding='UTF-8'?>
643 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
644 <pkgmetadata>
645 <herd>base-system</herd>
646 </pkgmetadata>
647
648 diff --git a/sys-apps/gscanbus/metadata.xml b/sys-apps/gscanbus/metadata.xml
649 index e02aded..d77a1c1 100644
650 --- a/sys-apps/gscanbus/metadata.xml
651 +++ b/sys-apps/gscanbus/metadata.xml
652 @@ -1,8 +1,8 @@
653 -<?xml version="1.0" encoding="UTF-8"?>
654 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
655 +<?xml version='1.0' encoding='UTF-8'?>
656 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
657 <pkgmetadata>
658 - <herd>base-system</herd>
659 - <upstream>
660 - <remote-id type="sourceforge">gscanbus.berlios</remote-id>
661 - </upstream>
662 +<herd>base-system</herd>
663 +<upstream>
664 + <remote-id type='sourceforge'>gscanbus.berlios</remote-id>
665 +</upstream>
666 </pkgmetadata>
667
668 diff --git a/sys-apps/gsmartcontrol/metadata.xml b/sys-apps/gsmartcontrol/metadata.xml
669 index 77c4c35..ca80785 100644
670 --- a/sys-apps/gsmartcontrol/metadata.xml
671 +++ b/sys-apps/gsmartcontrol/metadata.xml
672 @@ -1,12 +1,11 @@
673 -<?xml version="1.0" encoding="UTF-8"?>
674 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
675 +<?xml version='1.0' encoding='UTF-8'?>
676 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
677 <pkgmetadata>
678 - <herd>base-system</herd>
679 - <maintainer>
680 - <email>ssuominen@g.o</email>
681 - <name>Samuli Suominen</name>
682 - </maintainer>
683 - <upstream>
684 - <remote-id type="sourceforge">gsmartcontrol</remote-id>
685 - </upstream>
686 +<herd>base-system</herd>
687 +<maintainer>
688 + <email>ssuominen@g.o</email>
689 +</maintainer>
690 +<upstream>
691 + <remote-id type='sourceforge'>gsmartcontrol</remote-id>
692 +</upstream>
693 </pkgmetadata>
694
695 diff --git a/sys-apps/hbaapi/metadata.xml b/sys-apps/hbaapi/metadata.xml
696 index 290c474..1530e08 100644
697 --- a/sys-apps/hbaapi/metadata.xml
698 +++ b/sys-apps/hbaapi/metadata.xml
699 @@ -1,8 +1,8 @@
700 -<?xml version="1.0" encoding="UTF-8"?>
701 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
702 +<?xml version='1.0' encoding='UTF-8'?>
703 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
704 <pkgmetadata>
705 - <herd>base-system</herd>
706 - <upstream>
707 - <remote-id type="sourceforge">hbaapi</remote-id>
708 - </upstream>
709 +<herd>base-system</herd>
710 +<upstream>
711 + <remote-id type='sourceforge'>hbaapi</remote-id>
712 +</upstream>
713 </pkgmetadata>
714
715 diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
716 index 5124b52..b95f8a6 100644
717 --- a/sys-apps/hdparm/metadata.xml
718 +++ b/sys-apps/hdparm/metadata.xml
719 @@ -1,8 +1,8 @@
720 -<?xml version="1.0" encoding="UTF-8"?>
721 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
722 +<?xml version='1.0' encoding='UTF-8'?>
723 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
724 <pkgmetadata>
725 - <herd>base-system</herd>
726 - <upstream>
727 - <remote-id type="sourceforge">hdparm</remote-id>
728 - </upstream>
729 +<herd>base-system</herd>
730 +<upstream>
731 + <remote-id type='sourceforge'>hdparm</remote-id>
732 +</upstream>
733 </pkgmetadata>
734
735 diff --git a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml
736 index 96a2d58..261fd29 100644
737 --- a/sys-apps/help2man/metadata.xml
738 +++ b/sys-apps/help2man/metadata.xml
739 @@ -1,5 +1,5 @@
740 -<?xml version="1.0" encoding="UTF-8"?>
741 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
742 +<?xml version='1.0' encoding='UTF-8'?>
743 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
744 <pkgmetadata>
745 <herd>base-system</herd>
746 </pkgmetadata>
747
748 diff --git a/sys-apps/hprofile/metadata.xml b/sys-apps/hprofile/metadata.xml
749 index 09d45f0..d4d904c 100644
750 --- a/sys-apps/hprofile/metadata.xml
751 +++ b/sys-apps/hprofile/metadata.xml
752 @@ -1,8 +1,8 @@
753 -<?xml version="1.0" encoding="UTF-8"?>
754 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
755 +<?xml version='1.0' encoding='UTF-8'?>
756 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
757 <pkgmetadata>
758 - <herd>base-system</herd>
759 - <upstream>
760 - <remote-id type="github">tokiclover/hprofile</remote-id>
761 - </upstream>
762 +<herd>base-system</herd>
763 +<upstream>
764 + <remote-id type='github'>tokiclover/hprofile</remote-id>
765 +</upstream>
766 </pkgmetadata>
767
768 diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
769 index 75953f3..ab5f996 100644
770 --- a/sys-apps/hwids/metadata.xml
771 +++ b/sys-apps/hwids/metadata.xml
772 @@ -1,23 +1,23 @@
773 -<?xml version="1.0" encoding="UTF-8"?>
774 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
775 +<?xml version='1.0' encoding='UTF-8'?>
776 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
777 <pkgmetadata>
778 - <herd>base-system</herd>
779 - <maintainer>
780 - <email>flameeyes@g.o</email>
781 - </maintainer>
782 - <maintainer>
783 - <email>gregkh@g.o</email>
784 - </maintainer>
785 - <maintainer>
786 - <email>floppym@g.o</email>
787 - </maintainer>
788 - <use>
789 - <flag name="net">Install the oui.txt and iab.txt databases</flag>
790 - <flag name="pci">Install the pci.ids database</flag>
791 - <flag name="usb">Install the usb.ids database</flag>
792 - <flag name="udev">Install hwdb.d rules for udev</flag>
793 - </use>
794 - <upstream>
795 - <remote-id type="github">gentoo/hwids</remote-id>
796 - </upstream>
797 +<herd>base-system</herd>
798 +<maintainer>
799 + <email>flameeyes@g.o</email>
800 +</maintainer>
801 +<maintainer>
802 + <email>gregkh@g.o</email>
803 +</maintainer>
804 +<maintainer>
805 + <email>floppym@g.o</email>
806 +</maintainer>
807 +<use>
808 + <flag name='net'>Install the oui.txt and iab.txt databases</flag>
809 + <flag name='pci'>Install the pci.ids database</flag>
810 + <flag name='usb'>Install the usb.ids database</flag>
811 + <flag name='udev'>Install hwdb.d rules for udev</flag>
812 +</use>
813 +<upstream>
814 + <remote-id type='github'>gentoo/hwids</remote-id>
815 +</upstream>
816 </pkgmetadata>
817
818 diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
819 index 26ed76b..5b8948b 100644
820 --- a/sys-apps/ifplugd/metadata.xml
821 +++ b/sys-apps/ifplugd/metadata.xml
822 @@ -1,8 +1,8 @@
823 -<?xml version="1.0" encoding="UTF-8"?>
824 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
825 +<?xml version='1.0' encoding='UTF-8'?>
826 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
827 <pkgmetadata>
828 - <herd>base-system</herd>
829 - <longdescription lang="en">
830 - Brings up/down ethernet ports automatically with cable detection
831 - </longdescription>
832 +<herd>base-system</herd>
833 +<longdescription lang='en'>
834 + Brings up/down ethernet ports automatically with cable detection
835 +</longdescription>
836 </pkgmetadata>
837
838 diff --git a/sys-apps/install-xattr/metadata.xml b/sys-apps/install-xattr/metadata.xml
839 index 3f1a615..4bb0995 100644
840 --- a/sys-apps/install-xattr/metadata.xml
841 +++ b/sys-apps/install-xattr/metadata.xml
842 @@ -1,9 +1,8 @@
843 -<?xml version="1.0" encoding="UTF-8"?>
844 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
845 +<?xml version='1.0' encoding='UTF-8'?>
846 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
847 <pkgmetadata>
848 +<herd>base-system</herd>
849 <maintainer>
850 <email>blueness@g.o</email>
851 - <name>Anthony G. Basile</name>
852 </maintainer>
853 -<herd>base-system</herd>
854 </pkgmetadata>
855
856 diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
857 index fb2e46a..5d4e2b0 100644
858 --- a/sys-apps/iproute2/metadata.xml
859 +++ b/sys-apps/iproute2/metadata.xml
860 @@ -1,5 +1,5 @@
861 -<?xml version="1.0" encoding="UTF-8"?>
862 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
863 +<?xml version='1.0' encoding='UTF-8'?>
864 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
865 <pkgmetadata>
866 <herd>base-system</herd>
867 <use>
868
869 diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
870 index 9a4bd53..506515c 100644
871 --- a/sys-apps/irqbalance/metadata.xml
872 +++ b/sys-apps/irqbalance/metadata.xml
873 @@ -1,12 +1,12 @@
874 -<?xml version="1.0" encoding="UTF-8"?>
875 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
876 +<?xml version='1.0' encoding='UTF-8'?>
877 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
878 <pkgmetadata>
879 - <herd>base-system</herd>
880 - <use>
881 - <flag name="numa">Support balancing IRQs across NUMA nodes</flag>
882 - </use>
883 - <upstream>
884 - <remote-id type="google-code">irqbalance</remote-id>
885 - <remote-id type="github">Irqbalance/irqbalance</remote-id>
886 - </upstream>
887 +<herd>base-system</herd>
888 +<use>
889 + <flag name='numa'>Support balancing IRQs across NUMA nodes</flag>
890 +</use>
891 +<upstream>
892 + <remote-id type='google-code'>irqbalance</remote-id>
893 + <remote-id type='github'>Irqbalance/irqbalance</remote-id>
894 +</upstream>
895 </pkgmetadata>
896
897 diff --git a/sys-apps/isapnptools/metadata.xml b/sys-apps/isapnptools/metadata.xml
898 index 96a2d58..261fd29 100644
899 --- a/sys-apps/isapnptools/metadata.xml
900 +++ b/sys-apps/isapnptools/metadata.xml
901 @@ -1,5 +1,5 @@
902 -<?xml version="1.0" encoding="UTF-8"?>
903 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
904 +<?xml version='1.0' encoding='UTF-8'?>
905 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
906 <pkgmetadata>
907 <herd>base-system</herd>
908 </pkgmetadata>
909
910 diff --git a/sys-apps/iucode_tool/metadata.xml b/sys-apps/iucode_tool/metadata.xml
911 index 96a2d58..261fd29 100644
912 --- a/sys-apps/iucode_tool/metadata.xml
913 +++ b/sys-apps/iucode_tool/metadata.xml
914 @@ -1,5 +1,5 @@
915 -<?xml version="1.0" encoding="UTF-8"?>
916 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
917 +<?xml version='1.0' encoding='UTF-8'?>
918 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
919 <pkgmetadata>
920 <herd>base-system</herd>
921 </pkgmetadata>
922
923 diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
924 index cfeb124..200afaa 100644
925 --- a/sys-apps/kbd/metadata.xml
926 +++ b/sys-apps/kbd/metadata.xml
927 @@ -1,8 +1,8 @@
928 <?xml version='1.0' encoding='UTF-8'?>
929 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
930 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
931 <pkgmetadata>
932 - <herd>base-system</herd>
933 - <upstream>
934 - <remote-id type="freshmeat">kbd</remote-id>
935 - </upstream>
936 +<herd>base-system</herd>
937 +<upstream>
938 + <remote-id type='freshmeat'>kbd</remote-id>
939 +</upstream>
940 </pkgmetadata>
941
942 diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
943 index 5f280f8..36d7f8d 100644
944 --- a/sys-apps/keyutils/metadata.xml
945 +++ b/sys-apps/keyutils/metadata.xml
946 @@ -1,8 +1,8 @@
947 -<?xml version="1.0" encoding="UTF-8"?>
948 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
949 +<?xml version='1.0' encoding='UTF-8'?>
950 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
951 <pkgmetadata>
952 - <herd>base-system</herd>
953 - <maintainer>
954 - <email>robbat2@g.o</email>
955 - </maintainer>
956 +<herd>base-system</herd>
957 +<maintainer>
958 + <email>robbat2@g.o</email>
959 +</maintainer>
960 </pkgmetadata>
961
962 diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
963 index f2fc4f7..98fac0d 100644
964 --- a/sys-apps/kmod/metadata.xml
965 +++ b/sys-apps/kmod/metadata.xml
966 @@ -1,13 +1,13 @@
967 -<?xml version="1.0" encoding="UTF-8"?>
968 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
969 +<?xml version='1.0' encoding='UTF-8'?>
970 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
971 <pkgmetadata>
972 - <herd>base-system</herd>
973 - <maintainer>
974 - <email>udev-bugs@g.o</email>
975 - </maintainer>
976 - <use>
977 - <flag name='lzma'>Enable support for XZ compressed modules</flag>
978 - <flag name='tools'>Install module loading/unloading tools.</flag>
979 - <flag name='zlib'>Enable support for gzipped modules</flag>
980 - </use>
981 +<herd>base-system</herd>
982 +<maintainer>
983 + <email>udev-bugs@g.o</email>
984 +</maintainer>
985 +<use>
986 + <flag name='lzma'>Enable support for XZ compressed modules</flag>
987 + <flag name='tools'>Install module loading/unloading tools.</flag>
988 + <flag name='zlib'>Enable support for gzipped modules</flag>
989 +</use>
990 </pkgmetadata>
991
992 diff --git a/sys-apps/lcdsplash/metadata.xml b/sys-apps/lcdsplash/metadata.xml
993 index 96a2d58..261fd29 100644
994 --- a/sys-apps/lcdsplash/metadata.xml
995 +++ b/sys-apps/lcdsplash/metadata.xml
996 @@ -1,5 +1,5 @@
997 -<?xml version="1.0" encoding="UTF-8"?>
998 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
999 +<?xml version='1.0' encoding='UTF-8'?>
1000 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1001 <pkgmetadata>
1002 <herd>base-system</herd>
1003 </pkgmetadata>
1004
1005 diff --git a/sys-apps/lcdtest/metadata.xml b/sys-apps/lcdtest/metadata.xml
1006 index 6324866..9477e17 100644
1007 --- a/sys-apps/lcdtest/metadata.xml
1008 +++ b/sys-apps/lcdtest/metadata.xml
1009 @@ -1,14 +1,12 @@
1010 -<?xml version="1.0" encoding="UTF-8"?>
1011 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1012 +<?xml version='1.0' encoding='UTF-8'?>
1013 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1014 <pkgmetadata>
1015 <herd>base-system</herd>
1016 <herd>proxy-maintainers</herd>
1017 <maintainer>
1018 - <email>chainsaw@g.o</email>
1019 - <name>Tony Vroon</name>
1020 + <email>chainsaw@g.o</email>
1021 </maintainer>
1022 <maintainer>
1023 - <email>nikoli@×××.us</email>
1024 - <name>Nikoli</name>
1025 + <email>nikoli@×××.us</email>
1026 </maintainer>
1027 </pkgmetadata>
1028
1029 diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
1030 index 96a2d58..261fd29 100644
1031 --- a/sys-apps/less/metadata.xml
1032 +++ b/sys-apps/less/metadata.xml
1033 @@ -1,5 +1,5 @@
1034 -<?xml version="1.0" encoding="UTF-8"?>
1035 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1036 +<?xml version='1.0' encoding='UTF-8'?>
1037 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1038 <pkgmetadata>
1039 <herd>base-system</herd>
1040 </pkgmetadata>
1041
1042 diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
1043 index b348d74..e472bfe 100644
1044 --- a/sys-apps/logwatch/metadata.xml
1045 +++ b/sys-apps/logwatch/metadata.xml
1046 @@ -1,8 +1,8 @@
1047 -<?xml version="1.0" encoding="UTF-8"?>
1048 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1049 +<?xml version='1.0' encoding='UTF-8'?>
1050 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1051 <pkgmetadata>
1052 - <herd>base-system</herd>
1053 - <upstream>
1054 - <remote-id type="sourceforge">logwatch</remote-id>
1055 - </upstream>
1056 +<herd>base-system</herd>
1057 +<upstream>
1058 + <remote-id type='sourceforge'>logwatch</remote-id>
1059 +</upstream>
1060 </pkgmetadata>
1061
1062 diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
1063 index 96a2d58..261fd29 100644
1064 --- a/sys-apps/lshw/metadata.xml
1065 +++ b/sys-apps/lshw/metadata.xml
1066 @@ -1,5 +1,5 @@
1067 -<?xml version="1.0" encoding="UTF-8"?>
1068 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1069 +<?xml version='1.0' encoding='UTF-8'?>
1070 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1071 <pkgmetadata>
1072 <herd>base-system</herd>
1073 </pkgmetadata>
1074
1075 diff --git a/sys-apps/makedev/metadata.xml b/sys-apps/makedev/metadata.xml
1076 index 96a2d58..261fd29 100644
1077 --- a/sys-apps/makedev/metadata.xml
1078 +++ b/sys-apps/makedev/metadata.xml
1079 @@ -1,5 +1,5 @@
1080 -<?xml version="1.0" encoding="UTF-8"?>
1081 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1082 +<?xml version='1.0' encoding='UTF-8'?>
1083 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1084 <pkgmetadata>
1085 <herd>base-system</herd>
1086 </pkgmetadata>
1087
1088 diff --git a/sys-apps/man-db/metadata.xml b/sys-apps/man-db/metadata.xml
1089 index 7f3c55c..8f8f5c9 100644
1090 --- a/sys-apps/man-db/metadata.xml
1091 +++ b/sys-apps/man-db/metadata.xml
1092 @@ -1,5 +1,5 @@
1093 -<?xml version="1.0" encoding="UTF-8"?>
1094 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1095 +<?xml version='1.0' encoding='UTF-8'?>
1096 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1097 <pkgmetadata>
1098 <herd>base-system</herd>
1099 <use>
1100
1101 diff --git a/sys-apps/man-pages-posix/metadata.xml b/sys-apps/man-pages-posix/metadata.xml
1102 index 96a2d58..261fd29 100644
1103 --- a/sys-apps/man-pages-posix/metadata.xml
1104 +++ b/sys-apps/man-pages-posix/metadata.xml
1105 @@ -1,5 +1,5 @@
1106 -<?xml version="1.0" encoding="UTF-8"?>
1107 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1108 +<?xml version='1.0' encoding='UTF-8'?>
1109 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1110 <pkgmetadata>
1111 <herd>base-system</herd>
1112 </pkgmetadata>
1113
1114 diff --git a/sys-apps/man-pages/metadata.xml b/sys-apps/man-pages/metadata.xml
1115 index 96a2d58..261fd29 100644
1116 --- a/sys-apps/man-pages/metadata.xml
1117 +++ b/sys-apps/man-pages/metadata.xml
1118 @@ -1,5 +1,5 @@
1119 -<?xml version="1.0" encoding="UTF-8"?>
1120 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1121 +<?xml version='1.0' encoding='UTF-8'?>
1122 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1123 <pkgmetadata>
1124 <herd>base-system</herd>
1125 </pkgmetadata>
1126
1127 diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
1128 index 96a2d58..261fd29 100644
1129 --- a/sys-apps/man/metadata.xml
1130 +++ b/sys-apps/man/metadata.xml
1131 @@ -1,5 +1,5 @@
1132 -<?xml version="1.0" encoding="UTF-8"?>
1133 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1134 +<?xml version='1.0' encoding='UTF-8'?>
1135 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1136 <pkgmetadata>
1137 <herd>base-system</herd>
1138 </pkgmetadata>
1139
1140 diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
1141 index 96a2d58..261fd29 100644
1142 --- a/sys-apps/mawk/metadata.xml
1143 +++ b/sys-apps/mawk/metadata.xml
1144 @@ -1,5 +1,5 @@
1145 -<?xml version="1.0" encoding="UTF-8"?>
1146 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1147 +<?xml version='1.0' encoding='UTF-8'?>
1148 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1149 <pkgmetadata>
1150 <herd>base-system</herd>
1151 </pkgmetadata>
1152
1153 diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
1154 index d797549..551e3ce 100644
1155 --- a/sys-apps/memtest86+/metadata.xml
1156 +++ b/sys-apps/memtest86+/metadata.xml
1157 @@ -1,5 +1,5 @@
1158 -<?xml version="1.0" encoding="UTF-8"?>
1159 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1160 +<?xml version='1.0' encoding='UTF-8'?>
1161 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1162 <pkgmetadata>
1163 <herd>base-system</herd>
1164 <use>
1165
1166 diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml
1167 index 6865707..97af1f5 100644
1168 --- a/sys-apps/memtest86/metadata.xml
1169 +++ b/sys-apps/memtest86/metadata.xml
1170 @@ -1,5 +1,5 @@
1171 -<?xml version="1.0" encoding="UTF-8"?>
1172 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1173 +<?xml version='1.0' encoding='UTF-8'?>
1174 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1175 <pkgmetadata>
1176 <herd>base-system</herd>
1177 <use>
1178
1179 diff --git a/sys-apps/memtester/metadata.xml b/sys-apps/memtester/metadata.xml
1180 index 96a2d58..261fd29 100644
1181 --- a/sys-apps/memtester/metadata.xml
1182 +++ b/sys-apps/memtester/metadata.xml
1183 @@ -1,5 +1,5 @@
1184 -<?xml version="1.0" encoding="UTF-8"?>
1185 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1186 +<?xml version='1.0' encoding='UTF-8'?>
1187 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1188 <pkgmetadata>
1189 <herd>base-system</herd>
1190 </pkgmetadata>
1191
1192 diff --git a/sys-apps/microcode-ctl/metadata.xml b/sys-apps/microcode-ctl/metadata.xml
1193 index 96a2d58..261fd29 100644
1194 --- a/sys-apps/microcode-ctl/metadata.xml
1195 +++ b/sys-apps/microcode-ctl/metadata.xml
1196 @@ -1,5 +1,5 @@
1197 -<?xml version="1.0" encoding="UTF-8"?>
1198 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1199 +<?xml version='1.0' encoding='UTF-8'?>
1200 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1201 <pkgmetadata>
1202 <herd>base-system</herd>
1203 </pkgmetadata>
1204
1205 diff --git a/sys-apps/microcode-data/metadata.xml b/sys-apps/microcode-data/metadata.xml
1206 index 4cf0268..e44fc55 100644
1207 --- a/sys-apps/microcode-data/metadata.xml
1208 +++ b/sys-apps/microcode-data/metadata.xml
1209 @@ -1,5 +1,5 @@
1210 -<?xml version="1.0" encoding="UTF-8"?>
1211 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1212 +<?xml version='1.0' encoding='UTF-8'?>
1213 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1214 <pkgmetadata>
1215 <herd>base-system</herd>
1216 <use>
1217
1218 diff --git a/sys-apps/minised/metadata.xml b/sys-apps/minised/metadata.xml
1219 index 80f59b5..79a14fa 100644
1220 --- a/sys-apps/minised/metadata.xml
1221 +++ b/sys-apps/minised/metadata.xml
1222 @@ -1,5 +1,5 @@
1223 -<?xml version="1.0" encoding="UTF-8"?>
1224 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1225 +<?xml version='1.0' encoding='UTF-8'?>
1226 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1227 <pkgmetadata>
1228 <herd>embedded</herd>
1229 <herd>base-system</herd>
1230
1231 diff --git a/sys-apps/miscfiles/metadata.xml b/sys-apps/miscfiles/metadata.xml
1232 index 96a2d58..261fd29 100644
1233 --- a/sys-apps/miscfiles/metadata.xml
1234 +++ b/sys-apps/miscfiles/metadata.xml
1235 @@ -1,5 +1,5 @@
1236 -<?xml version="1.0" encoding="UTF-8"?>
1237 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1238 +<?xml version='1.0' encoding='UTF-8'?>
1239 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1240 <pkgmetadata>
1241 <herd>base-system</herd>
1242 </pkgmetadata>
1243
1244 diff --git a/sys-apps/mlocate/metadata.xml b/sys-apps/mlocate/metadata.xml
1245 index 67bbc5a..0238058 100644
1246 --- a/sys-apps/mlocate/metadata.xml
1247 +++ b/sys-apps/mlocate/metadata.xml
1248 @@ -1,9 +1,8 @@
1249 -<?xml version="1.0" encoding="UTF-8"?>
1250 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1251 +<?xml version='1.0' encoding='UTF-8'?>
1252 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1253 <pkgmetadata>
1254 <herd>base-system</herd>
1255 - <maintainer>
1256 - <email>fauli@g.o</email>
1257 - <name>Christian Faulhammer</name>
1258 - </maintainer>
1259 +<maintainer>
1260 + <email>fauli@g.o</email>
1261 +</maintainer>
1262 </pkgmetadata>
1263
1264 diff --git a/sys-apps/modutils/metadata.xml b/sys-apps/modutils/metadata.xml
1265 index 96a2d58..261fd29 100644
1266 --- a/sys-apps/modutils/metadata.xml
1267 +++ b/sys-apps/modutils/metadata.xml
1268 @@ -1,5 +1,5 @@
1269 -<?xml version="1.0" encoding="UTF-8"?>
1270 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1271 +<?xml version='1.0' encoding='UTF-8'?>
1272 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1273 <pkgmetadata>
1274 <herd>base-system</herd>
1275 </pkgmetadata>
1276
1277 diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
1278 index 3bdc7d7..2ba8491 100644
1279 --- a/sys-apps/mtree/metadata.xml
1280 +++ b/sys-apps/mtree/metadata.xml
1281 @@ -1,8 +1,8 @@
1282 -<?xml version="1.0" encoding="UTF-8"?>
1283 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1284 +<?xml version='1.0' encoding='UTF-8'?>
1285 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1286 <pkgmetadata>
1287 - <herd>base-system</herd>
1288 - <upstream>
1289 - <remote-id type="github">archiecobbs/mtree-port</remote-id>
1290 - </upstream>
1291 +<herd>base-system</herd>
1292 +<upstream>
1293 + <remote-id type='github'>archiecobbs/mtree-port</remote-id>
1294 +</upstream>
1295 </pkgmetadata>
1296
1297 diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
1298 index 6ce7863..c7d905c 100644
1299 --- a/sys-apps/nawk/metadata.xml
1300 +++ b/sys-apps/nawk/metadata.xml
1301 @@ -1,9 +1,8 @@
1302 -<?xml version="1.0" encoding="UTF-8"?>
1303 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1304 +<?xml version='1.0' encoding='UTF-8'?>
1305 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1306 <pkgmetadata>
1307 - <maintainer>
1308 - <email>ottxor@g.o</email>
1309 - <name>Christoph Junghans</name>
1310 - </maintainer>
1311 - <herd>base-system</herd>
1312 +<herd>base-system</herd>
1313 +<maintainer>
1314 + <email>ottxor@g.o</email>
1315 +</maintainer>
1316 </pkgmetadata>
1317
1318 diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
1319 index ef54322..cd6f227 100644
1320 --- a/sys-apps/net-tools/metadata.xml
1321 +++ b/sys-apps/net-tools/metadata.xml
1322 @@ -1,11 +1,11 @@
1323 <?xml version='1.0' encoding='UTF-8'?>
1324 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1325 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1326 <pkgmetadata>
1327 - <herd>base-system</herd>
1328 - <use>
1329 - <flag name="old-output">use old ifconfig output style (useful for when new output breaks scripts)</flag>
1330 - </use>
1331 - <upstream>
1332 - <remote-id type="sourceforge">net-tools</remote-id>
1333 - </upstream>
1334 +<herd>base-system</herd>
1335 +<use>
1336 + <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
1337 +</use>
1338 +<upstream>
1339 + <remote-id type='sourceforge'>net-tools</remote-id>
1340 +</upstream>
1341 </pkgmetadata>
1342
1343 diff --git a/sys-apps/netboot-base/metadata.xml b/sys-apps/netboot-base/metadata.xml
1344 index 96a2d58..261fd29 100644
1345 --- a/sys-apps/netboot-base/metadata.xml
1346 +++ b/sys-apps/netboot-base/metadata.xml
1347 @@ -1,5 +1,5 @@
1348 -<?xml version="1.0" encoding="UTF-8"?>
1349 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1350 +<?xml version='1.0' encoding='UTF-8'?>
1351 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1352 <pkgmetadata>
1353 <herd>base-system</herd>
1354 </pkgmetadata>
1355
1356 diff --git a/sys-apps/netkit-base/metadata.xml b/sys-apps/netkit-base/metadata.xml
1357 index 96a2d58..261fd29 100644
1358 --- a/sys-apps/netkit-base/metadata.xml
1359 +++ b/sys-apps/netkit-base/metadata.xml
1360 @@ -1,5 +1,5 @@
1361 -<?xml version="1.0" encoding="UTF-8"?>
1362 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1363 +<?xml version='1.0' encoding='UTF-8'?>
1364 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1365 <pkgmetadata>
1366 <herd>base-system</herd>
1367 </pkgmetadata>
1368
1369 diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
1370 index aab7197..4e85ba8 100644
1371 --- a/sys-apps/pciutils/metadata.xml
1372 +++ b/sys-apps/pciutils/metadata.xml
1373 @@ -1,10 +1,10 @@
1374 -<?xml version="1.0" encoding="UTF-8"?>
1375 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1376 +<?xml version='1.0' encoding='UTF-8'?>
1377 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1378 <pkgmetadata>
1379 - <herd>base-system</herd>
1380 - <use>
1381 - <flag name='dns'>Enable support for querying the central database of PCI IDs using DNS</flag>
1382 - <flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
1383 - <flag name='zlib'>Support compressed pci.ids database</flag>
1384 - </use>
1385 +<herd>base-system</herd>
1386 +<use>
1387 + <flag name='dns'>Enable support for querying the central database of PCI IDs using DNS</flag>
1388 + <flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
1389 + <flag name='zlib'>Support compressed pci.ids database</flag>
1390 +</use>
1391 </pkgmetadata>
1392
1393 diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
1394 index 0ed2678..dc41c4f 100644
1395 --- a/sys-apps/qingy/metadata.xml
1396 +++ b/sys-apps/qingy/metadata.xml
1397 @@ -1,13 +1,12 @@
1398 -<?xml version="1.0" encoding="UTF-8"?>
1399 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1400 +<?xml version='1.0' encoding='UTF-8'?>
1401 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1402 <pkgmetadata>
1403 - <herd>base-system</herd>
1404 - <use>
1405 - <flag name="consolekit">Enable native consolekit support</flag>
1406 - <flag name="opensslcrypt">Encrypt communications between qingy and its GUI
1407 - using <pkg>dev-libs/openssl</pkg></flag>
1408 - </use>
1409 - <upstream>
1410 - <remote-id type="sourceforge">qingy</remote-id>
1411 - </upstream>
1412 +<herd>base-system</herd>
1413 +<use>
1414 + <flag name='consolekit'>Enable native consolekit support</flag>
1415 + <flag name='opensslcrypt'>Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
1416 +</use>
1417 +<upstream>
1418 + <remote-id type='sourceforge'>qingy</remote-id>
1419 +</upstream>
1420 </pkgmetadata>
1421
1422 diff --git a/sys-apps/readahead-list/metadata.xml b/sys-apps/readahead-list/metadata.xml
1423 index c530161..1887e6f 100644
1424 --- a/sys-apps/readahead-list/metadata.xml
1425 +++ b/sys-apps/readahead-list/metadata.xml
1426 @@ -1,9 +1,9 @@
1427 -<?xml version="1.0" encoding="UTF-8"?>
1428 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1429 +<?xml version='1.0' encoding='UTF-8'?>
1430 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1431 <pkgmetadata>
1432 <herd>base-system</herd>
1433 <maintainer>
1434 - <email>robbat2@g.o</email>
1435 - <description>Upstream author as well as maintainer for Gentoo.</description>
1436 + <email>robbat2@g.o</email>
1437 + <description>Upstream author as well as maintainer for Gentoo.</description>
1438 </maintainer>
1439 </pkgmetadata>
1440
1441 diff --git a/sys-apps/rename/metadata.xml b/sys-apps/rename/metadata.xml
1442 index 5433f7a..43a7af5 100644
1443 --- a/sys-apps/rename/metadata.xml
1444 +++ b/sys-apps/rename/metadata.xml
1445 @@ -1,8 +1,8 @@
1446 <?xml version='1.0' encoding='UTF-8'?>
1447 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1448 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1449 <pkgmetadata>
1450 - <herd>base-system</herd>
1451 - <upstream>
1452 - <remote-id type="sourceforge">rename</remote-id>
1453 - </upstream>
1454 +<herd>base-system</herd>
1455 +<upstream>
1456 + <remote-id type='sourceforge'>rename</remote-id>
1457 +</upstream>
1458 </pkgmetadata>
1459
1460 diff --git a/sys-apps/rescan-scsi-bus/metadata.xml b/sys-apps/rescan-scsi-bus/metadata.xml
1461 index 035bc6b..36d7f8d 100644
1462 --- a/sys-apps/rescan-scsi-bus/metadata.xml
1463 +++ b/sys-apps/rescan-scsi-bus/metadata.xml
1464 @@ -1,8 +1,8 @@
1465 -<?xml version="1.0" encoding="UTF-8"?>
1466 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1467 +<?xml version='1.0' encoding='UTF-8'?>
1468 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1469 <pkgmetadata>
1470 <herd>base-system</herd>
1471 <maintainer>
1472 - <email>robbat2@g.o</email>
1473 + <email>robbat2@g.o</email>
1474 </maintainer>
1475 </pkgmetadata>
1476
1477 diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
1478 index 582bac6..79e3319 100644
1479 --- a/sys-apps/rng-tools/metadata.xml
1480 +++ b/sys-apps/rng-tools/metadata.xml
1481 @@ -1,18 +1,17 @@
1482 -<?xml version="1.0" encoding="UTF-8"?>
1483 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1484 +<?xml version='1.0' encoding='UTF-8'?>
1485 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1486 <pkgmetadata>
1487 - <herd>base-system</herd>
1488 - <herd>proxy-maintainers</herd>
1489 - <maintainer>
1490 - <email>idella4@g.o</email>
1491 - <name>Ian Delaney</name>
1492 - </maintainer>
1493 - <maintainer>
1494 - <email>gokturk@××××××××××.edu</email>
1495 - <name>Gokturk Yuksek</name>
1496 - <description>Proxy maintainer, CC him on bugs.</description>
1497 - </maintainer>
1498 - <upstream>
1499 - <remote-id type="sourceforge">gkernel</remote-id>
1500 - </upstream>
1501 +<herd>base-system</herd>
1502 +<herd>proxy-maintainers</herd>
1503 +<maintainer>
1504 + <email>idella4@g.o</email>
1505 +</maintainer>
1506 +<maintainer>
1507 + <email>gokturk@××××××××××.edu</email>
1508 + <name>Gokturk Yuksek</name>
1509 + <description>Proxy maintainer, CC him on bugs.</description>
1510 +</maintainer>
1511 +<upstream>
1512 + <remote-id type='sourceforge'>gkernel</remote-id>
1513 +</upstream>
1514 </pkgmetadata>
1515
1516 diff --git a/sys-apps/sdparm/metadata.xml b/sys-apps/sdparm/metadata.xml
1517 index 442859c..c98623d 100644
1518 --- a/sys-apps/sdparm/metadata.xml
1519 +++ b/sys-apps/sdparm/metadata.xml
1520 @@ -1,8 +1,8 @@
1521 -<?xml version="1.0" encoding="UTF-8"?>
1522 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1523 +<?xml version='1.0' encoding='UTF-8'?>
1524 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1525 <pkgmetadata>
1526 - <herd>base-system</herd>
1527 - <longdescription>
1528 - Utility to output and modify parameters on a SCSI device, like hdparm.
1529 - </longdescription>
1530 +<herd>base-system</herd>
1531 +<longdescription lang='en'>
1532 + Utility to output and modify parameters on a SCSI device, like hdparm.
1533 +</longdescription>
1534 </pkgmetadata>
1535
1536 diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
1537 index e68a743..4289897 100644
1538 --- a/sys-apps/sed/metadata.xml
1539 +++ b/sys-apps/sed/metadata.xml
1540 @@ -1,8 +1,8 @@
1541 <?xml version='1.0' encoding='UTF-8'?>
1542 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1543 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1544 <pkgmetadata>
1545 - <herd>base-system</herd>
1546 - <upstream>
1547 - <remote-id type="sourceforge">sed</remote-id>
1548 - </upstream>
1549 +<herd>base-system</herd>
1550 +<upstream>
1551 + <remote-id type='sourceforge'>sed</remote-id>
1552 +</upstream>
1553 </pkgmetadata>
1554
1555 diff --git a/sys-apps/setserial/metadata.xml b/sys-apps/setserial/metadata.xml
1556 index 1524036..0685d1c 100644
1557 --- a/sys-apps/setserial/metadata.xml
1558 +++ b/sys-apps/setserial/metadata.xml
1559 @@ -1,8 +1,8 @@
1560 <?xml version='1.0' encoding='UTF-8'?>
1561 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1562 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1563 <pkgmetadata>
1564 - <herd>base-system</herd>
1565 - <upstream>
1566 - <remote-id type="sourceforge">setserial</remote-id>
1567 - </upstream>
1568 +<herd>base-system</herd>
1569 +<upstream>
1570 + <remote-id type='sourceforge'>setserial</remote-id>
1571 +</upstream>
1572 </pkgmetadata>
1573
1574 diff --git a/sys-apps/sg3_utils/metadata.xml b/sys-apps/sg3_utils/metadata.xml
1575 index 96a2d58..261fd29 100644
1576 --- a/sys-apps/sg3_utils/metadata.xml
1577 +++ b/sys-apps/sg3_utils/metadata.xml
1578 @@ -1,5 +1,5 @@
1579 -<?xml version="1.0" encoding="UTF-8"?>
1580 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1581 +<?xml version='1.0' encoding='UTF-8'?>
1582 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1583 <pkgmetadata>
1584 <herd>base-system</herd>
1585 </pkgmetadata>
1586
1587 diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
1588 index 87480c4..bfa4890 100644
1589 --- a/sys-apps/shadow/metadata.xml
1590 +++ b/sys-apps/shadow/metadata.xml
1591 @@ -1,9 +1,9 @@
1592 -<?xml version="1.0" encoding="UTF-8"?>
1593 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1594 +<?xml version='1.0' encoding='UTF-8'?>
1595 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1596 <pkgmetadata>
1597 <herd>base-system</herd>
1598 <herd>pam</herd> <!-- only for USE=pam -->
1599 <upstream>
1600 - <remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
1601 + <remote-id type='cpe'>cpe:/a:debian:shadow</remote-id>
1602 </upstream>
1603 </pkgmetadata>
1604
1605 diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
1606 index 0eea617..4243bf9 100644
1607 --- a/sys-apps/smartmontools/metadata.xml
1608 +++ b/sys-apps/smartmontools/metadata.xml
1609 @@ -1,11 +1,11 @@
1610 -<?xml version="1.0" encoding="UTF-8"?>
1611 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1612 +<?xml version='1.0' encoding='UTF-8'?>
1613 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1614 <pkgmetadata>
1615 - <herd>base-system</herd>
1616 - <use>
1617 - <flag name="minimal">Do not install the monitoring daemon and associated scripts.</flag>
1618 - </use>
1619 - <upstream>
1620 - <remote-id type="sourceforge">smartmontools</remote-id>
1621 - </upstream>
1622 +<herd>base-system</herd>
1623 +<use>
1624 + <flag name='minimal'>Do not install the monitoring daemon and associated scripts.</flag>
1625 +</use>
1626 +<upstream>
1627 + <remote-id type='sourceforge'>smartmontools</remote-id>
1628 +</upstream>
1629 </pkgmetadata>
1630
1631 diff --git a/sys-apps/syscriptor/metadata.xml b/sys-apps/syscriptor/metadata.xml
1632 index 85abe37..40dd6af 100644
1633 --- a/sys-apps/syscriptor/metadata.xml
1634 +++ b/sys-apps/syscriptor/metadata.xml
1635 @@ -1,8 +1,8 @@
1636 -<?xml version="1.0" encoding="UTF-8"?>
1637 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1638 +<?xml version='1.0' encoding='UTF-8'?>
1639 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1640 <pkgmetadata>
1641 - <herd>base-system</herd>
1642 - <upstream>
1643 - <remote-id type="sourceforge">syscriptor</remote-id>
1644 - </upstream>
1645 +<herd>base-system</herd>
1646 +<upstream>
1647 + <remote-id type='sourceforge'>syscriptor</remote-id>
1648 +</upstream>
1649 </pkgmetadata>
1650
1651 diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
1652 index 96a2d58..261fd29 100644
1653 --- a/sys-apps/sysvinit/metadata.xml
1654 +++ b/sys-apps/sysvinit/metadata.xml
1655 @@ -1,5 +1,5 @@
1656 -<?xml version="1.0" encoding="UTF-8"?>
1657 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1658 +<?xml version='1.0' encoding='UTF-8'?>
1659 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1660 <pkgmetadata>
1661 <herd>base-system</herd>
1662 </pkgmetadata>
1663
1664 diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
1665 index 0f754bf..cd9cfcc 100644
1666 --- a/sys-apps/tcp-wrappers/metadata.xml
1667 +++ b/sys-apps/tcp-wrappers/metadata.xml
1668 @@ -1,11 +1,11 @@
1669 -<?xml version="1.0" encoding="UTF-8"?>
1670 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1671 +<?xml version='1.0' encoding='UTF-8'?>
1672 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1673 <pkgmetadata>
1674 <herd>base-system</herd>
1675 <use>
1676 - <flag name='netgroups'>
1677 - Support matching NIS (host) netgroup names via the @netgroup syntax
1678 - (if you don't know what this means, you most likely do not need it)
1679 - </flag>
1680 + <flag name='netgroups'>
1681 + Support matching NIS (host) netgroup names via the @netgroup syntax
1682 + (if you don't know what this means, you most likely do not need it)
1683 + </flag>
1684 </use>
1685 </pkgmetadata>
1686
1687 diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
1688 index 659da0c..261fd29 100644
1689 --- a/sys-apps/texinfo/metadata.xml
1690 +++ b/sys-apps/texinfo/metadata.xml
1691 @@ -1,5 +1,5 @@
1692 -<?xml version="1.0" encoding="UTF-8"?>
1693 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1694 +<?xml version='1.0' encoding='UTF-8'?>
1695 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1696 <pkgmetadata>
1697 - <herd>base-system</herd>
1698 +<herd>base-system</herd>
1699 </pkgmetadata>
1700
1701 diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
1702 index 2b14dbd..f2d8f19 100644
1703 --- a/sys-apps/ucspi-proxy/metadata.xml
1704 +++ b/sys-apps/ucspi-proxy/metadata.xml
1705 @@ -1,8 +1,8 @@
1706 -<?xml version="1.0" encoding="UTF-8"?>
1707 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1708 +<?xml version='1.0' encoding='UTF-8'?>
1709 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1710 <pkgmetadata>
1711 <herd>base-system</herd>
1712 -<longdescription lang="en">
1713 +<longdescription lang='en'>
1714 This package contains a proxy program that passes data back and forth
1715 between two connections set up by a UCSPI server and a UCSPI client.
1716 </longdescription>
1717
1718 diff --git a/sys-apps/ucspi-unix/metadata.xml b/sys-apps/ucspi-unix/metadata.xml
1719 index ada679e..590ac8f 100644
1720 --- a/sys-apps/ucspi-unix/metadata.xml
1721 +++ b/sys-apps/ucspi-unix/metadata.xml
1722 @@ -1,8 +1,8 @@
1723 -<?xml version="1.0" encoding="UTF-8"?>
1724 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1725 +<?xml version='1.0' encoding='UTF-8'?>
1726 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1727 <pkgmetadata>
1728 <herd>base-system</herd>
1729 -<longdescription lang="en">
1730 +<longdescription lang='en'>
1731 This package contains UNIX domain socket client and server programs that
1732 conform to UCSPI, the UNIX Client-Server Program Interface.
1733 </longdescription>
1734
1735 diff --git a/sys-apps/usbredir/metadata.xml b/sys-apps/usbredir/metadata.xml
1736 index 87124c2..7b3b205 100644
1737 --- a/sys-apps/usbredir/metadata.xml
1738 +++ b/sys-apps/usbredir/metadata.xml
1739 @@ -1,5 +1,5 @@
1740 -<?xml version="1.0" encoding="UTF-8"?>
1741 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1742 +<?xml version='1.0' encoding='UTF-8'?>
1743 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1744 <pkgmetadata>
1745 <herd>base-system</herd>
1746 <herd>qemu</herd>
1747
1748 diff --git a/sys-apps/usbutils/metadata.xml b/sys-apps/usbutils/metadata.xml
1749 index abf9dde..b600503 100644
1750 --- a/sys-apps/usbutils/metadata.xml
1751 +++ b/sys-apps/usbutils/metadata.xml
1752 @@ -1,8 +1,8 @@
1753 <?xml version='1.0' encoding='UTF-8'?>
1754 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1755 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1756 <pkgmetadata>
1757 - <herd>base-system</herd>
1758 - <upstream>
1759 - <remote-id type="sourceforge">linux-usb</remote-id>
1760 - </upstream>
1761 +<herd>base-system</herd>
1762 +<upstream>
1763 + <remote-id type='sourceforge'>linux-usb</remote-id>
1764 +</upstream>
1765 </pkgmetadata>
1766
1767 diff --git a/sys-apps/utempter/metadata.xml b/sys-apps/utempter/metadata.xml
1768 index 5aafc10..12f6cb3 100644
1769 --- a/sys-apps/utempter/metadata.xml
1770 +++ b/sys-apps/utempter/metadata.xml
1771 @@ -1,6 +1,6 @@
1772 -<?xml version="1.0" encoding="UTF-8"?>
1773 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1774 +<?xml version='1.0' encoding='UTF-8'?>
1775 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1776 <pkgmetadata>
1777 - <herd>base-system</herd>
1778 - <herd>x11</herd>
1779 +<herd>base-system</herd>
1780 +<herd>x11</herd>
1781 </pkgmetadata>
1782
1783 diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
1784 index 77690bc..5dd62ea 100644
1785 --- a/sys-apps/util-linux/metadata.xml
1786 +++ b/sys-apps/util-linux/metadata.xml
1787 @@ -1,20 +1,20 @@
1788 -<?xml version="1.0" encoding="UTF-8"?>
1789 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1790 +<?xml version='1.0' encoding='UTF-8'?>
1791 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1792 <pkgmetadata>
1793 - <herd>base-system</herd>
1794 - <use>
1795 - <flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
1796 - <flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
1797 - <flag name="cytune">build cytune for Cyclades-Z multiport serial cards</flag>
1798 - <flag name="fdformat">build fdformat (floppy disk format)</flag>
1799 - <flag name="pam">build runuser helper</flag>
1800 - <flag name="suid">
1801 +<herd>base-system</herd>
1802 +<use>
1803 + <flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
1804 + <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
1805 + <flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
1806 + <flag name='fdformat'>build fdformat (floppy disk format)</flag>
1807 + <flag name='pam'>build runuser helper</flag>
1808 + <flag name='suid'>
1809 install mount/umount as setuid so non-root users may mount/umount devices,
1810 and wall/write as setgid so non-root users can notify other users
1811 </flag>
1812 - <flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag>
1813 - </use>
1814 - <upstream>
1815 - <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
1816 - </upstream>
1817 + <flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag>
1818 +</use>
1819 +<upstream>
1820 + <remote-id type='cpe'>cpe:/a:andries_brouwer:util-linux</remote-id>
1821 +</upstream>
1822 </pkgmetadata>
1823
1824 diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
1825 index 65d570f..fd0cd20 100644
1826 --- a/sys-apps/watchdog/metadata.xml
1827 +++ b/sys-apps/watchdog/metadata.xml
1828 @@ -1,11 +1,11 @@
1829 -<?xml version="1.0" encoding="UTF-8"?>
1830 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1831 +<?xml version='1.0' encoding='UTF-8'?>
1832 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1833 <pkgmetadata>
1834 - <herd>base-system</herd>
1835 - <use>
1836 - <flag name="nfs">enable support for checking nfs mounts</flag>
1837 - </use>
1838 - <upstream>
1839 - <remote-id type="sourceforge">watchdog</remote-id>
1840 - </upstream>
1841 +<herd>base-system</herd>
1842 +<use>
1843 + <flag name='nfs'>enable support for checking nfs mounts</flag>
1844 +</use>
1845 +<upstream>
1846 + <remote-id type='sourceforge'>watchdog</remote-id>
1847 +</upstream>
1848 </pkgmetadata>
1849
1850 diff --git a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml
1851 index 96a2d58..261fd29 100644
1852 --- a/sys-apps/which/metadata.xml
1853 +++ b/sys-apps/which/metadata.xml
1854 @@ -1,5 +1,5 @@
1855 -<?xml version="1.0" encoding="UTF-8"?>
1856 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1857 +<?xml version='1.0' encoding='UTF-8'?>
1858 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1859 <pkgmetadata>
1860 <herd>base-system</herd>
1861 </pkgmetadata>
1862
1863 diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
1864 index e2a0d74..36d7f8d 100644
1865 --- a/sys-apps/x86info/metadata.xml
1866 +++ b/sys-apps/x86info/metadata.xml
1867 @@ -1,8 +1,8 @@
1868 -<?xml version="1.0" encoding="UTF-8"?>
1869 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1870 +<?xml version='1.0' encoding='UTF-8'?>
1871 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1872 <pkgmetadata>
1873 - <herd>base-system</herd>
1874 - <maintainer>
1875 - <email>robbat2@g.o</email>
1876 - </maintainer>
1877 +<herd>base-system</herd>
1878 +<maintainer>
1879 + <email>robbat2@g.o</email>
1880 +</maintainer>
1881 </pkgmetadata>
1882
1883 diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
1884 index ec64a32..9935eed 100644
1885 --- a/sys-apps/xinetd/metadata.xml
1886 +++ b/sys-apps/xinetd/metadata.xml
1887 @@ -1,8 +1,8 @@
1888 -<?xml version="1.0" encoding="UTF-8"?>
1889 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1890 +<?xml version='1.0' encoding='UTF-8'?>
1891 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1892 <pkgmetadata>
1893 <herd>base-system</herd>
1894 <use>
1895 - <flag name='rpc'>support RPC services</flag>
1896 + <flag name='rpc'>support RPC services</flag>
1897 </use>
1898 </pkgmetadata>
1899
1900 diff --git a/sys-apps/xmbmon/metadata.xml b/sys-apps/xmbmon/metadata.xml
1901 index 96a2d58..261fd29 100644
1902 --- a/sys-apps/xmbmon/metadata.xml
1903 +++ b/sys-apps/xmbmon/metadata.xml
1904 @@ -1,5 +1,5 @@
1905 -<?xml version="1.0" encoding="UTF-8"?>
1906 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1907 +<?xml version='1.0' encoding='UTF-8'?>
1908 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1909 <pkgmetadata>
1910 <herd>base-system</herd>
1911 </pkgmetadata>
1912
1913 diff --git a/sys-block/aoetools/metadata.xml b/sys-block/aoetools/metadata.xml
1914 index 1154867..ab8548a 100644
1915 --- a/sys-block/aoetools/metadata.xml
1916 +++ b/sys-block/aoetools/metadata.xml
1917 @@ -1,8 +1,8 @@
1918 -<?xml version="1.0" encoding="UTF-8"?>
1919 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1920 +<?xml version='1.0' encoding='UTF-8'?>
1921 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1922 <pkgmetadata>
1923 - <herd>base-system</herd>
1924 - <upstream>
1925 - <remote-id type="sourceforge">aoetools</remote-id>
1926 - </upstream>
1927 +<herd>base-system</herd>
1928 +<upstream>
1929 + <remote-id type='sourceforge'>aoetools</remote-id>
1930 +</upstream>
1931 </pkgmetadata>
1932
1933 diff --git a/sys-block/buffer/metadata.xml b/sys-block/buffer/metadata.xml
1934 index 96a2d58..261fd29 100644
1935 --- a/sys-block/buffer/metadata.xml
1936 +++ b/sys-block/buffer/metadata.xml
1937 @@ -1,5 +1,5 @@
1938 -<?xml version="1.0" encoding="UTF-8"?>
1939 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1940 +<?xml version='1.0' encoding='UTF-8'?>
1941 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1942 <pkgmetadata>
1943 <herd>base-system</herd>
1944 </pkgmetadata>
1945
1946 diff --git a/sys-block/di/metadata.xml b/sys-block/di/metadata.xml
1947 index 96a2d58..261fd29 100644
1948 --- a/sys-block/di/metadata.xml
1949 +++ b/sys-block/di/metadata.xml
1950 @@ -1,5 +1,5 @@
1951 -<?xml version="1.0" encoding="UTF-8"?>
1952 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1953 +<?xml version='1.0' encoding='UTF-8'?>
1954 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1955 <pkgmetadata>
1956 <herd>base-system</herd>
1957 </pkgmetadata>
1958
1959 diff --git a/sys-block/eject/metadata.xml b/sys-block/eject/metadata.xml
1960 index 9503a80..08e54e0 100644
1961 --- a/sys-block/eject/metadata.xml
1962 +++ b/sys-block/eject/metadata.xml
1963 @@ -1,8 +1,8 @@
1964 <?xml version='1.0' encoding='UTF-8'?>
1965 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1966 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1967 <pkgmetadata>
1968 - <herd>base-system</herd>
1969 - <upstream>
1970 - <remote-id type="sourceforge">eject</remote-id>
1971 - </upstream>
1972 +<herd>base-system</herd>
1973 +<upstream>
1974 + <remote-id type='sourceforge'>eject</remote-id>
1975 +</upstream>
1976 </pkgmetadata>
1977
1978 diff --git a/sys-block/endpoint/metadata.xml b/sys-block/endpoint/metadata.xml
1979 index 4272e6c..637b63e 100644
1980 --- a/sys-block/endpoint/metadata.xml
1981 +++ b/sys-block/endpoint/metadata.xml
1982 @@ -1,12 +1,12 @@
1983 -<?xml version="1.0" encoding="UTF-8"?>
1984 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1985 +<?xml version='1.0' encoding='UTF-8'?>
1986 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
1987 <pkgmetadata>
1988 - <herd>base-system</herd>
1989 - <longdescription lang="en">
1990 - Endpoint turns a Linux machine with one or more firewire cards into an SBP-2
1991 - device. The advantage is that you can use any file or device the linux
1992 - machine supports as storage, and that multiple clients can sit on separate
1993 - buses so they can get the full bandwidth of the bus.
1994 - </longdescription>
1995 +<herd>base-system</herd>
1996 +<longdescription lang='en'>
1997 + Endpoint turns a Linux machine with one or more firewire cards into an SBP-2
1998 + device. The advantage is that you can use any file or device the linux
1999 + machine supports as storage, and that multiple clients can sit on separate
2000 + buses so they can get the full bandwidth of the bus.
2001 +</longdescription>
2002 </pkgmetadata>
2003
2004
2005 diff --git a/sys-block/fwdl/metadata.xml b/sys-block/fwdl/metadata.xml
2006 index 96a2d58..261fd29 100644
2007 --- a/sys-block/fwdl/metadata.xml
2008 +++ b/sys-block/fwdl/metadata.xml
2009 @@ -1,5 +1,5 @@
2010 -<?xml version="1.0" encoding="UTF-8"?>
2011 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2012 +<?xml version='1.0' encoding='UTF-8'?>
2013 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2014 <pkgmetadata>
2015 <herd>base-system</herd>
2016 </pkgmetadata>
2017
2018 diff --git a/sys-block/gpart/metadata.xml b/sys-block/gpart/metadata.xml
2019 index 96a2d58..261fd29 100644
2020 --- a/sys-block/gpart/metadata.xml
2021 +++ b/sys-block/gpart/metadata.xml
2022 @@ -1,5 +1,5 @@
2023 -<?xml version="1.0" encoding="UTF-8"?>
2024 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2025 +<?xml version='1.0' encoding='UTF-8'?>
2026 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2027 <pkgmetadata>
2028 <herd>base-system</herd>
2029 </pkgmetadata>
2030
2031 diff --git a/sys-block/iscsitarget/metadata.xml b/sys-block/iscsitarget/metadata.xml
2032 index 79b709a..a07487e 100644
2033 --- a/sys-block/iscsitarget/metadata.xml
2034 +++ b/sys-block/iscsitarget/metadata.xml
2035 @@ -1,13 +1,12 @@
2036 <?xml version='1.0' encoding='UTF-8'?>
2037 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2038 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2039 <pkgmetadata>
2040 - <herd>base-system</herd>
2041 - <maintainer>
2042 - <email>ryao@g.o</email>
2043 - <name>Richard Yao</name>
2044 - <description>Primary maintainer</description>
2045 - </maintainer>
2046 - <upstream>
2047 - <remote-id type="sourceforge">iscsitarget</remote-id>
2048 - </upstream>
2049 +<herd>base-system</herd>
2050 +<maintainer>
2051 + <email>ryao@g.o</email>
2052 + <description>Primary maintainer</description>
2053 +</maintainer>
2054 +<upstream>
2055 + <remote-id type='sourceforge'>iscsitarget</remote-id>
2056 +</upstream>
2057 </pkgmetadata>
2058
2059 diff --git a/sys-block/mbuffer/metadata.xml b/sys-block/mbuffer/metadata.xml
2060 index 96a2d58..261fd29 100644
2061 --- a/sys-block/mbuffer/metadata.xml
2062 +++ b/sys-block/mbuffer/metadata.xml
2063 @@ -1,5 +1,5 @@
2064 -<?xml version="1.0" encoding="UTF-8"?>
2065 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2066 +<?xml version='1.0' encoding='UTF-8'?>
2067 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2068 <pkgmetadata>
2069 <herd>base-system</herd>
2070 </pkgmetadata>
2071
2072 diff --git a/sys-block/mtx/metadata.xml b/sys-block/mtx/metadata.xml
2073 index 153df00..7bb6fd4 100644
2074 --- a/sys-block/mtx/metadata.xml
2075 +++ b/sys-block/mtx/metadata.xml
2076 @@ -1,8 +1,8 @@
2077 -<?xml version="1.0" encoding="UTF-8"?>
2078 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2079 +<?xml version='1.0' encoding='UTF-8'?>
2080 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2081 <pkgmetadata>
2082 - <herd>base-system</herd>
2083 - <upstream>
2084 - <remote-id type="sourceforge">mtx</remote-id>
2085 - </upstream>
2086 +<herd>base-system</herd>
2087 +<upstream>
2088 + <remote-id type='sourceforge'>mtx</remote-id>
2089 +</upstream>
2090 </pkgmetadata>
2091
2092 diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
2093 index 8ce88b9..cb24ee3 100644
2094 --- a/sys-block/nbd/metadata.xml
2095 +++ b/sys-block/nbd/metadata.xml
2096 @@ -1,8 +1,8 @@
2097 -<?xml version="1.0" encoding="UTF-8"?>
2098 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2099 +<?xml version='1.0' encoding='UTF-8'?>
2100 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2101 <pkgmetadata>
2102 - <herd>base-system</herd>
2103 - <upstream>
2104 - <remote-id type="sourceforge">nbd</remote-id>
2105 - </upstream>
2106 +<herd>base-system</herd>
2107 +<upstream>
2108 + <remote-id type='sourceforge'>nbd</remote-id>
2109 +</upstream>
2110 </pkgmetadata>
2111
2112 diff --git a/sys-block/noflushd/metadata.xml b/sys-block/noflushd/metadata.xml
2113 index cab7039..27c91de 100644
2114 --- a/sys-block/noflushd/metadata.xml
2115 +++ b/sys-block/noflushd/metadata.xml
2116 @@ -1,8 +1,8 @@
2117 -<?xml version="1.0" encoding="UTF-8"?>
2118 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2119 +<?xml version='1.0' encoding='UTF-8'?>
2120 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2121 <pkgmetadata>
2122 - <herd>base-system</herd>
2123 - <upstream>
2124 - <remote-id type="sourceforge">noflushd</remote-id>
2125 - </upstream>
2126 +<herd>base-system</herd>
2127 +<upstream>
2128 + <remote-id type='sourceforge'>noflushd</remote-id>
2129 +</upstream>
2130 </pkgmetadata>
2131
2132 diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
2133 index 96a2d58..261fd29 100644
2134 --- a/sys-block/open-iscsi/metadata.xml
2135 +++ b/sys-block/open-iscsi/metadata.xml
2136 @@ -1,5 +1,5 @@
2137 -<?xml version="1.0" encoding="UTF-8"?>
2138 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2139 +<?xml version='1.0' encoding='UTF-8'?>
2140 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2141 <pkgmetadata>
2142 <herd>base-system</herd>
2143 </pkgmetadata>
2144
2145 diff --git a/sys-block/partimage/metadata.xml b/sys-block/partimage/metadata.xml
2146 index fba1621..d0e029d 100644
2147 --- a/sys-block/partimage/metadata.xml
2148 +++ b/sys-block/partimage/metadata.xml
2149 @@ -1,11 +1,11 @@
2150 -<?xml version="1.0" encoding="UTF-8"?>
2151 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2152 +<?xml version='1.0' encoding='UTF-8'?>
2153 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2154 <pkgmetadata>
2155 - <herd>base-system</herd>
2156 - <use>
2157 - <flag name="nologin">Do not include login support when connecting partimaged</flag>
2158 - </use>
2159 - <upstream>
2160 - <remote-id type="sourceforge">partimage</remote-id>
2161 - </upstream>
2162 +<herd>base-system</herd>
2163 +<use>
2164 + <flag name='nologin'>Do not include login support when connecting partimaged</flag>
2165 +</use>
2166 +<upstream>
2167 + <remote-id type='sourceforge'>partimage</remote-id>
2168 +</upstream>
2169 </pkgmetadata>
2170
2171 diff --git a/sys-block/qla-fc-firmware/metadata.xml b/sys-block/qla-fc-firmware/metadata.xml
2172 index de72ca2..a76bc01 100644
2173 --- a/sys-block/qla-fc-firmware/metadata.xml
2174 +++ b/sys-block/qla-fc-firmware/metadata.xml
2175 @@ -1,11 +1,11 @@
2176 -<?xml version="1.0" encoding="UTF-8"?>
2177 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2178 +<?xml version='1.0' encoding='UTF-8'?>
2179 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2180 <pkgmetadata>
2181 <herd>base-system</herd>
2182 <maintainer>
2183 - <email>robbat2@g.o</email>
2184 + <email>robbat2@g.o</email>
2185 </maintainer>
2186 -<longdescription>
2187 +<longdescription lang='en'>
2188 QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards.
2189 This package contains snapshots of firmware releases from the QLogic FTP server.
2190 </longdescription>
2191
2192 diff --git a/sys-block/smp_utils/metadata.xml b/sys-block/smp_utils/metadata.xml
2193 index 96a2d58..261fd29 100644
2194 --- a/sys-block/smp_utils/metadata.xml
2195 +++ b/sys-block/smp_utils/metadata.xml
2196 @@ -1,5 +1,5 @@
2197 -<?xml version="1.0" encoding="UTF-8"?>
2198 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2199 +<?xml version='1.0' encoding='UTF-8'?>
2200 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2201 <pkgmetadata>
2202 <herd>base-system</herd>
2203 </pkgmetadata>
2204
2205 diff --git a/sys-block/tapecat/metadata.xml b/sys-block/tapecat/metadata.xml
2206 index 70aaab5..938ef35 100644
2207 --- a/sys-block/tapecat/metadata.xml
2208 +++ b/sys-block/tapecat/metadata.xml
2209 @@ -1,9 +1,9 @@
2210 -<?xml version="1.0" encoding="UTF-8"?>
2211 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2212 +<?xml version='1.0' encoding='UTF-8'?>
2213 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2214 <pkgmetadata>
2215 <herd>base-system</herd>
2216 <herd>app-backup</herd>
2217 <maintainer>
2218 - <email>robbat2@g.o</email>
2219 + <email>robbat2@g.o</email>
2220 </maintainer>
2221 </pkgmetadata>
2222
2223 diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
2224 index 659c8f5..705b75d 100644
2225 --- a/sys-block/thin-provisioning-tools/metadata.xml
2226 +++ b/sys-block/thin-provisioning-tools/metadata.xml
2227 @@ -1,15 +1,14 @@
2228 -<?xml version="1.0" encoding="UTF-8"?>
2229 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2230 +<?xml version='1.0' encoding='UTF-8'?>
2231 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2232 <pkgmetadata>
2233 - <herd>base-system</herd>
2234 - <maintainer>
2235 - <email>robbat2@g.o</email>
2236 - <name>Robin H. Johnson</name>
2237 - </maintainer>
2238 - <longdescription lang="en">
2239 +<herd>base-system</herd>
2240 +<maintainer>
2241 + <email>robbat2@g.o</email>
2242 +</maintainer>
2243 +<longdescription lang='en'>
2244 A suite of tools for thin provisioning on Linux.
2245 </longdescription>
2246 - <upstream>
2247 - <remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
2248 - </upstream>
2249 +<upstream>
2250 + <remote-id type='github'>jthornber/thin-provisioning-tools</remote-id>
2251 +</upstream>
2252 </pkgmetadata>
2253
2254 diff --git a/sys-block/vblade/metadata.xml b/sys-block/vblade/metadata.xml
2255 index 1154867..ab8548a 100644
2256 --- a/sys-block/vblade/metadata.xml
2257 +++ b/sys-block/vblade/metadata.xml
2258 @@ -1,8 +1,8 @@
2259 -<?xml version="1.0" encoding="UTF-8"?>
2260 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2261 +<?xml version='1.0' encoding='UTF-8'?>
2262 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2263 <pkgmetadata>
2264 - <herd>base-system</herd>
2265 - <upstream>
2266 - <remote-id type="sourceforge">aoetools</remote-id>
2267 - </upstream>
2268 +<herd>base-system</herd>
2269 +<upstream>
2270 + <remote-id type='sourceforge'>aoetools</remote-id>
2271 +</upstream>
2272 </pkgmetadata>
2273
2274 diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
2275 index 1df6b40..77314da 100644
2276 --- a/sys-boot/grub/metadata.xml
2277 +++ b/sys-boot/grub/metadata.xml
2278 @@ -1,36 +1,32 @@
2279 -<?xml version="1.0" encoding="UTF-8"?>
2280 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2281 +<?xml version='1.0' encoding='UTF-8'?>
2282 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2283 <pkgmetadata>
2284 - <herd>base-system</herd>
2285 - <maintainer>
2286 - <email>base-system@g.o</email>
2287 - </maintainer>
2288 - <maintainer restrict="&gt;=sys-boot/grub-2">
2289 - <email>floppym@g.o</email>
2290 - <name>Mike Gilbert</name>
2291 - </maintainer>
2292 - <use>
2293 - <flag name="device-mapper">
2294 +<herd>base-system</herd>
2295 +<maintainer restrict='&gt;=sys-boot/grub-2'>
2296 + <email>floppym@g.o</email>
2297 +</maintainer>
2298 +<use>
2299 + <flag name='device-mapper'>
2300 Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg>
2301 </flag>
2302 - <flag name="efiemu">
2303 + <flag name='efiemu'>
2304 Build and install the efiemu runtimes
2305 </flag>
2306 - <flag name="fonts">Build and install fonts for the gfxterm module</flag>
2307 - <flag name="mount">
2308 + <flag name='fonts'>Build and install fonts for the gfxterm module</flag>
2309 + <flag name='mount'>
2310 Build and install the grub-mount utility
2311 </flag>
2312 - <flag name="libzfs">
2313 + <flag name='libzfs'>
2314 Enable support for <pkg>sys-fs/zfs</pkg>
2315 </flag>
2316 - <flag name="multislot">
2317 + <flag name='multislot'>
2318 Allow concurrent installation of <pkg>sys-boot/grub:0</pkg> and
2319 <pkg>sys-boot/grub:2</pkg> by renaming all programs.
2320 </flag>
2321 - <flag name="themes">Build and install GRUB themes (starfield)</flag>
2322 - <flag name="truetype">Build and install grub-mkfont conversion utility</flag>
2323 - </use>
2324 - <upstream>
2325 - <remote-id type="sourceforge">dejavu</remote-id>
2326 - </upstream>
2327 + <flag name='themes'>Build and install GRUB themes (starfield)</flag>
2328 + <flag name='truetype'>Build and install grub-mkfont conversion utility</flag>
2329 +</use>
2330 +<upstream>
2331 + <remote-id type='sourceforge'>dejavu</remote-id>
2332 +</upstream>
2333 </pkgmetadata>
2334
2335 diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
2336 index 256d249..44fefae 100644
2337 --- a/sys-boot/lilo/metadata.xml
2338 +++ b/sys-boot/lilo/metadata.xml
2339 @@ -1,14 +1,13 @@
2340 -<?xml version="1.0" encoding="UTF-8"?>
2341 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2342 +<?xml version='1.0' encoding='UTF-8'?>
2343 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2344 <pkgmetadata>
2345 <herd>base-system</herd>
2346 <maintainer>
2347 - <email>chainsaw@g.o</email>
2348 - <name>Tony Vroon</name>
2349 + <email>chainsaw@g.o</email>
2350 </maintainer>
2351 <use>
2352 - <flag name='device-mapper'>Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
2353 - <flag name='minimal'>Do not install the dolilo helper script</flag>
2354 - <flag name='pxeserial'>Avoid character echo on PXE serial console</flag>
2355 + <flag name='device-mapper'>Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
2356 + <flag name='minimal'>Do not install the dolilo helper script</flag>
2357 + <flag name='pxeserial'>Avoid character echo on PXE serial console</flag>
2358 </use>
2359 </pkgmetadata>
2360
2361 diff --git a/sys-boot/mbr-gpt/metadata.xml b/sys-boot/mbr-gpt/metadata.xml
2362 index 035bc6b..36d7f8d 100644
2363 --- a/sys-boot/mbr-gpt/metadata.xml
2364 +++ b/sys-boot/mbr-gpt/metadata.xml
2365 @@ -1,8 +1,8 @@
2366 -<?xml version="1.0" encoding="UTF-8"?>
2367 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2368 +<?xml version='1.0' encoding='UTF-8'?>
2369 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2370 <pkgmetadata>
2371 <herd>base-system</herd>
2372 <maintainer>
2373 - <email>robbat2@g.o</email>
2374 + <email>robbat2@g.o</email>
2375 </maintainer>
2376 </pkgmetadata>
2377
2378 diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
2379 index e73f4a6..356cc45 100644
2380 --- a/sys-boot/syslinux/metadata.xml
2381 +++ b/sys-boot/syslinux/metadata.xml
2382 @@ -1,9 +1,8 @@
2383 -<?xml version="1.0" encoding="UTF-8"?>
2384 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2385 +<?xml version='1.0' encoding='UTF-8'?>
2386 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2387 <pkgmetadata>
2388 +<herd>base-system</herd>
2389 <maintainer>
2390 <email>chithanh@g.o</email>
2391 - <name>Chí-Thanh Christopher Nguyễn</name>
2392 </maintainer>
2393 -<herd>base-system</herd>
2394 </pkgmetadata>
2395
2396 diff --git a/sys-devel/autoconf-archive/metadata.xml b/sys-devel/autoconf-archive/metadata.xml
2397 index 3708129..63fe7b3 100644
2398 --- a/sys-devel/autoconf-archive/metadata.xml
2399 +++ b/sys-devel/autoconf-archive/metadata.xml
2400 @@ -1,9 +1,8 @@
2401 -<?xml version="1.0" encoding="UTF-8"?>
2402 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2403 +<?xml version='1.0' encoding='UTF-8'?>
2404 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2405 <pkgmetadata>
2406 - <herd>base-system</herd>
2407 - <maintainer>
2408 - <email>binki@g.o</email>
2409 - <name>Nathan Phillip Brink</name>
2410 - </maintainer>
2411 +<herd>base-system</herd>
2412 +<maintainer>
2413 + <email>binki@g.o</email>
2414 +</maintainer>
2415 </pkgmetadata>
2416
2417 diff --git a/sys-devel/autoconf-wrapper/metadata.xml b/sys-devel/autoconf-wrapper/metadata.xml
2418 index 96a2d58..261fd29 100644
2419 --- a/sys-devel/autoconf-wrapper/metadata.xml
2420 +++ b/sys-devel/autoconf-wrapper/metadata.xml
2421 @@ -1,5 +1,5 @@
2422 -<?xml version="1.0" encoding="UTF-8"?>
2423 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2424 +<?xml version='1.0' encoding='UTF-8'?>
2425 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2426 <pkgmetadata>
2427 <herd>base-system</herd>
2428 </pkgmetadata>
2429
2430 diff --git a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml
2431 index f9d3cbf..c03ef2d 100644
2432 --- a/sys-devel/autoconf/metadata.xml
2433 +++ b/sys-devel/autoconf/metadata.xml
2434 @@ -1,8 +1,8 @@
2435 -<?xml version="1.0" encoding="UTF-8"?>
2436 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2437 +<?xml version='1.0' encoding='UTF-8'?>
2438 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2439 <pkgmetadata>
2440 <herd>base-system</herd>
2441 <use>
2442 -<flag name='multislot'>Allow for multiple versions to be installed at once</flag>
2443 + <flag name='multislot'>Allow for multiple versions to be installed at once</flag>
2444 </use>
2445 </pkgmetadata>
2446
2447 diff --git a/sys-devel/automake-wrapper/metadata.xml b/sys-devel/automake-wrapper/metadata.xml
2448 index 96a2d58..261fd29 100644
2449 --- a/sys-devel/automake-wrapper/metadata.xml
2450 +++ b/sys-devel/automake-wrapper/metadata.xml
2451 @@ -1,5 +1,5 @@
2452 -<?xml version="1.0" encoding="UTF-8"?>
2453 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2454 +<?xml version='1.0' encoding='UTF-8'?>
2455 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2456 <pkgmetadata>
2457 <herd>base-system</herd>
2458 </pkgmetadata>
2459
2460 diff --git a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml
2461 index 96a2d58..261fd29 100644
2462 --- a/sys-devel/automake/metadata.xml
2463 +++ b/sys-devel/automake/metadata.xml
2464 @@ -1,5 +1,5 @@
2465 -<?xml version="1.0" encoding="UTF-8"?>
2466 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2467 +<?xml version='1.0' encoding='UTF-8'?>
2468 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2469 <pkgmetadata>
2470 <herd>base-system</herd>
2471 </pkgmetadata>
2472
2473 diff --git a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml
2474 index 96a2d58..261fd29 100644
2475 --- a/sys-devel/bc/metadata.xml
2476 +++ b/sys-devel/bc/metadata.xml
2477 @@ -1,5 +1,5 @@
2478 -<?xml version="1.0" encoding="UTF-8"?>
2479 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2480 +<?xml version='1.0' encoding='UTF-8'?>
2481 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2482 <pkgmetadata>
2483 <herd>base-system</herd>
2484 </pkgmetadata>
2485
2486 diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
2487 index 0e95eb6..57a0443 100644
2488 --- a/sys-devel/bin86/metadata.xml
2489 +++ b/sys-devel/bin86/metadata.xml
2490 @@ -1,12 +1,12 @@
2491 <?xml version='1.0' encoding='UTF-8'?>
2492 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2493 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2494 <pkgmetadata>
2495 - <herd>base-system</herd>
2496 - <!--
2497 - If anyone from base-system wants to be secondary, by all means just add
2498 - yourself, and send me (boo) a mail telling me that you've done so.
2499 - -->
2500 - <upstream>
2501 - <remote-id type="github">lkundrak/dev86</remote-id>
2502 - </upstream>
2503 +<herd>base-system</herd>
2504 +<!--
2505 + If anyone from base-system wants to be secondary, by all means just add
2506 + yourself, and send me (boo) a mail telling me that you've done so.
2507 +-->
2508 +<upstream>
2509 + <remote-id type='github'>lkundrak/dev86</remote-id>
2510 +</upstream>
2511 </pkgmetadata>
2512
2513 diff --git a/sys-devel/bison/metadata.xml b/sys-devel/bison/metadata.xml
2514 index 96a2d58..261fd29 100644
2515 --- a/sys-devel/bison/metadata.xml
2516 +++ b/sys-devel/bison/metadata.xml
2517 @@ -1,5 +1,5 @@
2518 -<?xml version="1.0" encoding="UTF-8"?>
2519 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2520 +<?xml version='1.0' encoding='UTF-8'?>
2521 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2522 <pkgmetadata>
2523 <herd>base-system</herd>
2524 </pkgmetadata>
2525
2526 diff --git a/sys-devel/cons/metadata.xml b/sys-devel/cons/metadata.xml
2527 index 96a2d58..261fd29 100644
2528 --- a/sys-devel/cons/metadata.xml
2529 +++ b/sys-devel/cons/metadata.xml
2530 @@ -1,5 +1,5 @@
2531 -<?xml version="1.0" encoding="UTF-8"?>
2532 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2533 +<?xml version='1.0' encoding='UTF-8'?>
2534 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2535 <pkgmetadata>
2536 <herd>base-system</herd>
2537 </pkgmetadata>
2538
2539 diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
2540 index 00f4c58..dd48366 100644
2541 --- a/sys-devel/flex/metadata.xml
2542 +++ b/sys-devel/flex/metadata.xml
2543 @@ -1,8 +1,8 @@
2544 -<?xml version="1.0" encoding="UTF-8"?>
2545 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2546 +<?xml version='1.0' encoding='UTF-8'?>
2547 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2548 <pkgmetadata>
2549 - <herd>base-system</herd>
2550 - <upstream>
2551 - <remote-id type="sourceforge">flex</remote-id>
2552 - </upstream>
2553 +<herd>base-system</herd>
2554 +<upstream>
2555 + <remote-id type='sourceforge'>flex</remote-id>
2556 +</upstream>
2557 </pkgmetadata>
2558
2559 diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
2560 index 757fc75..2941d57 100644
2561 --- a/sys-devel/gettext/metadata.xml
2562 +++ b/sys-devel/gettext/metadata.xml
2563 @@ -1,11 +1,15 @@
2564 -<?xml version="1.0" encoding="UTF-8"?>
2565 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2566 +<?xml version='1.0' encoding='UTF-8'?>
2567 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2568 <pkgmetadata>
2569 <herd>base-system</herd>
2570 <use>
2571 - <flag name="cvs">When running `autopoint`, use cvs to store the internal development files;
2572 - this requires cvs at runtime, but will be faster/smaller than raw archives</flag>
2573 - <flag name="git">When running `autopoint`, use git to store the internal development files;
2574 - this requires git at runtime, but will be faster/smaller than raw archives</flag>
2575 + <flag name='cvs'>
2576 + When running `autopoint`, use cvs to store the internal development files;
2577 + this requires cvs at runtime, but will be faster/smaller than raw archives
2578 + </flag>
2579 + <flag name='git'>
2580 + When running `autopoint`, use git to store the internal development files;
2581 + this requires git at runtime, but will be faster/smaller than raw archives
2582 + </flag>
2583 </use>
2584 </pkgmetadata>
2585
2586 diff --git a/sys-devel/gnuconfig/metadata.xml b/sys-devel/gnuconfig/metadata.xml
2587 index 59c5b7b..6509a6c 100644
2588 --- a/sys-devel/gnuconfig/metadata.xml
2589 +++ b/sys-devel/gnuconfig/metadata.xml
2590 @@ -1,8 +1,8 @@
2591 -<?xml version="1.0" encoding="UTF-8"?>
2592 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2593 +<?xml version='1.0' encoding='UTF-8'?>
2594 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2595 <pkgmetadata>
2596 <herd>base-system</herd>
2597 -<longdescription>
2598 +<longdescription lang='en'>
2599 Updated config.{sub,guess} files from upstream cvs to properly detect various system types.
2600 </longdescription>
2601 </pkgmetadata>
2602
2603 diff --git a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml
2604 index 96a2d58..261fd29 100644
2605 --- a/sys-devel/libtool/metadata.xml
2606 +++ b/sys-devel/libtool/metadata.xml
2607 @@ -1,5 +1,5 @@
2608 -<?xml version="1.0" encoding="UTF-8"?>
2609 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2610 +<?xml version='1.0' encoding='UTF-8'?>
2611 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2612 <pkgmetadata>
2613 <herd>base-system</herd>
2614 </pkgmetadata>
2615
2616 diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
2617 index 96a2d58..261fd29 100644
2618 --- a/sys-devel/m4/metadata.xml
2619 +++ b/sys-devel/m4/metadata.xml
2620 @@ -1,5 +1,5 @@
2621 -<?xml version="1.0" encoding="UTF-8"?>
2622 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2623 +<?xml version='1.0' encoding='UTF-8'?>
2624 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2625 <pkgmetadata>
2626 <herd>base-system</herd>
2627 </pkgmetadata>
2628
2629 diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml
2630 index 96a2d58..261fd29 100644
2631 --- a/sys-devel/make/metadata.xml
2632 +++ b/sys-devel/make/metadata.xml
2633 @@ -1,5 +1,5 @@
2634 -<?xml version="1.0" encoding="UTF-8"?>
2635 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2636 +<?xml version='1.0' encoding='UTF-8'?>
2637 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2638 <pkgmetadata>
2639 <herd>base-system</herd>
2640 </pkgmetadata>
2641
2642 diff --git a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml
2643 index 96a2d58..261fd29 100644
2644 --- a/sys-devel/patch/metadata.xml
2645 +++ b/sys-devel/patch/metadata.xml
2646 @@ -1,5 +1,5 @@
2647 -<?xml version="1.0" encoding="UTF-8"?>
2648 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2649 +<?xml version='1.0' encoding='UTF-8'?>
2650 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2651 <pkgmetadata>
2652 <herd>base-system</herd>
2653 </pkgmetadata>
2654
2655 diff --git a/sys-devel/remake/metadata.xml b/sys-devel/remake/metadata.xml
2656 index cd565cc..cbcda7a 100644
2657 --- a/sys-devel/remake/metadata.xml
2658 +++ b/sys-devel/remake/metadata.xml
2659 @@ -1,8 +1,8 @@
2660 -<?xml version="1.0" encoding="UTF-8"?>
2661 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2662 +<?xml version='1.0' encoding='UTF-8'?>
2663 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2664 <pkgmetadata>
2665 - <herd>base-system</herd>
2666 - <upstream>
2667 - <remote-id type="sourceforge">bashdb</remote-id>
2668 - </upstream>
2669 +<herd>base-system</herd>
2670 +<upstream>
2671 + <remote-id type='sourceforge'>bashdb</remote-id>
2672 +</upstream>
2673 </pkgmetadata>
2674
2675 diff --git a/sys-fs/autorun/metadata.xml b/sys-fs/autorun/metadata.xml
2676 index d9b34f0..c3b0990 100644
2677 --- a/sys-fs/autorun/metadata.xml
2678 +++ b/sys-fs/autorun/metadata.xml
2679 @@ -1,8 +1,8 @@
2680 -<?xml version="1.0" encoding="UTF-8"?>
2681 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2682 +<?xml version='1.0' encoding='UTF-8'?>
2683 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2684 <pkgmetadata>
2685 - <herd>base-system</herd>
2686 - <upstream>
2687 - <remote-id type="sourceforge">autorun</remote-id>
2688 - </upstream>
2689 +<herd>base-system</herd>
2690 +<upstream>
2691 + <remote-id type='sourceforge'>autorun</remote-id>
2692 +</upstream>
2693 </pkgmetadata>
2694
2695 diff --git a/sys-fs/cramfs/metadata.xml b/sys-fs/cramfs/metadata.xml
2696 index 5e24375..a2d1105 100644
2697 --- a/sys-fs/cramfs/metadata.xml
2698 +++ b/sys-fs/cramfs/metadata.xml
2699 @@ -1,8 +1,8 @@
2700 -<?xml version="1.0" encoding="UTF-8"?>
2701 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2702 +<?xml version='1.0' encoding='UTF-8'?>
2703 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2704 <pkgmetadata>
2705 - <herd>base-system</herd>
2706 - <upstream>
2707 - <remote-id type="sourceforge">cramfs</remote-id>
2708 - </upstream>
2709 +<herd>base-system</herd>
2710 +<upstream>
2711 + <remote-id type='sourceforge'>cramfs</remote-id>
2712 +</upstream>
2713 </pkgmetadata>
2714
2715 diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
2716 index 17bad91..e674745 100644
2717 --- a/sys-fs/cryptsetup/metadata.xml
2718 +++ b/sys-fs/cryptsetup/metadata.xml
2719 @@ -1,17 +1,17 @@
2720 -<?xml version="1.0" encoding="UTF-8"?>
2721 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2722 +<?xml version='1.0' encoding='UTF-8'?>
2723 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2724 <pkgmetadata>
2725 - <herd>base-system</herd>
2726 - <use>
2727 - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
2728 - <flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
2729 - <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
2730 - <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> crypto backend</flag>
2731 - <flag name="pwquality">Use <pkg>dev-libs/libpwquality</pkg> for password quality checking</flag>
2732 - <flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
2733 - <flag name="reencrypt">Build cryptsetup-reencrypt</flag>
2734 - </use>
2735 - <upstream>
2736 - <remote-id type="google-code">cryptsetup</remote-id>
2737 - </upstream>
2738 +<herd>base-system</herd>
2739 +<use>
2740 + <flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
2741 + <flag name='kernel'>Use kernel crypto backend (mainly for embedded systems)</flag>
2742 + <flag name='nettle'>Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
2743 + <flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> crypto backend</flag>
2744 + <flag name='pwquality'>Use <pkg>dev-libs/libpwquality</pkg> for password quality checking</flag>
2745 + <flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
2746 + <flag name='reencrypt'>Build cryptsetup-reencrypt</flag>
2747 +</use>
2748 +<upstream>
2749 + <remote-id type='google-code'>cryptsetup</remote-id>
2750 +</upstream>
2751 </pkgmetadata>
2752
2753 diff --git a/sys-fs/dd-rescue/metadata.xml b/sys-fs/dd-rescue/metadata.xml
2754 index 96a2d58..261fd29 100644
2755 --- a/sys-fs/dd-rescue/metadata.xml
2756 +++ b/sys-fs/dd-rescue/metadata.xml
2757 @@ -1,5 +1,5 @@
2758 -<?xml version="1.0" encoding="UTF-8"?>
2759 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2760 +<?xml version='1.0' encoding='UTF-8'?>
2761 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2762 <pkgmetadata>
2763 <herd>base-system</herd>
2764 </pkgmetadata>
2765
2766 diff --git a/sys-fs/devfsd/metadata.xml b/sys-fs/devfsd/metadata.xml
2767 index 96a2d58..261fd29 100644
2768 --- a/sys-fs/devfsd/metadata.xml
2769 +++ b/sys-fs/devfsd/metadata.xml
2770 @@ -1,5 +1,5 @@
2771 -<?xml version="1.0" encoding="UTF-8"?>
2772 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2773 +<?xml version='1.0' encoding='UTF-8'?>
2774 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2775 <pkgmetadata>
2776 <herd>base-system</herd>
2777 </pkgmetadata>
2778
2779 diff --git a/sys-fs/dmg2img/metadata.xml b/sys-fs/dmg2img/metadata.xml
2780 index 05318e4..f7d12d1 100644
2781 --- a/sys-fs/dmg2img/metadata.xml
2782 +++ b/sys-fs/dmg2img/metadata.xml
2783 @@ -1,13 +1,12 @@
2784 -<?xml version="1.0" encoding="UTF-8"?>
2785 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2786 +<?xml version='1.0' encoding='UTF-8'?>
2787 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2788 <pkgmetadata>
2789 <herd>base-system</herd>
2790 <maintainer>
2791 -<email>josejx@g.o</email>
2792 -<name>Joseph Jezak</name>
2793 + <email>josejx@g.o</email>
2794 </maintainer>
2795 -<longdescription lang="en">
2796 - dmg2img is an application that can convert .dmg files, popular on Mac OSX
2797 - systems, to HFS+ disk images, suitable for mounting on Linux systems.
2798 +<longdescription lang='en'>
2799 + dmg2img is an application that can convert .dmg files, popular on Mac OSX
2800 + systems, to HFS+ disk images, suitable for mounting on Linux systems.
2801 </longdescription>
2802 </pkgmetadata>
2803
2804 diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
2805 index afead5b..9c4024b 100644
2806 --- a/sys-fs/dosfstools/metadata.xml
2807 +++ b/sys-fs/dosfstools/metadata.xml
2808 @@ -1,8 +1,8 @@
2809 -<?xml version="1.0" encoding="UTF-8"?>
2810 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2811 +<?xml version='1.0' encoding='UTF-8'?>
2812 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2813 <pkgmetadata>
2814 - <herd>base-system</herd>
2815 - <upstream>
2816 - <remote-id type="github">dosfstools/dosfstools</remote-id>
2817 - </upstream>
2818 +<herd>base-system</herd>
2819 +<upstream>
2820 + <remote-id type='github'>dosfstools/dosfstools</remote-id>
2821 +</upstream>
2822 </pkgmetadata>
2823
2824 diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
2825 index 14bdacd..e12e683 100644
2826 --- a/sys-fs/e2fsprogs/metadata.xml
2827 +++ b/sys-fs/e2fsprogs/metadata.xml
2828 @@ -1,9 +1,9 @@
2829 -<?xml version="1.0" encoding="UTF-8"?>
2830 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2831 +<?xml version='1.0' encoding='UTF-8'?>
2832 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2833 <pkgmetadata>
2834 - <herd>base-system</herd>
2835 - <upstream>
2836 - <remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
2837 - <remote-id type="sourceforge">e2fsprogs</remote-id>
2838 - </upstream>
2839 +<herd>base-system</herd>
2840 +<upstream>
2841 + <remote-id type='cpe'>cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
2842 + <remote-id type='sourceforge'>e2fsprogs</remote-id>
2843 +</upstream>
2844 </pkgmetadata>
2845
2846 diff --git a/sys-fs/e2tools/metadata.xml b/sys-fs/e2tools/metadata.xml
2847 index 96a2d58..261fd29 100644
2848 --- a/sys-fs/e2tools/metadata.xml
2849 +++ b/sys-fs/e2tools/metadata.xml
2850 @@ -1,5 +1,5 @@
2851 -<?xml version="1.0" encoding="UTF-8"?>
2852 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2853 +<?xml version='1.0' encoding='UTF-8'?>
2854 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2855 <pkgmetadata>
2856 <herd>base-system</herd>
2857 </pkgmetadata>
2858
2859 diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
2860 index c1867dc..bfe6631 100644
2861 --- a/sys-fs/exfat-utils/metadata.xml
2862 +++ b/sys-fs/exfat-utils/metadata.xml
2863 @@ -1,17 +1,15 @@
2864 -<?xml version="1.0" encoding="UTF-8"?>
2865 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2866 +<?xml version='1.0' encoding='UTF-8'?>
2867 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2868 <pkgmetadata>
2869 - <herd>base-system</herd>
2870 - <maintainer>
2871 - <email>ssuominen@g.o</email>
2872 - <name>Samuli Suominen</name>
2873 - </maintainer>
2874 - <maintainer>
2875 - <email>floppym@g.o</email>
2876 - <name>Mike Gilbert</name>
2877 - </maintainer>
2878 - <upstream>
2879 - <remote-id type="google-code">exfat</remote-id>
2880 - <remote-id type="github">relan/exfat</remote-id>
2881 - </upstream>
2882 +<herd>base-system</herd>
2883 +<maintainer>
2884 + <email>ssuominen@g.o</email>
2885 +</maintainer>
2886 +<maintainer>
2887 + <email>floppym@g.o</email>
2888 +</maintainer>
2889 +<upstream>
2890 + <remote-id type='google-code'>exfat</remote-id>
2891 + <remote-id type='github'>relan/exfat</remote-id>
2892 +</upstream>
2893 </pkgmetadata>
2894
2895 diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml
2896 index 3af2005..71eea01 100644
2897 --- a/sys-fs/extundelete/metadata.xml
2898 +++ b/sys-fs/extundelete/metadata.xml
2899 @@ -1,12 +1,11 @@
2900 -<?xml version="1.0" encoding="UTF-8"?>
2901 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2902 +<?xml version='1.0' encoding='UTF-8'?>
2903 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2904 <pkgmetadata>
2905 - <herd>base-system</herd>
2906 - <maintainer>
2907 - <email>ssuominen@g.o</email>
2908 - <name>Samuli Suominen</name>
2909 - </maintainer>
2910 - <upstream>
2911 - <remote-id type="sourceforge">extundelete</remote-id>
2912 - </upstream>
2913 +<herd>base-system</herd>
2914 +<maintainer>
2915 + <email>ssuominen@g.o</email>
2916 +</maintainer>
2917 +<upstream>
2918 + <remote-id type='sourceforge'>extundelete</remote-id>
2919 +</upstream>
2920 </pkgmetadata>
2921
2922 diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
2923 index c1867dc..bfe6631 100644
2924 --- a/sys-fs/fuse-exfat/metadata.xml
2925 +++ b/sys-fs/fuse-exfat/metadata.xml
2926 @@ -1,17 +1,15 @@
2927 -<?xml version="1.0" encoding="UTF-8"?>
2928 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2929 +<?xml version='1.0' encoding='UTF-8'?>
2930 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2931 <pkgmetadata>
2932 - <herd>base-system</herd>
2933 - <maintainer>
2934 - <email>ssuominen@g.o</email>
2935 - <name>Samuli Suominen</name>
2936 - </maintainer>
2937 - <maintainer>
2938 - <email>floppym@g.o</email>
2939 - <name>Mike Gilbert</name>
2940 - </maintainer>
2941 - <upstream>
2942 - <remote-id type="google-code">exfat</remote-id>
2943 - <remote-id type="github">relan/exfat</remote-id>
2944 - </upstream>
2945 +<herd>base-system</herd>
2946 +<maintainer>
2947 + <email>ssuominen@g.o</email>
2948 +</maintainer>
2949 +<maintainer>
2950 + <email>floppym@g.o</email>
2951 +</maintainer>
2952 +<upstream>
2953 + <remote-id type='google-code'>exfat</remote-id>
2954 + <remote-id type='github'>relan/exfat</remote-id>
2955 +</upstream>
2956 </pkgmetadata>
2957
2958 diff --git a/sys-fs/lde/metadata.xml b/sys-fs/lde/metadata.xml
2959 index 3a3de54..cc3cfd6 100644
2960 --- a/sys-fs/lde/metadata.xml
2961 +++ b/sys-fs/lde/metadata.xml
2962 @@ -1,8 +1,8 @@
2963 -<?xml version="1.0" encoding="UTF-8"?>
2964 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2965 +<?xml version='1.0' encoding='UTF-8'?>
2966 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2967 <pkgmetadata>
2968 - <herd>base-system</herd>
2969 - <upstream>
2970 - <remote-id type="sourceforge">lde</remote-id>
2971 - </upstream>
2972 +<herd>base-system</herd>
2973 +<upstream>
2974 + <remote-id type='sourceforge'>lde</remote-id>
2975 +</upstream>
2976 </pkgmetadata>
2977
2978 diff --git a/sys-fs/lsscsi/metadata.xml b/sys-fs/lsscsi/metadata.xml
2979 index 96a2d58..261fd29 100644
2980 --- a/sys-fs/lsscsi/metadata.xml
2981 +++ b/sys-fs/lsscsi/metadata.xml
2982 @@ -1,5 +1,5 @@
2983 -<?xml version="1.0" encoding="UTF-8"?>
2984 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2985 +<?xml version='1.0' encoding='UTF-8'?>
2986 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
2987 <pkgmetadata>
2988 <herd>base-system</herd>
2989 </pkgmetadata>
2990
2991 diff --git a/sys-fs/lufs/metadata.xml b/sys-fs/lufs/metadata.xml
2992 index 65b57aa..ef76d02 100644
2993 --- a/sys-fs/lufs/metadata.xml
2994 +++ b/sys-fs/lufs/metadata.xml
2995 @@ -1,8 +1,8 @@
2996 -<?xml version="1.0" encoding="UTF-8"?>
2997 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2998 +<?xml version='1.0' encoding='UTF-8'?>
2999 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3000 <pkgmetadata>
3001 - <herd>base-system</herd>
3002 - <upstream>
3003 - <remote-id type="sourceforge">lufs</remote-id>
3004 - </upstream>
3005 +<herd>base-system</herd>
3006 +<upstream>
3007 + <remote-id type='sourceforge'>lufs</remote-id>
3008 +</upstream>
3009 </pkgmetadata>
3010
3011 diff --git a/sys-fs/mdadm/metadata.xml b/sys-fs/mdadm/metadata.xml
3012 index 96a2d58..261fd29 100644
3013 --- a/sys-fs/mdadm/metadata.xml
3014 +++ b/sys-fs/mdadm/metadata.xml
3015 @@ -1,5 +1,5 @@
3016 -<?xml version="1.0" encoding="UTF-8"?>
3017 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3018 +<?xml version='1.0' encoding='UTF-8'?>
3019 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3020 <pkgmetadata>
3021 <herd>base-system</herd>
3022 </pkgmetadata>
3023
3024 diff --git a/sys-fs/mtools/metadata.xml b/sys-fs/mtools/metadata.xml
3025 index 96a2d58..261fd29 100644
3026 --- a/sys-fs/mtools/metadata.xml
3027 +++ b/sys-fs/mtools/metadata.xml
3028 @@ -1,5 +1,5 @@
3029 -<?xml version="1.0" encoding="UTF-8"?>
3030 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3031 +<?xml version='1.0' encoding='UTF-8'?>
3032 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3033 <pkgmetadata>
3034 <herd>base-system</herd>
3035 </pkgmetadata>
3036
3037 diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
3038 index 96a2d58..261fd29 100644
3039 --- a/sys-fs/multipath-tools/metadata.xml
3040 +++ b/sys-fs/multipath-tools/metadata.xml
3041 @@ -1,5 +1,5 @@
3042 -<?xml version="1.0" encoding="UTF-8"?>
3043 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3044 +<?xml version='1.0' encoding='UTF-8'?>
3045 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3046 <pkgmetadata>
3047 <herd>base-system</herd>
3048 </pkgmetadata>
3049
3050 diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
3051 index 1f0868a..9f6d59b 100644
3052 --- a/sys-fs/ntfs3g/metadata.xml
3053 +++ b/sys-fs/ntfs3g/metadata.xml
3054 @@ -1,29 +1,29 @@
3055 -<?xml version="1.0" encoding="UTF-8"?>
3056 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3057 +<?xml version='1.0' encoding='UTF-8'?>
3058 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3059 <pkgmetadata>
3060 - <herd>base-system</herd>
3061 - <maintainer>
3062 - <email>chutzpah@g.o</email>
3063 - <name>Patrick McLean</name>
3064 - </maintainer>
3065 - <maintainer>
3066 - <email>ssuominen@g.o</email>
3067 - <name>Samuli Suominen</name>
3068 - </maintainer>
3069 - <longdescription lang="en">
3070 +<herd>base-system</herd>
3071 +<maintainer>
3072 + <email>chutzpah@g.o</email>
3073 +</maintainer>
3074 +<maintainer>
3075 + <email>ssuominen@g.o</email>
3076 +</maintainer>
3077 +<longdescription lang='en'>
3078 The ntfs-3g driver is an open source, GPL licensed, third generation Linux
3079 NTFS driver for 32-bit, little-endian architectures which was implemented
3080 by the Linux-NTFS project. It provides full read-write access to NTFS,
3081 excluding access to encrypted files, writing compressed files, changing
3082 file ownership, access right.
3083 - </longdescription>
3084 - <use>
3085 - <flag name='external-fuse'>Use external FUSE library instead of internal
3086 - one. Must be disabled for unprivileged mounting to work.</flag>
3087 - <flag name='ntfsdecrypt'>Build and install the ntfsdecrypt application.</flag>
3088 - <flag name='ntfsprogs'>Include internal version of ntfsprogs.</flag>
3089 - </use>
3090 - <upstream>
3091 - <remote-id type="cpe">cpe:/a:ntfs-3g:ntfs-3g</remote-id>
3092 - </upstream>
3093 +</longdescription>
3094 +<use>
3095 + <flag name='external-fuse'>
3096 + Use external FUSE library instead of internal one. Must be disabled
3097 + for unprivileged mounting to work.
3098 + </flag>
3099 + <flag name='ntfsdecrypt'>Build and install the ntfsdecrypt application.</flag>
3100 + <flag name='ntfsprogs'>Include internal version of ntfsprogs.</flag>
3101 +</use>
3102 +<upstream>
3103 + <remote-id type='cpe'>cpe:/a:ntfs-3g:ntfs-3g</remote-id>
3104 +</upstream>
3105 </pkgmetadata>
3106
3107 diff --git a/sys-fs/progsreiserfs/metadata.xml b/sys-fs/progsreiserfs/metadata.xml
3108 index 07c910b..c529daf 100644
3109 --- a/sys-fs/progsreiserfs/metadata.xml
3110 +++ b/sys-fs/progsreiserfs/metadata.xml
3111 @@ -1,9 +1,9 @@
3112 -<?xml version="1.0" encoding="UTF-8"?>
3113 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3114 +<?xml version='1.0' encoding='UTF-8'?>
3115 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3116 <pkgmetadata>
3117 <herd>base-system</herd>
3118 <maintainer>
3119 - <email>robbat2@g.o</email>
3120 - <description>Maintainer as part of base-system work. Assign bugs to base-system.</description>
3121 + <email>robbat2@g.o</email>
3122 + <description>Maintainer as part of base-system work. Assign bugs to base-system.</description>
3123 </maintainer>
3124 </pkgmetadata>
3125
3126 diff --git a/sys-fs/quota/metadata.xml b/sys-fs/quota/metadata.xml
3127 index 12e2a6c..2374242 100644
3128 --- a/sys-fs/quota/metadata.xml
3129 +++ b/sys-fs/quota/metadata.xml
3130 @@ -1,12 +1,12 @@
3131 -<?xml version="1.0" encoding="UTF-8"?>
3132 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3133 +<?xml version='1.0' encoding='UTF-8'?>
3134 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3135 <pkgmetadata>
3136 - <herd>base-system</herd>
3137 - <use>
3138 - <flag name="netlink">Compile daemon receiving quota messages via netlink</flag>
3139 - <flag name="rpc">Enable quota interaction via RPC</flag>
3140 - </use>
3141 - <upstream>
3142 - <remote-id type="sourceforge">linuxquota</remote-id>
3143 - </upstream>
3144 +<herd>base-system</herd>
3145 +<use>
3146 + <flag name='netlink'>Compile daemon receiving quota messages via netlink</flag>
3147 + <flag name='rpc'>Enable quota interaction via RPC</flag>
3148 +</use>
3149 +<upstream>
3150 + <remote-id type='sourceforge'>linuxquota</remote-id>
3151 +</upstream>
3152 </pkgmetadata>
3153
3154 diff --git a/sys-fs/quotatool/metadata.xml b/sys-fs/quotatool/metadata.xml
3155 index 96a2d58..261fd29 100644
3156 --- a/sys-fs/quotatool/metadata.xml
3157 +++ b/sys-fs/quotatool/metadata.xml
3158 @@ -1,5 +1,5 @@
3159 -<?xml version="1.0" encoding="UTF-8"?>
3160 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3161 +<?xml version='1.0' encoding='UTF-8'?>
3162 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3163 <pkgmetadata>
3164 <herd>base-system</herd>
3165 </pkgmetadata>
3166
3167 diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml
3168 index f1ece2e..9b1c3ca 100644
3169 --- a/sys-fs/reiser4progs/metadata.xml
3170 +++ b/sys-fs/reiser4progs/metadata.xml
3171 @@ -1,11 +1,11 @@
3172 -<?xml version="1.0" encoding="UTF-8"?>
3173 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3174 +<?xml version='1.0' encoding='UTF-8'?>
3175 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3176 <pkgmetadata>
3177 - <herd>base-system</herd>
3178 - <longdescription>
3179 +<herd>base-system</herd>
3180 +<longdescription lang='en'>
3181 This is a library for reiser4 filesystem access and manipulation.
3182 </longdescription>
3183 - <upstream>
3184 - <remote-id type="sourceforge">reiser4</remote-id>
3185 - </upstream>
3186 +<upstream>
3187 + <remote-id type='sourceforge'>reiser4</remote-id>
3188 +</upstream>
3189 </pkgmetadata>
3190
3191 diff --git a/sys-fs/reiserfsprogs/metadata.xml b/sys-fs/reiserfsprogs/metadata.xml
3192 index 96a2d58..261fd29 100644
3193 --- a/sys-fs/reiserfsprogs/metadata.xml
3194 +++ b/sys-fs/reiserfsprogs/metadata.xml
3195 @@ -1,5 +1,5 @@
3196 -<?xml version="1.0" encoding="UTF-8"?>
3197 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3198 +<?xml version='1.0' encoding='UTF-8'?>
3199 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3200 <pkgmetadata>
3201 <herd>base-system</herd>
3202 </pkgmetadata>
3203
3204 diff --git a/sys-fs/static-dev/metadata.xml b/sys-fs/static-dev/metadata.xml
3205 index 96a2d58..261fd29 100644
3206 --- a/sys-fs/static-dev/metadata.xml
3207 +++ b/sys-fs/static-dev/metadata.xml
3208 @@ -1,5 +1,5 @@
3209 -<?xml version="1.0" encoding="UTF-8"?>
3210 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3211 +<?xml version='1.0' encoding='UTF-8'?>
3212 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3213 <pkgmetadata>
3214 <herd>base-system</herd>
3215 </pkgmetadata>
3216
3217 diff --git a/sys-fs/sysfsutils/metadata.xml b/sys-fs/sysfsutils/metadata.xml
3218 index 9bf2cea..365a4d6 100644
3219 --- a/sys-fs/sysfsutils/metadata.xml
3220 +++ b/sys-fs/sysfsutils/metadata.xml
3221 @@ -1,12 +1,11 @@
3222 -<?xml version="1.0" encoding="UTF-8"?>
3223 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3224 +<?xml version='1.0' encoding='UTF-8'?>
3225 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3226 <pkgmetadata>
3227 - <herd>base-system</herd>
3228 - <maintainer>
3229 - <email>gregkh@g.o</email>
3230 - <name>Greg Kroah-Hartman</name>
3231 - </maintainer>
3232 - <upstream>
3233 - <remote-id type="sourceforge">linux-diag</remote-id>
3234 - </upstream>
3235 +<herd>base-system</herd>
3236 +<maintainer>
3237 + <email>gregkh@g.o</email>
3238 +</maintainer>
3239 +<upstream>
3240 + <remote-id type='sourceforge'>linux-diag</remote-id>
3241 +</upstream>
3242 </pkgmetadata>
3243
3244 diff --git a/sys-fs/udftools/metadata.xml b/sys-fs/udftools/metadata.xml
3245 index acbd888..7416e3f 100644
3246 --- a/sys-fs/udftools/metadata.xml
3247 +++ b/sys-fs/udftools/metadata.xml
3248 @@ -1,8 +1,8 @@
3249 -<?xml version="1.0" encoding="UTF-8"?>
3250 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3251 +<?xml version='1.0' encoding='UTF-8'?>
3252 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3253 <pkgmetadata>
3254 - <herd>base-system</herd>
3255 - <upstream>
3256 - <remote-id type="sourceforge">linux-udf</remote-id>
3257 - </upstream>
3258 +<herd>base-system</herd>
3259 +<upstream>
3260 + <remote-id type='sourceforge'>linux-udf</remote-id>
3261 +</upstream>
3262 </pkgmetadata>
3263
3264 diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
3265 index 96a2d58..261fd29 100644
3266 --- a/sys-fs/xfsdump/metadata.xml
3267 +++ b/sys-fs/xfsdump/metadata.xml
3268 @@ -1,5 +1,5 @@
3269 -<?xml version="1.0" encoding="UTF-8"?>
3270 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3271 +<?xml version='1.0' encoding='UTF-8'?>
3272 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3273 <pkgmetadata>
3274 <herd>base-system</herd>
3275 </pkgmetadata>
3276
3277 diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
3278 index 96a2d58..261fd29 100644
3279 --- a/sys-fs/xfsprogs/metadata.xml
3280 +++ b/sys-fs/xfsprogs/metadata.xml
3281 @@ -1,5 +1,5 @@
3282 -<?xml version="1.0" encoding="UTF-8"?>
3283 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3284 +<?xml version='1.0' encoding='UTF-8'?>
3285 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3286 <pkgmetadata>
3287 <herd>base-system</herd>
3288 </pkgmetadata>
3289
3290 diff --git a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml
3291 index 60405e4..3d1bb00 100644
3292 --- a/sys-libs/cracklib/metadata.xml
3293 +++ b/sys-libs/cracklib/metadata.xml
3294 @@ -1,9 +1,9 @@
3295 -<?xml version="1.0" encoding="UTF-8"?>
3296 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3297 +<?xml version='1.0' encoding='UTF-8'?>
3298 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3299 <pkgmetadata>
3300 - <herd>base-system</herd>
3301 - <upstream>
3302 - <remote-id type="sourceforge">cracklib</remote-id>
3303 - <remote-id type="github">cracklib/cracklib</remote-id>
3304 - </upstream>
3305 +<herd>base-system</herd>
3306 +<upstream>
3307 + <remote-id type='sourceforge'>cracklib</remote-id>
3308 + <remote-id type='github'>cracklib/cracklib</remote-id>
3309 +</upstream>
3310 </pkgmetadata>
3311
3312 diff --git a/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml
3313 index 0f33890..2a90f89 100644
3314 --- a/sys-libs/db/metadata.xml
3315 +++ b/sys-libs/db/metadata.xml
3316 @@ -1,22 +1,26 @@
3317 -<?xml version="1.0" encoding="UTF-8"?>
3318 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3319 +<?xml version='1.0' encoding='UTF-8'?>
3320 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3321 <pkgmetadata>
3322 - <herd>base-system</herd>
3323 - <longdescription>The Berkeley Database (Berkeley DB) is a programmatic toolkit
3324 +<herd>base-system</herd>
3325 +<longdescription>
3326 +The Berkeley Database (Berkeley DB) is a programmatic toolkit
3327 that provides embedded database support for both traditional and client/server
3328 applications. Berkeley DB includes b+tree, queue, extended linear hashing,
3329 fixed, and variable-length record access methods, transactions, locking,
3330 logging, shared memory caching and database recovery. DB supports C, C++, Java,
3331 and Perl APIs. DB is available for a wide variety of UNIX platforms as well as
3332 -Windows NT and Windows '95 (MSVC 4, 5 and 6).</longdescription>
3333 - <longdescription lang="nl">De Berkeley Database is een programmatische toolkit
3334 +Windows NT and Windows '95 (MSVC 4, 5 and 6).
3335 +</longdescription>
3336 +<longdescription lang='nl'>
3337 +De Berkeley Database is een programmatische toolkit
3338 die embedded database support verzorg voor en traditionele en client/server
3339 applicaties. Berkeley DB bevat b+tree, rij, uitgebreide lineaire hashing, vaste
3340 en variabele lengte record toegangsmethoden, transacties, locking, logging,
3341 gedeeld geheugen caching en database herstel. DB ondersteund C, C++, Java en
3342 Perl API's. DB is beschikbaar voor veel UNIX platformen en
3343 -Windows.</longdescription>
3344 - <use>
3345 - <flag name="rpc">Enable rpc client/server</flag>
3346 - </use>
3347 +Windows.
3348 +</longdescription>
3349 +<use>
3350 + <flag name='rpc'>Enable rpc client/server</flag>
3351 +</use>
3352 </pkgmetadata>
3353
3354 diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
3355 index ab7b3fa..53c2f64 100644
3356 --- a/sys-libs/e2fsprogs-libs/metadata.xml
3357 +++ b/sys-libs/e2fsprogs-libs/metadata.xml
3358 @@ -1,8 +1,8 @@
3359 -<?xml version="1.0" encoding="UTF-8"?>
3360 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3361 +<?xml version='1.0' encoding='UTF-8'?>
3362 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3363 <pkgmetadata>
3364 - <herd>base-system</herd>
3365 - <upstream>
3366 - <remote-id type="sourceforge">e2fsprogs</remote-id>
3367 - </upstream>
3368 +<herd>base-system</herd>
3369 +<upstream>
3370 + <remote-id type='sourceforge'>e2fsprogs</remote-id>
3371 +</upstream>
3372 </pkgmetadata>
3373
3374 diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
3375 index 07b3785..e5a9582 100644
3376 --- a/sys-libs/gdbm/metadata.xml
3377 +++ b/sys-libs/gdbm/metadata.xml
3378 @@ -1,9 +1,9 @@
3379 -<?xml version="1.0" encoding="UTF-8"?>
3380 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3381 +<?xml version='1.0' encoding='UTF-8'?>
3382 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3383 <pkgmetadata>
3384 <herd>base-system</herd>
3385 <use>
3386 - <flag name='berkdb'>enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
3387 - <flag name='exporter'>enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
3388 + <flag name='berkdb'>enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
3389 + <flag name='exporter'>enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
3390 </use>
3391 </pkgmetadata>
3392
3393 diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml
3394 index 96a2d58..261fd29 100644
3395 --- a/sys-libs/gpm/metadata.xml
3396 +++ b/sys-libs/gpm/metadata.xml
3397 @@ -1,5 +1,5 @@
3398 -<?xml version="1.0" encoding="UTF-8"?>
3399 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3400 +<?xml version='1.0' encoding='UTF-8'?>
3401 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3402 <pkgmetadata>
3403 <herd>base-system</herd>
3404 </pkgmetadata>
3405
3406 diff --git a/sys-libs/lib-compat/metadata.xml b/sys-libs/lib-compat/metadata.xml
3407 index 96a2d58..261fd29 100644
3408 --- a/sys-libs/lib-compat/metadata.xml
3409 +++ b/sys-libs/lib-compat/metadata.xml
3410 @@ -1,5 +1,5 @@
3411 -<?xml version="1.0" encoding="UTF-8"?>
3412 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3413 +<?xml version='1.0' encoding='UTF-8'?>
3414 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3415 <pkgmetadata>
3416 <herd>base-system</herd>
3417 </pkgmetadata>
3418
3419 diff --git a/sys-libs/libaal/metadata.xml b/sys-libs/libaal/metadata.xml
3420 index bf71b94..3b27564 100644
3421 --- a/sys-libs/libaal/metadata.xml
3422 +++ b/sys-libs/libaal/metadata.xml
3423 @@ -1,12 +1,12 @@
3424 -<?xml version="1.0" encoding="UTF-8"?>
3425 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3426 +<?xml version='1.0' encoding='UTF-8'?>
3427 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3428 <pkgmetadata>
3429 - <herd>base-system</herd>
3430 - <longdescription>
3431 +<herd>base-system</herd>
3432 +<longdescription>
3433 This is a library, that provides application abstraction mechanism.
3434 It includes device abstraction, libc independence code, etc.
3435 </longdescription>
3436 - <upstream>
3437 - <remote-id type="sourceforge">reiser4</remote-id>
3438 - </upstream>
3439 +<upstream>
3440 + <remote-id type='sourceforge'>reiser4</remote-id>
3441 +</upstream>
3442 </pkgmetadata>
3443
3444 diff --git a/sys-libs/libavc1394/metadata.xml b/sys-libs/libavc1394/metadata.xml
3445 index 5d6da8b..c65005e 100644
3446 --- a/sys-libs/libavc1394/metadata.xml
3447 +++ b/sys-libs/libavc1394/metadata.xml
3448 @@ -1,8 +1,8 @@
3449 -<?xml version="1.0" encoding="UTF-8"?>
3450 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3451 +<?xml version='1.0' encoding='UTF-8'?>
3452 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3453 <pkgmetadata>
3454 - <herd>base-system</herd>
3455 - <upstream>
3456 - <remote-id type="sourceforge">libavc1394</remote-id>
3457 - </upstream>
3458 +<herd>base-system</herd>
3459 +<upstream>
3460 + <remote-id type='sourceforge'>libavc1394</remote-id>
3461 +</upstream>
3462 </pkgmetadata>
3463
3464 diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
3465 index 703c252..b1eb865 100644
3466 --- a/sys-libs/libcap-ng/metadata.xml
3467 +++ b/sys-libs/libcap-ng/metadata.xml
3468 @@ -1,10 +1,11 @@
3469 <?xml version = '1.0' encoding = 'UTF-8'?>
3470 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3471 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3472 <pkgmetadata>
3473 - <herd>base-system</herd>
3474 - <longdescription>The libcap-ng library is intended to make programming with
3475 - POSIX capabilities much easier than the traditional libcap library. It
3476 - includes utilities that can analyse all currently running applications and
3477 - print out any capabilities and whether or not it has an open ended bounding
3478 - set.</longdescription>
3479 +<herd>base-system</herd>
3480 +<longdescription>
3481 + The libcap-ng library is intended to make programming with POSIX
3482 + capabilities much easier than the traditional libcap library. It includes
3483 + utilities that can analyse all currently running applications and print
3484 + out any capabilities and whether or not it has an open ended bounding set.
3485 +</longdescription>
3486 </pkgmetadata>
3487
3488 diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
3489 index 96a2d58..261fd29 100644
3490 --- a/sys-libs/libcap/metadata.xml
3491 +++ b/sys-libs/libcap/metadata.xml
3492 @@ -1,5 +1,5 @@
3493 -<?xml version="1.0" encoding="UTF-8"?>
3494 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3495 +<?xml version='1.0' encoding='UTF-8'?>
3496 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3497 <pkgmetadata>
3498 <herd>base-system</herd>
3499 </pkgmetadata>
3500
3501 diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml
3502 index d60aa45..d1332ae 100644
3503 --- a/sys-libs/libhugetlbfs/metadata.xml
3504 +++ b/sys-libs/libhugetlbfs/metadata.xml
3505 @@ -1,9 +1,9 @@
3506 <?xml version='1.0' encoding='UTF-8'?>
3507 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3508 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3509 <pkgmetadata>
3510 - <herd>base-system</herd>
3511 - <upstream>
3512 - <remote-id type="github">libhugetlbfs/libhugetlbfs</remote-id>
3513 - <remote-id type="sourceforge">libhugetlbfs</remote-id>
3514 - </upstream>
3515 +<herd>base-system</herd>
3516 +<upstream>
3517 + <remote-id type='github'>libhugetlbfs/libhugetlbfs</remote-id>
3518 + <remote-id type='sourceforge'>libhugetlbfs</remote-id>
3519 +</upstream>
3520 </pkgmetadata>
3521
3522 diff --git a/sys-libs/libieee1284/metadata.xml b/sys-libs/libieee1284/metadata.xml
3523 index bec1543..d73d544 100644
3524 --- a/sys-libs/libieee1284/metadata.xml
3525 +++ b/sys-libs/libieee1284/metadata.xml
3526 @@ -1,8 +1,8 @@
3527 -<?xml version="1.0" encoding="UTF-8"?>
3528 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3529 +<?xml version='1.0' encoding='UTF-8'?>
3530 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3531 <pkgmetadata>
3532 - <herd>base-system</herd>
3533 - <upstream>
3534 - <remote-id type="sourceforge">libieee1284</remote-id>
3535 - </upstream>
3536 +<herd>base-system</herd>
3537 +<upstream>
3538 + <remote-id type='sourceforge'>libieee1284</remote-id>
3539 +</upstream>
3540 </pkgmetadata>
3541
3542 diff --git a/sys-libs/libraw1394/metadata.xml b/sys-libs/libraw1394/metadata.xml
3543 index 96a2d58..261fd29 100644
3544 --- a/sys-libs/libraw1394/metadata.xml
3545 +++ b/sys-libs/libraw1394/metadata.xml
3546 @@ -1,5 +1,5 @@
3547 -<?xml version="1.0" encoding="UTF-8"?>
3548 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3549 +<?xml version='1.0' encoding='UTF-8'?>
3550 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3551 <pkgmetadata>
3552 <herd>base-system</herd>
3553 </pkgmetadata>
3554
3555 diff --git a/sys-libs/libtermcap-compat/metadata.xml b/sys-libs/libtermcap-compat/metadata.xml
3556 index 96a2d58..261fd29 100644
3557 --- a/sys-libs/libtermcap-compat/metadata.xml
3558 +++ b/sys-libs/libtermcap-compat/metadata.xml
3559 @@ -1,5 +1,5 @@
3560 -<?xml version="1.0" encoding="UTF-8"?>
3561 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3562 +<?xml version='1.0' encoding='UTF-8'?>
3563 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3564 <pkgmetadata>
3565 <herd>base-system</herd>
3566 </pkgmetadata>
3567
3568 diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
3569 index 5aafc10..12f6cb3 100644
3570 --- a/sys-libs/libutempter/metadata.xml
3571 +++ b/sys-libs/libutempter/metadata.xml
3572 @@ -1,6 +1,6 @@
3573 -<?xml version="1.0" encoding="UTF-8"?>
3574 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3575 +<?xml version='1.0' encoding='UTF-8'?>
3576 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3577 <pkgmetadata>
3578 - <herd>base-system</herd>
3579 - <herd>x11</herd>
3580 +<herd>base-system</herd>
3581 +<herd>x11</herd>
3582 </pkgmetadata>
3583
3584 diff --git a/sys-libs/lrmi/metadata.xml b/sys-libs/lrmi/metadata.xml
3585 index c5ea2bc..5a6e7b1 100644
3586 --- a/sys-libs/lrmi/metadata.xml
3587 +++ b/sys-libs/lrmi/metadata.xml
3588 @@ -1,8 +1,8 @@
3589 -<?xml version="1.0" encoding="UTF-8"?>
3590 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3591 +<?xml version='1.0' encoding='UTF-8'?>
3592 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3593 <pkgmetadata>
3594 - <herd>base-system</herd>
3595 - <upstream>
3596 - <remote-id type="sourceforge">lrmi</remote-id>
3597 - </upstream>
3598 +<herd>base-system</herd>
3599 +<upstream>
3600 + <remote-id type='sourceforge'>lrmi</remote-id>
3601 +</upstream>
3602 </pkgmetadata>
3603
3604 diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
3605 index e136782..c11de62 100644
3606 --- a/sys-libs/ncurses/metadata.xml
3607 +++ b/sys-libs/ncurses/metadata.xml
3608 @@ -1,14 +1,14 @@
3609 -<?xml version="1.0" encoding="UTF-8"?>
3610 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3611 +<?xml version='1.0' encoding='UTF-8'?>
3612 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3613 <pkgmetadata>
3614 - <herd>base-system</herd>
3615 - <use>
3616 - <flag name="ada">Add bindings for the ADA programming language</flag>
3617 - <flag name="tinfo">
3618 +<herd>base-system</herd>
3619 +<use>
3620 + <flag name='ada'>Add bindings for the ADA programming language</flag>
3621 + <flag name='tinfo'>
3622 Build curses library (libncurses) sep from the low-level terminfo
3623 library (libtinfo) -- usually needed only for binary packages -- but
3624 it is binary compatible in either mode
3625 </flag>
3626 - <flag name="trace">Enable test trace() support in ncurses calls</flag>
3627 - </use>
3628 + <flag name='trace'>Enable test trace() support in ncurses calls</flag>
3629 +</use>
3630 </pkgmetadata>
3631
3632 diff --git a/sys-libs/nss-db/metadata.xml b/sys-libs/nss-db/metadata.xml
3633 index 96a2d58..261fd29 100644
3634 --- a/sys-libs/nss-db/metadata.xml
3635 +++ b/sys-libs/nss-db/metadata.xml
3636 @@ -1,5 +1,5 @@
3637 -<?xml version="1.0" encoding="UTF-8"?>
3638 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3639 +<?xml version='1.0' encoding='UTF-8'?>
3640 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3641 <pkgmetadata>
3642 <herd>base-system</herd>
3643 </pkgmetadata>
3644
3645 diff --git a/sys-libs/pwdb/metadata.xml b/sys-libs/pwdb/metadata.xml
3646 index 96a2d58..261fd29 100644
3647 --- a/sys-libs/pwdb/metadata.xml
3648 +++ b/sys-libs/pwdb/metadata.xml
3649 @@ -1,5 +1,5 @@
3650 -<?xml version="1.0" encoding="UTF-8"?>
3651 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3652 +<?xml version='1.0' encoding='UTF-8'?>
3653 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3654 <pkgmetadata>
3655 <herd>base-system</herd>
3656 </pkgmetadata>
3657
3658 diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
3659 index 6172776..cb211eb 100644
3660 --- a/sys-libs/readline/metadata.xml
3661 +++ b/sys-libs/readline/metadata.xml
3662 @@ -1,8 +1,8 @@
3663 -<?xml version="1.0" encoding="UTF-8"?>
3664 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3665 +<?xml version='1.0' encoding='UTF-8'?>
3666 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3667 <pkgmetadata>
3668 - <herd>base-system</herd>
3669 - <use>
3670 - <flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
3671 - </use>
3672 +<herd>base-system</herd>
3673 +<use>
3674 + <flag name='utils'>Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
3675 +</use>
3676 </pkgmetadata>
3677
3678 diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
3679 index b2dbe04..0b0bdfe 100644
3680 --- a/sys-libs/zlib/metadata.xml
3681 +++ b/sys-libs/zlib/metadata.xml
3682 @@ -1,11 +1,11 @@
3683 -<?xml version="1.0" encoding="UTF-8"?>
3684 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3685 +<?xml version='1.0' encoding='UTF-8'?>
3686 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3687 <pkgmetadata>
3688 - <herd>base-system</herd>
3689 - <use>
3690 - <flag name="minizip">include the minizip library for quick and dirty zip extraction</flag>
3691 - </use>
3692 - <upstream>
3693 - <remote-id type="cpe">cpe:/a:gnu:zlib</remote-id>
3694 - </upstream>
3695 +<herd>base-system</herd>
3696 +<use>
3697 + <flag name='minizip'>include the minizip library for quick and dirty zip extraction</flag>
3698 +</use>
3699 +<upstream>
3700 + <remote-id type='cpe'>cpe:/a:gnu:zlib</remote-id>
3701 +</upstream>
3702 </pkgmetadata>
3703
3704 diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
3705 index ceee693..23aba6e 100644
3706 --- a/sys-power/apcupsd/metadata.xml
3707 +++ b/sys-power/apcupsd/metadata.xml
3708 @@ -1,11 +1,11 @@
3709 -<?xml version="1.0" encoding="UTF-8"?>
3710 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3711 +<?xml version='1.0' encoding='UTF-8'?>
3712 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3713 <pkgmetadata>
3714 - <maintainer>
3715 - <email>mattm@g.o</email>
3716 - <name>Matthew Marlowe</name>
3717 - </maintainer>
3718 - <longdescription>
3719 +<herd>base-system</herd>
3720 +<maintainer>
3721 + <email>mattm@g.o</email>
3722 +</maintainer>
3723 +<longdescription lang='en'>
3724 Apcupsd can be used for power mangement and controlling most of
3725 APC's UPS models on Unix and Windows machines. Apcupsd works with
3726 most of APC's Smart-UPS models as well as most simple signalling
3727 @@ -16,8 +16,7 @@ will follow when the battery is exhausted, a timeout (seconds)
3728 expires, or runtime expires based on internal APC calculations
3729 determined by power consumption rates.
3730 </longdescription>
3731 - <herd>base-system</herd>
3732 - <upstream>
3733 - <remote-id type="sourceforge">apcupsd</remote-id>
3734 - </upstream>
3735 +<upstream>
3736 + <remote-id type='sourceforge'>apcupsd</remote-id>
3737 +</upstream>
3738 </pkgmetadata>
3739
3740 diff --git a/sys-power/athcool/metadata.xml b/sys-power/athcool/metadata.xml
3741 index 96a2d58..261fd29 100644
3742 --- a/sys-power/athcool/metadata.xml
3743 +++ b/sys-power/athcool/metadata.xml
3744 @@ -1,5 +1,5 @@
3745 -<?xml version="1.0" encoding="UTF-8"?>
3746 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3747 +<?xml version='1.0' encoding='UTF-8'?>
3748 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3749 <pkgmetadata>
3750 <herd>base-system</herd>
3751 </pkgmetadata>
3752
3753 diff --git a/sys-power/nvram-reboot/metadata.xml b/sys-power/nvram-reboot/metadata.xml
3754 index 8037d85..83c747b 100644
3755 --- a/sys-power/nvram-reboot/metadata.xml
3756 +++ b/sys-power/nvram-reboot/metadata.xml
3757 @@ -1,8 +1,8 @@
3758 -<?xml version="1.0" encoding="UTF-8"?>
3759 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3760 +<?xml version='1.0' encoding='UTF-8'?>
3761 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3762 <pkgmetadata>
3763 - <herd>base-system</herd>
3764 - <upstream>
3765 - <remote-id type="sourceforge">nvram-wakeup</remote-id>
3766 - </upstream>
3767 +<herd>base-system</herd>
3768 +<upstream>
3769 + <remote-id type='sourceforge'>nvram-wakeup</remote-id>
3770 +</upstream>
3771 </pkgmetadata>
3772
3773 diff --git a/sys-power/nvram-wakeup/metadata.xml b/sys-power/nvram-wakeup/metadata.xml
3774 index 8037d85..83c747b 100644
3775 --- a/sys-power/nvram-wakeup/metadata.xml
3776 +++ b/sys-power/nvram-wakeup/metadata.xml
3777 @@ -1,8 +1,8 @@
3778 -<?xml version="1.0" encoding="UTF-8"?>
3779 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3780 +<?xml version='1.0' encoding='UTF-8'?>
3781 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3782 <pkgmetadata>
3783 - <herd>base-system</herd>
3784 - <upstream>
3785 - <remote-id type="sourceforge">nvram-wakeup</remote-id>
3786 - </upstream>
3787 +<herd>base-system</herd>
3788 +<upstream>
3789 + <remote-id type='sourceforge'>nvram-wakeup</remote-id>
3790 +</upstream>
3791 </pkgmetadata>
3792
3793 diff --git a/sys-process/acct/metadata.xml b/sys-process/acct/metadata.xml
3794 index 96a2d58..261fd29 100644
3795 --- a/sys-process/acct/metadata.xml
3796 +++ b/sys-process/acct/metadata.xml
3797 @@ -1,5 +1,5 @@
3798 -<?xml version="1.0" encoding="UTF-8"?>
3799 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3800 +<?xml version='1.0' encoding='UTF-8'?>
3801 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3802 <pkgmetadata>
3803 <herd>base-system</herd>
3804 </pkgmetadata>
3805
3806 diff --git a/sys-process/atop/metadata.xml b/sys-process/atop/metadata.xml
3807 index 96a2d58..261fd29 100644
3808 --- a/sys-process/atop/metadata.xml
3809 +++ b/sys-process/atop/metadata.xml
3810 @@ -1,5 +1,5 @@
3811 -<?xml version="1.0" encoding="UTF-8"?>
3812 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3813 +<?xml version='1.0' encoding='UTF-8'?>
3814 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3815 <pkgmetadata>
3816 <herd>base-system</herd>
3817 </pkgmetadata>
3818
3819 diff --git a/sys-process/daemontools-encore/metadata.xml b/sys-process/daemontools-encore/metadata.xml
3820 index c9faa95..62e73b9 100644
3821 --- a/sys-process/daemontools-encore/metadata.xml
3822 +++ b/sys-process/daemontools-encore/metadata.xml
3823 @@ -1,8 +1,8 @@
3824 -<?xml version="1.0" encoding="UTF-8"?>
3825 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3826 +<?xml version='1.0' encoding='UTF-8'?>
3827 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3828 <pkgmetadata>
3829 - <herd>base-system</herd>
3830 -<longdescription lang="en">
3831 +<herd>base-system</herd>
3832 +<longdescription lang='en'>
3833 daemontools-encore is a collection of tools for managing UNIX services.
3834 It is derived from the public-domain release of daemontools by
3835 D. J. Bernstein.
3836
3837 diff --git a/sys-process/daemontools/metadata.xml b/sys-process/daemontools/metadata.xml
3838 index 659da0c..261fd29 100644
3839 --- a/sys-process/daemontools/metadata.xml
3840 +++ b/sys-process/daemontools/metadata.xml
3841 @@ -1,5 +1,5 @@
3842 -<?xml version="1.0" encoding="UTF-8"?>
3843 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3844 +<?xml version='1.0' encoding='UTF-8'?>
3845 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3846 <pkgmetadata>
3847 - <herd>base-system</herd>
3848 +<herd>base-system</herd>
3849 </pkgmetadata>
3850
3851 diff --git a/sys-process/latencytop/metadata.xml b/sys-process/latencytop/metadata.xml
3852 index 96a2d58..261fd29 100644
3853 --- a/sys-process/latencytop/metadata.xml
3854 +++ b/sys-process/latencytop/metadata.xml
3855 @@ -1,5 +1,5 @@
3856 -<?xml version="1.0" encoding="UTF-8"?>
3857 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3858 +<?xml version='1.0' encoding='UTF-8'?>
3859 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3860 <pkgmetadata>
3861 <herd>base-system</herd>
3862 </pkgmetadata>
3863
3864 diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
3865 index 49fb858..92c6d7b 100644
3866 --- a/sys-process/lsof/metadata.xml
3867 +++ b/sys-process/lsof/metadata.xml
3868 @@ -1,8 +1,8 @@
3869 -<?xml version="1.0" encoding="UTF-8"?>
3870 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3871 +<?xml version='1.0' encoding='UTF-8'?>
3872 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3873 <pkgmetadata>
3874 <herd>base-system</herd>
3875 <use>
3876 - <flag name='rpc'>support looking up RPC service info</flag>
3877 + <flag name='rpc'>support looking up RPC service info</flag>
3878 </use>
3879 </pkgmetadata>
3880
3881 diff --git a/sys-process/numactl/metadata.xml b/sys-process/numactl/metadata.xml
3882 index bee9f9a..261fd29 100644
3883 --- a/sys-process/numactl/metadata.xml
3884 +++ b/sys-process/numactl/metadata.xml
3885 @@ -1,5 +1,5 @@
3886 -<?xml version="1.0" encoding="UTF-8"?>
3887 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3888 +<?xml version='1.0' encoding='UTF-8'?>
3889 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3890 <pkgmetadata>
3891 - <herd>base-system</herd>
3892 +<herd>base-system</herd>
3893 </pkgmetadata>
3894
3895 diff --git a/sys-process/numad/metadata.xml b/sys-process/numad/metadata.xml
3896 index 6565d58..93c6a36 100644
3897 --- a/sys-process/numad/metadata.xml
3898 +++ b/sys-process/numad/metadata.xml
3899 @@ -1,9 +1,8 @@
3900 -<?xml version="1.0" encoding="UTF-8"?>
3901 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3902 +<?xml version='1.0' encoding='UTF-8'?>
3903 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3904 <pkgmetadata>
3905 - <herd>base-system</herd>
3906 - <maintainer>
3907 - <email>cardoe@g.o</email>
3908 - <name>Doug Goldstein</name>
3909 - </maintainer>
3910 +<herd>base-system</herd>
3911 +<maintainer>
3912 + <email>cardoe@g.o</email>
3913 +</maintainer>
3914 </pkgmetadata>
3915
3916 diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
3917 index 05c4176..dca0e7b 100644
3918 --- a/sys-process/procps/metadata.xml
3919 +++ b/sys-process/procps/metadata.xml
3920 @@ -1,14 +1,12 @@
3921 <?xml version='1.0' encoding='UTF-8'?>
3922 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3923 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3924 <pkgmetadata>
3925 - <herd>base-system</herd>
3926 - <use>
3927 - <flag name="modern-top">Enables new startup defaults of top. Keeps old
3928 - defaults if disabled</flag>
3929 - <flag name="ncurses">Build programs that use ncurses: top, slabtop,
3930 - watch</flag>
3931 - </use>
3932 - <upstream>
3933 - <remote-id type="sourceforge">procps</remote-id>
3934 - </upstream>
3935 +<herd>base-system</herd>
3936 +<use>
3937 + <flag name='modern-top'>Enables new startup defaults of top. Keeps old defaults if disabled</flag>
3938 + <flag name='ncurses'>Build programs that use ncurses: top, slabtop, watch</flag>
3939 +</use>
3940 +<upstream>
3941 + <remote-id type='sourceforge'>procps</remote-id>
3942 +</upstream>
3943 </pkgmetadata>
3944
3945 diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml
3946 index 8be3e0d..9ef0e84 100644
3947 --- a/sys-process/psmisc/metadata.xml
3948 +++ b/sys-process/psmisc/metadata.xml
3949 @@ -1,8 +1,8 @@
3950 -<?xml version="1.0" encoding="UTF-8"?>
3951 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3952 +<?xml version='1.0' encoding='UTF-8'?>
3953 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3954 <pkgmetadata>
3955 - <herd>base-system</herd>
3956 - <upstream>
3957 - <remote-id type="sourceforge">psmisc</remote-id>
3958 - </upstream>
3959 +<herd>base-system</herd>
3960 +<upstream>
3961 + <remote-id type='sourceforge'>psmisc</remote-id>
3962 +</upstream>
3963 </pkgmetadata>
3964
3965 diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
3966 index 9f01357..daf629a 100644
3967 --- a/sys-process/runit/metadata.xml
3968 +++ b/sys-process/runit/metadata.xml
3969 @@ -1,10 +1,8 @@
3970 -<?xml version="1.0" encoding="UTF-8"?>
3971 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3972 +<?xml version='1.0' encoding='UTF-8'?>
3973 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3974 <pkgmetadata>
3975 +<herd>base-system</herd>
3976 <maintainer>
3977 -<email>
3978 -williamh@g.o
3979 -</email>
3980 + <email>williamh@g.o</email>
3981 </maintainer>
3982 -<herd>base-system</herd>
3983 </pkgmetadata>
3984
3985 diff --git a/sys-process/supervise-scripts/metadata.xml b/sys-process/supervise-scripts/metadata.xml
3986 index 96a2d58..261fd29 100644
3987 --- a/sys-process/supervise-scripts/metadata.xml
3988 +++ b/sys-process/supervise-scripts/metadata.xml
3989 @@ -1,5 +1,5 @@
3990 -<?xml version="1.0" encoding="UTF-8"?>
3991 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3992 +<?xml version='1.0' encoding='UTF-8'?>
3993 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
3994 <pkgmetadata>
3995 <herd>base-system</herd>
3996 </pkgmetadata>
3997
3998 diff --git a/sys-process/time/metadata.xml b/sys-process/time/metadata.xml
3999 index 96a2d58..261fd29 100644
4000 --- a/sys-process/time/metadata.xml
4001 +++ b/sys-process/time/metadata.xml
4002 @@ -1,5 +1,5 @@
4003 -<?xml version="1.0" encoding="UTF-8"?>
4004 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
4005 +<?xml version='1.0' encoding='UTF-8'?>
4006 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
4007 <pkgmetadata>
4008 <herd>base-system</herd>
4009 </pkgmetadata>
4010
4011 diff --git a/sys-process/watchpid/metadata.xml b/sys-process/watchpid/metadata.xml
4012 index 96a2d58..261fd29 100644
4013 --- a/sys-process/watchpid/metadata.xml
4014 +++ b/sys-process/watchpid/metadata.xml
4015 @@ -1,5 +1,5 @@
4016 -<?xml version="1.0" encoding="UTF-8"?>
4017 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
4018 +<?xml version='1.0' encoding='UTF-8'?>
4019 +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
4020 <pkgmetadata>
4021 <herd>base-system</herd>
4022 </pkgmetadata>