summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-16 16:18:18 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-16 16:18:18 +0000
commit0704956f7256f1f618cc5e03af2c1dbd0e83dbc5 (patch)
tree881671532c0c3c82ebd4523b6d6cbc8ace982aae /dev-lang
parent21435953e16cda318a82334ddbadb3b5c36d9ea7 (diff)
gentoo resync : 16.01.2020
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/Manifest.gzbin17345 -> 17339 bytes
-rw-r--r--dev-lang/gdl/Manifest2
-rw-r--r--dev-lang/gdl/gdl-0.9.6-r2.ebuild7
3 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0b1f4712c587..550088618b0c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index f3745b8d8033..bb4eb9785dcb 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -9,5 +9,5 @@ AUX 0.9.6-fun-fix.patch 2064 BLAKE2B 45d2f76e437cbd557460a51a6fd49881a8dde5c200b
AUX 0.9.6-gcc6.patch 1255 BLAKE2B a529b29d007a0b71f1a1f2ecfc0940d73696ba97dc2a48bfd3be995d3d9e37b788b1fa6c1d13a7c63f2c5dbe2b07accfd86766f56f495f984baf0acb7ab6f27f SHA512 870231a918cd2d114ac31973bbd2c53733c3e64811c48eadf88c78f82a353aecf4d604e28dfa3a532efb3b0480e5d7209e8fad1fef793212027e89f53608c619
AUX 0.9.6-python-use-path-and-startup.patch 682 BLAKE2B f4a3f07c7757e297a8a40056aad3f36705f035f8ca63dfd0d8c75dec15953b826d8074fbbf1b698ec8d9c92a4e364993c2eced1df3c86ef4a3915a17b2ed65ba SHA512 f6e20eadb6acfd3805d5f41bba8d90e9dba5230211577e0b47217638b97745dd921c657dad7adf935abeeb9316989554858976d915f14b79dc2082eb132f9418
DIST gdl-0.9.6v2.tgz 1777167 BLAKE2B 4d92ed93f12e0979d591959d60ae9fa6785400e4f169a00f462103d263bce1aa02e615cc8467b53146791a12045850f9dae1da113f9caff4d6b44dd2a5798b3b SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5
-EBUILD gdl-0.9.6-r2.ebuild 4065 BLAKE2B de770b98b470cd431ec7c4cb89e0fde65987821750c59523d6dcc0af0348a27a39cf3aef5d44e45493db09f361b7f2568b7a702cf8585694ac567f8353a76636 SHA512 3f36317062e0cbaf8ae9a4af2487c3532005824dfb27560f37abc28faae7919ac590440945857e8ed9684104eab85799ed0a27c628ea0da3521df621968e9150
+EBUILD gdl-0.9.6-r2.ebuild 4120 BLAKE2B 754ad88aab633d014a8c0bc16700001bc72bc4271792765ac7ea648f6a7ba33fee58fbe26694471cac44803a794181ac5163108c07a12310b072361837f856f9 SHA512 e639db3b5a75e450ef15fb54f8c2e90b3d9cedf19382f99a6ea4cd5e23903bbfa5c87029b976d357032b06a229243aa1217da8240ce3b2a3e54849e5072b9dc0
MISC metadata.xml 1028 BLAKE2B bf82665c331acc8ebe611ea473e0ce9e68bef85cae01a89a5356c5db4a7b5c611fc580f5abbf116492d1b49c2f54379644c30cff099d2c0a7c6c317cb3a76aff SHA512 bbf8bafc0aa727148a15b800c096037ef4ad4f17de36ee76082fd51355d7e60a211faf57ddeb9ee1012258a78e67f948fca4c8a010dce891b1e0875cb088e23d
diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
index 7e72f15aef01..3a51f5b1f4b9 100644
--- a/dev-lang/gdl/gdl-0.9.6-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -39,7 +39,10 @@ RDEPEND="
postscript? ( dev-libs/pslib )
python? (
${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
)
udunits? ( sci-libs/udunits )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"