fix compilation with sip 4.10, thanks to Victor Yu. Kowalsky and Kacper Kowalik for...
authorFabio Erculiani <lxnay@gentoo.org>
Thu, 25 Feb 2010 14:59:40 +0000 (14:59 +0000)
committerFabio Erculiani <lxnay@gentoo.org>
Thu, 25 Feb 2010 14:59:40 +0000 (14:59 +0000)
Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

sci-chemistry/avogadro/ChangeLog
sci-chemistry/avogadro/Manifest
sci-chemistry/avogadro/avogadro-1.0.0.ebuild
sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch [new file with mode: 0644]

index ee2f3669a29dbe0fb9be3d03c880a29efaab452c..7aa8436697cfeca4ef461a3096d4dfcc60a8219c 100644 (file)
@@ -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)
 
index 619ca243e589a7608cc58c7650073eecda8a9047..80d3a52590cf80d76399ee00c02bfd03680b5bd1 100644 (file)
@@ -1,9 +1,10 @@
 AUX avogadro-0.9.7-shader-include.patch 836 RMD160 5f3df7190a19904d36303df43648103929da835d SHA1 3ed8f1ed9aefedc7a98462588e4bd1955a5d2a67 SHA256 c99f463acb26f8b0b295762935a1ac07062e214b96a18c8d1c5e5595442ecf15
+AUX avogadro-1.0.0-sip-4.10.patch 616 RMD160 269609b257ab06fd39a8d8c652c8c36e472e4886 SHA1 f7ea7f670ab27d7d9a6800e518d17caf0bc11897 SHA256 d17c125b081a68fc119d142721438ac1e67acd1b3136536fb32ece4940320de6
 DIST avogadro-0.9.8.tar.bz2 4815425 RMD160 29d734137ee4e522ebc6d1b6998bd4f13ea6d046 SHA1 78de2419a93af9427a0d31fc0f022a47e924b490 SHA256 105f86f049741d3a72e0e19d364113295975ad853d047bba01795a4496a8f847
 DIST avogadro-0.9.9.tar.bz2 4834645 RMD160 ed5a350377fd07bad5a1cee2343a8c350559c310 SHA1 37f53caa956b4f254ebb98a1df9183c98c6badb9 SHA256 a05efde188b11852098203550e276eaf9931ad001c4cdf1e04a747ed26529724
 DIST avogadro-1.0.0.tar.bz2 4838702 RMD160 514225910de6b37e90fdd52b201b419c11413fc1 SHA1 9d7f2acfd15de5db68572a6221c67d5fc9e7b8e1 SHA256 a262da58c3aa183fca9a0bf3885709444cd35627b866f4a9d9a1b3bf7347d637
 EBUILD avogadro-0.9.8.ebuild 1076 RMD160 c22b85a05b125f41cfadb9aeaf7c1d4c2d902274 SHA1 76863db36e38822cd857feab9277d2a75ab7a748 SHA256 cc868d2477db07a011684e47b3f592d89268a618d9d99d65fe66526686d62429
 EBUILD avogadro-0.9.9.ebuild 1076 RMD160 97139afc4df1afb72034f259edc01d87c172a82a SHA1 ad2057f12c4ba47a65bf5ba7876f903ba3fbb10c SHA256 18aadbb50db0640dc41e8db710a3f7adff7f486d497835fed1369a1bec991682
-EBUILD avogadro-1.0.0.ebuild 1076 RMD160 c0a5e638d520dc56b68be6c8dc2a173f9e25485d SHA1 e1b145c2da3df9c40cd571336ff78ec2cb627066 SHA256 cdf57b7ab5e569445284397cbf3b795c00e7e3119fcef87d4363de788ad1f426
-MISC ChangeLog 4616 RMD160 9190c61bafed4cc03bc220bcea04e1f5e8e1a650 SHA1 f2dff108574d48f66b42ced8d22bda66120b93c1 SHA256 6ecc36c2837521422f330a06ae25ec68c8fcbd1d1fb9113cd68613b9d45f232d
+EBUILD avogadro-1.0.0.ebuild 1137 RMD160 891c8c3ea6ec8aeb8849a5d1228a12f4a79b85de SHA1 1d5bb9ee5b8c328fea32082dea45e01f613caecd SHA256 961059f53aa67b0b9d9cfc03618576becce97cfa23680b0953a160333abf1e94
+MISC ChangeLog 4847 RMD160 bf894d4e5b38490fa8d7e156bbcc81b802d66f7c SHA1 5a9d58fa052a5abaa204573a68e9ce45d769e240 SHA256 28c20c1981a08d14faa6fee89b23dbab49a198c5a49f557691cc58c91fd29533
 MISC metadata.xml 600 RMD160 d3559123f9438a9d0a49783ebb38027f91492e8d SHA1 f0dc9728b4196c6b09e8a0c4fdb02cd9f692cda4 SHA256 298cc4b9c2fc652f167bf9ae6e9faec1cfd1aa41a276295f4d1a6814912b58af
index c4489970da72bd5be4757225460d35b4d6c33b2a..3328bdc6376ecabf81dad149ea39626445896210 100644 (file)
@@ -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 (file)
index 0000000..55d21b9
--- /dev/null
@@ -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.")