Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 188485 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +23 lines)
Line  Link Here
0
-- dev-libs/apr/apr-1.2.9.ebuild
0
++ dev-libs/apr/apr-1.2.9.ebuild
Lines 11-20 Link Here
11
LICENSE="Apache-2.0"
11
LICENSE="Apache-2.0"
12
SLOT="1"
12
SLOT="1"
13
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
13
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
14
IUSE="ipv6 urandom debug"
14
IUSE="debug doc ipv6 urandom"
15
RESTRICT="test"
15
RESTRICT="test"
16
16
17
DEPEND=""
17
DEPEND="doc? ( app-doc/doxygen )"
18
18
19
src_unpack() {
19
src_unpack() {
20
	unpack ${A}
20
	unpack ${A}
Lines 42-48 Link Here
42
		myconf="${myconf} --with-devrandom=/dev/random"
42
		myconf="${myconf} --with-devrandom=/dev/random"
43
	fi
43
	fi
44
44
45
	use debug && myconf="${myconf} --enable-maintainer-mode"
45
	use debug && myconf="${myconf} --enable-maintainer-mode --enable-pool-debug=all"
46
46
47
	# We pre-load the cache with the correct answer!  This avoids
47
	# We pre-load the cache with the correct answer!  This avoids
48
	# it violating the sandbox.  This may have to be changed for
48
	# it violating the sandbox.  This may have to be changed for
Lines 63-68 Link Here
63
	rm -f "${S}"/libtool
63
	rm -f "${S}"/libtool
64
64
65
	emake || die "Make failed"
65
	emake || die "Make failed"
66
67
	if use doc ; then
68
		emake dox || die "Make dox failed"
69
	fi
66
}
70
}
67
71
68
src_install() {
72
src_install() {
Lines 73-78 Link Here
73
	rm "${D}"/usr/$(get_libdir)/apr.exp
77
	rm "${D}"/usr/$(get_libdir)/apr.exp
74
78
75
	dodoc CHANGES NOTICE
79
	dodoc CHANGES NOTICE
80
81
	if use doc ; then
82
		dohtml "${S}"/docs/dox/html/* || die "dohtml failed"
83
	fi
76
}
84
}
77
85
78
pkg_postinst() {
86
pkg_postinst() {
79
-- dev-libs/apr-util/apr-util-1.2.8-r1.ebuild
87
++ dev-libs/apr-util/apr-util-1.2.8-r1.ebuild
Lines 15-26 Link Here
15
LICENSE="Apache-2.0"
15
LICENSE="Apache-2.0"
16
SLOT="1"
16
SLOT="1"
17
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
17
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
18
IUSE="berkdb gdbm ldap mysql postgres sqlite sqlite3"
18
IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
19
RESTRICT="test"
19
RESTRICT="test"
20
20
21
DEPEND="dev-libs/expat
21
DEPEND="dev-libs/expat
22
	>=dev-libs/apr-${PV}
22
	>=dev-libs/apr-${PV}
23
	berkdb? ( =sys-libs/db-4* )
23
	berkdb? ( =sys-libs/db-4* )
24
	doc? ( app-doc/doxygen )
24
	gdbm? ( sys-libs/gdbm )
25
	gdbm? ( sys-libs/gdbm )
25
	ldap? ( =net-nds/openldap-2* )
26
	ldap? ( =net-nds/openldap-2* )
26
	mysql? ( =virtual/mysql-5* )
27
	mysql? ( =virtual/mysql-5* )
Lines 67-72 Link Here
67
		${myconf} || die "econf failed!"
68
		${myconf} || die "econf failed!"
68
69
69
	emake || die "emake failed!"
70
	emake || die "emake failed!"
71
72
	if use doc ; then
73
		emake dox || die "Make dox failed"
74
	fi
70
}
75
}
71
76
72
src_install() {
77
src_install() {
Lines 77-80 Link Here
77
	# This file is only used on AIX systems, which gentoo is not,
82
	# This file is only used on AIX systems, which gentoo is not,
78
	# and causes collisions between the SLOTs, so kill it
83
	# and causes collisions between the SLOTs, so kill it
79
	rm "${D}"/usr/$(get_libdir)/aprutil.exp
84
	rm "${D}"/usr/$(get_libdir)/aprutil.exp
85
86
	if use doc ; then
87
		dohtml "${S}"/docs/dox/html/* || die "dohtml failed"
88
	fi
80
}
89
}

Return to bug 188485