--- /usr/portage/dev-libs/cgicc/cgicc-3.2.5.ebuild      2008-01-30 11:23:26.000000000 +0000
+++ /usr/portage/dev-libs/cgicc/cgicc-3.2.5-2.ebuild    2009-12-16 20:45:06.000000000 +0000
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cgicc/cgicc-3.2.5.ebuild,v 1.1 2008/01/30 11:23:26 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cgicc/cgicc-3.2.5-2.ebuild,v 1.1 2008/01/30 11:23:26 dev-zero Exp $
+
+inherit autotools

 DESCRIPTION="A C++ class library for writing CGI applications"
 HOMEPAGE="http://www.cgicc.org/"
@@ -8,7 +10,7 @@
 LICENSE="LGPL-3 doc? ( FDL-1.2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc debug"
+IUSE="doc"

 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
@@ -21,14 +23,25 @@
        # upstream bug: #22176
        sed -i \
                -e 's/@GNUCAP_LDFLAGS@//' \
-               cgicc/Makefile.in || die "sed failed"
+               cgicc/Makefile.am || die "sed failed"

        # Fix docdir/htmldir paths in doc/Makefile.in
        # upstream bug: #6385
        sed -i \
                -e 's|$(docdir)|@htmldir@|g' \
                -e 's|$(prefix)/doc/\$(PACKAGE)-\$(VERSION)|@docdir@|' \
-               doc/Makefile.in || die "sed failed"
+               doc/Makefile.am || die "sed failed"
+
+        # Fix libtool links
+        #  bug: #227537 (http://bugs.gentoo.org/227537)
+        rm example/config.guess example/ltmain.sh example/config.sub
+        ln -s /usr/share/libtool/config/config.guess example/
+        ln -s /usr/share/libtool/config/ltmain.sh example/
+        ln -s /usr/share/libtool/config/config.sub example/
+
+        # run autoconf
+        eautoreconf || die "autoconf failed"
+        epatch "${FILESDIR}"/HTMLElement-cstring.patch
 }

 src_compile() {
@@ -42,7 +55,6 @@
        econf \
                --disable-demos \
                --htmldir=/usr/share/doc/${PF}/html \
-               $(use_enable debug debug-logging) \
                || die "econf failed"
        emake || die "emake failed"
 }