summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-07-21 10:05:13 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-07-21 10:05:13 +0000
commit4bffd1d81d5af2f431952e64500ffd0c8b23ba97 (patch)
tree18401b9da2a0d211aafff967c2a760f7e84ba51e
parent2020-07-21 09:46:03 UTC (diff)
parentsci-chemistry/vmd: Drop old (diff)
downloadgentoo-4bffd1d81d5af2f431952e64500ffd0c8b23ba97.tar.gz
gentoo-4bffd1d81d5af2f431952e64500ffd0c8b23ba97.tar.bz2
gentoo-4bffd1d81d5af2f431952e64500ffd0c8b23ba97.zip
Merge updates from master
-rw-r--r--app-eselect/eselect-vi/eselect-vi-1.2.ebuild2
-rw-r--r--dev-libs/clhpp/clhpp-2.0.12.ebuild2
-rw-r--r--dev-libs/libinput/libinput-1.15.6.ebuild2
-rw-r--r--dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild2
-rw-r--r--dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild2
-rw-r--r--dev-ruby/x25519/x25519-1.0.8.ebuild2
-rw-r--r--media-libs/libao/libao-1.2.2-r1.ebuild2
-rw-r--r--media-libs/libgig/libgig-4.2.0.ebuild4
-rw-r--r--media-libs/libglvnd/libglvnd-1.3.2.ebuild2
-rw-r--r--media-libs/libsoundio/libsoundio-2.0.0.ebuild2
-rw-r--r--media-libs/stk/stk-4.6.1.ebuild2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild2
-rw-r--r--media-sound/lmms/lmms-1.2.1.ebuild2
-rw-r--r--net-misc/dropbear/dropbear-2020.80.ebuild2
-rw-r--r--sci-chemistry/vmd/Manifest2
-rw-r--r--sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch28
-rw-r--r--sci-chemistry/vmd/files/vmd-1.9.2-format-security.patch16
-rw-r--r--sci-chemistry/vmd/vmd-1.9.2.ebuild256
-rw-r--r--sci-chemistry/vmd/vmd-1.9.3-r1.ebuild267
-rw-r--r--sci-chemistry/vmd/vmd-1.9.3-r4.ebuild271
-rw-r--r--sci-chemistry/vmd/vmd-1.9.3.ebuild255
-rw-r--r--sci-libs/nlopt/Manifest1
-rw-r--r--sci-libs/nlopt/files/nlopt-2.3-as-needed.patch23
-rw-r--r--sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch10
-rw-r--r--sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch62
-rw-r--r--sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch49
-rw-r--r--sci-libs/nlopt/nlopt-2.4.2-r2.ebuild118
-rw-r--r--sci-libs/nlopt/nlopt-2.6.2-r1.ebuild2
-rw-r--r--sci-libs/nlopt/nlopt-2.6.2.ebuild110
-rw-r--r--sys-libs/libseccomp/libseccomp-2.5.0.ebuild3
-rw-r--r--sys-libs/libseccomp/libseccomp-9999.ebuild3
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild2
-rw-r--r--x11-libs/cairo/cairo-1.16.0-r4.ebuild2
-rw-r--r--x11-libs/libdrm/libdrm-2.4.102.ebuild2
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild2
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild2
-rw-r--r--x11-wm/twm/twm-1.0.11.ebuild2
-rw-r--r--xfce-base/thunar/thunar-1.8.15.ebuild2
38 files changed, 27 insertions, 1493 deletions
diff --git a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
index ff857e6a03e3..8c69f5dffa48 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-admin/eselect"
diff --git a/dev-libs/clhpp/clhpp-2.0.12.ebuild b/dev-libs/clhpp/clhpp-2.0.12.ebuild
index 9a31f0397b8b..d7a61c4044f0 100644
--- a/dev-libs/clhpp/clhpp-2.0.12.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> $
LICENSE="Khronos-CLHPP"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="virtual/opencl"
RDEPEND="${DEPEND}"
diff --git a/dev-libs/libinput/libinput-1.15.6.ebuild b/dev-libs/libinput/libinput-1.15.6.ebuild
index 94e9ed544808..1e8da08891db 100644
--- a/dev-libs/libinput/libinput-1.15.6.ebuild
+++ b/dev-libs/libinput/libinput-1.15.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
index 282d9f9bccf0..84b66865615f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc +html +ical +ini +subtitles +yaml"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
index b561440e321e..dccb52657443 100644
--- a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
IUSE="ed25519 test"
ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )"
diff --git a/dev-ruby/x25519/x25519-1.0.8.ebuild b/dev-ruby/x25519/x25519-1.0.8.ebuild
index 8245f6a6a8fc..3220c03c3432 100644
--- a/dev-ruby/x25519/x25519-1.0.8.ebuild
+++ b/dev-ruby/x25519/x25519-1.0.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/crypto-rb/x25519/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
IUSE=""
all_ruby_prepare() {
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
index d7fe1e1afab9..ee3051f98318 100644
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ b/media-libs/libao/libao-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="alsa nas mmap pulseaudio static-libs"
RDEPEND="
diff --git a/media-libs/libgig/libgig-4.2.0.ebuild b/media-libs/libgig/libgig-4.2.0.ebuild
index 2ccb3fcaa142..d79cf9a5d5f3 100644
--- a/media-libs/libgig/libgig-4.2.0.ebuild
+++ b/media-libs/libgig/libgig-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc"
RDEPEND="
diff --git a/media-libs/libglvnd/libglvnd-1.3.2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
index e13c74e640ca..45f589e3bee9 100644
--- a/media-libs/libglvnd/libglvnd-1.3.2.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
S=${WORKDIR}/${PN}-v${PV}
fi
diff --git a/media-libs/libsoundio/libsoundio-2.0.0.ebuild b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
index 638496809221..a2ff792b5b8c 100644
--- a/media-libs/libsoundio/libsoundio-2.0.0.ebuild
+++ b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/andrewrk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa coreaudio examples jack pulseaudio static-libs"
DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
diff --git a/media-libs/stk/stk-4.6.1.ebuild b/media-libs/stk/stk-4.6.1.ebuild
index dcf17ad19a50..7f4e3b6ed7c8 100644
--- a/media-libs/stk/stk-4.6.1.ebuild
+++ b/media-libs/stk/stk-4.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa debug doc jack oss static-libs"
BDEPEND="
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
index ac318ddcd7c4..df5e32f75e32 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild
index 1a55310d9c50..49ab03f05489 100644
--- a/media-sound/lmms/lmms-1.2.1.ebuild
+++ b/media-sound/lmms/lmms-1.2.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/net-misc/dropbear/dropbear-2020.80.ebuild b/net-misc/dropbear/dropbear-2020.80.ebuild
index 85c2a45375cc..276eaf05fc27 100644
--- a/net-misc/dropbear/dropbear-2020.80.ebuild
+++ b/net-misc/dropbear/dropbear-2020.80.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 49868a8280db..977dcfa66a20 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,4 +1,2 @@
-DIST vmd-1.9.2-gentoo-patches.tar.xz 14896 BLAKE2B eb7c7fb982602f37bd8374bf8458a0a2ea2202161248caffd0d4e0f8124d627755304bb778976e1cf5598b6bfbbe5d8c8e6016c9ec562204d6782aaaf179b185 SHA512 0516b9e57b256ce822a64df420ebf3ab7391722757caeaa7e615526242043e9375fee8f4ee86fb4eb8de7a50d5cfc8f8d973ace5fa082e6f9010eb692cd6ee51
-DIST vmd-1.9.2.src.tar.gz 34903084 BLAKE2B f7f7048ef7bb72a8b0dcae955c7f90691085158c38a59229d5b929a4b52d3148bdb2f40084cf8c4544f01cb8bcb57de1d98a90bd17568a07c4ebb8f6985cec9b SHA512 b232b743d4ea97dcf76e3005e1c8716d7138602edc078c4846026ab67759c8559af956182cb1acf3c85890db10b6f658ac9c269d432f2595612cf376d6d505ef
DIST vmd-1.9.3-gentoo-patches.tar.xz 14804 BLAKE2B 64e5df40ed88c23c924d32636495f0383590f91dbb714e64c73551072bb50d72b4e5f188fb2da58d32e84b4bc96ff0297d7ff1bf02b0481198901c4e12e4ee59 SHA512 5d506d4df5ca4a3edb33d77aeeb440fcb4750a250c77103b99f385f356eb9d71d954173b981d3a50f7a714cfc872587e5040868904e50fa1f6fd69d7e4d9f1b1
DIST vmd-1.9.3.src.tar 129566720 BLAKE2B 848f3280d51765dcd18722dd233e0cdee3b7c0ac3dd48324260ebe1604ba781ca0a1fe4cae6652501d23d5d41712020e17dbb6bc21a1856eb3289a4aab6b774b SHA512 0502df1e8b60c570ca88b779b4153acfaa599a78df53fa96fca36301bab902864118332b5524ae7d170d3a9e429cf1e13d69e1197268b5e841afc0bb56a737ba
diff --git a/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch b/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
deleted file mode 100644
index 67eb11bbd36b..000000000000
--- a/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- vmd-1.9.1/src/CUDAMarchingCubes.cu | 1 +
- vmd-1.9.1/src/CUDAQuickSurf.cu | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/vmd-1.9.1/src/CUDAMarchingCubes.cu b/vmd-1.9.1/src/CUDAMarchingCubes.cu
-index 5bfe7bf..36faaf0 100755
---- a/src/CUDAMarchingCubes.cu
-+++ b/src/CUDAMarchingCubes.cu
-@@ -45,6 +45,7 @@
- #include "CUDAMarchingCubes.h"
- #include <thrust/scan.h>
- #include <thrust/functional.h>
-+#include <thrust/device_ptr.h>
-
- // The number of threads to use for triangle generation
- // (limited by shared memory size)
-diff --git a/vmd-1.9.1/src/CUDAQuickSurf.cu b/vmd-1.9.1/src/CUDAQuickSurf.cu
-index a21ebde..56a42c8 100755
---- a/src/CUDAQuickSurf.cu
-+++ b/src/CUDAQuickSurf.cu
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <cuda.h>
-+#include <thrust/device_ptr.h>
-
- #if CUDART_VERSION < 4000
- #error The VMD QuickSurf feature requires CUDA 4.0 or later
diff --git a/sci-chemistry/vmd/files/vmd-1.9.2-format-security.patch b/sci-chemistry/vmd/files/vmd-1.9.2-format-security.patch
deleted file mode 100644
index 3f9ea5c8c2ef..000000000000
--- a/sci-chemistry/vmd/files/vmd-1.9.2-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- plugins/molfile_plugin/src/maeffplugin.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/molfile_plugin/src/maeffplugin.cxx b/plugins/molfile_plugin/src/maeffplugin.cxx
-index cfe1223..41d92bb 100644
---- a/plugins/molfile_plugin/src/maeffplugin.cxx
-+++ b/plugins/molfile_plugin/src/maeffplugin.cxx
-@@ -1979,7 +1979,7 @@ namespace {
- }
- }
- catch (std::exception &e) {
-- fprintf(stderr, e.what());
-+ fprintf(stderr, "%s", e.what());
- return MOLFILE_ERROR;
- }
- return MOLFILE_SUCCESS;
diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild b/sci-chemistry/vmd/vmd-1.9.2.ebuild
deleted file mode 100644
index 92daf0304775..000000000000
--- a/sci-chemistry/vmd/vmd-1.9.2.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cuda eutils flag-o-matic multilib prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="Visual Molecular Dynamics"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
-SRC_URI="
- https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
- ${P}.src.tar.gz"
-
-SLOT="0"
-LICENSE="vmd"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="fetch"
-
-# currently, tk-8.5* with USE=truetype breaks some
-# tk apps such as Sequence Viewer or Timeline.
-CDEPEND="
- >=dev-lang/tk-8.6.1
- dev-lang/perl
- dev-libs/expat
- $(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
- ')
- sci-libs/netcdf:0=
- virtual/opengl
- >=x11-libs/fltk-1.1.10-r2:1
- x11-libs/libXft
- x11-libs/libXi
- ${PYTHON_DEPS}
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
- gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1[tng] )
- sqlite? ( dev-db/sqlite:3= )
- tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- dev-lang/swig"
-RDEPEND="${CDEPEND}
- sci-biology/stride
- sci-chemistry/surf
- x11-terms/xterm
- msms? ( sci-chemistry/msms-bin )
- povray? ( media-gfx/povray )
- "
-
-VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
-# Binary only plugin!!
-QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
-QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-
-pkg_nofetch() {
- elog "Please download ${P}.src.tar.gz from"
- elog "${VMD_DOWNLOAD}"
- elog "after agreeing to the license and get"
- elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
- elog "Place both into your DISTDIR directory"
-}
-
-src_prepare() {
- use cuda && cuda_sanitize
-
- epatch "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
-
- cd "${WORKDIR}"/plugins || die
-
- epatch \
- "${WORKDIR}"/${P}-gentoo-plugins.patch \
- "${FILESDIR}"/${P}-format-security.patch
-
- [[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
-
- sed \
- -e "s:CC = gcc:CC = $(tc-getCC):" \
- -e "s:CXX = g++:CXX = $(tc-getCXX):" \
- -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
- -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
- -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
- -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
- -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
- -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
- -e "s:-ltcl8.5:-ltcl:" \
- -i Make-arch || die "Failed to set up plugins Makefile"
-
- sed \
- -e '/^AR /s:=:?=:g' \
- -e '/^RANLIB /s:=:?=:g' \
- -i ../plugins/*/Makefile || die
-
- tc-export AR RANLIB
-
- sed \
- -e "s:\$(CXXFLAGS)::g" \
- -i hesstrans/Makefile || die
-
- # prepare vmd itself
- cd "${S}" || die
-
- epatch "${WORKDIR}"/${P}-gentoo-base.patch
-
- # PREFIX
- sed \
- -e "s:/usr/include/:${EPREFIX}/usr/include:g" \
- -i configure || die
-
- sed \
- -e "s:gentoo-bindir:${ED}/usr/bin:g" \
- -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
- -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
- -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:gentoo-gcc:$(tc-getCC):g" \
- -e "s:gentoo-g++:$(tc-getCXX):g" \
- -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
- -e "s:gentoo-cflags:${CFLAGS}:g" \
- -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
- -e "s:gentoo-nvflags::g" \
- -e "s:gentoo-ldflags:${LDFLAGS}:g" \
- -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
- -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
- -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
- -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
- -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -i configure || die
-
- if use cuda; then
- sed \
- -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
- -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
- -i configure src/Makefile || die
- sed \
- -e '/compute_/d' \
- -i configure || die
- sed \
- -e 's:-gencode .*code=sm_..::' \
- -i src/Makefile || die
- fi
-
- sed \
- -e "s:LINUXPPC:LINUX:g" \
- -e "s:LINUXALPHA:LINUX:g" \
- -e "s:LINUXAMD64:LINUX:g" \
- -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
- -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
- -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
- -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
-
- EMAKEOPTS=(
- TCLINC="-I${EPREFIX}/usr/include"
- TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
- TCLLDFLAGS="-shared"
- NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf) ${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
- NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf) ${EPREFIX}/usr/include"
- NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
- NETCDFDYNAMIC=1
- EXPATINC="-I${EPREFIX}/usr/include"
- EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
- EXPATLDFLAGS="-shared"
- EXPATDYNAMIC=1
- )
- if use gromacs; then
- EMAKEOPTS+=(
- TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
- TNGINC="-I${EPREFIX}/usr/include"
- TNGLDFLAGS="-shared"
- TNGDYNAMIC=1
- )
- fi
- if use sqlite; then
- EMAKEOPTS+=(
- SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
- SQLITEINC="-I${EPREFIX}/usr/include"
- SQLITELDFLAGS="-shared"
- SQLITEDYNAMIC=1
- )
- fi
-}
-
-src_configure() {
- local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
- rm -f configure.options && echo $myconf >> configure.options
-
- use cuda && myconf+=" CUDA"
-# use mpi && myconf+=" MPI"
- use tachyon && myconf+=" LIBTACHYON" && append-cflags -I"${EPREFIX}/usr/include/tachyon"
- use xinerama && myconf+=" XINERAMA"
-
- export \
- PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
- PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
- PYTHON_LIBRARY="$(python_get_LIBS)" \
- NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
- NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
-
- perl ./configure LINUX \
- ${myconf} || die
-}
-
-src_compile() {
- # build plugins
- cd "${WORKDIR}"/plugins || die
-
- emake \
- ${EMAKEOPTS[@]} \
- LINUX
-
- # build vmd
- cd "${S}"/src || die
- emake
-}
-
-src_install() {
- # install plugins
- cd "${WORKDIR}"/plugins || die
- emake \
- PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
- distrib
-
- # install vmd
- cd "${S}"/src || die
- emake install
-
- # install docs
- cd "${S}" || die
- dodoc Announcement README doc/ig.pdf doc/ug.pdf
-
- # remove some of the things we don't want and need in
- # /usr/lib
- cd "${ED}"/usr/$(get_libdir)/vmd || die
- rm -fr doc README Announcement LICENSE || \
- die "failed to clean up /usr/lib/vmd directory"
-
- # adjust path in vmd wrapper
- sed \
- -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
- -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
- || die "failed to set up vmd wrapper script"
-
- # install icon and generate desktop entry
- insinto /usr/share/pixmaps
- doins "${WORKDIR}"/vmd.png
- eprefixify "${WORKDIR}"/vmd.desktop
- sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
- domenu "${WORKDIR}"/vmd.desktop
-}
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
deleted file mode 100644
index f42cb4d104fe..000000000000
--- a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cuda desktop flag-o-matic prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="Visual Molecular Dynamics"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
-SRC_URI="
- https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
- ${P}.src.tar
-"
-
-SLOT="0"
-LICENSE="vmd"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="fetch"
-
-# currently, tk-8.5* with USE=truetype breaks some
-# tk apps such as Sequence Viewer or Timeline.
-CDEPEND="
- >=dev-lang/tk-8.6.1:0=
- dev-lang/perl
- dev-libs/expat
- $(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
- ')
- sci-libs/netcdf:0=
- virtual/opengl
- >=x11-libs/fltk-1.1.10-r2:1
- x11-libs/libXft
- x11-libs/libXi
- ${PYTHON_DEPS}
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
- gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] )
- sqlite? ( dev-db/sqlite:3= )
- tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- dev-lang/swig
-"
-RDEPEND="${CDEPEND}
- sci-biology/stride
- sci-chemistry/surf
- x11-terms/xterm
- msms? ( sci-chemistry/msms-bin )
- povray? ( media-gfx/povray )
-"
-
-VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
-# Binary only plugin!!
-QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
-QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-
-pkg_nofetch() {
- elog "Please download ${P}.src.tar from"
- elog "${VMD_DOWNLOAD}"
- elog "after agreeing to the license and get"
- elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
- elog "Place both into your DISTDIR directory"
- elog
- elog "Due to an upstream bug (https://bugs.gentoo.org/640440) sources"
- elog "file may get downloaded as a compressed tarball or not. In that case"
- elog "you will need to ensure you uncompress the file and rename it"
- elog "as ${P}.src.tar"
-}
-
-src_prepare() {
- default
-
- use cuda && cuda_sanitize
-
- eapply "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
-
- cd "${WORKDIR}"/plugins || die
-
- eapply -p2 "${WORKDIR}"/${P}-gentoo-plugins.patch
-
- [[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
-
- sed \
- -e "s:CC = gcc:CC = $(tc-getCC):" \
- -e "s:CXX = g++:CXX = $(tc-getCXX):" \
- -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
- -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
- -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
- -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
- -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
- -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
- -e "s:-ltcl8.5:-ltcl:" \
- -i Make-arch || die "Failed to set up plugins Makefile"
-
- sed \
- -e '/^AR /s:=:?=:g' \
- -e '/^RANLIB /s:=:?=:g' \
- -i ../plugins/*/Makefile || die
-
- tc-export AR RANLIB
-
- sed \
- -e "s:\$(CXXFLAGS)::g" \
- -i hesstrans/Makefile || die
-
- # prepare vmd itself
- cd "${S}" || die
-
- eapply -p2 "${WORKDIR}"/${P}-gentoo-base.patch
- eapply "${FILESDIR}"/${P}-configure-libtachyon.patch
-
- # PREFIX
- sed \
- -e "s:/usr/include/:${EPREFIX}/usr/include:g" \
- -i configure || die
-
- sed \
- -e "s:gentoo-bindir:${ED}/usr/bin:g" \
- -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
- -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
- -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:gentoo-gcc:$(tc-getCC):g" \
- -e "s:gentoo-g++:$(tc-getCXX):g" \
- -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
- -e "s:gentoo-cflags:${CFLAGS}:g" \
- -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
- -e "s:gentoo-nvflags::g" \
- -e "s:gentoo-ldflags:${LDFLAGS}:g" \
- -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
- -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
- -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
- -e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \
- -e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
- -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -i configure || die
-
- if use cuda; then
- sed \
- -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
- -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
- -i configure src/Makefile || die
- sed \
- -e '/compute_/d' \
- -i configure || die
- sed \
- -e 's:-gencode .*code=sm_..::' \
- -i src/Makefile || die
- fi
-
- sed \
- -e "s:LINUXPPC:LINUX:g" \
- -e "s:LINUXALPHA:LINUX:g" \
- -e "s:LINUXAMD64:LINUX:g" \
- -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
- -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
- -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
- -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
-
- EMAKEOPTS=(
- TCLINC="-I${EPREFIX}/usr/include"
- TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
- TCLLDFLAGS="-shared"
- NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
- NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include"
- NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
- NETCDFDYNAMIC=1
- EXPATINC="-I${EPREFIX}/usr/include"
- EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
- EXPATLDFLAGS="-shared"
- EXPATDYNAMIC=1
- )
- if use gromacs; then
- EMAKEOPTS+=(
- TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
- TNGINC="-I${EPREFIX}/usr/include"
- TNGLDFLAGS="-shared"
- TNGDYNAMIC=1
- )
- fi
- if use sqlite; then
- EMAKEOPTS+=(
- SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
- SQLITEINC="-I${EPREFIX}/usr/include"
- SQLITELDFLAGS="-shared"
- SQLITEDYNAMIC=1
- )
- fi
-}
-
-src_configure() {
- local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
- rm -f configure.options && echo $myconf >> configure.options
-
- use cuda && myconf+=" CUDA"
-# use mpi && myconf+=" MPI"
- use tachyon && myconf+=" LIBTACHYON"
- use xinerama && myconf+=" XINERAMA"
-
- export \
- PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
- PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
- PYTHON_LIBRARY="$(python_get_LIBS)" \
- NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
- NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
-
- perl ./configure LINUX \
- ${myconf} || die
-}
-
-src_compile() {
- # build plugins
- cd "${WORKDIR}"/plugins || die
-
- emake \
- ${EMAKEOPTS[@]} \
- LINUX
-
- # build vmd
- cd "${S}"/src || die
- emake
-}
-
-src_install() {
- # install plugins
- cd "${WORKDIR}"/plugins || die
- emake \
- PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
- distrib
-
- # install vmd
- cd "${S}"/src || die
- emake install
-
- # install docs
- cd "${S}" || die
- dodoc Announcement README doc/ig.pdf doc/ug.pdf
-
- # remove some of the things we don't want and need in
- # /usr/lib
- cd "${ED}"/usr/$(get_libdir)/vmd || die
- rm -fr doc README Announcement LICENSE || \
- die "failed to clean up /usr/lib/vmd directory"
-
- # adjust path in vmd wrapper
- sed \
- -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
- -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
- || die "failed to set up vmd wrapper script"
-
- # install icon and generate desktop entry
- insinto /usr/share/pixmaps
- doins "${WORKDIR}"/vmd.png
- eprefixify "${WORKDIR}"/vmd.desktop
- sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
- domenu "${WORKDIR}"/vmd.desktop
-}
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
deleted file mode 100644
index 39e7a9751cee..000000000000
--- a/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cuda desktop flag-o-matic prefix python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="Visual Molecular Dynamics"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
-SRC_URI="
- https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
- ${P}.src.tar
-"
-
-SLOT="0"
-LICENSE="vmd"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="fetch"
-
-# currently, tk-8.5* with USE=truetype breaks some
-# tk apps such as Sequence Viewer or Timeline.
-CDEPEND="
- >=dev-lang/tk-8.6.1:0=
- dev-lang/perl
- dev-libs/expat
- $(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
- ')
- sci-libs/netcdf:0=
- virtual/opengl
- >=x11-libs/fltk-1.1.10-r2:1
- x11-libs/libXft
- x11-libs/libXi
- ${PYTHON_DEPS}
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
- gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] )
- sqlite? ( dev-db/sqlite:3= )
- tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- dev-lang/swig
-"
-RDEPEND="${CDEPEND}
- sci-biology/stride
- sci-chemistry/chemical-mime-data
- sci-chemistry/surf
- x11-terms/xterm
- msms? ( sci-chemistry/msms-bin )
- povray? ( media-gfx/povray )
-"
-
-VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
-# Binary only plugin!!
-QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
-QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-
-pkg_nofetch() {
- elog "Please download ${P}.src.tar from"
- elog "${VMD_DOWNLOAD}"
- elog "after agreeing to the license and get"
- elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
- elog "Place both into your DISTDIR directory"
- elog
- elog "Due to an upstream bug (https://bugs.gentoo.org/640440) sources"
- elog "file may get downloaded as a compressed tarball or not. In that case"
- elog "you will need to ensure you uncompress the file and rename it"
- elog "as ${P}.src.tar"
-}
-
-src_prepare() {
- xdg_src_prepare
-
- use cuda && cuda_sanitize
-
- eapply "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
-
- cd "${WORKDIR}"/plugins || die
-
- eapply -p2 "${WORKDIR}"/${P}-gentoo-plugins.patch
-
- [[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
-
- sed \
- -e "s:CC = gcc:CC = $(tc-getCC):" \
- -e "s:CXX = g++:CXX = $(tc-getCXX):" \
- -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
- -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
- -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
- -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
- -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
- -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
- -e "s:-ltcl8.5:-ltcl:" \
- -i Make-arch || die "Failed to set up plugins Makefile"
-
- sed \
- -e '/^AR /s:=:?=:g' \
- -e '/^RANLIB /s:=:?=:g' \
- -i ../plugins/*/Makefile || die
-
- tc-export AR RANLIB
-
- sed \
- -e "s:\$(CXXFLAGS)::g" \
- -i hesstrans/Makefile || die
-
- # prepare vmd itself
- cd "${S}" || die
-
- eapply -p2 "${WORKDIR}"/${P}-gentoo-base.patch
- eapply "${FILESDIR}"/${P}-configure-libtachyon.patch
- eapply "${FILESDIR}"/${P}-tmpdir.patch
-
- # PREFIX
- sed \
- -e "s:/usr/include/:${EPREFIX}/usr/include:g" \
- -i configure || die
-
- sed \
- -e "s:gentoo-bindir:${ED}/usr/bin:g" \
- -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
- -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
- -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:gentoo-gcc:$(tc-getCC):g" \
- -e "s:gentoo-g++:$(tc-getCXX):g" \
- -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
- -e "s:gentoo-cflags:${CFLAGS}:g" \
- -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
- -e "s:gentoo-nvflags::g" \
- -e "s:gentoo-ldflags:${LDFLAGS}:g" \
- -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
- -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
- -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
- -e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \
- -e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
- -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -i configure || die
-
- if use cuda; then
- sed \
- -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
- -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
- -i configure src/Makefile || die
- sed \
- -e '/compute_/d' \
- -i configure || die
- sed \
- -e 's:-gencode .*code=sm_..::' \
- -i src/Makefile || die
- fi
-
- sed \
- -e "s:LINUXPPC:LINUX:g" \
- -e "s:LINUXALPHA:LINUX:g" \
- -e "s:LINUXAMD64:LINUX:g" \
- -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
- -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
- -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
- -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
-
- EMAKEOPTS=(
- TCLINC="-I${EPREFIX}/usr/include"
- TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
- TCLLDFLAGS="-shared"
- NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
- NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include"
- NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
- NETCDFDYNAMIC=1
- EXPATINC="-I${EPREFIX}/usr/include"
- EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
- EXPATLDFLAGS="-shared"
- EXPATDYNAMIC=1
- )
- if use gromacs; then
- EMAKEOPTS+=(
- TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
- TNGINC="-I${EPREFIX}/usr/include"
- TNGLDFLAGS="-shared"
- TNGDYNAMIC=1
- )
- fi
- if use sqlite; then
- EMAKEOPTS+=(
- SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
- SQLITEINC="-I${EPREFIX}/usr/include"
- SQLITELDFLAGS="-shared"
- SQLITEDYNAMIC=1
- )
- fi
-}
-
-src_configure() {
- local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
- rm -f configure.options && echo $myconf >> configure.options
-
- use cuda && myconf+=" CUDA"
-# use mpi && myconf+=" MPI"
- use tachyon && myconf+=" LIBTACHYON"
- use xinerama && myconf+=" XINERAMA"
-
- export \
- PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
- PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
- PYTHON_LIBRARY="$(python_get_LIBS)" \
- NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
- NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
-
- perl ./configure LINUX \
- ${myconf} || die
-}
-
-src_compile() {
- # build plugins
- cd "${WORKDIR}"/plugins || die
-
- emake \
- ${EMAKEOPTS[@]} \
- LINUX
-
- # build vmd
- cd "${S}"/src || die
- emake
-}
-
-src_install() {
- # install plugins
- cd "${WORKDIR}"/plugins || die
- emake \
- PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
- distrib
-
- # install vmd
- cd "${S}"/src || die
- emake install
-
- # install docs
- cd "${S}" || die
- dodoc Announcement README doc/ig.pdf doc/ug.pdf
-
- # remove some of the things we don't want and need in
- # /usr/lib
- cd "${ED}"/usr/$(get_libdir)/vmd || die
- rm -fr doc README Announcement LICENSE || \
- die "failed to clean up /usr/lib/vmd directory"
-
- # adjust path in vmd wrapper
- sed \
- -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
- -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
- || die "failed to set up vmd wrapper script"
-
- # install icon and generate desktop entry
- insinto /usr/share/pixmaps
- doins "${WORKDIR}"/vmd.png
- eprefixify "${WORKDIR}"/vmd.desktop
- sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
- # Open PDB files with VMD
- echo "MimeType=chemical/x-pdb;" >> "${WORKDIR}"/vmd.desktop || die
- domenu "${WORKDIR}"/vmd.desktop
-}
diff --git a/sci-chemistry/vmd/vmd-1.9.3.ebuild b/sci-chemistry/vmd/vmd-1.9.3.ebuild
deleted file mode 100644
index 88394af1970d..000000000000
--- a/sci-chemistry/vmd/vmd-1.9.3.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cuda eutils flag-o-matic multilib prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="Visual Molecular Dynamics"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
-SRC_URI="
- https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
- ${P}.src.tar"
-
-SLOT="0"
-LICENSE="vmd"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="fetch"
-
-# currently, tk-8.5* with USE=truetype breaks some
-# tk apps such as Sequence Viewer or Timeline.
-CDEPEND="
- >=dev-lang/tk-8.6.1
- dev-lang/perl
- dev-libs/expat
- $(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
- ')
- sci-libs/netcdf:0=
- virtual/opengl
- >=x11-libs/fltk-1.1.10-r2:1
- x11-libs/libXft
- x11-libs/libXi
- ${PYTHON_DEPS}
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
- gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] )
- sqlite? ( dev-db/sqlite:3= )
- tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- dev-lang/swig"
-RDEPEND="${CDEPEND}
- sci-biology/stride
- sci-chemistry/surf
- x11-terms/xterm
- msms? ( sci-chemistry/msms-bin )
- povray? ( media-gfx/povray )
- "
-
-VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
-# Binary only plugin!!
-QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
-QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-
-pkg_nofetch() {
- elog "Please download ${P}.src.tar.gz from"
- elog "${VMD_DOWNLOAD}"
- elog "after agreeing to the license and get"
- elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
- elog "Place both into your DISTDIR directory"
-}
-
-src_prepare() {
- use cuda && cuda_sanitize
-
- epatch "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
-
- cd "${WORKDIR}"/plugins || die
-
- epatch \
- "${WORKDIR}"/${P}-gentoo-plugins.patch
-
- [[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
-
- sed \
- -e "s:CC = gcc:CC = $(tc-getCC):" \
- -e "s:CXX = g++:CXX = $(tc-getCXX):" \
- -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
- -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
- -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
- -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
- -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
- -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
- -e "s:-ltcl8.5:-ltcl:" \
- -i Make-arch || die "Failed to set up plugins Makefile"
-
- sed \
- -e '/^AR /s:=:?=:g' \
- -e '/^RANLIB /s:=:?=:g' \
- -i ../plugins/*/Makefile || die
-
- tc-export AR RANLIB
-
- sed \
- -e "s:\$(CXXFLAGS)::g" \
- -i hesstrans/Makefile || die
-
- # prepare vmd itself
- cd "${S}" || die
-
- epatch "${WORKDIR}"/${P}-gentoo-base.patch
-
- # PREFIX
- sed \
- -e "s:/usr/include/:${EPREFIX}/usr/include:g" \
- -i configure || die
-
- sed \
- -e "s:gentoo-bindir:${ED}/usr/bin:g" \
- -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
- -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
- -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -e "s:gentoo-gcc:$(tc-getCC):g" \
- -e "s:gentoo-g++:$(tc-getCXX):g" \
- -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
- -e "s:gentoo-cflags:${CFLAGS}:g" \
- -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
- -e "s:gentoo-nvflags::g" \
- -e "s:gentoo-ldflags:${LDFLAGS}:g" \
- -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
- -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
- -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
- -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
- -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
- -i configure || die
-
- if use cuda; then
- sed \
- -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
- -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
- -i configure src/Makefile || die
- sed \
- -e '/compute_/d' \
- -i configure || die
- sed \
- -e 's:-gencode .*code=sm_..::' \
- -i src/Makefile || die
- fi
-
- sed \
- -e "s:LINUXPPC:LINUX:g" \
- -e "s:LINUXALPHA:LINUX:g" \
- -e "s:LINUXAMD64:LINUX:g" \
- -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
- -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
- -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
- -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
-
- EMAKEOPTS=(
- TCLINC="-I${EPREFIX}/usr/include"
- TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
- TCLLDFLAGS="-shared"
- NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf) ${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
- NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf) ${EPREFIX}/usr/include"
- NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
- NETCDFDYNAMIC=1
- EXPATINC="-I${EPREFIX}/usr/include"
- EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
- EXPATLDFLAGS="-shared"
- EXPATDYNAMIC=1
- )
- if use gromacs; then
- EMAKEOPTS+=(
- TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
- TNGINC="-I${EPREFIX}/usr/include"
- TNGLDFLAGS="-shared"
- TNGDYNAMIC=1
- )
- fi
- if use sqlite; then
- EMAKEOPTS+=(
- SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
- SQLITEINC="-I${EPREFIX}/usr/include"
- SQLITELDFLAGS="-shared"
- SQLITEDYNAMIC=1
- )
- fi
-}
-
-src_configure() {
- local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
- rm -f configure.options && echo $myconf >> configure.options
-
- use cuda && myconf+=" CUDA"
-# use mpi && myconf+=" MPI"
- use tachyon && myconf+=" LIBTACHYON" && append-cflags -I"${EPREFIX}/usr/include/tachyon"
- use xinerama && myconf+=" XINERAMA"
-
- export \
- PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
- PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
- PYTHON_LIBRARY="$(python_get_LIBS)" \
- NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
- NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
-
- perl ./configure LINUX \
- ${myconf} || die
-}
-
-src_compile() {
- # build plugins
- cd "${WORKDIR}"/plugins || die
-
- emake \
- ${EMAKEOPTS[@]} \
- LINUX
-
- # build vmd
- cd "${S}"/src || die
- emake
-}
-
-src_install() {
- # install plugins
- cd "${WORKDIR}"/plugins || die
- emake \
- PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
- distrib
-
- # install vmd
- cd "${S}"/src || die
- emake install
-
- # install docs
- cd "${S}" || die
- dodoc Announcement README doc/ig.pdf doc/ug.pdf
-
- # remove some of the things we don't want and need in
- # /usr/lib
- cd "${ED}"/usr/$(get_libdir)/vmd || die
- rm -fr doc README Announcement LICENSE || \
- die "failed to clean up /usr/lib/vmd directory"
-
- # adjust path in vmd wrapper
- sed \
- -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
- -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
- || die "failed to set up vmd wrapper script"
-
- # install icon and generate desktop entry
- insinto /usr/share/pixmaps
- doins "${WORKDIR}"/vmd.png
- eprefixify "${WORKDIR}"/vmd.desktop
- sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
- domenu "${WORKDIR}"/vmd.desktop
-}
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 763315e9b520..a4d07e389b10 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,2 +1 @@
-DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
diff --git a/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch b/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch
deleted file mode 100644
index 928ec174b771..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur nlopt-2.3.orig/Makefile.am nlopt-2.3/Makefile.am
---- nlopt-2.3.orig/Makefile.am 2012-08-03 02:07:09.000000000 +0100
-+++ nlopt-2.3/Makefile.am 2012-08-03 02:13:13.000000000 +0100
-@@ -25,6 +25,7 @@
-
- if WITH_CXX
- libnlopt@NLOPT_SUFFIX@_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+libnlopt@NLOPT_SUFFIX@_la_LIBADD += -lstdc++
- else
- libnlopt@NLOPT_SUFFIX@_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
- endif
-diff -Nur nlopt-2.3.orig/swig/Makefile.am nlopt-2.3/swig/Makefile.am
---- nlopt-2.3.orig/swig/Makefile.am 2012-08-03 02:07:09.000000000 +0100
-+++ nlopt-2.3/swig/Makefile.am 2012-08-03 03:04:30.000000000 +0100
-@@ -9,7 +9,7 @@
- # Guile wrapper
-
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
--libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
-+libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_builddir)/api
-
diff --git a/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch b/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch
deleted file mode 100644
index 8a072b15e2e2..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nlopt.pc.in.orig 2012-08-03 01:41:30.000000000 +0100
-+++ nlopt.pc.in 2012-08-03 01:42:29.000000000 +0100
-@@ -6,5 +6,6 @@
- Name: NLopt
- Description: nonlinear optimization libary
- Version: @VERSION@
--Libs: -L${libdir} -lnlopt -lm
-+Libs: -L${libdir} -lnlopt@NLOPT_SUFFIX@
-+Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch b/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
deleted file mode 100644
index beb9dd4de815..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Fix underlinking issues, caused by missing -lpython27 and -lpthread
-
---- nlopt-2.4.2/configure.ac
-+++ nlopt-2.4.2/configure.ac
-@@ -161,33 +161,17 @@
- dnl Python:
- AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
- if test $have_python = yes; then
-- AC_ARG_VAR([PYTHON_CONFIG], [python-config program])
-- AC_PATH_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config],
-- [unknown], [`dirname $PYTHON`:$PATH])
-- AC_MSG_CHECKING([for Python include flags])
-- if test "x$PYTHON_CONFIG" = "xunknown"; then
-- pinc=-I`echo "import distutils.sysconfig; print (distutils.sysconfig.get_python_inc())" | $PYTHON - 2>/dev/null`
-- test "x$pinc" = "x-I" && pinc=""
-- else
-- pinc=`$PYTHON_CONFIG --includes 2>/dev/null`
-- fi
-- AC_MSG_RESULT([${pinc:-unknown}])
-- PYTHON_INCLUDES="$pinc"
-- save_CPPFLAGS=$CPPFLAGS
-- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-- AC_CHECK_HEADER([Python.h], [], [AC_MSG_WARN([disabling Python wrappers])
-- have_python=no])
-- if test $have_python = yes; then
-+ PKG_CHECK_MODULES([PYTHON], [python-2.7])
-+ CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-+
- AC_MSG_CHECKING([for Numpy include directory])
- pinc=`echo "import numpy; print (numpy.get_include())" | $PYTHON - 2>/dev/null`
- AC_MSG_RESULT([${pinc:-unknown}])
-- test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_INCLUDES -I$pinc"
-+ test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_CFLAGS -I$pinc"
- CPPFLAGS="$save_CPPFLAGS $PYTHON_INCLUDES"
- AC_CHECK_HEADER([numpy/arrayobject.h],[],[
- AC_MSG_WARN([disabling Python wrappers])
- have_python=no],[#include <Python.h>])
-- fi
-- CPPFLAGS=$save_CPPFLAGS
- fi
-
- fi # with_python
---- nlopt-2.4.2/swig/Makefile.am
-+++ nlopt-2.4.2/swig/Makefile.am
-@@ -9,7 +9,7 @@
- # Guile wrapper
-
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
--libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
-+libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = -lpthread ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_srcdir)/api
-
-@@ -23,7 +23,7 @@
- # Python wrapper
-
- _nlopt_la_SOURCES = nlopt-python.cpp
--_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
-+_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @PYTHON_LIBS@
- _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@
- _nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api
-
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch b/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
deleted file mode 100644
index c82d99497e67..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fix issues caused by Octave-4 renaming Octave_map to octave_map
-See also
-https://bugs.gentoo.org/show_bug.cgi?id=569996
-https://github.com/stevengj/nlopt/commit/5326ab410c978f9d8c3cae7e4917f55c10ef2c2e?diff=unified
-
---- nlopt-2.4.2_old/octave/nlopt_optimize-oct.cc 2014-05-20 20:35:58.000000000 +0200
-+++ nlopt-2.4.2/octave/nlopt_optimize-oct.cc 2016-01-09 16:10:53.358491776 +0100
-@@ -30,5 +30,5 @@
- #include "nlopt_optimize_usage.h"
-
--static int struct_val_default(Octave_map &m, const std::string& k,
-+static int struct_val_default(octave_map &m, const std::string& k,
- int dflt)
- {
-@@ -40,5 +40,5 @@
- }
-
--static double struct_val_default(Octave_map &m, const std::string& k,
-+static double struct_val_default(octave_map &m, const std::string& k,
- double dflt)
- {
-@@ -50,5 +50,5 @@
- }
-
--static Matrix struct_val_default(Octave_map &m, const std::string& k,
-+static Matrix struct_val_default(octave_map &m, const std::string& k,
- Matrix &dflt)
- {
-@@ -141,5 +141,5 @@
- #define CHECK1(cond, msg) if (!(cond)) { fprintf(stderr, msg "\n\n"); nlopt_destroy(opt); nlopt_destroy(local_opt); return NULL; }
-
--nlopt_opt make_opt(Octave_map &opts, int n)
-+nlopt_opt make_opt(octave_map &opts, int n)
- {
- nlopt_opt opt = NULL, local_opt = NULL;
-@@ -196,5 +196,5 @@
- && (opts.contents("local_optimizer"))(0).is_map(),
- "opt.local_optimizer must be a structure");
-- Octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
-+ octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
- CHECK1((local_opt = make_opt(local_opts, n)),
- "error initializing local optimizer");
-@@ -217,5 +217,5 @@
-
- CHECK(args(0).is_map(), "opt must be structure")
-- Octave_map opts = args(0).map_value();
-+ octave_map opts = args(0).map_value();
-
- CHECK(args(1).is_real_matrix() || args(1).is_real_scalar(),
diff --git a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
deleted file mode 100644
index 5a937cd80edd..000000000000
--- a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit python-r1 autotools-utils
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="http://ab-initio.mit.edu/nlopt/"
-SRC_URI="http://ab-initio.mit.edu/nlopt/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- guile? ( dev-scheme/guile:* )
- octave? ( sci-mathematics/octave )
- python? (
- ${PYTHON_DEPS}
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-pkgconfig.patch
- "${FILESDIR}"/${PN}-2.3-as-needed.patch
- "${FILESDIR}"/${P}-fix-dynamic-underlinking.patch
-)
-
-src_prepare() {
- # fix #569996 due to renaming of Octave_map class
- has_version ">=sci-mathematics/octave-4.0" && \
- epatch "${FILESDIR}/${P}-octave-4-map.patch"
- autotools-utils_src_prepare
- use cxx && BUILD_CXX="${S}_cxx"
- use python && python_copy_sources
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with octave)
- )
- if use octave; then
- export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)"
- export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)"
- else
- export MKOCTFILE=None
- fi
-
- myeconfargs+=(
- $(use_with guile)
- )
-
- if use python; then
- python_foreach_impl run_in_build_dir autotools-utils_src_configure
- else
- autotools-utils_src_configure
- fi
-
- if use cxx; then
- myeconfargs+=( --with-cxx --without-octave --without-python )
- BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure
- fi
-}
-
-src_compile() {
- if use python; then
- python_foreach_impl run_in_build_dir autotools-utils_src_compile
- else
- autotools-utils_src_compile
- fi
- use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile
- #-C "${BUILD_DIR}_cxx"
-}
-
-src_test() {
- do_test() {
- local a f
- cd "${BUILD_DIR}"/test
- for a in {1..7}; do
- for f in {5..9}; do
- ./testopt -a $a -o $f || die "algorithm $a function $f failed"
- done
- done
- }
- if use python; then
- python_foreach_impl run_in_build_dir do_test
- else
- do_test
- fi
- cd "${BUILD_CXX}"/test
- for a in {1..9}; do
- for f in {5..9}; do
- ./testopt -a $a -o $f || die "algorithm $a function $f failed"
- done
- done
-}
-
-src_install() {
- # build cxx first so the c lib overwrites the pc file
- use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install
- if use python; then
- python_foreach_impl run_in_build_dir autotools-utils_src_install
- else
- autotools-utils_src_install
- fi
- local r
- for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index e84205a3af5c..6fa9dea93bbe 100644
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="cxx guile octave python static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild
deleted file mode 100644
index 21c2ada3624a..000000000000
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit python-r1 cmake fortran-2
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
-SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- guile? ( dev-scheme/guile:* )
- octave? ( sci-mathematics/octave )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep 'dev-python/numpy-python2[${PYTHON_USEDEP}]' -2)
- $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3)
- )
- "
-DEPEND="
- ${RDEPEND}
- python? ( dev-lang/swig )
- "
-
-src_prepare() {
- cmake_src_prepare
- use python && python_copy_sources
-}
-
-src_configure() {
- local mycmakeargs=(
- -DNLOPT_CXX=$(usex cxx)
- -DNLOPT_FORTRAN=$(usex test)
- -DNLOPT_GUILE=$(usex guile)
- -DNLOPT_OCTAVE=$(usex octave)
- -DNLOPT_PYTHON=$(usex python)
- -DNLOPT_SWIG=$(usex python)
- -DNLOPT_TESTS=$(usex test)
- )
- if use python; then
- python_foreach_impl run_in_build_dir cmake_src_configure
- else
- cmake_src_configure
- fi
- if use static-libs; then
- mycmakeargs+=(
- -DBUILD_SHARED_LIBS=OFF
- )
- BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
- fi
-}
-
-src_compile() {
- if use python; then
- python_foreach_impl run_in_build_dir cmake_src_compile
- else
- cmake_src_compile
- fi
- if use static-libs; then
- BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
- fi
-}
-
-src_test() {
- do_test() {
- local a f
- cd "${BUILD_DIR}"/test
- for a in {1..$(usex cxx 9 7)}; do
- for f in {5..9}; do
- ./testopt -a $a -o $f || die "algorithm $a function $f failed"
- done
- done
- }
- if use python; then
- python_foreach_impl run_in_build_dir do_test
- else
- do_test
- fi
- if use static-libs; then
- BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
- fi
-}
-
-nlopt_install() {
- cmake_src_install
- python_optimize
-}
-
-src_install() {
- if use python; then
- python_foreach_impl run_in_build_dir nlopt_install
- else
- cmake_src_install
- fi
- if use static-libs; then
- BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
- fi
- local r
- for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}
diff --git a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild b/sys-libs/libseccomp/libseccomp-2.5.0.ebuild
index a70a1f90aa97..726c7a197cbe 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.0.ebuild
@@ -24,7 +24,8 @@ LICENSE="LGPL-2.1"
SLOT="0"
IUSE="python static-libs"
-REQUIRED_USE="python? ( static-libs )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python? ( static-libs )"
BDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${BDEPEND}"
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild
index a70a1f90aa97..726c7a197cbe 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -24,7 +24,8 @@ LICENSE="LGPL-2.1"
SLOT="0"
IUSE="python static-libs"
-REQUIRED_USE="python? ( static-libs )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python? ( static-libs )"
BDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${BDEPEND}"
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
index dc5df5913e3b..7043aaa18d92 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 202506b7952a..e5f6838fccdc 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
index 8d82aff5c914..306010737958 100644
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
index 6c47c0520c6e..8378ce88a275 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
else
SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
index 41efa1acde31..af4d98c3a435 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
else
SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
index 4d532bf5526e..1e44df7555a7 100644
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Tab Window Manager"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
COMMON_DEPEND="
diff --git a/xfce-base/thunar/thunar-1.8.15.ebuild b/xfce-base/thunar/thunar-1.8.15.ebuild
index a8edcfa262ec..d56945bf657d 100644
--- a/xfce-base/thunar/thunar-1.8.15.ebuild
+++ b/xfce-base/thunar/thunar-1.8.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"