sci-chemistry/avogadro: Version Bump prepared by Reinis Danne, #439436; fixes build with latest boost, #406267

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 105 insertions, 26 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index ff1928f689b8..454049098493 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/avogadro
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.40 2011/08/14 17:18:19 alexxy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.41 2012/12/06 18:08:58 jlec Exp $
+
+*avogadro-1.1.0 (06 Dec 2012)
+
+  06 Dec 2012; Justin Lecher <jlec@gentoo.org> +avogadro-1.1.0.ebuild,
+  +files/avogadro-1.1.0-textrel.patch, metadata.xml:
+  Version Bump prepared by Reinis Danne, #439436; fixes build with latest
+  boost, #406267
 
 *avogadro-1.0.3-r1 (14 Aug 2011)
 
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 1d6c8a35c295..41cb7ba9b2ef 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.0.1-gl2ps.patch 1511 RMD160 b9e0ae01bf514c1dc738fd0c5d51ae9c83efb861 SHA1 eafb59894ef10d16b20c43b2a89b33c635273a12 SHA256 0aae5556233c8e413739fdd890b5d8453d9a1e39dd3251a5a7a7705227a13e7b
-DIST avogadro-1.0.3.tar.bz2 4971989 RMD160 67cdeae1b35e5b4cd4cdfd551379779295a0caf1 SHA1 ef108a5faacd46d8b7c20edf91f26292eb7da138 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468
-EBUILD avogadro-1.0.3-r1.ebuild 1295 RMD160 ea5c29d36c764ab039ef962d1e55f1114c034d5c SHA1 686fbd75af263223f3eda92a3737f2a2e2948c6c SHA256 57ccc0fe0915c51ec92e2bb00cdd7cfdc1edeb8cdf71525432a2a7c17e324bc9
-MISC ChangeLog 6325 RMD160 6d400e17f066d21f8f654098c5c6794b015a4d44 SHA1 73bf3d0da29ee0e5fee9f9d5785aa91059abdfca SHA256 ebe2988a461f9afad52ecc4bf9b58dc0d1e77fe05a03aef589b0984378ce4f38
-MISC metadata.xml 533 RMD160 8da1d3bc8c61912c8c5cda149b647aa6d56e3512 SHA1 4ee939428b3b3d34ef86f36b50dd05b3666f1c7c SHA256 f0c611c081821a1a7e7ba42af53fc9bb4318119da01ae593c6fb96d866c31c8a
+AUX 1.0.1-gl2ps.patch 1511 SHA256 0aae5556233c8e413739fdd890b5d8453d9a1e39dd3251a5a7a7705227a13e7b SHA512 b4a8d0138bffa7c018e2125e16a47cefefba01f19ce3d460488f36e44f55b212cea9c9875429e7c0c596388366adea045b50ace579b6352d2b7e0b073420c67f WHIRLPOOL 015420a79e56b5f3da238d73d12e28573636161e4edcdc94db80149aa84621de05b84f08332d701b5ed89dadb414a30e33badc686788698dd539603d2eeb5a05
+AUX avogadro-1.1.0-textrel.patch 756 SHA256 433bc2dcad2809d1b2fd81e846a47481e6d75cb0361b9709efbcc376082ee224 SHA512 8b86fe2032eabf63eb8a284bf6add1d3388c39b5755bd483eac8da0ef5dc2087d043b4e3ad7a61feab37b840e5a004b16dc68086252f2bc0ddfae9cab9d85bf5 WHIRLPOOL 25e0df3b1dc7e02e7778dd66111fd76185548a2cfd358c13f38a54edc3041022cf263083b8e4b83cfb9bd5a493d205d11827dea1fb010d2657de3c847d980cfc
+DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
+DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
+EBUILD avogadro-1.0.3-r1.ebuild 1295 SHA256 57ccc0fe0915c51ec92e2bb00cdd7cfdc1edeb8cdf71525432a2a7c17e324bc9 SHA512 c86444fe22f1304ae7bd51311c0c8930bda2e079a8462f0c53ab582088c4000381daca864afe47789898b966c65493336e594e53d9e1ef312f6b46ac83c6c17d WHIRLPOOL b2ca9ca04fab2c4e0e9dee9e02a316427ca971e016ec12d3873f51b5950e039b4fbc7bc1b5efa3b94607a06f66466dcf9f81cae39e9d8866c5f8cd9975222386
+EBUILD avogadro-1.1.0.ebuild 1435 SHA256 f02780acdc2ddac4cc7a71d3a70ee0301f0f6750cd885c5adec8e1a0b25de8ee SHA512 0df7521c6d938c4085a8f381e58125a738770b60a17772a96e807f17c491b75ee36ebb4ac0f53d7e42b5c7b7f84ed53f2506555ae93416074d21228809f71f33 WHIRLPOOL 52536e06c9c3b9836d7958da9f6c7f3a5a08c9b7a2669ea12f9ff0036353f792382e08d3e75dae55d585457bad32b8224e524a0058bd03850918f1d386c5207e
+MISC ChangeLog 6570 SHA256 fc0aefc8e029f90f69609eb8f00011ee6925cae60e19ba7e75082010affe2068 SHA512 a9a690caedcbb502c77e2cb7a32642a14f22976073e7a2d981ce5553b6487413e7e246518f9504889e2b0e55656ced0c0bd0b0701471030fd23199d6ced9958f WHIRLPOOL da999871ad3d61627df434ab33bd696cf1b35403f0471a9bd04360bf04687457b8448595abdd80ab79f0bfa86a85f5d8c175b9bb7c8432577a889e7bc0cf8b51
+MISC metadata.xml 527 SHA256 d67a0e6d35b2446449ca6937f60adb2e33a204da8dec20f0fa847659348ddc15 SHA512 bb879b77ad6eed881822bee0f262ef3a5fe1b0b63584fe159b0c86501e227b86a32e50f36e79942cda05ef552f91ed0bec2eced8a5a67fbeb1265e979098a0f0 WHIRLPOOL 399f0d4a344ce90420154d1468315a93f388141c8a2e655a69e9a9aa2870cc67bd25dee6ada8e35b0725f43e82d79dad462351db1132c52c04f96204ece1bc2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOSANnAAoJEOf+E+/4L5LmhP4P/29y7w8wrSpKXzEU4jYlvIGi
-OUGrsvRRXTrlDGV2CF1ZxbBX16gQfjuae6WblmEjfy8K2NMZLy/oBBxgI0PYFbyD
-J8Q48KreBpVE9gMw358YuyZ3a+l3o5RImzm09vxyOGqcMqKZBIYtdGvSX4qqIo67
-EQIYXfc1JdqOncs+0l/kPsut7qR079xgklRyjpVoutKKfO76axG1s/9LD4gAFyrL
-XMMpYoDac41krwmmswwFxVkhhf5BrMRuu4IlY3b3qgRSbMrkFPdrLdbfZpgqME/J
-h5pAO+5p+CMZl/jFbX2tZUnvSmuz1GkL7lXSQ4lwi23usB4e4Gga3KfSzSEKiBDj
-TnTkDYIwrFQHWDwGAJlvXFYPVkTbBcfBYe89A6L79UVlx+SYWVRRDmVM7qC60J+O
-QFsCkG+9cq1Vkn5pa/9oebxFNaZnpz8hKRERa9bfdYpuhldzKXmIsIMbm6KfqgBg
-Dyo6/p8Y3HwIrVVsacnOGOEgtUiD8BQQtNcv6b8hpii1LTjyLqKhHJcEEEunH/JD
-Ri0v6nh1+PMb9ggp2D9KBkB+4GuolvdGFvTpRqaiA2aK4nAQuIsDix3s7izxaS1r
-6AuprGegTgHuRQ0/j+29f3sARE0ksdk7spgnw9itRnWiVBuAmCic3KaGbS76Lx8f
-NBDxWCuIrcD5fkx1MY9X
-=5kdi
+iEYEAREIAAYFAlDA3zsACgkQgAnW8HDreRaSnQCeIwAlWW4nMr+pb1r1nIRhdVrJ
+RTkAn3kpUpb6p6pPis49KYw/bb1Zhr5l
+=XEcM
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
new file mode 100644
index 000000000000..81aef8b81eff
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.1.0.ebuild,v 1.1 2012/12/06 18:08:58 jlec Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit cmake-utils eutils python
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.openmolecules.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+glsl python sse2 test"
+
+RDEPEND="
+	>=sci-chemistry/openbabel-2.3.0
+	>=x11-libs/qt-gui-4.5.3:4
+	>=x11-libs/qt-opengl-4.5.3:4
+	x11-libs/gl2ps
+	glsl? ( >=media-libs/glew-1.5.0 )
+	python? (
+		>=dev-libs/boost-1.35.0-r5[python]
+		dev-python/numpy
+		dev-python/sip
+	)"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:2
+	dev-util/cmake"
+
+# https://sourceforge.net/p/avogadro/bugs/653/
+RESTRICT="test"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-textrel.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DENABLE_THREADGL=OFF"
+		"-DENABLE_RPATH=OFF"
+		"-DENABLE_UPDATE_CHECKER=OFF"
+		"-DQT_MKSPECS_DIR=${EPREFIX}/usr/share/qt4/mkspecs"
+		"-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs"
+		$(cmake-utils_use_enable glsl)
+		$(cmake-utils_use_enable test TESTS)
+		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_enable python)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
new file mode 100644
index 000000000000..5b5cf0e4dc17
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
@@ -0,0 +1,15 @@
+ libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
+index fb88316..2ddcfdf 100644
+--- a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
++++ b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
+@@ -20,6 +20,6 @@ add_library(spglib STATIC ${spglib_SRCS})
+ set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
+ 
+ # Set -fPIC on x86_64
+-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
++if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64)$")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
+ endif()
diff --git a/sci-chemistry/avogadro/metadata.xml b/sci-chemistry/avogadro/metadata.xml
index b0721418598d..c478c239e306 100644
--- a/sci-chemistry/avogadro/metadata.xml
+++ b/sci-chemistry/avogadro/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <longdescription>
+	<herd>sci-chemistry</herd>
+	<longdescription>
     Avogadro is an advanced molecular editor designed for cross-platform use in
 	computational chemistry, molecular modeling, bioinformatics, materials
 	science, and related areas. It offers flexible rendering and a powerful
 	plugin architecture.
   </longdescription>
-  <use>
-    <flag name="glsl">Enable glsl features via GLEW.</flag>
-  </use>
+	<use>
+		<flag name="glsl">Enable glsl features via GLEW.</flag>
+	</use>
 </pkgmetadata>