gentoo resync : 19.04.2018

16 files changed, 6 insertions, 716 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 59a28fad491d..606f78573991 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 2409eb740730..96ee6c8b58d6 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,22 +1,4 @@
-AUX glpk-4.52.1-mariadb-5.5.patch 275 BLAKE2B b997846c95457f6d2be37603bcf08c7cd134dae3a0eace8c0e83011213c9f883e5d10af7e04cfe4fa9fa061af6c9745f5fab4d1c7deb2a2f6dd1aa8c996ef11b SHA512 32669b38d5ec7b1ae4d97e07cb9fa054952321e516a8a4cd9d64bc1237081bf14be031513cc2db96c142cdb01b2fe602f843eb51864ce71e106a4cff662903d0
-AUX glpk-4.54-debundle-system-libs.patch 1763 BLAKE2B 2ec1aa43b1a660d192c8169f41bcf9eed617f945ab327f9940fceb773af034110162fd9f1f631875e2a4903d4eed884a028a5e41614093808a50dded3c7bc700 SHA512 57d5cdff8d9da56b4d5db22655b019d35efa5b938e25622246fa6d5a54421ae9221d5a164894cbd1c19cd46a963eb26132d7ba1f4aa26ff9eb401a155f77949a
-AUX glpk-4.57-debundle-system-libs.patch 1729 BLAKE2B 297b47bc11cbd2a92158469a2ac402565683d2ba14fc00ac308cafe4489bb5387ae689275d56ab33c3346acccae7d765f8fc9df938d7615dede304396965c77b SHA512 406795f4dd5249aaab90707c9f9c7315a8b7dad90e5ee8995701d5ecc7027085a1c4ae5ed3b72cb18b4c2c9e1a2ae3332bccdd5ffd371e78761d4bcc9354c253
-AUX glpk-4.60-debundle-system-libs.patch 1811 BLAKE2B b6d5a3d3803acd1bcb2253f24d1bb1c7629033d9e3aa5353e30d43cbbd1e419507bc5c93eba9b5659fea329494b48b5b2458bebd9b982705e7fb82128fbe37ef SHA512 733e94e8f8e16b452bd436b8ea87c8d330f2c180fa0e8c9332adb4b4cd52cafc6c82a95d362b848bd86c787df2c268138352b29f63860897106f6b3e10d63d38
 AUX glpk-4.63-debundle-system-libs.patch 2240 BLAKE2B 5bd0d25768682a410159e3bf0eaf83dc038da8c6bda275c6994846516bb347caf6d4ea726e8635c77b84a463cb1ec32955f573589291486067c651a88d7f276c SHA512 186c1dd2197119b376a76a2db9a73d7fc1e43adc6ae54f5d3e39ad9114a9a406d45dd7bce4bcea31cfce94e71234b70872db22378e8312026912a93077488805
-DIST glpk-4.45.tar.gz 3132439 BLAKE2B 1c3c8123fbb91c4d0357553ca5cbaea3b69c07f79e2353289f4ca17f7f02e06c8639257fc752a9d513481803c66ab1218ede51cf053d6d77a468bbaa208f36d8 SHA512 27089b760d89ee16c5a3332d319007af4b05e8d27df0b990311508f856a01461d8b7b40b111bbf1f3dd4d754af84000112f95349d5286e6d3e42e56226f98649
-DIST glpk-4.48.tar.gz 3488482 BLAKE2B c96c278b8eac7b79aa642106fc3563123f812546fc2e8967a107acd50f010107ea5ef2e005f18117c0ff5061cdf6c3b14eafed22827177cd6516857dc585b18f SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70
-DIST glpk-4.54.tar.gz 3098202 BLAKE2B 32d4f6715e893e52982e572424e18642d80c76b5a8cefb30ee6ec49ae334f8fb3fa2e1e92fe4a90ceb048a4c02cde7248a777a5a88f797a9751777cf523840f9 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070
-DIST glpk-4.55.tar.gz 3424345 BLAKE2B cc4e7b6edeb4497c3aa41151f53c1f48070ba3b83e04ecd48dd2d51f2d464be26440213e1f21cad92159c9326e5c5472f63c5ecfd25b1dfc44e39c3bbafc9eac SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689
-DIST glpk-4.57.tar.gz 3782998 BLAKE2B 031db9f4cc1aec933f551926fb0a65190609132de6692e3cb7f3ad4940b7b25d7f9b267cca671abc53fc803025389858557413a4a658489b6c55e2df13e507ec SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48
-DIST glpk-4.60.tar.gz 4160915 BLAKE2B 26cd258701574825ce9333803fc0f1991cec62206563afb9ca0a1dec0e2b55f58661b066ae8a328d11f2bc7cb2be9c77535804d16c267b51d67a1e3696de8395 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a
-DIST glpk-4.61.tar.gz 4116291 BLAKE2B aaf67b2e6729772540887174e6241576cc2fe530074d7304eb319e852f8474a8e50f7ee0b9a7d0e2d38f08eb63484eef2b62d92e495ba0520a2715736b57fd17 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1
 DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
