diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-19 17:15:31 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-01-19 19:39:37 +0100 |
commit | ac9cdfea7a0a64ca70fc819a11f892cc11e5d91c (patch) | |
tree | 27e9678e18849de38bdddcf978ab0ea52046abc1 /sci-chemistry | |
parent | sci-physics/geant-data: Drop old (diff) | |
download | gentoo-ac9cdfea7a0a64ca70fc819a11f892cc11e5d91c.tar.gz gentoo-ac9cdfea7a0a64ca70fc819a11f892cc11e5d91c.tar.bz2 gentoo-ac9cdfea7a0a64ca70fc819a11f892cc11e5d91c.zip |
sci-chemistry/avogadro: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sci-chemistry')
-rw-r--r-- | sci-chemistry/avogadro/Manifest | 1 | ||||
-rw-r--r-- | sci-chemistry/avogadro/avogadro-1.1.1.ebuild | 78 | ||||
-rw-r--r-- | sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch | 16 | ||||
-rw-r--r-- | sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch | 51 | ||||
-rw-r--r-- | sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch | 23 |
5 files changed, 0 insertions, 169 deletions
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest index bce09655f56f..32c261928909 100644 --- a/sci-chemistry/avogadro/Manifest +++ b/sci-chemistry/avogadro/Manifest @@ -1,2 +1 @@ -DIST avogadro-1.1.1.tar.bz2 11118046 BLAKE2B 358eda508c56247fb34e9cf4b4d790859cc156e000fa10f9e2f2700e9e295557dd5e615ca626227a918fa4f699c089bee23596d186f613f8934a73b8cfeeb358 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827 DIST avogadro-1.2.0_p20170207.tar.gz 16805634 BLAKE2B 012ac0fa6e86bdff1ec117e81faf88ddda2e3264b36c3997ce60814f5a5900dc8722266a52bda70715279e640a3deb04a38bc2bfdfc4ae856182d94e25b7c705 SHA512 c5088ba1e1b48f3202766e38b1c3f2016c3facbf4ea544e24eedb0706328815e7500bcebdedfea2a330e665b97f76c7f86b669339c6f5a765533bfd3a88d7b51 diff --git a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild deleted file mode 100644 index 63150ada5fa9..000000000000 --- a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils flag-o-matic python-single-r1 - -DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" -HOMEPAGE="http://avogadro.openmolecules.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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.8.5:4 - >=dev-qt/qtopengl-4.8.5: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} - virtual/pkgconfig - dev-cpp/eigen" - -# https://sourceforge.net/p/avogadro/bugs/653/ -RESTRICT="test" - -PATCHES=( - #"${FILESDIR}"/${PN}-1.1.0-textrel.patch - "${FILESDIR}"/${PN}-1.1.0-xlibs.patch - "${FILESDIR}"/${P}-eigen3.patch - "${FILESDIR}"/${P}-mkspecs-dir.patch - "${FILESDIR}"/${P}-no-strip.patch - "${FILESDIR}"/${P}-pkgconfig_eigen.patch - "${FILESDIR}"/${P}-openbabel.patch - "${FILESDIR}"/${P}-boost-join-moc.patch - "${FILESDIR}"/${P}-gcc-version.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - sed \ - -e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \ - -i CMakeLists.txt || die - # warning: "Eigen2 support is deprecated in Eigen 3.2.x and it will be removed in Eigen 3.3." - append-cppflags -DEIGEN_NO_EIGEN2_DEPRECATED_WARNING - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_THREADEDGL=OFF - -DENABLE_RPATH=OFF - -DENABLE_UPDATE_CHECKER=OFF - -DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs" - -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs - -DENABLE_glsl="$(usex glsl)" - -DENABLE_TESTS="$(usex test)" - -DWITH_SSE2="$(usex cpu_flags_x86_sse2)" - -DENABLE_python="$(usex python)" - ) - - cmake-utils_src_configure -} diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch deleted file mode 100644 index 74a5889ec8ae..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch +++ /dev/null @@ -1,16 +0,0 @@ - * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi) - * Info: Getting attachment 403034 - * Info: Viewing attachment: "X11.patch" -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 60ec98f..03443a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -225,6 +225,7 @@ set(I18N_LANGUAGE "" CACHE STRING "Build i18n only for selected language") - - find_package(Qt4 4.6.0 REQUIRED) # find and setup Qt4 for this project - find_package(OpenGL REQUIRED) # find and setup OpenGL -+find_package(X11 REQUIRED) - find_package(Linguist) # find and setup Linguist - if(NOT Linguist_FOUND) - message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") - diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch deleted file mode 100644 index dc07d6974e12..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- avogadro-1.1.1/CMakeLists.txt.omv~ 2014-01-30 13:58:22.999443609 +0100 -+++ avogadro-1.1.1/CMakeLists.txt 2014-01-30 13:59:31.086106925 +0100 -@@ -230,13 +230,15 @@ if(NOT Linguist_FOUND) - message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") - endif() - --find_package(Eigen3) # find and setup Eigen3 if available -+find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available - if(NOT EIGEN3_FOUND) - message(STATUS "Cannot find Eigen3, trying Eigen2") -- find_package(Eigen2 REQUIRED) # Some version is required -+ find_package(Eigen2) # Some version is required - else() - # Use Stage10 Eigen3 support - set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) -+ add_definitions (-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API) -+ set (EIGEN2_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR}) - endif() - - find_package(ZLIB REQUIRED) ---- avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt.omv~ 2014-01-30 14:12:33.859401753 +0100 -+++ avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt 2014-01-30 14:15:07.652727522 +0100 -@@ -4,6 +4,8 @@ set(LINK_LIBS avogadro) - set(PLUGIN_LABEL extensions) - set(PLUGIN_TARGET extensions) - -+add_definitions(-DEIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS -std=gnu++11) -+ - set(qtaimextension_SRCS - qtaimextension.cpp - # qtaimdialog.cpp ---- avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt.omv~ 2014-01-30 13:59:05.889441500 +0100 -+++ avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt 2014-01-30 13:59:08.832774688 +0100 -@@ -1,5 +1,5 @@ - find_package(Qt4 4.6 REQUIRED) --find_package(Eigen2 REQUIRED) -+find_package(Eigen3 REQUIRED) - - include_directories(${QT_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR}) - ---- avogadro-1.1.1/cmake/modules/AvogadroUse.cmake.orig 2014-10-13 20:13:59.909828034 +0100 -+++ avogadro-1.1.1/cmake/modules/AvogadroUse.cmake 2014-10-13 20:15:09.492822908 +0100 -@@ -12,7 +12,7 @@ - - # Add the Avogadro modules directory to the CMake module path - set(CMAKE_MODULE_PATH ${Avogadro_PLUGIN_DIR}/cmake ${CMAKE_MODULE_PATH}) --find_package(Eigen2 REQUIRED) -+find_package(Eigen3 REQUIRED) - include_directories(${EIGEN2_INCLUDE_DIR}) - if(Avogadro_ENABLE_GLSL) - find_package(GLEW) diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch deleted file mode 100644 index 48840204a8a0..000000000000 --- a/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a8bf7bcd7881147c3bcec97d247a2fa4160019d9 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Tue, 5 Jul 2016 00:10:26 +0200 -Subject: [PATCH] Fix detection of gcc6's version number - -...and be safe for further new versions. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1cbeb8f10..8d2958739 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,7 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) - # Now check if we can use visibility to selectively export symbols - # Get the GCC version - from KDE4 cmake files - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: - if (NOT _gcc_version) |