gentoo resync : 27.03.2018

5 files changed, 5 insertions, 173 deletions

diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 95d0f0d17316..b63dbc83b866 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,14 +1,9 @@
-AUX zstd-1.1.0-fix_build_system.patch 3103 BLAKE2B 36779f1456a4c0ddca40866574976bfd020d837b5ed58a37e6918ce8b98b951c8c6ca2b89e993b3f4ba80f0b5514bf681961331fc60460836955dd96cca81b13 SHA512 0ea1a9381a5766f1b7558f57a4082a919f02ead3f5ef6400c991f8f70390349bb8f96af1e36599c2c985285acd339a673e51cfbeb5839a790fe1aa672f93aaad
-DIST zstd-1.1.0.tar.gz 716327 BLAKE2B 042b9d46f3e58d7ce5ac8fd427b1682ec62cfb326ac7c7408f564f69957f406bb466dcd619b7efaf24dfbffd17f1b5002c06c1b25a0576f171724fc9d8759553 SHA512 9fe72081d333b58d5c8f27f13bd01ab0d729984215b75690282770aa769aab6879b88177aa2b45d8ce2869bf1b360f3a828ca00aa3646a7cc57285a4e167d71f
 DIST zstd-1.1.3.tar.gz 845902 BLAKE2B f8896d467c255dd0dfd348aee0d8b8a13b1551ee0e526db0f4b8939654ce5bd40f0a0273109880b27196d2b4fc4b381464f102fe1f736956f6c830205c601087 SHA512 6c025ca3899d0487bf2b4a9b333b47c6e2bb525ae3fc7328cc040f50d6f3c53a1bb9bd17e104352ddbc7b96b240c250c60d5be99e0a980332dbd3c518b2a81e1
-DIST zstd-1.2.0.tar.gz 1300584 BLAKE2B 3bde619cde6a6cf6ea83c86ba8ad2c7aa0cfecbf606aec0695ae809f438712fc0114d8a245deaf153faf130564d31522a15d1fef96357c5a90728b963399e4de SHA512 b21910c6bdcfad3199c07b9f70f7c049062ebd1cce9249dd33c36153e29f24dd9e796ddbc2f37846b9f508c14b0d0f67651fd8d2bdce558128f20bdfff50a7df
-DIST zstd-1.3.0.tar.gz 1469911 BLAKE2B c62e467c1ba2b6a13aca79f939bf0c63e25eb1168ba3b8908720cad245f2f61e39c214edecaafa6201af4f9c8d1875d24f08b8aa6df6f42ba083dce7cc2e94c0 SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30
 DIST zstd-1.3.2.tar.gz 1618939 BLAKE2B 1bb8c9ac0a521230e1507380afd5346e9cbd5b850c9a6516ef2fcf3e339e90ad1dc6adda13b7eb2d75630a788903ed12732a41fde065601ad879cca36c677125 SHA512 e2848d08b38d2fe98cd327611044bdac2f948547124321c8d63d5bdc2e6694d623c40c7bcc7d499fa83531f9cb92ddcb8be67614a49f855a9103f0ee6af0985c
 DIST zstd-1.3.3.tar.gz 1857232 BLAKE2B 45b737b8798fa6982b22163553e38fbe77143d5562032a8f5f5593225ea07fee277b27c06c00670196b59030a4919d819d562bf9e1e185aadc755d0563b251bb SHA512 72b63f96f65ca987cdc82c24354f7665c7dc3b2563cb0646f355c34bf8f090d8a0759729f8beaba8317272bdab34749f934055707b25cfd69c98a9fdcfbc59ae
