diff options
| -rw-r--r-- | app-doc/xorg-docs/ChangeLog | 9 | ||||
| -rw-r--r-- | app-doc/xorg-docs/files/1.4-sgml-fixes.patch | 450 | ||||
| -rw-r--r-- | app-doc/xorg-docs/files/65533-URL-interpolation.patch | 42 | ||||
| -rw-r--r-- | app-doc/xorg-docs/files/digest-xorg-docs-1.4-r1 | 3 | ||||
| -rw-r--r-- | app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild | 41 |
5 files changed, 544 insertions, 1 deletions
diff --git a/app-doc/xorg-docs/ChangeLog b/app-doc/xorg-docs/ChangeLog index a30c91b5b12e..02fedf7e4a76 100644 --- a/app-doc/xorg-docs/ChangeLog +++ b/app-doc/xorg-docs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-doc/xorg-docs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/ChangeLog,v 1.36 2007/07/03 13:17:16 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/ChangeLog,v 1.37 2007/08/01 23:22:55 dberkholz Exp $ + +*xorg-docs-1.4-r1 (01 Aug 2007) + + 01 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4-sgml-fixes.patch, +files/65533-URL-interpolation.patch, + +xorg-docs-1.4-r1.ebuild: + (#170800, #170798) Make PDF/PS/HTML/txt doc generation finally work! 03 Jul 2007; Lars Weiler <pylon@gentoo.org> xorg-docs-1.4.ebuild: Stable on ppc; bug #175465. diff --git a/app-doc/xorg-docs/files/1.4-sgml-fixes.patch b/app-doc/xorg-docs/files/1.4-sgml-fixes.patch new file mode 100644 index 000000000000..312a65f41e16 --- /dev/null +++ b/app-doc/xorg-docs/files/1.4-sgml-fixes.patch @@ -0,0 +1,450 @@ +--- sgml/input/XKB-Enhancing.sgml 2007/03/13 23:40:16 1.1 ++++ sgml/input/XKB-Enhancing.sgml 2007/03/13 23:43:10 +@@ -109,6 +109,7 @@ etc. + </ItemizedList> + + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>Types</Term> +@@ -118,6 +119,7 @@ Types describe how the produced key is c + Shift, Control, Alt, ...). There are several predefined types which + cover most of used combinations. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>Compat</Term> +@@ -128,6 +130,7 @@ compat component you can assign various + in xkb specification) to key events. This is also the place where + LED-indicators behaviour is defined. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>Symbols</Term> +@@ -139,6 +142,7 @@ symbolic name, see above). There may be + for each key and then it depends on a key type and on modifiers state + (respective compat component) which value will be the resulting one. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>Geometry</Term> +@@ -147,6 +151,7 @@ for each key and then it depends on a ke + Geometry files aren't used by xkb itself but they may be used by some + external programs to depict a keyboard image. + </Para> ++</ListItem> + </VarListEntry> + </VariableList> + All these components have the files located in xkb configuration tree +@@ -456,6 +461,7 @@ The most used schemes are: + The key does not depend on any modifiers. The symbol from first level + is always chosen. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>TWO_LEVEL</Term> +@@ -468,6 +474,7 @@ system-specific capitalization rules. If + symbol from the second level is taken and capitalization rules are applied + (and usually have no effect). + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>ALPHABETIC</Term> +@@ -481,6 +488,7 @@ modifier apply the symbol from the first + capitalization rules applied. This is often called shift-cancels-caps + behaviour. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>THREE_LEVEL</Term> +@@ -494,6 +502,7 @@ the resulting level. Only Shift and Leve + consideration. If the Lock modifier is active capitalization rules + are applied on the resulting symbol. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>FOUR_LEVEL</Term> +@@ -502,6 +511,7 @@ are applied on the resulting symbol. + Is the same as THREE_LEVEL but unlike LEVEL_THREE if both Shift+LevelThree + modifiers apply the symbol is taken from the fourth level. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>FOUR_LEVEL_ALPHABETIC</Term> +@@ -513,6 +523,7 @@ third level is taken and the capitalizat + If Lock+Shift+LevelThree apply the symbol from the third level is taken + and no capitalization rules are applied. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>KEYPAD</Term> +@@ -525,6 +536,7 @@ Shift or NumLock modifiers apply the sym + If both Shift+NumLock modifiers apply the symbol from the first level + is taken. Again, shift-cancels-caps variant. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>FOUR_LEVEL_KEYPAD</Term> +@@ -536,6 +548,7 @@ If Shift+LevelThree or NumLock+LevelThre + level is taken. If all Shift+NumLock+LevelThree modifiers apply the symbol + from the third level is taken. This also, shift-cancels-caps variant. + </Para> ++</ListItem> + </VarListEntry> + </VariableList> + </Para> +@@ -552,6 +565,7 @@ It is similar to TWO_LEVEL scheme + modifier rather than Shift. That means, the symbol from the second level + is chosen by Control rather than by Shift. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>PC_SYSRQ</Term> +@@ -561,6 +575,7 @@ It is similar to TWO_LEVEL scheme + than Shift. That means, the symbol from the second level + is chosen by Alt rather than by Shift. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>CTRL+ALT</Term> +@@ -571,6 +586,7 @@ values. If only one modifier (Alt or Con + from the first level is chosen. Only if both Alt+Control modifiers apply + the symbol from the second level is chosen. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term>SHIFT+ALT</Term> +@@ -581,6 +597,7 @@ If only one modifier (Alt or Shift) appl + from the first level is chosen. Only if both Alt+Shift modifiers apply + the symbol from the second level is chosen. + </Para> ++</ListItem> + </VarListEntry> + </VariableList> + </Para> +--- sgml/platforms/Solaris.sgml 2007/03/13 23:45:13 1.1 ++++ sgml/platforms/Solaris.sgml 2007/03/13 23:49:54 +@@ -181,6 +181,7 @@ however a number of <Literal remap="tt"> + Both GCC, and the Sun Studio compilers are supported by X11R&relvers;. + The minimum recommended GCC release is 2.7.2. + Some earlier GCC's are known to not work and should be avoided. ++</Para> + <Para> + You should also make certain your version of GCC predefines `sun'. + If needed edit <Literal remap="tt">/usr/local/lib/gcc-lib/*/*/specs</Literal>, and modify the +@@ -199,13 +200,16 @@ Also on SPARCs, you may be able to build + older cg* graphics devices by adding "#define XsunServer YES" or "#define + Xsun24Server YES" or "#define XsunMonoServer YES" to xc/config/cf/host.def. + These servers are no longer maintained nor supported and may not build in +-this release.</ListItem> ++this release. ++</Para> ++</ListItem> + <ListItem> + <Para> + A Threaded Xlib compiled with GCC has subtle problems. + It'll work 98% of the time, however clients will occasionally exhibit + strange hangs. + Most notably image viewers such as xv-3.10 exhibit this problem. ++</Para> + <Para> + It is recommended that you set ThreadedX in <Literal remap="tt">˜xc/config/cf/host.def</Literal> to + NO, if you are using GCC. +@@ -218,6 +222,7 @@ Whether this behaviour still exists with + To build X11R&relvers; with GCC you need gcc and (optionally) c++filt from GNU + binutils. + Don't install gas or ld from GNU binutils, use the one provided by Sun. ++</Para> + <Para> + You might need to setup a /opt/SUNWspro/bin directory containing symbolic links + named <Literal remap="tt">cc</Literal>, <Literal remap="tt">CC</Literal>, and <Literal remap="tt">c++filt</Literal> pointing respectively to the actual +@@ -228,7 +233,9 @@ named <Literal remap="tt">cc</Literal>, + <Para> + If you are using Sun compilers to compile the X11R&relvers; distribution, you need to + modify your PATH appropriately so the Sun compiler tools are available. +-Normally, they should be in <Literal remap="tt">/opt/SUNWspro/bin</Literal></ListItem> ++Normally, they should be in <Literal remap="tt">/opt/SUNWspro/bin</Literal> ++</Para> ++</ListItem> + <ListItem> + <Para> + You <Emphasis remap="bf">MUST</Emphasis> put <Literal remap="tt">/usr/ccs/bin</Literal> at the front of your PATH. +@@ -236,7 +243,9 @@ There are known problems with some GNU r + there. + So the <Literal remap="tt">/usr/ccs/bin</Literal> versions of these programs must be found before + any possible GNU versions. +-(Most notably GNU '<Literal remap="tt">ar</Literal>' does not work during the build).</ListItem> ++(Most notably GNU '<Literal remap="tt">ar</Literal>' does not work during the build). ++</Para> ++</ListItem> + + </OrderedList> + +@@ -254,6 +263,7 @@ any possible GNU versions. + <Para> + Depending on the release or architecture of Solaris you are running, you might + need to install an OS driver for an aperture device. ++</Para> + <Para> + Under Solaris x86 2.5 and later, there's a system driver (<Literal remap="tt">/dev/xsvc</Literal>) + that provides this functionality. +@@ -278,6 +288,7 @@ If you have not made the Virtual Termina + terminal device to run the Xserver on. + The correct device is vt00 so your <Literal remap="tt">xinit</Literal> command would look like + so: ++</Para> + <Para> + + <Screen> +@@ -294,6 +305,7 @@ For old releases of Solaris you will pro + <Literal remap="tt">/usr/X11R6/lib:/usr/openwin/lib:/usr/dt/lib</Literal>. + Including <Literal remap="tt">/usr/X11R6/lib</Literal> in your LD_LIBRARY_PATH is probably not + necessary, however it doesn't hurt. :) ++</Para> + <Para> + Including <Literal remap="tt">/usr/openwin/lib</Literal> in the LD_LIBRARY_PATH is recommended + on older releases because some Sun supplied binaries were not compiled with LD_RUN_PATH set +@@ -310,14 +322,18 @@ LD_LIBRARY_PATH too. + Xqueue is <Emphasis remap="bf">NOT</Emphasis> supported under Solaris. + The includes necessary for Xqueue are available, however the driver does not + seem to be in the kernel. +-(Go figure)</ListItem> ++(Go figure) ++</Para> ++</ListItem> + <ListItem> + <Para> + If you want to use xdm with Solaris, extract the files from the shar file in + <Literal remap="tt">/usr/X11R6/lib/X11/etc/XdmConf.svr4</Literal> into a temporary directory. + The <Literal remap="tt">README</Literal> file tells where the individual files need to be installed. + Be sure to read through each file and make any site-specific changes that you +-need.</ListItem> ++need. ++</Para> ++</ListItem> + + </OrderedList> + +@@ -337,6 +353,7 @@ The Solaris 2.1 for x86 OpenWindows file + Xserver, it probably will also not work against a X11R6 Xserver. + Attempting to 'Drag and Drop' a file causes the filemgr to abort with an + 'X error' ++</Para> + <Para> + Solaris x86 2.4 does not have this problem. + </Para> +@@ -349,7 +366,9 @@ There is no known work around. + <Para> + The SPARC port is still quite new, so instability is to be expected (and + reported!). +-It might even have broken some aspects of the x86 port.</ListItem> ++It might even have broken some aspects of the x86 port. ++</Para> ++</ListItem> + + </OrderedList> + +--- sgml/RELNOTES.sgml 2007/03/13 23:52:18 1.1 ++++ sgml/RELNOTES.sgml 2007/03/13 23:54:25 +@@ -189,7 +189,7 @@ The next section describes what is new i + <row> + <entry>Driver Name</entry> + <entry>Description</entry> +- <entry>Further Information ++ <entry>Further Information</entry> + </row> + <row> + <entry><Literal remap="tt">apm</Literal></entry> +@@ -403,7 +403,7 @@ The next section describes what is new i + <row> + <entry><Literal remap="tt">vga</Literal></entry> + <entry>Generic VGA</entry> +- <entry><ulink URL="vga.4.html">vga(4)</ulink> ++ <entry><ulink URL="vga.4.html">vga(4)</ulink></entry> + </row> + <row> + <entry><Literal remap="tt">via</Literal></entry> +@@ -488,7 +488,7 @@ The next section describes what is new i + <row> + <entry><Literal remap="tt">citron</Literal></entry> + <entry>Citron</entry> +- <entry><ulink URL="citron.4.html">citron(4)</ulink> ++ <entry><ulink URL="citron.4.html">citron(4)</ulink></entry> + </row> + <row> + <entry><Literal remap="tt">digitaledge</Literal></entry> +@@ -498,7 +498,7 @@ The next section describes what is new i + <row> + <entry><Literal remap="tt">dmc</Literal></entry> + <entry>DMC</entry> +- <entry><ulink URL="dmc.4.html">dmc(4)</ulink> ++ <entry><ulink URL="dmc.4.html">dmc(4)</ulink></entry> + </row> + <row> + <entry><Literal remap="tt">dynapro</Literal></entry> +@@ -523,7 +523,7 @@ The next section describes what is new i + <row> + <entry><Literal remap="tt">fpit</Literal></entry> + <entry>Fujitsu Stylistic Tablet PCs</entry> +- <entry><ulink URL="fpit.4.html">fpit(4)</ulink> ++ <entry><ulink URL="fpit.4.html">fpit(4)</ulink></entry> + </row> + <row> + <entry><Literal remap="tt">hyperpen</Literal></entry> +@@ -1372,6 +1372,8 @@ The next section describes what is new i + <ListItem> + <Para> + The LBX extension is has been removed in this release. ++ </Para> ++ </ListItem> + </VarListEntry> + <VarListEntry> + <Term>CID Fonts</Term> +@@ -1380,6 +1382,7 @@ The next section describes what is new i + Support for CID fonts has been removed as of this release. + mkcfm has also been deprecated as a result. + </Para> ++ </ListItem> + </VarListEntry> + <VarListEntry> + <Term>xkbdata</Term> +@@ -1390,6 +1393,7 @@ The next section describes what is new i + data provided by the xkeyboard-config project, which located in + the xkbdesc CVS module. + </Para> ++ </ListItem> + </VarListEntry> + </VariableList> + </Para> +@@ -1478,6 +1482,7 @@ The next section describes what is new i + Thomas Winischhofer, + David Woodhouse, + </Para> ++ </ListItem> + </VarListEntry> + </VariableList> + </Para> +@@ -1893,8 +1898,9 @@ The next section describes what is new i + + <Para> + This product includes software developed by the X-Oz Technologies and its +- contributors. +- </Para> ++ contributors. ++ </Para> ++ </ListItem> + </VarListEntry> + </VariableList> + </Para> +--- sgml/Versions.sgml 2007/03/13 23:54:39 1.1 ++++ sgml/Versions.sgml 2007/03/13 23:55:42 +@@ -127,6 +127,7 @@ development leading up to version 6.8: + <Para> + The first snapshot of the pre-6.8 development branch. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.7.99.23</Literal></Term> +@@ -134,6 +135,7 @@ The first snapshot of the pre-6.8 develo + <Para> + The twenty-third snapshot of the pre-6.8 development branch. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.7.99.900</Literal></Term> +@@ -141,6 +143,7 @@ The twenty-third snapshot of the pre-6.8 + <Para> + The start of the 6.8 feature freeze. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.7.99.903</Literal></Term> +@@ -148,6 +151,7 @@ The start of the 6.8 feature freeze. + <Para> + The third 6.8 release candidate. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.0</Literal></Term> +@@ -155,6 +159,7 @@ The third 6.8 release candidate. + <Para> + The 6.8 release. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.99.1</Literal></Term> +@@ -163,6 +168,7 @@ The 6.8 release. + The first pre-6.9 development snapshot, which is the first main + branch snapshot after creating the 6.8 stable branch. + </Para> ++</ListItem> + </VarListEntry> + </VariableList> + </Para> +@@ -196,6 +202,7 @@ stable branch: + <Para> + The 6.8 release. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.0.901</Literal></Term> +@@ -203,6 +210,7 @@ The 6.8 release. + <Para> + The first pre 6.8.1 snapshot. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.0.903</Literal></Term> +@@ -211,6 +219,7 @@ The first pre 6.8.1 snapshot. + The third pre 6.8.1 snapshot, also known as the third 6.8.1 release + candidate. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.1</Literal></Term> +@@ -218,6 +227,7 @@ candidate. + <Para> + The 6.8.1 release. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.1.901</Literal></Term> +@@ -225,6 +235,7 @@ The 6.8.1 release. + <Para> + The first pre 6.8.2 snapshot. + </Para> ++</ListItem> + </VarListEntry> + <VarListEntry> + <Term><Literal remap="tt">6.8.2</Literal></Term> +@@ -232,6 +243,7 @@ The first pre 6.8.2 snapshot. + <Para> + The 6.8.2 release. + </Para> ++</ListItem> + </VarListEntry> + </VariableList> + </Para> diff --git a/app-doc/xorg-docs/files/65533-URL-interpolation.patch b/app-doc/xorg-docs/files/65533-URL-interpolation.patch new file mode 100644 index 000000000000..396f21b1019a --- /dev/null +++ b/app-doc/xorg-docs/files/65533-URL-interpolation.patch @@ -0,0 +1,42 @@ +--- ./sgml/fonts/fonts.sgml 2007/03/13 23:19:40 1.1 ++++ ./sgml/fonts/fonts.sgml 2007/03/13 23:21:54 +@@ -1920,7 +1920,7 @@ standard `<Literal remap="tt">fixed</Lit + <Para> + Unicode (<ULink + URL="http://www.unicode.org" +->�</ULink ++>http://www.unicode.org</ULink + >) is a coded character + set with the goal of uniquely identifying all characters for all + scripts, current and historical. While Unicode was explicitly not +--- ./sgml/graphics/dps.sgml 2007/03/13 23:19:45 1.1 ++++ ./sgml/graphics/dps.sgml 2007/03/13 23:21:54 +@@ -179,7 +179,7 @@ HSV spaces. The latter three widgets ar + summary Scrolling Widget documentation is available in the <Literal remap="tt">doc</Literal> + subdirectory of the <Literal remap="tt">DPS.tar.gz</Literal> file, available from <ULink + URL="ftp://dps.sourceforge.net/pub/dps/DPS.tar.gz" +->�</ULink ++>ftp://dps.sourceforge.net/pub/dps/DPS.tar.gz</ULink + >. + </Para> + +@@ -257,7 +257,7 @@ respective manual pages. + <Para> + A number of sample clients that depend on Motif are available in <ULink + URL="ftp://dps.sourceforge.net/pub/ftp/DPS.tar.gz" +->�</ULink ++>ftp://dps.sourceforge.net/pub/ftp/DPS.tar.gz</ULink + >. Additional + sample clients can be found as part of GtkDPS (see above). + </Para> +--- ./sgml/platforms/SCO.sgml 2007/03/13 23:19:45 1.1 ++++ ./sgml/platforms/SCO.sgml 2007/03/13 23:21:55 +@@ -84,7 +84,7 @@ URL="ftp://ftp.sco.com/pub/openserver5/o + If you are not using OSR 5.0.7 or later, you need to get an updated + console driver. See <ULink + URL="http://www.sco.com" +->�</ULink ++>http://www.sco.com</ULink + > for details on + OpenServer supplements. If you can't or don't want to upgrade your + console driver, X11R&relvers; will still compile, but you may run into diff --git a/app-doc/xorg-docs/files/digest-xorg-docs-1.4-r1 b/app-doc/xorg-docs/files/digest-xorg-docs-1.4-r1 new file mode 100644 index 000000000000..61268d4fa1bd --- /dev/null +++ b/app-doc/xorg-docs/files/digest-xorg-docs-1.4-r1 @@ -0,0 +1,3 @@ +MD5 4f2005bdd430a98c262901383459009e xorg-docs-1.4.tar.bz2 8300321 +RMD160 51cc8289e2e0ed5fca80bcbee91449e20da40849 xorg-docs-1.4.tar.bz2 8300321 +SHA256 fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925 xorg-docs-1.4.tar.bz2 8300321 diff --git a/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild b/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild new file mode 100644 index 000000000000..12eb2db4d334 --- /dev/null +++ b/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2007 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.1 2007/08/01 23:22:55 dberkholz Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org docs" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +RDEPEND="" +DEPEND="${RDEPEND} + >=x11-misc/util-macros-1.1.5 + >=app-doc/xorg-sgml-doctools-1.2 + doc? ( + app-text/docbook-sgml-utils + =app-text/docbook-sgml-dtd-4.2* + )" + +IUSE="doc" + +PATCHES="${FILESDIR}/1.1-allow_manpages_only.patch + ${FILESDIR}/65533-URL-interpolation.patch + ${FILESDIR}/1.4-sgml-fixes.patch" + +CONFIGURE_OPTIONS="--with-x11docdir=/usr/share/doc/${PF} + $(use_enable doc non-man-docs) + --disable-txt + --disable-pdf + --disable-html + --disable-ps + $(use_enable doc txt) + $(use_enable doc pdf) + $(use_enable doc html) + $(use_enable doc ps)" + +# parallel build broken -- https://bugs.gentoo.org/show_bug.cgi?id=170798 +MAKEOPTS="${MAKEOPTS} -j1" |