diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-06-09 19:37:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-09 19:37:02 +0000 |
| commit | b98e0d8358075bc36e994b64f164cbe485692646 (patch) | |
| tree | 767cfa73b188198a539279ab5381f37d98669397 /sys-auth/consolekit | |
| parent | Bump to beta7, fixes #273341 (diff) | |
| download | gentoo-2-b98e0d8358075bc36e994b64f164cbe485692646.tar.gz gentoo-2-b98e0d8358075bc36e994b64f164cbe485692646.tar.bz2 gentoo-2-b98e0d8358075bc36e994b64f164cbe485692646.zip | |
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.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth/consolekit')
| -rw-r--r-- | sys-auth/consolekit/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-auth/consolekit/consolekit-0.3.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | sys-auth/consolekit/files/consolekit-0.3.0-skip_xmlto_validation.patch | 18 |
3 files changed, 30 insertions, 3 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/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 + |