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

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 93 insertions, 7 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/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>