Skip xmlto validation because 0.0.22 adds --noent to xmllint options and documentation doesn't validate anymore wrt #271678, thanks to Darren Dale for reporting.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 33 insertions, 15 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index bf1056a1f649..a5abdf4df7d5 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.46 2009/04/27 19:31:44 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.47 2009/06/09 19:37:02 ssuominen Exp $
+
+  09 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  consolekit-0.3.0-r1.ebuild,
+  +files/consolekit-0.3.0-skip_xmlto_validation.patch:
+  Skip xmlto validation because 0.0.22 adds --noent to xmllint options and
+  documentation doesn't validate anymore wrt #271678, thanks to Darren Dale
+  for reporting.
 
 *consolekit-0.3.0-r1 (27 Apr 2009)
 
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 0daa512fa775..92aea643678a 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 90-consolekit 272 RMD160 63bfb8c8320ce5590013848632f4d03bbeecdb90 SHA1 094f29f3efc6523db9d464f1d67e64a87214abbe SHA256 7a133beda59eace7572849ffaff305c3627860d26735bbbd0352620f626f0cb9
 AUX consolekit-0.1.rc 540 RMD160 0db24125d14b177ac54819f4d57fcac589a86bf3 SHA1 e1001914190b644d1557034f5534ba412e4ead57 SHA256 53510ed5f365af2f5fc760fb9462aea660ba54cbbd5f4c6be8d3bc75c4c399c8
 AUX consolekit-0.2.10-cleanup_console_tags.patch 1680 RMD160 1fccda3d4da3197ba9416b12177d05dd4a2e9705 SHA1 a7c0a267ce9950e8e3887abbe7a778e70f24a26b SHA256 1bc8323346d3a58c23d3790a317b7965dbd964b2307ef9bc6a8374f45a34f0f7
@@ -10,6 +7,7 @@ AUX consolekit-0.2.10-polkit-automagic.patch 988 RMD160 1146e1c30b327191a5429e54
 AUX consolekit-0.2.3-freebsd.patch 2945 RMD160 e1193ba4010daa33c9646ed8a78a374944ea73dc SHA1 10af67cab72a184fbe89ba36330a20020ae60206 SHA256 f17aa9f3229a24d6bd4291c9f249396864eceb9c01ed00e5c97172c1c57932c5
 AUX consolekit-0.3.0-allow-setidle.patch 648 RMD160 03bd610a6d13ece9a1ad46beb43efbc3ac875e61 SHA1 00145467e96ac917e0aa6a756a938f2c62434602 SHA256 693accef2bea6fe62900226075c88b50b6ff541649a86affbebe98ea6134ec08
 AUX consolekit-0.3.0-shutdown.patch 924 RMD160 d0ad31aed472df41f94327c0625b64aee31fc6ed SHA1 f02205b3273047afdfe4438fac4f71f50655112b SHA256 7016cf51e86a5e87104ce960524fa4c75a1f7362d7b3d8d8e0e3e5f8469132ab
+AUX consolekit-0.3.0-skip_xmlto_validation.patch 770 RMD160 b8b229e8d7ab2f2ef2266dc553588f9a1ccf0600 SHA1 5518debddb04d814f12a5377e4b958c8963ffaee SHA256 28e1cb19567d8b57d81aea5c0ed02f998cc7017fe3ada5759574fdaa217653cb
 AUX pam-foreground-compat.ck 389 RMD160 b72a66d5fde612a825fb60f0f1402a0665cc6d81 SHA1 25c3e54e326606e6c476e0dbb9637e2e551a6ccc SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
 DIST ConsoleKit-0.2.10.tar.gz 521473 RMD160 fa75c371a28803c990c9293732229e2c67625ff6 SHA1 ac4107f2239b072156f4a815609ea1c6fbb5f6cf SHA256 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb
 DIST ConsoleKit-0.2.3.tar.gz 468591 RMD160 457c1a08e9d2fc789537127c9d069088588c035b SHA1 009f731aa4331125ef052e587d7b0583e07ee8aa SHA256 1b9571f958d3c3be464a6261947c6f817948e878166bca4616f4ac3ac9f02e47
