summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/avogadro/Manifest2
-rw-r--r--sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild56
-rw-r--r--sci-chemistry/avogadro/avogadro-1.1.0.ebuild62
-rw-r--r--sci-chemistry/avogadro/files/1.0.1-gl2ps.patch39
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch29
5 files changed, 0 insertions, 188 deletions
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 9fb4e9f1187a..5badc8a7886a 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,3 +1 @@
-DIST avogadro-1.0.3.tar.bz2 4971989 BLAKE2B 1cebca8c36c265475e68adbcd3dd451088654095545d9546c1d786920d13d312c035b9d6f7f34ea655e7778d392feaf5dedf36fe93775b18f0d644f97229c47d SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210
-DIST avogadro-1.1.0.tar.bz2 10741835 BLAKE2B 1427eb5c060f4566b431ecbd3847526d6ea4cc22067fa78e2e55ae113550c818959d96f1441432872eb5e96bae13f23e17d0a6640c7b034c90140da3e92df073 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a
DIST avogadro-1.1.1.tar.bz2 11118046 BLAKE2B 358eda508c56247fb34e9cf4b4d790859cc156e000fa10f9e2f2700e9e295557dd5e615ca626227a918fa4f699c089bee23596d186f613f8934a73b8cfeeb358 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827
diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
deleted file mode 100644
index ce624e4ae71f..000000000000
--- a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-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 ~arm ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=sci-chemistry/openbabel-2.2.3
- >=dev-qt/qtgui-4.5.3:4
- >=dev-qt/qtopengl-4.5.3:4
- x11-libs/gl2ps
- glsl? ( >=media-libs/glew-1.5.0:0= )
- python? (
- >=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:2"
-
-PATCHES=(
- "${FILESDIR}"/1.0.1-gl2ps.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-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_with cpu_flags_x86_sse2 SSE2)
- $(cmake-utils_use_enable python)
- )
-
- cmake-utils_src_configure
-}
diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
deleted file mode 100644
index ff3a9036301b..000000000000
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-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 ~arm ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2 test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=sci-chemistry/openbabel-2.3.0
- >=dev-qt/qtgui-4.5.3:4
- >=dev-qt/qtopengl-4.5.3:4
- x11-libs/gl2ps
- glsl? ( >=media-libs/glew-1.5.0:0= )
- python? (
- >=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )"
-DEPEND="${RDEPEND}
- dev-cpp/eigen:2"
-
-# https://sourceforge.net/p/avogadro/bugs/653/
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-textrel.patch
- "${FILESDIR}"/${P}-xlibs.patch
- "${FILESDIR}"/${PN}-1.1.1-openbabel.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-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 cpu_flags_x86_sse2 SSE2)
- $(cmake-utils_use_enable python)
- )
-
- cmake-utils_src_configure
-}
diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
deleted file mode 100644
index d8a0c0f758e1..000000000000
--- a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
-index 75b6dfb..d87ac2c 100644
---- a/avogadro/src/CMakeLists.txt
-+++ b/avogadro/src/CMakeLists.txt
-@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
- FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
- set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
- # Add GL2PS to the executable
--set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
-+#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
-
- if( WIN32 )
- set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
-diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
-index 66785fd..2933953 100644
---- a/avogadro/src/mainwindow.cpp
-+++ b/avogadro/src/mainwindow.cpp
-@@ -51,7 +51,7 @@
- //#endif
-
- // Include the GL2PS header
--#include "../gl2ps/gl2ps.h"
-+#include <gl2ps.h>
-
- #include <avogadro/pluginmanager.h>
-
-diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
-index cce8ece..cc084fb 100644
---- a/libavogadro/src/CMakeLists.txt
-+++ b/libavogadro/src/CMakeLists.txt
-@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
- add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
- PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
--target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-+target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
-
- install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
- install(FILES ${libavogadro_HDRS}
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
deleted file mode 100644
index 6d4536ef7c9b..000000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
- libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-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|ppc|ppc64)$")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
- endif()
-diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-index 0cd0c3e..9e89daf 100644
---- a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-+++ b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
- set_target_properties(tubegen 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|ppc|ppc64)$")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
- endif()