summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-doc/xorg-docs/ChangeLog8
-rw-r--r--app-doc/xorg-docs/Manifest15
-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
4 files changed, 23 insertions, 7 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/Manifest b/app-doc/xorg-docs/Manifest
index 829f72b25df3..83469b397b61 100644
--- a/app-doc/xorg-docs/Manifest
+++ b/app-doc/xorg-docs/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 1.1-allow_manpages_only.patch 957 RMD160 57be7a6f8c6e2680d3beba76279501c88b12db40 SHA1 1ea1e9d0873d952f26ea96e799d524f22cb14ff3 SHA256 7f6f59c15acd9b6bdc17e208a2e2d936fb4b661bba55829f0978bb0a00299a2f
+AUX 1.4-rename-security.man.patch.bz2 8137 RMD160 c5070016711cc829f773a9ee401834f84e98c70c SHA1 c7227bf28798be1ea0bf4c01f74f433bfa2f2534 SHA256 f6149945ba8823dad87dd9912d9049866d3a9a4b489390867b06fbeac8c02117
AUX 1.4-sgml-fixes.patch 15642 RMD160 5a512c5fa445430be35ec9d60abf1243e8b99e53 SHA1 eca4989b54bf9e68932f16e65b13de464a2cdf19 SHA256 35bd913579c841b62c013613bbfa3ee3e009799a9cded5d616641f00de15d8d4
AUX 65533-URL-interpolation.patch 1740 RMD160 626126300824947d84d12840043ecef2c5d8b3e7 SHA1 37ec8e2d0f8714e6e147b7691965005afc4d33b9 SHA256 cb6bbd34609ffc906702737dd1720eb5a04cbce95f8a1b9a9de066dff63c3f47
DIST xorg-docs-1.4.tar.bz2 8300321 RMD160 51cc8289e2e0ed5fca80bcbee91449e20da40849 SHA1 1c129bf9a2da57a308c7b57cb994c960ff15880a SHA256 fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
-EBUILD xorg-docs-1.4-r1.ebuild 1049 RMD160 89d2b925ac9020763330abc1c308a480fcbf3d23 SHA1 632bbffe367aef1f27504c8d2184dccc669d1be6 SHA256 c2c954301a23c4916e6a922ec216ea5feeaab2b0b6cd7632c9e154285429a467
+EBUILD xorg-docs-1.4-r1.ebuild 1098 RMD160 a566ac6c5011adddb329e1aa4d974a177843c448 SHA1 3f3ef4ca1676c126f9ff5501a90a77a3bfe8d89f SHA256 1c0812a2c2e7fe942469cbcb8e53fb1efa09e4f769649af3b02ea4ae299f82d9
EBUILD xorg-docs-1.4.ebuild 822 RMD160 8126e3389a33a3c663413c14681d7ac8bfcf9d30 SHA1 dfdccb6204ac49a2175e3266f16d88654d3b755b SHA256 b9b9c9318e4b83c433123922244e30927375fdf62210da51ce25439b9e9ec1db
-MISC ChangeLog 6350 RMD160 5ad06d157c6b80adfdf53794e3c655ff13992e87 SHA1 81d8acd3befb331ca74a035faa4e9dbd2552e577 SHA256 13c09acc1550299200b7a6695ac249104f9ea20f9c5b0c5aabd5652cfb355c81
+MISC ChangeLog 6540 RMD160 149cf732b3589b11390979d0b261b4b510240891 SHA1 b36c4a5c20a8c0a2799a622d76cc77324701d4a5 SHA256 add0487daf36969c2cbcd99907375f45d758af46e5e881c392d1741ccd2fc6b2
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (FreeBSD)
+
+iEYEARECAAYFAklifwkACgkQoAP6MIsfg8LiOACcCg5BNvW1NkwItCV9AVqIX9wR
+VXQAnRoEno7idPdLPsrrHzxd3Vh7N4Yz
+=Rb71
+-----END PGP SIGNATURE-----
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)