@@ -17,14 +15,7 @@ DIST ConsoleKit-0.3.0.tar.bz2 393694 RMD160 7a1ebd2f4bfb65690e70138c9923c3fd2fca
 EBUILD consolekit-0.2.10-r1.ebuild 2774 RMD160 f8559aa2308d13303b175b221c02485e129de2e5 SHA1 a25553eb1ee7d5efd0c124563743651bf1cc467a SHA256 387f4fdb2fcf64e1a4adce25801f8eefc319c24563c80e426f14300c7fd5a337
 EBUILD consolekit-0.2.10.ebuild 1830 RMD160 438ead30e1f6ea4c0866460110ef9cd24b8b7966 SHA1 8760b062e977f7f885c27b063b1c8df7a5187cab SHA256 cb4a08b78fd8cee5cd24a8520abef20015984d2608b7471fb30288c083bb3caa
 EBUILD consolekit-0.2.3.ebuild 1974 RMD160 dc7a31ad67bb006431223c6db2904be818d0cd18 SHA1 d28953c9196c2c21c497169a586a89b5a2595d70 SHA256 86a16b9373650a8b41e45c9187d8007300c86fb3a7f9ed034fcc39d758eb7672
-EBUILD consolekit-0.3.0-r1.ebuild 3127 RMD160 c3673e0e8d10cad6346d6eaf84c1da6140caaae1 SHA1 8b3a7379fc9f891c3b5cc3295d3d76741db5c86e SHA256 370a2f2f3d8c4762b02634946d9c983a0fae237410cf87cd74840bc24cc5e1b2
+EBUILD consolekit-0.3.0-r1.ebuild 3186 RMD160 646bb6120ad1a6f98bcfed2f8938d992ac4f1f0f SHA1 059c96e11d0b4cc4a33bbd5354960a339a3d7823 SHA256 be96ca67ecef9c051571eb45d1519829afde71393425c8b8af0eb9e9110d9f6c
 EBUILD consolekit-0.3.0.ebuild 3001 RMD160 f363e675bca2730de53557468c987460c4d956dd SHA1 0474b904f7b81420e4cb0f94a17e64e63b56b873 SHA256 edac31ab2222276780aeaefd0ddba0995baf2242b7b9e02e7016d62efb64aa7d
-MISC ChangeLog 6985 RMD160 70f5ea019dac8b3775a6b142a47f02824449756c SHA1 7cc6ef8cff3f755cfc5089a5e72932f998178b72 SHA256 1febbf90875c4f9b5959a581cd6145dfccdc93f981237267625ba959e267507d
+MISC ChangeLog 7298 RMD160 099527e229ce5b873021525df628a5e66bb57792 SHA1 c3a0f07e2b10f228650c93a6d667d3d8a15f86b3 SHA256 e0e0a6e41b449a6cc7d3da49e936a4d43c5231ac5a9fb6aa9f3ecf030d3cc3b3
 MISC metadata.xml 316 RMD160 0d18a4fee930a899bcd1eeff6fc7fe4de491f71b SHA1 0643d12b32e383861623f4f257f9d5b1446a90da SHA256 d026b12ac11b38e175987871769588146cf0c587a1462559cd1581ae05aaa83d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoPYjQACgkQn/5bYzqsSmFm8gCffViFaqSqhaYUpKLq+VxO042R
-rM0AoMoV8intcwe46q1wFGzEUBkr9j7+
-=HxTy
------END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild b/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild
index c4766a221bc6..b099a49736dd 100644
--- a/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild,v 1.1 2009/04/27 19:31:44 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r1.ebuild,v 1.2 2009/06/09 19:37:02 ssuominen Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	doc? ( app-text/xmlto )"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+S=${WORKDIR}/${MY_PN}-${MY_PV}
 
 src_prepare() {
 	# Fix directory leaks, bug #258685
@@ -52,6 +52,8 @@ src_prepare() {
 	# Add SetIdleHint policy to handle new default deny on dbus
 	epatch "${FILESDIR}/${P}-allow-setidle.patch"
 
+	epatch "${FILESDIR}"/${P}-skip_xmlto_validation.patch
+
 	eautoreconf
 }
 
diff --git a/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch b/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch
new file mode 100644
index 000000000000..1dfe366ce58c
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch
@@ -0,0 +1,18 @@
+Because xmlto-0.0.22 adds --noent to xmllint options, it's more strict,
+and doesn't validate anymore. This is a temp. solution until upstream
+gets their documentation fixed.
+
+http://bugs.gentoo.org/show_bug.cgi?id=271678
+
+diff -ur ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am ConsoleKit-0.3.0/doc/dbus/Makefile.am
+--- ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am	2008-07-31 00:35:51.000000000 +0300
++++ ConsoleKit-0.3.0/doc/dbus/Makefile.am	2009-06-09 22:30:57.000000000 +0300
+@@ -16,7 +16,7 @@
+ htmldoc_DATA = ConsoleKit.html
+ 
+ ConsoleKit.html : $(SPEC_XML_FILES)
+-	$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
++	$(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
+ 
+ endif # DOCBOOK_DOCS_ENABLED
+