gentoo resync : 18.12.2017

7 files changed, 24 insertions, 30 deletions

diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 47c7d79587ee..79074c3772cd 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/gsl-1.16 b/metadata/md5-cache/sci-libs/gsl-1.16
index ae670ea346e3..b05431223219 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.16
+++ b/metadata/md5-cache/sci-libs/gsl-1.16
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
-SRC_URI=mirror://gnu/gsl/gsl-1.16.tar.gz
+SRC_URI=mirror://gnu/gsl/gsl-1.16.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-1.16-cblas.patch.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fb9db9a816429ae603c99e53b0db6402
+_md5_=5d377e856c6f64bfc0ec45883ac4d7ce
diff --git a/metadata/md5-cache/sci-libs/gsl-2.1 b/metadata/md5-cache/sci-libs/gsl-2.1
deleted file mode 100644
index fcf81df24524..000000000000
--- a/metadata/md5-cache/sci-libs/gsl-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=cblas-external? ( virtual/cblas ) app-eselect/eselect-cblas virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The GNU Scientific Library
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gsl/
-IUSE=cblas-external static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=cblas-external? ( virtual/cblas )
-SLOT=0/19
-SRC_URI=mirror://gnu/gsl/gsl-2.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=07726c4192b065e182a9259fe1d2a13e
diff --git a/metadata/md5-cache/sci-libs/gsl-2.3 b/metadata/md5-cache/sci-libs/gsl-2.3
deleted file mode 100644
index 92e3474b5d14..000000000000
--- a/metadata/md5-cache/sci-libs/gsl-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=cblas-external? ( virtual/cblas ) app-eselect/eselect-cblas virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The GNU Scientific Library
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gsl/
-IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=cblas-external? ( virtual/cblas )
-SLOT=0/19.3
-SRC_URI=mirror://gnu/gsl/gsl-2.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d6bdac0e2cc56e0184d139cdb332c56c
diff --git a/metadata/md5-cache/sci-libs/gsl-2.4 b/metadata/md5-cache/sci-libs/gsl-2.4
index c1740da627e8..ada17656f7d6 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.4
+++ b/metadata/md5-cache/sci-libs/gsl-2.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/23
-SRC_URI=mirror://gnu/gsl/gsl-2.4.tar.gz
+SRC_URI=mirror://gnu/gsl/gsl-2.4.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=db28012f02e0c22cdfd8bb6303012127
+_md5_=59709a3583c9f004b12ab9b12f6a5513
diff --git a/metadata/md5-cache/sci-libs/mmdb-1.25.6.1 b/metadata/md5-cache/sci-libs/mmdb-1.25.6.1
new file mode 100644
index 000000000000..53a2daf69784
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mmdb-1.25.6.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
+EAPI=6
+HOMEPAGE=https://launchpad.net/mmdb/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-3
+SLOT=0
+SRC_URI=https://launchpad.net/mmdb/1.25/1.25.6.1/+download/mmdb-1.25.6.1.tar.gz
+_md5_=2ce7b211455698d23881932cdd4e773e
diff --git a/metadata/md5-cache/sci-libs/mmdb-2.0.5 b/metadata/md5-cache/sci-libs/mmdb-2.0.5
new file mode 100644
index 000000000000..59e05e7b1e01
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mmdb-2.0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
+EAPI=6
+HOMEPAGE=https://launchpad.net/mmdb/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-3
+SLOT=2
+SRC_URI=ftp://ftp.ccp4.ac.uk/opensource/mmdb2-2.0.5.tar.gz
+_md5_=0b2d3c8201a67dd71571a893c04312d6