gentoo resync : 28.04.2019

3 files changed, 5 insertions, 72 deletions

diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 4bf66793cc47..8415aa5147cf 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,9 +1,7 @@
 DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8
-DIST liblinear-211.tar.gz 506507 BLAKE2B 31b7677dfbf9dbb060a28dc19c63db4244e55c4ddc984a8c9ccadc517beabaf8fabef04488366cd7375608412dad3c37d4f09fe27b37b69e69209d32379a9e45 SHA512 005a47b3a8ff27f9890ce10549478be4b041c92d162815fba33dd56db7c014e6958b3e7e161451490c34d88df2161366365bd41b1a48d6a77034edc346a0fc3a
-DIST liblinear-220.tar.gz 517302 BLAKE2B 6aa28c3357f830441ee3cb2e9691d4952e4d4db6592622f6e93be1ed12c8f871e4a9c98abcb35b472a227005bad0cc1e6076678358dc324a7453cbbfb34a0866 SHA512 cde798b7cb221513cf2b8bbe134d6c3dce1ed26c43504d8c09dbed93b82ca47bfd271d4dd3d03384187273906ce140d4ce4418a4a8c21410015ec1631c1042c6
 DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
+DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
 EBUILD liblinear-210-r1.ebuild 1416 BLAKE2B 329845a3366d90bd89c17c714b7dedaa8fac27f462d3c98ec2f4831d51b18d15cda975a2ed6aedf69b08cdfd439ee05a85cb09489c9bbfa102a145b7d78e7226 SHA512 96bf9b251b5ddca7c7c4b717b504ae585f821eba683a7891d4a23fa87ea961456f364bff5656e17e5fa36ea2a8918b10622c3ccc8a528f0262799d22e359b9ae
-EBUILD liblinear-211.ebuild 1434 BLAKE2B 655612d7b792bf82592b86caa56064c87f5b9b2fa323d421c25e442c3462a876445e126c6ed4b378d982cfb4554645f7be8950e7aa9f89e4243a0e9c75c63056 SHA512 bd3b0911b8fe4da36da8411224ffc315600691dc34b02914d06c296dc0853aaa42d8fcccccad25d362967fe796af30b726f42b354b93ef518e28e4f2c1880c74
-EBUILD liblinear-220.ebuild 1445 BLAKE2B a925bf8d337dfd549333ec294b3175c2f1c4e9ad4f3d3dd8961ee5f294f123c4413fad51a03028809f6428d24f24baa0390cc748c498176fa1c932d716b10811 SHA512 8e166b377b67f1d53940accd0c122f600f7fe4945ef7fa0094921082a4db90455edf719e436f11b05cff8909f0508fd0bf29e6fa7bde48a0a5740d9783dcba3a
 EBUILD liblinear-221.ebuild 1447 BLAKE2B 9560996f77a28c1d22eff32a3f0ddb3e4038fe59489dfaacdc052e3f94f22f32081f5f0e708c6e8abbaee621e047fa3df44b07f0dd7464f3668faebd62bc939e SHA512 616f1b29a9fbf1aa784e13f6fab3f4d771f670b77e14c9c39f38a556faf1bc33b387e2b4b4296cab9510fd732a98ec0dd8a7956dde254f8c37adfb840517cba7
+EBUILD liblinear-230.ebuild 1447 BLAKE2B 4416754ff7bd96f5ffc5d46fe1f6d2b287745e39ba2b2f05997d955e8bb2321ae39ae7196b11059ab54714ac141b66840f5257d672eedcc1d25dfd479914c406 SHA512 b2421ffe5a6c2e03cf8245dfe72cf21e9ba28e2086b2967b60751a677ab13d78f85eb707b41e258b2d4b4e924a1aa443af148822a09750cd7d31c57340961432
 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
diff --git a/dev-libs/liblinear/liblinear-211.ebuild b/dev-libs/liblinear/liblinear-211.ebuild
deleted file mode 100644
index 7176d0f8b119..000000000000
--- a/dev-libs/liblinear/liblinear-211.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="blas"
-
-RDEPEND="
-	blas? ( virtual/blas )
-"
-DEPEND="
-	${RDEPEND}
-	blas? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-	if use blas; then
-		sed -i -e 's:blas/blas.a::g' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \
-		lib all
-}
-
-src_install() {
-	dolib ${PN}.so.3
-	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-220.ebuild b/dev-libs/liblinear/liblinear-230.ebuild
index 5fdad5b9beb7..00881437e2d5 100644
--- a/dev-libs/liblinear/liblinear-220.ebuild
+++ b/dev-libs/liblinear/liblinear-230.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 inherit multilib toolchain-funcs
 
 DESCRIPTION="A Library for Large Linear Classification"
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	dolib ${PN}.so.3
+	dolib.so ${PN}.so.3
 	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
 
 	newbin predict ${PN}-predict