summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Villavicencio <the_paya@gentoo.org>2009-01-05 21:43:27 +0000
committerJavier Villavicencio <the_paya@gentoo.org>2009-01-05 21:43:27 +0000
commitf575e7cda42679e1388a1872fa7ba06ef66b0a3c (patch)
treee6f29edf061fe828149b1b3797ded2f194942876 /app-doc
parentdrop local icu USE-flag description, as it's global now (diff)
downloadgentoo-2-f575e7cda42679e1388a1872fa7ba06ef66b0a3c.tar.gz
gentoo-2-f575e7cda42679e1388a1872fa7ba06ef66b0a3c.tar.bz2
gentoo-2-f575e7cda42679e1388a1872fa7ba06ef66b0a3c.zip
Fix collision of security.7 man page, upstream bug 9068.
(Portage version: 2.2_rc20/cvs/FreeBSD 7.0-RELEASE i386)
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/xorg-docs/ChangeLog8
-rw-r--r--app-doc/xorg-docs/files/1.4-rename-security.man.patch.bz2bin0 -> 8137 bytes
-rw-r--r--app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild7
3 files changed, 10 insertions, 5 deletions
diff --git a/app-doc/xorg-docs/ChangeLog b/app-doc/xorg-docs/ChangeLog
index 9fcba01df28d..efc2b5a541af 100644
--- a/app-doc/xorg-docs/ChangeLog
+++ b/app-doc/xorg-docs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-doc/xorg-docs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/ChangeLog,v 1.49 2008/04/25 20:29:20 ricmm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/ChangeLog,v 1.50 2009/01/05 21:43:27 the_paya Exp $
+
+ 05 Jan 2009; Javier Villavicencio <the_paya@gentoo.org>
+ +files/1.4-rename-security.man.patch.bz2, xorg-docs-1.4-r1.ebuild:
+ Fix collision of security.7 man page, upstream bug 9068.
25 Apr 2008; <ricmm@gentoo.org> xorg-docs-1.4.ebuild:
Drop to ~mips due to unstable deps
diff --git a/app-doc/xorg-docs/files/1.4-rename-security.man.patch.bz2 b/app-doc/xorg-docs/files/1.4-rename-security.man.patch.bz2
new file mode 100644
index 000000000000..6948276b9168
--- /dev/null
+++ b/app-doc/xorg-docs/files/1.4-rename-security.man.patch.bz2
Binary files differ
diff --git a/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild b/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild
index 061752b88240..8a1a9bfca736 100644
--- a/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild
+++ b/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild,v 1.11 2007/10/08 01:33:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild,v 1.12 2009/01/05 21:43:27 the_paya Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -25,7 +25,8 @@ IUSE="doc"
PATCHES="${FILESDIR}/1.1-allow_manpages_only.patch
${FILESDIR}/65533-URL-interpolation.patch
- ${FILESDIR}/1.4-sgml-fixes.patch"
+ ${FILESDIR}/1.4-sgml-fixes.patch
+ ${FILESDIR}/1.4-rename-security.man.patch.bz2"
CONFIGURE_OPTIONS="--with-x11docdir=/usr/share/doc/${PF}
$(use_enable doc non-man-docs)