-EBUILD zstd-1.1.0.ebuild 928 BLAKE2B 7ede914553f0b418dbaebcca524d85215edd2a9786f22915493561f0a75b2c170539c8f9217276cc32b8e855622e37eb0809aede8e8ab75a2b34df8e6271c7c9 SHA512 46c64fe1cbdbb0d4cc6233517253e7ea9d098b7ae355aa93fd972f9b10fb07fb7ad19b6dd7bb1bcba36c24c3be4fc3ed14d06f96ab547f428d60f5115bc0d971
+DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d0dd07d8408e5a2c2641dcdbc388e053ce8d15f9e261255e80f018a172d6e103b5c2f5a2ebb555333ac5f15d SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
-EBUILD zstd-1.2.0.ebuild 911 BLAKE2B 1d05c3c40bd2508433ff818a7b53bdce10bbc2567660ca5a45228a661836b0a5662610a50afc33803d75d070bb0ad0871a26e6b586d73db9b438c7fbee22d73f SHA512 1df5717823ff075a56edc7ddd0d5c43087226560720cf48fdcd6084f4ba5ac2ae215865a9cb69549b61785ef78f689b9b7c15f934d4d29b9dce40f20ed8f3ae0
-EBUILD zstd-1.3.0.ebuild 1246 BLAKE2B 79cbdd3c8eeb485eebeabe7864f2a7815e1f7587ba656bc63c2679b4a4d4671f62696484dce5eba875f40974fa232bac3a37ce95e01b04048e0caa2bcd68154f SHA512 ae39d6c828fd7a3f1a9473a9028f5656bc5914aa0b1a149305ba13718e0482c12fe2f710bca4cbe73a746d9cab5cef2afcab327fe95cadeacbd699bbb32d6027
 EBUILD zstd-1.3.2.ebuild 1268 BLAKE2B 255455e55d8c6db01148dd8cf2ca511a6051481beb14d9c4eb6f12b5a97aeec14641c781a77d3dbbb3b0a5942434a9e23842d040983650485d871a4af88d346b SHA512 bd78230e8e1fa5d9e8aa2350b232959840d269f3d989c2995b3f5d600159814081ea772abea57799d4e53023dcc77ac8fd2b40631a69836aa8a2ea40348c3fcb
 EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
+EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch b/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
deleted file mode 100644
index 75531c409974..000000000000
--- a/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/lib/Makefile b/lib/Makefile
-index 4fb8ed9..ec5436d 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -63,17 +63,17 @@ all: clean libzstd
- 
- libzstd: $(ZSTD_FILES)
- 	@echo compiling static library
--	@$(CC) $(FLAGS) -c $^
--	@$(AR) rcs $@.a *.o
-+	$(CC) $(FLAGS) -c $^
-+	$(AR) rcs $@.a *.o
- 	@echo compiling dynamic library $(LIBVER)
--	@$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-+	$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
- 	@echo creating versioned links
--	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
--	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-+	ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-+	ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
- 
- clean:
--	@rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
--	@rm -f decompress/*.o
-+	rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-+	rm -f decompress/*.o
- 	@echo Cleaning library completed
- 
- #------------------------------------------------------------------------
-@@ -83,22 +83,22 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly
- libzstd.pc:
- libzstd.pc: libzstd.pc.in
- 	@echo creating pkgconfig
--	@sed -e 's|@PREFIX@|$(PREFIX)|' \
-+	sed -e 's|@PREFIX@|$(PREFIX)|' \
-              -e 's|@LIBDIR@|$(LIBDIR)|' \
-              -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
-              -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
--install: libzstd libzstd.pc
--	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
--	@cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
--	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
--	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
--	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
--	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+install: libzstd.pc
-+	install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+	install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-+	cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+	install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-+	install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+	install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+	install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
- 	@echo zstd static and shared library installed
- 
- uninstall:
-diff --git a/programs/Makefile b/programs/Makefile
-index 6e78d0e..993d138 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -21,11 +21,7 @@ MANDIR  = $(PREFIX)/share/man/man1
- 
- ZSTDDIR = ../lib
- 
--ifeq ($(shell $(CC) -v 2>&1 | grep -c "gcc version "), 1)
--ALIGN_LOOP = -falign-loops=32
--else
- ALIGN_LOOP =
--endif
- 
- CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
- CFLAGS ?= -O3
diff --git a/app-arch/zstd/zstd-1.1.0.ebuild b/app-arch/zstd/zstd-1.1.0.ebuild
deleted file mode 100644
index c120d6aa6675..000000000000
--- a/app-arch/zstd/zstd-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="http://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-PATCHES=( "${FILESDIR}/${P}-fix_build_system.patch" )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.2.0.ebuild b/app-arch/zstd/zstd-1.2.0.ebuild
deleted file mode 100644
index d110bfff7091..000000000000
--- a/app-arch/zstd/zstd-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.3.0.ebuild b/app-arch/zstd/zstd-1.3.4.ebuild
index 10e57a167eb2..63e5ab864115 100644
--- a/app-arch/zstd/zstd-1.3.0.ebuild
+++ b/app-arch/zstd/zstd-1.3.4.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
@@ -9,9 +9,9 @@ DESCRIPTION="zstd fast compression library"
 HOMEPAGE="https://facebook.github.io/zstd/"
 SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"