[patch] Updated patch

apr_doc.patch (text/plain), 2.77 KB, created by Arfrever Frehtes Taifersar Arahesis (RETIRED) on 2007-08-12 14:58:19 UTC

--- dev-libs/apr/apr-1.2.9.ebuild
+++ dev-libs/apr/apr-1.2.9.ebuild
@@ -11,10 +11,10 @@
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ipv6 urandom debug"
+IUSE="debug doc ipv6 urandom"
 RESTRICT="test"
 
-DEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
@@ -42,7 +42,7 @@
 		myconf="${myconf} --with-devrandom=/dev/random"
 	fi
 
-	use debug && myconf="${myconf} --enable-maintainer-mode"
+	use debug && myconf="${myconf} --enable-maintainer-mode --enable-pool-debug=all"
 
 	# We pre-load the cache with the correct answer!  This avoids
 	# it violating the sandbox.  This may have to be changed for
@@ -50,7 +50,7 @@
 	# hack is built around documentation in /usr/include/semaphore.h
 	# and the glibc (pthread) source
 	# See bugs 24215 and 133573
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> "${S}"/config.cache
+	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> config.cache
 
 	econf --enable-layout=gentoo \
 		 --enable-threads \
@@ -58,11 +58,15 @@
 		 ${myconf} || die "econf failed!"
 
 	# Make sure we use the system libtool
-	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk
-	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config
-	rm -f "${S}"/libtool
+	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
+	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
+	rm -f libtool
 
 	emake || die "Make failed"
+
+	if use doc ; then
+		emake dox || die "make dox failed"
+	fi
 }
 
 src_install() {
@@ -73,6 +77,10 @@
 	rm "${D}"/usr/$(get_libdir)/apr.exp
 
 	dodoc CHANGES NOTICE
+
+	if use doc ; then
+		dohtml docs/dox/html/* || die "dohtml failed"
+	fi
 }
 
 pkg_postinst() {
--- dev-libs/apr-util/apr-util-1.2.8-r1.ebuild
+++ dev-libs/apr-util/apr-util-1.2.8-r1.ebuild
@@ -15,12 +15,13 @@
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="berkdb gdbm ldap mysql postgres sqlite sqlite3"
+IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
 RESTRICT="test"
 
 DEPEND="dev-libs/expat
 	>=dev-libs/apr-${PV}
 	berkdb? ( =sys-libs/db-4* )
+	doc? ( app-doc/doxygen )
 	gdbm? ( sys-libs/gdbm )
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( =virtual/mysql-5* )
@@ -67,6 +68,10 @@
 		${myconf} || die "econf failed!"
 
 	emake || die "emake failed!"
+
+	if use doc ; then
+		emake dox || die "make dox failed"
+	fi
 }
 
 src_install() {
@@ -77,4 +82,8 @@
 	# This file is only used on AIX systems, which gentoo is not,
 	# and causes collisions between the SLOTs, so kill it
 	rm "${D}"/usr/$(get_libdir)/aprutil.exp
+
+	if use doc ; then
+		dohtml docs/dox/html/* || die "dohtml failed"
+	fi
 }