tupone 14/10/27 11:25:23 Modified: ChangeLog cal3d-0.11.0-r1.ebuild Log: Fix test. Bug #526558 (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Revision Changes Path 1.36 media-libs/cal3d/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cal3d/ChangeLog?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cal3d/ChangeLog?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cal3d/ChangeLog?r1=1.35&r2=1.36 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/cal3d/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ChangeLog 29 Jun 2012 11:48:28 -0000 1.35 +++ ChangeLog 27 Oct 2014 11:25:23 -0000 1.36 @@ -1,6 +1,12 @@ # ChangeLog for media-libs/cal3d -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/ChangeLog,v 1.35 2012/06/29 11:48:28 tupone Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/ChangeLog,v 1.36 2014/10/27 11:25:23 tupone Exp $ + + 27 Oct 2014; Alfredo Tupone <tup...@gentoo.org> cal3d-0.11.0-r1.ebuild, + +files/cal3d-0.11.0-tests.patch: + Fix test. Bug #526558 by flamee...@gentoo.org + Migrating to EAPI 5 + removing base eclass usage 29 Jun 2012; Tupone Alfredo <tup...@gentoo.org> cal3d-0.11.0-r1.ebuild, +files/cal3d-0.11.0-verbose.patch: 1.13 media-libs/cal3d/cal3d-0.11.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild?r1=1.12&r2=1.13 Index: cal3d-0.11.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cal3d-0.11.0-r1.ebuild 29 Jun 2012 11:48:28 -0000 1.12 +++ cal3d-0.11.0-r1.ebuild 27 Oct 2014 11:25:23 -0000 1.13 @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild,v 1.12 2012/06/29 11:48:28 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild,v 1.13 2014/10/27 11:25:23 tupone Exp $ -EAPI=2 -inherit eutils base autotools +EAPI=5 +inherit eutils autotools DESCRIPTION="Cal3D is a skeletal based character animation library" HOMEPAGE="http://home.gna.org/cal3d"; @@ -21,37 +21,37 @@ RDEPEND="" src_prepare() { - DOCS=( AUTHORS ChangeLog README TODO ) - use doc && HTML_DOCS=( docs/html/api docs/html/guide ) - PATCHES=( "${FILESDIR}"/${P}-gcc43.patch - "${FILESDIR}"/${P}-verbose.patch ) - - base_src_prepare - if use doc; then - sed -i \ - -e "s:db2html:docbook2html:g" \ - configure.in \ - docs/Makefile.am \ - || die "sed for doc failed" - eautoreconf - fi + epatch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-tests.patch \ + "${FILESDIR}"/${P}-verbose.patch + sed -i \ + -e "s:db2html:docbook2html:g" \ + configure.in \ + docs/Makefile.am \ + || die "sed for doc failed" + eautoreconf } src_configure() { econf \ $(use_enable debug) \ - $(use_enable 16bit-indices) \ - || die + $(use_enable 16bit-indices) } src_compile() { - base_src_compile + emake if use doc; then cd docs - emake doc-api || die "Failed making doc-api" - emake doc-guide || die "Failed making doc-guide" + emake doc-api + emake doc-guide mkdir -p html/{guide,api} mv *.{html,gif} html/guide/ mv api/html/* html/api/ fi } + +src_install() { + default + use doc && dohtml -r docs/html/api docs/html/guide +}
