Dropping old versions. Added API-doc generation (bug #157046) using doxygen. Updated...

Package-Manager: portage-2.1.2_rc2

diff --git a/dev-libs/xalan-c/ChangeLog b/dev-libs/xalan-c/ChangeLog
index ee993de9ac9619d4b9bdcd84e2dbe090cfef865e..dce31fe24dc1db091136cb649b1e20fe9506565e 100644 (file)
--- a/dev-libs/xalan-c/ChangeLog
+++ b/dev-libs/xalan-c/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xalan-c
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.8 2006/11/07 00:26:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.9 2006/12/04 17:49:19 dev-zero Exp $
+
+  04 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
+  -files/1.8.0-gcc34.patch, -xalan-c-1.7.0.ebuild, -xalan-c-1.8.0.ebuild,
+  xalan-c-1.10.0.ebuild:
+  Dropping old versions. Added API-doc generation (bug #157046) using doxygen.
+  Updated ebuild to make the package use our CXXFLAGS.
 
   07 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> xalan-c-1.10.0.ebuild:
   Marked stable on amd64 for bug #152042

diff --git a/dev-libs/xalan-c/xalan-c-1.10.0.ebuild b/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
index 2e2bf28d45464711c237a426f20473baafaf13d6..426fbd4036655df26b6ab6026624b0e0c26ed9d9 100644 (file)
--- a/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.10.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.10.0.ebuild,v 1.4 2006/11/07 00:26:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.10.0.ebuild,v 1.5 2006/12/04 17:49:19 dev-zero Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
 MY_PV=${PV//./_}
+
 DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
 HOMEPAGE="http://xml.apache.org/xalan-c/"
 SRC_URI="ftp://apache.mirrors.pair.com/xml/xalan-c/Xalan-C_${MY_PV}-src.tar.gz
@@ -16,7 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE="doc"
 
-DEPEND=">=dev-libs/xerces-c-2.4.0"
+RDEPEND=">=dev-libs/xerces-c-2.4.0"
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/xml-xalan/c
 
@@ -25,26 +28,39 @@ src_unpack() {
        cd "${S}"
        chmod a+r $(find . -type f)
        chmod a+rx $(find . -type d)
+
+       sed -i \
+               -e 's/^\(CXXFLAGS\)="$compileroptions/\1="${\1}/' \
+               -e 's/^\(CFLAGS\)="$compileroptions/\1="${\1}/' \
+               runConfigure || die "sed failed"
+
 }
 
 src_compile() {
        export XALANCROOT=${S}
        export XERCESCROOT="/usr/include/xercesc"
        append-ldflags -pthread
-       ./runConfigure -p linux -c "$(tc-getCC)" -x "$(tc-getCXX)" -P /usr || die
-       emake -j1 || die
+
+       ./runConfigure -p linux -c "$(tc-getCC)" -x "$(tc-getCXX)" -P /usr || die "configure failed"
+       emake -j1 || die "emake failed"
+
+       if use doc ; then
+               mkdir build
+               cd "${S}/xdocs"
+               doxygen DoxyfileXalan
+       fi
 }
 
 src_install() {
        export XALANCROOT=${S}
-       make DESTDIR="${D}" install || die
+       emake DESTDIR="${D}" install || die "emake install failed"
 
        dodoc README version.incl
        dohtml readme.html
        if use doc ; then
                dodir /usr/share/doc/${PF}
-               cp -r ${S}/samples ${D}/usr/share/doc/${PF}
-               find ${D}/usr/share/doc/${PF} -type d -name CVS -exec rm -rf '{}' \; >& /dev/null
-               dohtml -r doc/html
+               cp -r "${S}/samples" "${D}/usr/share/doc/${PF}"
+               find "${D}/usr/share/doc/${PF}" -type d -name CVS -exec rm -rf '{}' \; >& /dev/null
+               dohtml -r build/docs/apiDocs
        fi
 }