app-admin/augeas: Import two patches for tests (hopefully fixing #421907), pkgconfig file fix from upstream; add fix for glibc-2.16 gets drop, #428312

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

8 files changed, 220 insertions, 13 deletions

diff --git a/app-admin/augeas/ChangeLog b/app-admin/augeas/ChangeLog
index 9c0c45480154..e39c3c17917d 100644
--- a/app-admin/augeas/ChangeLog
+++ b/app-admin/augeas/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/augeas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/ChangeLog,v 1.38 2012/08/26 17:04:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/ChangeLog,v 1.39 2012/11/07 20:19:28 jlec Exp $
+
+*augeas-0.10.0-r1 (07 Nov 2012)
+
+  07 Nov 2012; Justin Lecher <jlec@gentoo.org> +augeas-0.10.0-r1.ebuild,
+  +files/augeas-0.10.0-gets.patch,
+  +files/augeas-0.10.0-libxml2-pkgconfig.patch,
+  +files/augeas-0.10.0-test.patch, +files/augeas-0.10.0-test2.patch,
+  metadata.xml:
+  Import two patches for tests (hopefully fixing #421907), pkgconfig file fix
+  from upstream; add fix for glibc-2.16 gets drop, #428312
 
   26 Aug 2012; Raúl Porcel <armin76@gentoo.org> augeas-0.10.0.ebuild:
   alpha/sparc stable wrt #418483
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index dd10d4692aa1..a00818b364a1 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX augeas-0.10.0-gets.patch 548 SHA256 10b57fbb769625d8677bf07f400cf94589b15a2f5244fad35b4b18a36dbca58c SHA512 cde05c4905613be475a051aab93f7bf9d5733c44e6d946a82ae39423dd51f21c98485e41a000dd54c750b3c4fcb1cf6b64237ebd708bbc91d0d37c10f346ec21 WHIRLPOOL 974cd4e4993ec13334c06fdea8afb173d8cdb921de306184507e196bc227803c331a9ae0c3e7a99234c86b80e939d2ee900a041421f6d7bc29a1173c0649efbb
+AUX augeas-0.10.0-libxml2-pkgconfig.patch 635 SHA256 ee4aea080eca0e1de6b93fc7ffc9e4105bafc9625f67d77e3490ab43f58463db SHA512 69d8398e0a6dce8959af0a83ab3e3767be1a9c5dda9b3ba03e6305a79b05df04652f76ff087dd5e82a2d46af9d042df0937b2ec885ca39ca2a05ad4df1fb84be WHIRLPOOL 7db91af93c5bf6b62a0ba808a2f01325e93e5719a58ab8591da2f035001544907c56047151641973c9a542d3e04cbc67de1c2794abfa000b58c54c27889c1669
+AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460de491dad4f8142f35f6fdaf33b SHA512 42e1c1b9024aab5f6d425c9fe421a3d5a81fd2e47908ad489aa8ea5044006b6c664810c9f8a12ad355217d4614b653f2a34000cafa8985ddc42632306cfb04a8 WHIRLPOOL 2ed6d9c3537eea7e3de425fc1084ac1b803c4ddf19d9fee7e26ea3796dac43d623a1a6d9f6487537fcf33e242bd35e2e4018ede2b9ddb5d24c24373e079c0455
+AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc
 AUX augeas-0.9.0-gnulib-test.patch 543 SHA256 ab45ca2a7f83cc85d5b1527f18d2e98b4b44d0a02dc8c2f65917c9d5931e9a5e SHA512 429f0aa5b243cb48e0a3c72ad7fd2f4e0ffc44025d96eae8f22f6e17647b74a34c5136651b40ee1158979357d89193161424ea6a4769b667b95997e953e90e1f WHIRLPOOL e5b45ca25381bd36805cca88b1a05e7bbb8299bb73210ab09b5755c6974184a5da0fa80dedb237cba779c6a77c70a2a81634edda306aa45c3065d1c7eacfd148
 DIST augeas-0.10.0.tar.gz 1676906 SHA256 ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca SHA512 4b23c69ce92971ad63cd5829044051a53b7976a7e3ccb9006282333a2dd06789e7c5da671450eb81904d237c36d449ac0924b06d9690dc7e5de4b8b40a58ec8c WHIRLPOOL 8b542cfa1bdcad3508cfd3cf25803ed27304ecdaaab4c9e7ce6ae2b7798c4cdc3d344ab4793cb2a0fd7b1b276eee20385b129d9fcf3b5b3b4596c3b0c96424cc
 DIST augeas-0.7.1.tar.gz 1346645 SHA256 f45749251dbc382b89458bfa25ca1f4090520f4b853b77c854de3861e9f82636 SHA512 2582a48cf009cf72a7865f0ef0ca9fc7246ea1c4f3fe2c2da074d1aafbe7d03ab69dea793c318cc8e106d1b6c5a75da0836cbdc71b9dd5aecc0afb634af45738 WHIRLPOOL 155b0cee6c3ff4218c24d3380b2f3784ccfdcd2315c87f821923ae554fdedcf354d68fae5ad27e5e0155f0f1d38d72acc26027f0099ca1dfd251ed3602b53971
 DIST augeas-0.7.4.tar.gz 1387927 SHA256 02ba7b4f1d0796dff6ea5f8cc5f4949e4ba30b7fa2f36a0c8a5079f9975060d1 SHA512 12fb246e21df9f82a5a89231448c8c1a8be8e62e4f2a46ddfe0ba53648b197ae11bb84e80427d739575b37afaf9f4580610ce486ab7759f4968b253887962c42 WHIRLPOOL c401e903bae303bb5ada3d9fd06f359528ee0e39494e6c5b38f703210b46d74dd77c7a5fa408aa2e3f747b1de0f74dd2a0f87c1cbe69cc003b2897a14fedbaa4
 DIST augeas-0.9.0.tar.gz 1630073 SHA256 55d2f482d02ac4cb38a80d95c53d2f73de435df7df1022827e7cba20bb4bb9b8 SHA512 4c6f475b985c85bb8251635f438e0274ac53ccc713bab282baa5cbc12f1a0140132f5688c15cdf73d0b86b8292385961137d56295ac76f5b9784145e579ddc27 WHIRLPOOL 874d1ff728eeb23f1607068e4644490b8664b68b1fb3ee9ec2a36c6e807ba57b3b37fbeb5fe04761c05ae06e5c30d51f475595dec4aeed67d6a184c15deb0d1b
+EBUILD augeas-0.10.0-r1.ebuild 1214 SHA256 428713d772ecc0f14fac4730d6a076007bbaaa12ed6e6b30987f8605b838b1c8 SHA512 26cbd1c9f46f371e01c56c1449f5fd7ee35ef09ce4fd0a580665c0246655c8fbfc4a51059c0f5f082a89cf46d9a738a0930f43ffadd2253c61a0fbb2ed8cd43e WHIRLPOOL 149608d0d9fe1ac92bc654350146b1a2ffd8d4218891d86f5fb2d3192203f18c3a7843c7188f133f121b770a9e03b41eaf0b4d6a9b2bd4a9f71a358e702bbc6b
 EBUILD augeas-0.10.0.ebuild 1060 SHA256 1a362307db743723e66a4b4c5f19a66ca30f2ee20ba8ab6604a783b215ddc555 SHA512 4b84b5914ed3493c653795540d25dbf319c17e3689ca0da921ed6d38db73dfda4f793bc23e94e8eda9b2b77a5919f0b4357fab8350da523ec9e5bcac354d535d WHIRLPOOL 0cf9175491e6b763b1ebb8476f00b28e9afc9d63afd77e572ace5106a2aced6a7cab5aa90b8eef47825d030c2704c759724b467565adc554f9379686f23f9a5f
 EBUILD augeas-0.7.1.ebuild 929 SHA256 f33c3a9abd062e78e178080303d260011879823428e4e567b96aba7b45595d7e SHA512 22a6d9d3a8c76ae8e397b74534c620c148c983caed9a6301d8df13e01c267024a9a8ba4519c645b8667ba7631c6610db9da3de6090fe89fcc30b19d24e06e560 WHIRLPOOL aebe9e62ea3e3b481e45267619f37a0ad5d8743b261bef16c025557733b303105490a1595040afb53f4c6c39430252e590e9fe10b5c376e76c6389cba59cb9db
 EBUILD augeas-0.7.4.ebuild 942 SHA256 cfe1e88bb6da2d46cf59be52cfc9c5d39af6a541b0457403f3cf6867f970e6b8 SHA512 d77d4623d7e98d6ca03ad038124a2b15a3b4dd5790ea355b45db4c039b81eab6ab913ca72ef32e5cb5dd1279ef8e00a2c6bdff6209c9c6aaca2f5a27cd637df6 WHIRLPOOL 79a069b09565a2ffc8c3a9dd24e97d4745ee933fcc774f88113bc8f89e30b0f863d47c16060cd06d9df2ff885dc087241577445cc19437451703d3926eb3c053
 EBUILD augeas-0.9.0.ebuild 1068 SHA256 a03e45c43bfa542c0672f1f7efe1516d5ccb179fa49d05c755f56a0ccd52ae0f SHA512 21499ae9419acb1cf3adac2b7a3ee1c299d8cdb8df8a56e306dd044358ef194348494d6910876ca19f6c0f8b7e6329a23abadf552d497ddf101a6c033df3109e WHIRLPOOL b964984b1be74c55e4160c3bb589d9c2d82129a283ffb70e06671da6bc16296641a898536561995adb879b217997297930816645a63e583f8be1f0fa7178a293
-MISC ChangeLog 4824 SHA256 b7318607147d64f05ace59f4ae0c7ff70ebf338de8d7b95c6fe7fd9dad7207a3 SHA512 9f2d6267542587f8c52c34d101d7f6dbfeab94dafea7cf3a0a0b4223591917dad38c45cc4eb24d1d2d40d340a3a7f41e6347e4e801262ab28cb5ae4818cc644c WHIRLPOOL 5fa4876f8a18cf926ca0a823a215adcf1b899f1762b20dfef5fcda37e5d239dc66c7ef88be41bd15e745a01b230560542561576d3d629c7a1213c343655d5a98
-MISC metadata.xml 668 SHA256 ac47e9c0f0944396fbb38d631a5fc5de024fe0cf3777934acc2a00a627797a6d SHA512 f9804d35101a925852010ffeb202baa31f36e5157f9d2ced722d74f5a949c7f0d03f867d42457e0ff321d6ce3909828fa42dc66921b0cc28d164705538b98f6f WHIRLPOOL d196984911f59c804491110b98d8110f49d7f71aca1d2013afbd882a970471f56fb982e00c50b15d83347293fa78a26605f7a62aedd0c4b9098c9da186e9b004
+MISC ChangeLog 5233 SHA256 117072978b9c064b6c87aadbb9ff89767fc833caa69c1dbba20374a3505ba8a2 SHA512 4754ddbf23127632dcc90923faf119878d1bc2e2c3021299c6f7e79c0eaff1c50edfaa49ed4398d7e6e0baf3ee28b0cca9fa330ba3a2266f30b7566f65e9d5e8 WHIRLPOOL e4eb38b8f3a37e62e7e9d46c9b65bb44fad4d0d2c56a03bb6fd052f24c2e868927d635756bce0536d88b51481d28a460647b23020934afc82fa8ed7949446d4f
+MISC metadata.xml 672 SHA256 df27dd9a200f5eabfc2c53c42451a8fdd2f6cf01a120051a25d95362dae26783 SHA512 fe574837c4932a84c0003a3829fb15ef946b0188ffb9c3e69babe2eae6268e111e13291415e3e5bde06cd9453a6038d7e116d000201c2de4ad892525869b2589 WHIRLPOOL 084145b0f7f4aee3972e3a335346cb4ce06c2d3028293939db8c6dd7227e3a45401890e0e93eae1ab22bf2667941d4b756fac29c72b51f9d3d228037df2fa712
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlA6VxYACgkQuQc30/atMkBKcQCbBeXJIezPCvIH/raTp+iZ0Jq3
-cusAnjHccKEhOk6Zc+u+r5xGqrxHVYnq
-=VpOu
+iEYEAREKAAYFAlCawlIACgkQgAnW8HDreRaYOACeLd1QUuaKTSorGLRCAJcXy3fo
+qOEAoIRMbHG4vQIme3OZMLFLOJZt8QFh
+=yOZo
 -----END PGP SIGNATURE-----
diff --git a/app-admin/augeas/augeas-0.10.0-r1.ebuild b/app-admin/augeas/augeas-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..2073381a776c
--- /dev/null
+++ b/app-admin/augeas/augeas-0.10.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/augeas-0.10.0-r1.ebuild,v 1.1 2012/11/07 20:19:28 jlec Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://augeas.net/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=app-doc/NaturalDocs-1.40
+	test? ( dev-lang/ruby )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gets.patch
+	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${P}-test2.patch
+	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
+	)
+
+src_prepare() {
+	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Languages.txt
+	fi
+	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Topics.txt
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Needs to implemented
+	local myeconfargs=( --without-selinux )
+	autotools-utils_src_configure
+}
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/files/augeas-0.10.0-gets.patch b/app-admin/augeas/files/augeas-0.10.0-gets.patch
new file mode 100644
index 000000000000..5f754955be6c
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-gets.patch
@@ -0,0 +1,15 @@
+ gnulib/lib/stdio.in.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h
+index 9091497..fa7e3fb 100644
+--- a/gnulib/lib/stdio.in.h
++++ b/gnulib/lib/stdio.in.h
+@@ -162,7 +162,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch b/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch
new file mode 100644
index 000000000000..aaa418670154
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch
@@ -0,0 +1,24 @@
+From b41deef293841da50a236023bad486ea3f57e4dc Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 3 Dec 2011 14:21:50 +0000
+Subject: [PATCH] pkg-config: Augeas requires libxml2.
+
+---
+ augeas.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/augeas.pc.in b/augeas.pc.in
+index c97847d..9e166db 100644
+--- a/augeas.pc.in
++++ b/augeas.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: augeas
+ Version: @VERSION@
+ Description: Augeas configuration editing library
+-Requires:
++Requires.private: libxml-2.0
+ Libs: -L${libdir} -laugeas @LIBS@
+ Cflags: -I${includedir}
+-- 
+1.7.6
+
diff --git a/app-admin/augeas/files/augeas-0.10.0-test.patch b/app-admin/augeas/files/augeas-0.10.0-test.patch
new file mode 100644
index 000000000000..e2630014f29a
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-test.patch
@@ -0,0 +1,56 @@
+From 075f8d35497fb36d9193e5364c055049c66fa5eb Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lubo.rintel@gooddata.com>
+Date: Mon, 9 Jan 2012 18:52:11 +0100
+Subject: [PATCH 1/2] Allow JSON number literals to be followed by whitespace
+
+Add a test case.
+
+Fixes https://fedorahosted.org/augeas/ticket/247
+---
+ AUTHORS                    |    1 +
+ lenses/json.aug            |    2 +-
+ lenses/tests/test_json.aug |    3 +++
+ 3 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index df63f95..e7870f2 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -44,6 +44,7 @@ Contributions by:
+   Bill Pemberton              <wfp5p@virginia.edu>
+   Alan Pevec                  <apevec@redhat.com>
+   Robin Lee Powell            <rlpowell@digitalkingdom.org>
++  Lubomir Rintel              <lubo.rintel@gooddata.com>
+   Roman Rakus                 <rrakus@redhat.com>
+   Satoru SATOH                <satoru.satoh@gmail.com>
+   Nicolas Valcárcel Scerpella <nvalcarcel@ubuntu.com>
+diff --git a/lenses/json.aug b/lenses/json.aug
+index c22ad90..6ceab09 100644
+--- a/lenses/json.aug
++++ b/lenses/json.aug
+@@ -29,7 +29,7 @@ let str_store =
+   let q =  del "\"" "\"" in
+   q . store /[^"]*/ . q . ws             (* " Emacs, relax *)
+ 
+-let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ ]
++let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ . ws ]
+ let str = [ label "string" . str_store ]
+ 
+ let const (r:regexp) = [ label "const" . store r . ws ]
+diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
+index 0bcd25d..d8b7fa8 100644
+--- a/lenses/tests/test_json.aug
++++ b/lenses/tests/test_json.aug
+@@ -8,6 +8,9 @@ test lns get "true" = { "const" = "true" }
+ 
+ test lns get "3.141" = { "number" = "3.141" }
+ 
++test lns get "{ \"key\" : 666 }" =
++  { "dict" { "entry" = "key" { "number" = "666" } } }
++
+ test lns get "[true, 0, \"yo\"]" =
+   { "array" { "const" = "true" } { "number" = "0" } { "string" = "yo" } }
+ 
+-- 
+1.7.7.5
+
diff --git a/app-admin/augeas/files/augeas-0.10.0-test2.patch b/app-admin/augeas/files/augeas-0.10.0-test2.patch
new file mode 100644
index 000000000000..743ccfdce1fc
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-test2.patch
@@ -0,0 +1,49 @@
+From 100a7b38222a63c6435a72b4974b55f39a28989e Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lubo.rintel@gooddata.com>
+Date: Mon, 9 Jan 2012 19:24:41 +0100
+Subject: [PATCH 2/2] Correctly parse empty object and arrays in JSON
+
+Add a test case.
+Fix from David Lutterkort <lutter@redhat.com>.
+
+https://fedorahosted.org/augeas/ticket/248
+---
+ lenses/json.aug            |    4 ++--
+ lenses/tests/test_json.aug |    5 +++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/lenses/json.aug b/lenses/json.aug
+index 6ceab09..2645806 100644
+--- a/lenses/json.aug
++++ b/lenses/json.aug
+@@ -37,9 +37,9 @@ let const (r:regexp) = [ label "const" . store r . ws ]
+ let value0 = str | number | const /true|false|null/
+ 
+ let fix_value (value:lens) =
+-  let array = [ label "array" . lbrack . Build.opt_list value comma . rbrack ] in
++  let array = [ label "array" . lbrack . (Build.opt_list value comma)? . rbrack ] in
+   let pair = [ label "entry" . str_store . colon . value ] in
+-  let obj = [ label "dict" . lbrace . Build.opt_list pair comma . rbrace ] in
++  let obj = [ label "dict" . lbrace . (Build.opt_list pair comma)? . rbrace ] in
+   (str | number | obj | array | const /true|false|null/)
+ 
+ (* Typecheck finitely deep nesting *)
+diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
+index d8b7fa8..aec7d4c 100644
+--- a/lenses/tests/test_json.aug
++++ b/lenses/tests/test_json.aug
+@@ -30,6 +30,11 @@ test lns get "{ \"0\": true, \"1\":false }" =
+ test lns get "{\"menu\": \"entry one\"}" =
+   { "dict" { "entry" = "menu" { "string" = "entry one" } } }
+ 
++test lns get "[ ]" =
++  { "array" }
++
++test lns get "{}" =
++  { "dict" }
+ 
+ let s = "{\"menu\": {
+   \"id\": \"file\",
+-- 
+1.7.7.5
+
diff --git a/app-admin/augeas/metadata.xml b/app-admin/augeas/metadata.xml
index d8f155f4c90a..5f0f899580a7 100644
--- a/app-admin/augeas/metadata.xml
+++ b/app-admin/augeas/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>matsuu@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>matsuu@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 A library for programmatically editing configuration files. Augeas parses
 configuration files into a tree structure, which it exposes through its
 public API. Changes made through the API are written back to the initially
@@ -15,4 +15,3 @@ details. It is controlled by ``lens'' definitions that describe the file
 format and the transformation into a tree.
 </longdescription>
 </pkgmetadata>
-