-EBUILD glpk-4.45.ebuild 1456 BLAKE2B 9250e585dca7c7360cd0de339fe93dc3c8831f2348515d0d24523bb752611f14eb6ba6893b2f7f07a49afd478314a1feaff953c4fda3a1a601ee7bf0787c622b SHA512 50e52c850b0ae23ea2445c54b14e052b6649b9e3a1413834d475ec208f55d9be32a1c46d5a86d25e8d61bbe41b9ddc7cc1558549750eb0d5c97bea65eff1f914
-EBUILD glpk-4.48.ebuild 1246 BLAKE2B 20d7cb971e9697c399d49ccd82407b5d542d62d95146950c037311eac23bcf31d61bb0c414e78e3dfad5dd742513d27eb6b129cca6230e978503417abad99090 SHA512 e728e1ff297c1bc4c8330a05088963c86878cb899bebce23159fcc7dd1431a4fe4212f3b92709e4414ba966a42327a66e66ae4cb5d345aca8e9ae07e6eb321f3
-EBUILD glpk-4.54.ebuild 1347 BLAKE2B b21d4850cdc95157143185e8eba3286f55ed05bc4867c031287c78020388091ce1d02ac2450aca0fef1ee9bf451bca1cb80472fe6cb3ea0972782cc87900bda2 SHA512 85f8a0446443a6db3d9e7ebe6fdce97c8acb6b7fe9b67acc91a338fe855f5da9335e39b357ddb42d9c80efd625636a580a189a62c29f5384bf4ebd33530aba43
-EBUILD glpk-4.55.ebuild 1347 BLAKE2B b21d4850cdc95157143185e8eba3286f55ed05bc4867c031287c78020388091ce1d02ac2450aca0fef1ee9bf451bca1cb80472fe6cb3ea0972782cc87900bda2 SHA512 85f8a0446443a6db3d9e7ebe6fdce97c8acb6b7fe9b67acc91a338fe855f5da9335e39b357ddb42d9c80efd625636a580a189a62c29f5384bf4ebd33530aba43
-EBUILD glpk-4.57.ebuild 1315 BLAKE2B efce0212dc4fa8215b72719d9cc596ba68db18a931276d0564ba3a9aead69667fd2fcbb02eadeac87ff1a98d9c869d04f558d1e80cdeda223100b48cff38aed6 SHA512 bbf6657723a9acedfdcbdf4aacffdc0c10e04274bcb2405ea8cd4e16c5a17d1aa0a8c8cb29d24c17c47d805078ab54ba06595626ec8d1e1c7b1d91d1155f2231
-EBUILD glpk-4.60.ebuild 1321 BLAKE2B 98ec6cc92bfae2d680c638dae089ef50374b1274867078eb136e4670e5b75023fb4cb78e0d36c7f1ebf4919b2eb4e52561f90afe02c5e8428a060b0c470c2327 SHA512 d08285cad862a073fbaf8e5c33ce3220cd0dd0ac77f9b5d509d44ce83b26220727adf2251e190bd3cd0d59c8112e6d331c25e75b6e12947643b2366297fba2c4
-EBUILD glpk-4.61-r1.ebuild 1371 BLAKE2B 4fc9822c369d6dd4800b1aa6f9c47bcbc1176e2f0d61b1b6feac4c17fce9afa4d991208f88e64216455a3c2b27f5fe544bc8fa649af7ac3cb60f956f1d44aeb9 SHA512 0b5ff8d0c16d053fbe5cb9a98ac87207f433b7e9fae4ce3d80083a423e01ba8396080c42ffee55f64ab1c16d22bed37a3baf19d08975959c2232650fedffd74f
-EBUILD glpk-4.63.ebuild 1364 BLAKE2B 717e0e7687678622073cd63f5e2287fd8a257e454d76eb3e10dda00733a4da74e679948791df149b4df6e656c7e6dad40e78025acf242e667028b69c5204836e SHA512 17319357876bbf58ef77793e6d566e7dc7625429781897d6b0cd21bcb2df8c84faff57c61c5f808e4967ad72b302616dcfcc9a12fb56f711ab84b8c6af89878d
+EBUILD glpk-4.63.ebuild 1370 BLAKE2B dbccbe5e61a11564984550cf1f39f0658b0201442e0330b292468afd5212780a803e72b0c81ac91c9657cdc986d0efb5b6655724ec741afaba1a6dcfb4d2782b SHA512 a6661f6f70dbdd0d47bd37029b9b23c0227554cc76538a8f29a721e2543ab38c45e562585910093398bdf6feeea5e20d5ec94c96cb8af674057bdb60b15ff08d
 MISC metadata.xml 668 BLAKE2B 9dec50a5d6aa33f108651ed8fd891750fc8146eedf8df28abc0fa04a6db2f0d590073fe3606c658a99d56d283d7a24629503bbf11f6593ef1b90314d26a1ab69 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
