diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-09 19:19:44 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-09 19:19:44 +0000 |
| commit | d8bfbc548c8fbfb035991a1c3142078075269579 (patch) | |
| tree | 92574d463819a9d2b7596c42b26946b428573216 /dev-libs/liborcus | |
| parent | Add ~amd64, wrt bug #442198 (diff) | |
| download | gentoo-2-d8bfbc548c8fbfb035991a1c3142078075269579.tar.gz gentoo-2-d8bfbc548c8fbfb035991a1c3142078075269579.tar.bz2 gentoo-2-d8bfbc548c8fbfb035991a1c3142078075269579.zip | |
Fix building with latest boost. Wrt bug#442262.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-libs/liborcus')
| -rw-r--r-- | dev-libs/liborcus/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/liborcus/liborcus-0.1.0.ebuild | 13 | ||||
| -rw-r--r-- | dev-libs/liborcus/liborcus-9999.ebuild | 4 |
3 files changed, 18 insertions, 5 deletions
diff --git a/dev-libs/liborcus/ChangeLog b/dev-libs/liborcus/ChangeLog index c8ef0b2b616c..477b4c47c6e2 100644 --- a/dev-libs/liborcus/ChangeLog +++ b/dev-libs/liborcus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/liborcus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.4 2012/09/27 16:44:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.5 2012/11/09 19:19:44 scarabeus Exp $ + + 09 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> liborcus-0.1.0.ebuild, + liborcus-9999.ebuild: + Fix building with latest boost. Wrt bug#442262. 27 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> liborcus-0.1.0.ebuild: Disable spreadsheet model on 0.1 as it aint working there. diff --git a/dev-libs/liborcus/liborcus-0.1.0.ebuild b/dev-libs/liborcus/liborcus-0.1.0.ebuild index 0beaa47a7cc1..5d4c185c0822 100644 --- a/dev-libs/liborcus/liborcus-0.1.0.ebuild +++ b/dev-libs/liborcus/liborcus-0.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.1.0.ebuild,v 1.2 2012/09/27 16:44:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.1.0.ebuild,v 1.3 2012/11/09 19:19:44 scarabeus Exp $ EAPI=4 @@ -20,16 +20,25 @@ SLOT="0" IUSE="static-libs" RDEPEND=" + >=dev-libs/boost-1.51.0 dev-libs/libzip " DEPEND="${RDEPEND} - >=dev-libs/boost-1.48.0 >=dev-util/mdds-0.6.0 " S="${WORKDIR}/${P/-/_}" src_prepare() { + # this is fixed in git + sed -i \ + -e 's:<ostream>:<ostream>\n#include <boost/utility.hpp>:' \ + include/orcus/dom_tree.hpp || die + + sed -i \ + -e 's:$(LIBIXION_LIBS):$(LIBIXION_LIBS) -lboost_system:g' \ + src/liborcus/Makefile.am || die + eautoreconf } diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild index 2a156e18513e..34addb5cdfe1 100644 --- a/dev-libs/liborcus/liborcus-9999.ebuild +++ b/dev-libs/liborcus/liborcus-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.2 2012/09/17 11:51:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.3 2012/11/09 19:19:44 scarabeus Exp $ EAPI=4 @@ -20,11 +20,11 @@ SLOT="0" IUSE="static-libs" RDEPEND=" + >=dev-libs/boost-1.51.0 >=dev-libs/libixion-0.4 dev-libs/libzip " DEPEND="${RDEPEND} - >=dev-libs/boost-1.48.0 >=dev-util/mdds-0.6.0 " |