added latest release (see bug #223275) and cleaned up stale versions

(Portage version: 2.2_rc7/cvs/Linux 2.6.26.1 x86_64)

12 files changed, 38 insertions, 824 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e35a430b38be..d5046aaf8978 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.148 2008/07/29 08:43:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.149 2008/08/16 00:30:14 nerdboy Exp $
+
+*doxygen-1.5.6 (16 Aug 2008)
+
+  16 Aug 2008; Steve Arnold <nerdboy@gentoo.org>
+  -files/1.4.6/01_all_cp1251.patch, -files/1.4.6/02_all_freebsd.patch,
+  -files/1.4.6/03_all_segfault.patch,
+  -files/1.4.6/05_all_system-libpng.patch, -files/1.4.6/06_all_qtools.patch,
+  -doxygen-1.4.2.ebuild, -doxygen-1.4.3-r1.ebuild, -doxygen-1.4.5.ebuild,
+  -doxygen-1.4.6.ebuild, -doxygen-1.5.1.ebuild, -doxygen-1.5.3.ebuild,
+  +doxygen-1.5.6.ebuild:
+  Added latest release (see bug #223275) and cleaned up stale versions. I
+  tried to keep enough of the older ones around not to leave anyone out in
+  the cold; if you really need one of the above old versions in portage,
+  please file a bug with your requirements.
 
   29 Jul 2008; Carsten Lohrke <carlo@gentoo.org> doxygen-1.4.2.ebuild,
   doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
deleted file mode 100644
index 59954b2751b6..000000000000
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.24 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc qt3 tetex unicode"
-
-DEPEND="media-gfx/graphviz
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/linux-g++/tmake.conf
-
-	if use userland_Darwin; then
-		epatch "${FILESDIR}/bsd-configure.patch"
-		[[ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]] &&  sed -i -e 's:-D__FreeBSD__:-D__FreeBSD__=5:' \
-		tmake/lib/macosx-c++/tmake.conf
-	fi
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	make DESTDIR="${D}" all || die '"make all" failed.'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
deleted file mode 100644
index 2b8aa0f26c59..000000000000
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.19 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND="media-gfx/graphviz
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/linux-g++/tmake.conf
-
-	epatch "${FILESDIR}/${P}-cp1251.patch"
-	epatch "${FILESDIR}/${P}-nls.patch"
-
-	if use userland_Darwin; then
-		epatch "${FILESDIR}/bsd-configure.patch"
-		[[ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]] && 	sed -i -e 's:-D__FreeBSD__:-D__FreeBSD__=5:' \
-			tmake/lib/macosx-c++/tmake.conf
-	fi
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
deleted file mode 100644
index de4992f0bd8d..000000000000
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.15 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS (on linux and macosx)
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/{linux-g++,macosx-c++}/tmake.conf
-
-	epatch "${FILESDIR}/doxygen-1.4.3-cp1251.patch"
-	epatch "${FILESDIR}/doxygen-1.4.4-darwin.patch"
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		"epatch ${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
deleted file mode 100644
index 9b46394d9227..000000000000
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.16 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Obj-C,
-	Python, IDL , and other C-like languages."
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf
-
-	if use unicode; then
-		epatch "${WORKDIR}/${PN}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		"epatch ${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PV}"
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "See the Doxygen homepage for additional language support tools."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.5.1.ebuild b/app-doc/doxygen/doxygen-1.5.1.ebuild
deleted file mode 100644
index 2cffd1905675..000000000000
--- a/app-doc/doxygen/doxygen-1.5.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.1.ebuild,v 1.7 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs qt3
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	unicode? ( mirror://gentoo/${P}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# still needs patch for Russian text in source files (see bug #112076)
-	if use unicode; then
-	    epatch "${WORKDIR}/${P}-utf8-ru.patch" || die "utf8-ru patch failed"
-	fi
-
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
-
-	if is-flagq "-O3" ; then
-	    echo
-	    ewarn "Compiling with -O3 is known to produce incorrectly"
-	    ewarn "optimized code which breaks doxygen."
-	    echo
-	    epause 6
-	    elog "Continuing with -O2 instead ..."
-	    echo
-	    replace-flags "-O3" "-O2"
-	fi
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "See the Doxygen homepage for additional language support tools."
-	elog
-}
diff --git a/app-doc/doxygen/doxygen-1.5.3.ebuild b/app-doc/doxygen/doxygen-1.5.6.ebuild
index 1dd9ae887026..a93b2fc959d4 100644
--- a/app-doc/doxygen/doxygen-1.5.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.3.ebuild,v 1.7 2008/07/29 08:43:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v 1.1 2008/08/16 00:30:14 nerdboy Exp $
 
 EAPI=1
 
@@ -13,12 +13,16 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot qt3 tetex elibc_FreeBSD"
+IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
 
 RDEPEND="qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
 	virtual/ghostscript
-	!nodot? ( >=media-gfx/graphviz-2.6 )"
+	!nodot? ( >=media-gfx/graphviz-2.6
+		media-libs/freetype )"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
@@ -37,9 +41,9 @@ src_unpack() {
 
 	# Ensure we link to -liconv
 	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}"
-		done
+	    for pro in */*.pro.in */*/*.pro.in; do
+		echo "unix:LIBS += -liconv" >> "${pro}"
+	    done
 	fi
 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
@@ -69,16 +73,17 @@ src_compile() {
 	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
 	# set ./configure options (prefix, Qt based wizard, docdir)
 
+	local my_conf=""
 	if use debug; then
-	    local my_conf="--prefix ${D}usr --debug"
+	    my_conf="--prefix ${D}usr --debug"
 	else
-	    local my_conf="--prefix ${D}usr"
+	    my_conf="--prefix ${D}usr"
 	fi
 
 	if use qt3; then
 	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
+	    export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
+	    export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
 	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
 	    ./configure ${my_conf} $(use_with qt3 doxywizard) \
@@ -100,8 +105,9 @@ src_compile() {
 		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
 		    {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
 	    fi
-	    if use tetex; then
+	    if use latex; then
 		addwrite /var/cache/fonts
+		addwrite /var/cache/fontconfig
 		addwrite /usr/share/texmf/fonts/pk
 		addwrite /usr/share/texmf/ls-R
 		make pdf || ewarn '"make pdf docs" failed.'
@@ -132,8 +138,8 @@ src_install() {
 
 	# pdf and html manuals
 	if use doc; then
-	    insinto /usr/share/doc/${PF}
-	    if use tetex; then
+	    insinto /usr/share/doc/"${PF}"
+	    if use latex; then
 		doins latex/doxygen_manual.pdf
 	    fi
 	    dohtml -r html/*
@@ -144,7 +150,7 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 
 	elog
-	elog "The USE flags qt3, doc, and tetex will enable doxywizard, or"
+	elog "The USE flags qt3, doc, and latex will enable doxywizard, or"
 	elog "the html and pdf documentation, respectively.  For examples"
 	elog "and other goodies, see the source tarball.  For some example"
 	elog "output, run doxygen on the doxygen source using the Doxyfile"
@@ -152,7 +158,8 @@ pkg_postinst() {
 	elog
 	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
 	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional language support tools."
+	elog "See the Doxygen homepage for additional helper tools to parse"
+	elog "more languages."
 	elog
 }
 
diff --git a/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch
deleted file mode 100644
index 0ffed14733e1..000000000000
--- a/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- qtools/qtextcodec.cpp.orig	2003-12-14 14:00:57.000000000 -0800
-+++ qtools/qtextcodec.cpp	2005-05-29 19:13:17.000000000 -0700
-@@ -1321,7 +1321,7 @@
- 
- 
- 
--#ifndef QT_NO_CODECS
-+// #ifndef QT_NO_CODECS
- 
- class QSimpleTextCodec: public QTextCodec
- {
-@@ -1948,7 +1948,7 @@
- }
- 
- 
--#endif // QT_NO_CODECS
-+// #endif // QT_NO_CODECS
- 
- class QLatin1Codec: public QTextCodec
- {
-@@ -2048,12 +2048,13 @@
- {
-     (void)new QLatin1Codec;
- 
--#ifndef QT_NO_CODECS
-+
-     int i = 0;
-     do {
-         (void)new QSimpleTextCodec( i );
-     } while( unicodevalues[i++].mib != LAST_MIB );
- 
-+#ifndef QT_NO_CODECS
-     (void)new QEucJpCodec;
-     (void)new QSjisCodec;
-     (void)new QJisCodec;
diff --git a/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch b/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch
deleted file mode 100644
index 16a827dd5384..000000000000
--- a/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: doxygen-1.4.6/configure
-===================================================================
---- doxygen-1.4.6.orig/configure
-+++ doxygen-1.4.6/configure
-@@ -158,6 +158,9 @@ if test -z "$f_platform"; then
-       ;;
-     FreeBSD:*)
-       f_platform=freebsd-g++
-+      if test "$f_insttool" = NO; then
-+        f_insttool=/usr/bin/install
-+      fi
-       ;;
-     HP-UX:*)
-       f_platform=hpux-g++
diff --git a/app-doc/doxygen/files/1.4.6/03_all_segfault.patch b/app-doc/doxygen/files/1.4.6/03_all_segfault.patch
deleted file mode 100644
index 5b62c475cff5..000000000000
--- a/app-doc/doxygen/files/1.4.6/03_all_segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doxygen-1.4.6.orig/src/doxygen.cpp
-+++ doxygen-1.4.6/src/doxygen.cpp
-@@ -1912,7 +1912,7 @@
-         // variable already in the scope
-       {
-         if (! // not a php array
--            (getLanguageFromFileName(md->getFileDef()->name())==SrcLangExt_PHP) &&
-+            (md->getFileDef() && getLanguageFromFileName(md->getFileDef()->name())==SrcLangExt_PHP) &&
-             (md->argsString()!=root->args && root->args.find('[')!=-1)
-            ) 
-           // not a php array variable
diff --git a/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch
deleted file mode 100644
index 491e3a22a801..000000000000
--- a/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch
-+++ doxygen-1.4.6/debian/patches/system-libpng.dpatch
-@@ -0,0 +1,121 @@
-+#! /bin/sh -e
-+
-+# DP: Use the system libpng library
-+
-+dir=
-+if [ $# -eq 3 -a "$2" = '-d' ]; then
-+    pdir="-d $3"
-+    dir="$3/"
-+elif [ $# -ne 1 ]; then
-+    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+    exit 1
-+fi
-+case "$1" in
-+    -patch)
-+        patch $pdir -f --no-backup-if-mismatch -p1 < $0
-+        ;;
-+    -unpatch)
-+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
-+        ;;
-+    *)
-+	echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+        exit 1
-+esac
-+exit 0
-+
-+diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp
-+--- ./src/pngenc.cpp.orig	2004-01-06 04:40:25.000000000 +0100
-++++ ./src/pngenc.cpp	2004-09-21 09:04:40.000000000 +0200
-+@@ -25,7 +25,7 @@
-+ #endif
-+ 
-+ #define ALL_STATIC
-+-#include <../libpng/png.h>
-++#include <png.h>
-+ #include <stdio.h>
-+ #include <stdlib.h>
-+ #include <string.h>
-+diff -u ./Makefile.in.orig ./Makefile.in
-+--- ./Makefile.in.orig	2003-11-13 04:40:21.000000000 +0100
-++++ ./Makefile.in	2004-09-21 09:04:40.000000000 +0200
-+@@ -7,7 +7,6 @@
-+ 	cd doc ; $(MAKE) clean
-+ 	cd qtools ; $(MAKE) clean
-+ 	cd src ; $(MAKE) clean
-+-	cd libpng ; $(MAKE) clean
-+ 	cd libmd5 ; $(MAKE) clean
-+ 	cd addon/doxywizard ; $(MAKE) clean
-+ 	cd addon/doxmlparser/src ; $(MAKE) clean
-+@@ -18,7 +17,6 @@
-+ 
-+ distclean: clean
-+ 	cd src ; $(MAKE) distclean
-+-	cd libpng ; $(MAKE) distclean
-+ 	cd libmd5 ; $(MAKE) distclean
-+ 	cd addon/doxywizard ; $(MAKE) distclean
-+ 	cd addon/doxmlparser/src ; $(MAKE) distclean
-+@@ -31,11 +29,10 @@
-+ 	-rm -f objects/*.o
-+ 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
-+ 	-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
-+-	-rm -f libpng/Makefile.libpng
-+ 	-rm -f libmd5/Makefile.libmd5
-+ 	-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
-+ 	-rm -f .makeconfig .tmakeconfig
-+-	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
-++	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
-+ 	-rm -f src/version.cpp
-+ 	-rm -r addon/doxywizard/Makefile
-+ 	-rm -f addon/doxywizard/Makefile.doxywizard
-+diff -u ./configure.orig ./configure
-+--- ./configure.orig	2004-09-14 04:40:12.000000000 +0200
-++++ ./configure	2004-09-21 09:09:06.000000000 +0200
-+@@ -457,7 +457,7 @@
-+ EOF
-+ fi
-+ 
-+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in"
-++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in"
-+ 
-+ for i in $f_inmakefiles ; do
-+      SRC=$i
-+@@ -474,7 +474,6 @@
-+        echo "" >> $DST
-+        echo "all: src/version.cpp " >> $DST
-+        echo "	\$(MAKE) -C qtools" >> $DST
-+-       echo "	\$(MAKE) -C libpng" >> $DST
-+        echo "	\$(MAKE) -C libmd5" >> $DST
-+        echo "	\$(MAKE) -C src" >> $DST
-+        if test $f_wizard = YES; then
-+@@ -491,7 +490,7 @@
-+      echo "  Created $DST from $SRC..."
-+ done
-+ 
-+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" 
-++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" 
-+ 
-+ for i in $f_inprofiles ; do
-+      SRC=$i
-+diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in
-+--- ./src/doxygen.pro.in.orig	2004-05-18 04:40:13.000000000 +0200
-++++ ./src/doxygen.pro.in	2004-09-21 09:58:06.000000000 +0200
-+@@ -28,7 +28,7 @@
-+ win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
-+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-+-INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
-++INCLUDEPATH                += ../qtools ../libmd5 .
-+ #win32-g++:INCLUDEPATH      -= ../libpng
-+ DESTDIR                    =  ../bin
-+ TARGET                     =  doxygen
-+diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in
-+--- ./src/libdoxygen.pro.in.orig	2004-08-25 04:40:18.000000000 +0200
-++++ ./src/libdoxygen.pro.in	2004-09-21 09:58:55.000000000 +0200
-+@@ -189,7 +189,6 @@
-+ win32-msvc:TMAKE_CXXFLAGS  += -Zm200
-+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-+ INCLUDEPATH                += ../qtools
-+-INCLUDEPATH                += ../libpng
-+ INCLUDEPATH                += ../libmd5
-+ win32:INCLUDEPATH          += .
-+ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
diff --git a/app-doc/doxygen/files/1.4.6/06_all_qtools.patch b/app-doc/doxygen/files/1.4.6/06_all_qtools.patch
deleted file mode 100644
index 38a4fcbf000e..000000000000
--- a/app-doc/doxygen/files/1.4.6/06_all_qtools.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch
-+++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch
-@@ -0,0 +1,41 @@
-+#! /bin/sh -e
-+
-+# DP: Remove unused code that does not build with gcc 4.0 (#338099).
-+
-+dir=
-+if [ $# -eq 3 -a "$2" = '-d' ]; then
-+    pdir="-d $3"
-+    dir="$3/"
-+elif [ $# -ne 1 ]; then
-+    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+    exit 1
-+fi
-+case "$1" in
-+    -patch)
-+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-+        ;;
-+    -unpatch)
-+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-+        ;;
-+    *)
-+	echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
-+        exit 1
-+esac
-+exit 0
-+
-+--- qtools/qstring.h.orig	2004-12-01 19:26:16.000000000 +0000
-++++ qtools/qstring.h	2005-12-04 20:09:01.000000000 +0000
-+@@ -163,8 +163,13 @@
-+     bool isLetterOrNumber() const;
-+     bool isDigit() const;
-+ 
-++    // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM,
-++    // so they have been removed; the methods are not needed for doxygen
-++#if 0
-+     uchar& cell() { return cl; }
-+     uchar& row() { return rw; }
-++#endif
-++
-+     uchar cell() const { return cl; }
-+     uchar row() const { return rw; }
-+