diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-03-14 14:37:37 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-03-14 14:37:37 +0000 |
| commit | 3462dcd3754245b9898eb509959b405576d3201e (patch) | |
| tree | 8f3564ba2f84cad0f154b9860c2992975900782c /www-client/uzbl/uzbl-9999.ebuild | |
| parent | Version bump, comprising changes from science overlay. (diff) | |
| download | gentoo-2-3462dcd3754245b9898eb509959b405576d3201e.tar.gz gentoo-2-3462dcd3754245b9898eb509959b405576d3201e.tar.bz2 gentoo-2-3462dcd3754245b9898eb509959b405576d3201e.zip | |
[www-client/uzbl] updated makefile patch and sent it upstream - fixes bug #309159. fixed bug 309163. removed old version
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client/uzbl/uzbl-9999.ebuild')
| -rw-r--r-- | www-client/uzbl/uzbl-9999.ebuild | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild index 6e5ce03342bb..f9deec990bf9 100644 --- a/www-client/uzbl/uzbl-9999.ebuild +++ b/www-client/uzbl/uzbl-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.9 2010/01/27 15:33:08 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.10 2010/03/14 14:37:35 wired Exp $ EAPI="2" @@ -49,7 +49,7 @@ RDEPEND=" " pkg_setup() { - use experimental && EGIT_BRANCH="experimental" + use experimental && EGIT_BRANCH="experimental" && EGIT_COMMIT="experimental" if ! use helpers; then elog "uzbl's extra scripts use various optional applications:" @@ -84,8 +84,12 @@ pkg_setup() { src_prepare() { git_src_prepare - # patch Makefile to make it more sane - epatch "${FILESDIR}"/"${P}"-makefile-cleanup.patch + # patch Makefile for DOCDIR + epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch + + # remove -ggdb + sed -i "s/-ggdb //g" Makefile || + die "-ggdb removal sed failed" # adjust path in default config file to /usr/share sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \ @@ -102,8 +106,6 @@ src_install() { use browser && targets="${targets} install-uzbl-browser" use browser && use tabbed && targets="${targets} install-uzbl-tabbed" - emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed" - - # Install the docs in /usr/share/doc. - dodoc AUTHORS README docs/* || die "docs install failed" + emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} || + die "Installation failed" } |