diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2010-02-25 14:59:40 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2010-02-25 14:59:40 +0000 |
| commit | 31d8267776f01ff3b4cc84c8d1482bbaeb757b7a (patch) | |
| tree | b80f03bda370e20cdd9f48d2b33c9a11686b9a87 /sci-chemistry/avogadro | |
| parent | x86 stable, bug #304805 (diff) | |
| download | gentoo-2-31d8267776f01ff3b4cc84c8d1482bbaeb757b7a.tar.gz gentoo-2-31d8267776f01ff3b4cc84c8d1482bbaeb757b7a.tar.bz2 gentoo-2-31d8267776f01ff3b4cc84c8d1482bbaeb757b7a.zip | |
fix compilation with sip 4.10, thanks to Victor Yu. Kowalsky and Kacper Kowalik for reporting, close bug #303703
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/avogadro')
| -rw-r--r-- | sci-chemistry/avogadro/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/avogadro-1.0.0.ebuild | 8 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch | 13 |
3 files changed, 26 insertions, 4 deletions
diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog index ee2f3669a29d..7aa8436697cf 100644 --- a/sci-chemistry/avogadro/ChangeLog +++ b/sci-chemistry/avogadro/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/avogadro -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.31 2009/10/23 19:29:26 cryos Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.32 2010/02/25 14:59:39 lxnay Exp $ + + 25 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> avogadro-1.0.0.ebuild, + +files/avogadro-1.0.0-sip-4.10.patch: + fix compilation with sip 4.10, thanks to Victor Yu. Kowalsky and + Kacper Kowalik for reporting, close bug #303703 *avogadro-1.0.0 (23 Oct 2009) diff --git a/sci-chemistry/avogadro/avogadro-1.0.0.ebuild b/sci-chemistry/avogadro/avogadro-1.0.0.ebuild index c4489970da72..3328bdc6376e 100644 --- a/sci-chemistry/avogadro/avogadro-1.0.0.ebuild +++ b/sci-chemistry/avogadro/avogadro-1.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.0.ebuild,v 1.1 2009/10/23 19:29:26 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.0.ebuild,v 1.2 2010/02/25 14:59:39 lxnay Exp $ EAPI=2 @@ -30,6 +30,10 @@ DEPEND="${RDEPEND} dev-cpp/eigen:2 >=dev-util/cmake-2.6.2" +src_prepare() { + epatch "${FILESDIR}/${P}-sip-4.10.patch" +} + src_configure() { local mycmakeargs mycmakeargs="${mycmakeargs} diff --git a/sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch b/sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch new file mode 100644 index 000000000000..55d21b98f390 --- /dev/null +++ b/sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch @@ -0,0 +1,13 @@ +--- avogadro-1.0.0.orig/cmake/modules/PythonDeps.cmake ++++ avogadro-1.0.0/cmake/modules/PythonDeps.cmake +@@ -67,6 +67,10 @@ + message(STATUS "using sip version 4.9...") + add_definitions( -DSIP_4_8 ) + endif (${SIP_VERSION} MATCHES "4.9") ++ if (${SIP_VERSION} MATCHES "4.10") ++ message(STATUS "using sip version 4.10...") ++ add_definitions( -DSIP_4_8 ) ++ endif (${SIP_VERSION} MATCHES "4.10") + else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h) + message(STATUS "sip.h header NOT found - Python support disabled") + # message(STATUS "debian/ubuntu: install the python-sip4-dev package.") |