deleted file mode 100644
index 06aa8e5de95c..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glpk-4.52.1/src/glpsql.c.orig	2014-02-05 22:14:21.487843989 +0100
-+++ glpk-4.52.1/src/glpsql.c	2014-02-05 22:14:32.764510562 +0100
-@@ -1106,8 +1106,6 @@
- #define byte_defined 1
- #endif
- 
--#include <my_global.h>
--#include <my_sys.h>
- #include <mysql.h>
- 
- struct db_mysql
diff --git a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch
deleted file mode 100644
index a3140341a483..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-
---- configure.ac.orig	2014-04-05 14:18:56.045148287 -0700
-+++ configure.ac	2014-04-05 14:23:24.878803309 -0700
-@@ -59,6 +59,11 @@
- dnl Check for math library
- AC_CHECK_LIB([m], [exp])
- 
-+AC_CHECK_LIB([amd], [amd_1])
-+AC_CHECK_LIB([colamd], [colamd])
-+AC_CHECK_HEADER([amd.h])
-+AC_CHECK_LIB([z], [gzopen])
-+
- dnl Check for <sys/time.h> header
- AC_CHECK_HEADER([sys/time.h],
-    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
---- src/Makefile.am.orig	2014-04-05 14:19:16.401273769 -0700
-+++ src/Makefile.am	2014-04-05 14:21:56.696259485 -0700
-@@ -6,15 +6,12 @@
- 
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
---I$(srcdir)/proxy \
---I$(srcdir)/zlib
-+-I$(srcdir)/proxy
- 
- libglpk_la_LDFLAGS = \
- -version-info 37:1:1 \
-@@ -92,18 +89,6 @@
- glpssx02.c \
- glptsp.c \
- lux.c \
--amd/amd_1.c \
--amd/amd_2.c \
--amd/amd_aat.c \
--amd/amd_control.c \
--amd/amd_defaults.c \
--amd/amd_dump.c \
--amd/amd_info.c \
--amd/amd_order.c \
--amd/amd_post_tree.c \
--amd/amd_postorder.c \
--amd/amd_preprocess.c \
--amd/amd_valid.c \
- bflib/btf.c \
- bflib/btfint.c \
- bflib/fhv.c \
-@@ -117,7 +102,6 @@
- bflib/sva.c \
- cglib/cfg.c \
- cglib/cfg1.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -150,21 +134,6 @@
- misc/wclique.c \
- misc/wclique1.c \
- proxy/proxy.c \
--proxy/proxy1.c \
--zlib/adler32.c \
--zlib/compress.c \
--zlib/crc32.c \
--zlib/deflate.c \
--zlib/gzclose.c \
--zlib/gzlib.c \
--zlib/gzread.c \
--zlib/gzwrite.c \
--zlib/inffast.c \
--zlib/inflate.c \
--zlib/inftrees.c \
--zlib/trees.c \
--zlib/uncompr.c \
--zlib/zio.c \
--zlib/zutil.c
-+proxy/proxy1.c
- 
- ## eof ##
diff --git a/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
deleted file mode 100644
index d9efff2bb5f5..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-Updated for 4.57 by soap (Jan 2016)
-
---- glpk-4.57/configure.ac
-+++ glpk-4.57/configure.ac
-@@ -59,6 +59,11 @@
- dnl Check for math library
- AC_CHECK_LIB([m], [exp])
- 
-+AC_CHECK_LIB([amd], [amd_1])
-+AC_CHECK_LIB([colamd], [colamd])
-+AC_CHECK_HEADER([amd.h])
-+AC_CHECK_LIB([z], [gzopen])
-+
- dnl Check for <sys/time.h> header
- AC_CHECK_HEADER([sys/time.h],
-    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
---- glpk-4.57/src/Makefile.am
-+++ glpk-4.57/src/Makefile.am
-@@ -6,16 +6,13 @@
- 
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
- -I$(srcdir)/proxy \
---I$(srcdir)/simplex \
---I$(srcdir)/zlib
-+-I$(srcdir)/simplex
- 
- libglpk_la_LDFLAGS = \
- -version-info 38:0:2 \
-@@ -90,18 +87,6 @@
- glpssx01.c \
- glpssx02.c \
- lux.c \
--amd/amd_1.c \
--amd/amd_2.c \
--amd/amd_aat.c \
--amd/amd_control.c \
--amd/amd_defaults.c \
--amd/amd_dump.c \
--amd/amd_info.c \
--amd/amd_order.c \
--amd/amd_post_tree.c \
--amd/amd_postorder.c \
--amd/amd_preprocess.c \
--amd/amd_valid.c \
- bflib/btf.c \
- bflib/btfint.c \
- bflib/fhv.c \
-@@ -115,7 +100,6 @@
- bflib/sva.c \
- cglib/cfg.c \
- cglib/cfg1.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -158,21 +142,6 @@
- simplex/spxprob.c \
- simplex/spychuzc.c \
- simplex/spychuzr.c \
--simplex/spydual.c \
--zlib/adler32.c \
--zlib/compress.c \
--zlib/crc32.c \
--zlib/deflate.c \
--zlib/gzclose.c \
--zlib/gzlib.c \
--zlib/gzread.c \
--zlib/gzwrite.c \
--zlib/inffast.c \
--zlib/inflate.c \
--zlib/inftrees.c \
--zlib/trees.c \
--zlib/uncompr.c \
--zlib/zio.c \
--zlib/zutil.c
-+simplex/spydual.c
- 
- ## eof ##
diff --git a/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch
deleted file mode 100644
index 8790de5414fd..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-Updated for 4.57 by soap (Jan 2016)
-Updated for 4.60 by bicatali (Dec 2016)
-
---- glpk-4.60/configure.ac
-+++ glpk-4.60/configure.ac
-@@ -59,6 +59,11 @@
- dnl Check for math library
- AC_CHECK_LIB([m], [exp])
- 
-+AC_CHECK_LIB([amd], [amd_1])
-+AC_CHECK_LIB([colamd], [colamd])
-+AC_CHECK_HEADER([amd.h])
-+AC_CHECK_LIB([z], [gzopen])
-+
- dnl Check for <sys/time.h> header
- AC_CHECK_HEADER([sys/time.h],
-    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
-
---- glpk-4.60/src/Makefile.am
-+++ glpk-4.60/src/Makefile.am
-@@ -6,18 +6,15 @@
- 
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/api \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
- -I$(srcdir)/mpl \
- -I$(srcdir)/proxy \
---I$(srcdir)/simplex \
---I$(srcdir)/zlib
-+-I$(srcdir)/simplex
- 
- libglpk_la_LDFLAGS = \
- -version-info 41:0:1 \
-@@ -63,18 +60,6 @@
- glpssx02.c \
- lux.c \
- spv.c \
--amd/amd_1.c \
--amd/amd_2.c \
--amd/amd_aat.c \
--amd/amd_control.c \
--amd/amd_defaults.c \
--amd/amd_dump.c \
--amd/amd_info.c \
--amd/amd_order.c \
--amd/amd_post_tree.c \
--amd/amd_postorder.c \
--amd/amd_preprocess.c \
--amd/amd_valid.c \
- api/advbas.c \
- api/asnhall.c \
- api/asnlp.c \
-@@ -142,7 +127,6 @@
- cglib/gmicut.c \
- cglib/gmigen.c \
- cglib/mirgen.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -195,21 +179,6 @@
- simplex/spxprob.c \
- simplex/spychuzc.c \
- simplex/spychuzr.c \
--simplex/spydual.c \
--zlib/adler32.c \
--zlib/compress.c \
--zlib/crc32.c \
--zlib/deflate.c \
--zlib/gzclose.c \
--zlib/gzlib.c \
--zlib/gzread.c \
--zlib/gzwrite.c \
--zlib/inffast.c \
--zlib/inflate.c \
--zlib/inftrees.c \
--zlib/trees.c \
--zlib/uncompr.c \
--zlib/zio.c \
--zlib/zutil.c
-+simplex/spydual.c
- 
- ## eof ##
diff --git a/sci-mathematics/glpk/glpk-4.45.ebuild b/sci-mathematics/glpk/glpk-4.45.ebuild
deleted file mode 100644
index 87a75a0c57ef..000000000000
--- a/sci-mathematics/glpk/glpk-4.45.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-libs/zlib
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	gmp? ( dev-libs/gmp )
-	mysql? ( virtual/mysql )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch 	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
-}
-
-src_configure() {
-	local myconf="--disable-dl"
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	fi
-
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $(pkg-config --cflags libiodbc)
-
-	econf \
-		--with-zlib \
-		$(use_enable static-libs static) \
-		$(use_with gmp) \
-		$(use_enable odbc) \
-		$(use_enable mysql) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || \
-		die "failed to install docs"
-
-	insinto /usr/share/doc/${PF}
-	if use examples; then
-		emake distclean
-		doins -r examples || die "failed to install examples"
-	fi
-	if use doc; then
-		cd "${S}"/doc
-		doins *.pdf notes/*.pdf || die "failed to instal djvu and pdf"
-		dodoc *.txt || die "failed to install manual files"
-	fi
-}
diff --git a/sci-mathematics/glpk/glpk-4.48.ebuild b/sci-mathematics/glpk/glpk-4.48.ebuild
deleted file mode 100644
index f8ce132717c0..000000000000
--- a/sci-mathematics/glpk/glpk-4.48.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="
-	gmp? ( dev-libs/gmp:0 )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable odbc)
-		$(use_with gmp)
-	)
-	if use mysql || use odbc; then
-		myeconfargs+=( --enable-dl )
-	else
-		myeconfargs+=( --disable-dl )
-	fi
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.54.ebuild b/sci-mathematics/glpk/glpk-4.54.ebuild
deleted file mode 100644
index 948bf8bbcafb..000000000000
--- a/sci-mathematics/glpk/glpk-4.54.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.54-debundle-system-libs.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable odbc)
-		$(use_with gmp)
-	)
-	if use mysql || use odbc; then
-		myeconfargs+=( --enable-dl )
-	else
-		myeconfargs+=( --disable-dl )
-	fi
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.55.ebuild b/sci-mathematics/glpk/glpk-4.55.ebuild
deleted file mode 100644
index 948bf8bbcafb..000000000000
--- a/sci-mathematics/glpk/glpk-4.55.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.54-debundle-system-libs.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable odbc)
-		$(use_with gmp)
-	)
-	if use mysql || use odbc; then
-		myeconfargs+=( --enable-dl )
-	else
-		myeconfargs+=( --disable-dl )
-	fi
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.57.ebuild b/sci-mathematics/glpk/glpk-4.57.ebuild
deleted file mode 100644
index db5c9d1472c0..000000000000
--- a/sci-mathematics/glpk/glpk-4.57.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-debundle-system-libs.patch
-)
-
-src_prepare() {
-	use odbc && [[ -z $(type -P odbc_config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	else
-		myconf="--disable-dl"
-	fi
-
-	econf ${myconf} \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_with gmp)
-}
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.60.ebuild b/sci-mathematics/glpk/glpk-4.60.ebuild
deleted file mode 100644
index e860582c03f0..000000000000
--- a/sci-mathematics/glpk/glpk-4.60.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/40"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-debundle-system-libs.patch
-)
-
-src_prepare() {
-	use odbc && [[ -z $(type -P odbc_config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	else
-		myconf="--disable-dl"
-	fi
-
-	econf ${myconf} \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_with gmp)
-}
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.61-r1.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild
deleted file mode 100644
index dfc1dfe7f6c9..000000000000
--- a/sci-mathematics/glpk/glpk-4.61-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/40"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.60-debundle-system-libs.patch
-)
-
-src_prepare() {
-	use odbc && [[ -z $(type -P odbc_config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	else
-		myconf="--disable-dl"
-	fi
-
-	econf ${myconf} \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable static-libs static) \
-		$(use_with gmp)
-}
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index a4a40128c43f..4721b1832852 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/40"
 IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	sci-libs/amd:0=
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 8129f8bfe8b4..9ec90c81cc28 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,3 +1,3 @@
-DIST rkward-0.6.5_p20170420.tar.xz 969148 BLAKE2B 78847d8b6386f973e92eda8060836cf472f2b1380bd9b920db83e4820457daafac1302b773e6b7aa6b61da99126e35f7f62a18d98f13e2e4bc80b9c81b5ee89d SHA512 904fb9065f7b0d14e5c015a20236a496bd8380ee8083f104203d1d9944f978da10b4e00be497ec55967c8137815f09843adcad2dd71051fbf8b50471a5c0c09f
-EBUILD rkward-0.6.5_p20170420.ebuild 1261 BLAKE2B 59914386d1d551ddee2cf6b1eb744b23347b0fb4d13f9a900bb11e59948642b05eb7391525de2d967a0eb92a4f2e8508e8aaa5065f094c5b73b95520b4e40e43 SHA512 eba762c875a1f05c9bdcb8bb217a8e3c19a64e5af82023fc51539cd3526cadaca70795cfe37cad47491d924f518ce1bcee11e17941a370e1298d2088362eabad
+DIST rkward-0.7.0.tar.gz 3991768 BLAKE2B b823a7dd1b04bb92f08a9a1ef6bc32de8f4f1084c9d2fac65817022ea717f51f6b6d239396352ba2699f33e7806f968b2b3b74c7288a9fe8b0d889404cc0d878 SHA512 2cbf1adb0923140b983f9a6e64f775f05228cefa6188a3ff1cd0cf9ac8e64b8c57e5e0d4cba342a0d9a73f057e657f28d44c979e31c82b5d1c9b70e62e14385e
+EBUILD rkward-0.7.0.ebuild 1252 BLAKE2B d20fe9312cf4de99c4a6b502b49e457e3c97d545469f6b2ba9b05f78e318491e7ca41bdf112efab203d9372a3ca66a8cfabf020a16185518b520327020c90bf3 SHA512 88c47a0a190b368af293990a9b6153d36dc505733c683cb417172883e276006358db7906ebfa7945fdf0c083da83d904658e6cece0d958fd81d35f59f686379c
 MISC metadata.xml 592 BLAKE2B 887f22ad10d784dd1a12f50ab14ae07e9da5f90828b78027c08c864641e334cd1343bd4bbd197ccec086fe9e7d1e95602f8f78cc3f1316701900b73e266d763d SHA512 81c026c96614186bc6b31f9737b91692df82523d2179d467aeb663f10b7ce079a4b52354d8f744dedbe5bf5cf1939921a26f24f8deec9a170ac435da1f9863f6
diff --git a/sci-mathematics/rkward/rkward-0.6.5_p20170420.ebuild b/sci-mathematics/rkward/rkward-0.7.0.ebuild
index f3bea9438c61..cc0161f93c23 100644
--- a/sci-mathematics/rkward/rkward-0.6.5_p20170420.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="IDE for the R-project"
 HOMEPAGE="https://rkward.kde.org/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2"
 SLOT="5"