summaryrefslogtreecommitdiff
path: root/dev-libs
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/Manifest.gzbin84782 -> 84911 bytes
-rw-r--r--dev-libs/cyrus-sasl/Manifest6
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild4
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild4
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild2
-rw-r--r--dev-libs/efl/Manifest1
-rw-r--r--dev-libs/efl/efl-9999.ebuild288
-rw-r--r--dev-libs/elfutils/Manifest2
-rw-r--r--dev-libs/elfutils/elfutils-0.171.ebuild66
-rw-r--r--dev-libs/glib/Manifest4
-rw-r--r--dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch86
-rw-r--r--dev-libs/glib/glib-2.54.3-r6.ebuild304
-rw-r--r--dev-libs/gmp/Manifest12
-rw-r--r--dev-libs/gmp/gmp-4.3.2-r1.ebuild4
-rw-r--r--dev-libs/gmp/gmp-6.0.0a.ebuild6
-rw-r--r--dev-libs/gmp/gmp-6.1.0.ebuild6
-rw-r--r--dev-libs/gmp/gmp-6.1.1.ebuild6
-rw-r--r--dev-libs/gmp/gmp-6.1.2-r1.ebuild6
-rw-r--r--dev-libs/gmp/gmp-6.1.2.ebuild6
-rw-r--r--dev-libs/granite/Manifest11
-rw-r--r--dev-libs/granite/files/granite-0.3.0-build-fix.patch22
-rw-r--r--dev-libs/granite/files/granite-0.3.0-build-fix2.patch13
-rw-r--r--dev-libs/granite/files/granite-0.3.0-build-fix3.patch24
-rw-r--r--dev-libs/granite/granite-0.2.1.ebuild56
-rw-r--r--dev-libs/granite/granite-0.2.3.1.ebuild58
-rw-r--r--dev-libs/granite/granite-0.3.0.ebuild64
-rw-r--r--dev-libs/granite/granite-0.5.0.ebuild2
-rw-r--r--dev-libs/icu/Manifest2
-rw-r--r--dev-libs/icu/icu-60.2.ebuild2
-rw-r--r--dev-libs/ivykis/Manifest2
-rw-r--r--dev-libs/ivykis/ivykis-0.42.3.ebuild12
-rw-r--r--dev-libs/libarcus/Manifest11
-rw-r--r--dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch77
-rw-r--r--dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild42
-rw-r--r--dev-libs/libarcus/libarcus-3.3.0.ebuild (renamed from dev-libs/libarcus/libarcus-2.3.1.ebuild)20
-rw-r--r--dev-libs/libarcus/metadata.xml36
-rw-r--r--dev-libs/libatomic_ops/Manifest5
-rw-r--r--dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch19
-rw-r--r--dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch11
-rw-r--r--dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch46
-rw-r--r--dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch59
-rw-r--r--dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch43
-rw-r--r--dev-libs/libcharon/Manifest3
-rw-r--r--dev-libs/libcharon/libcharon-3.3.0.ebuild19
-rw-r--r--dev-libs/libcharon/metadata.xml30
-rw-r--r--dev-libs/libclc/Manifest2
-rw-r--r--dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild83
-rw-r--r--dev-libs/libconfig/Manifest2
-rw-r--r--dev-libs/libconfig/libconfig-1.5.ebuild4
-rw-r--r--dev-libs/libdbh/Manifest4
-rw-r--r--dev-libs/libdbh/libdbh-5.0.22.ebuild35
-rw-r--r--dev-libs/libdbh/metadata.xml8
-rw-r--r--dev-libs/libevdev/Manifest2
-rw-r--r--dev-libs/libevdev/libevdev-1.5.9.ebuild2
-rw-r--r--dev-libs/libevent/Manifest4
-rw-r--r--dev-libs/libevent/libevent-2.1.8.ebuild4
-rw-r--r--dev-libs/libevent/libevent-9999.ebuild6
-rw-r--r--dev-libs/libgcrypt/Manifest2
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild75
-rw-r--r--dev-libs/libgit2/Manifest2
-rw-r--r--dev-libs/libgit2/libgit2-0.27.2.ebuild80
-rw-r--r--dev-libs/libgpg-error/Manifest2
-rw-r--r--dev-libs/libgpg-error/libgpg-error-1.29.ebuild2
-rw-r--r--dev-libs/libmemcache/Manifest6
-rw-r--r--dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-implicit_pointer.patch12
-rw-r--r--dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch33
-rw-r--r--dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch40
-rw-r--r--dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild41
-rw-r--r--dev-libs/libmemcache/metadata.xml10
-rw-r--r--dev-libs/libressl/Manifest4
-rw-r--r--dev-libs/libressl/libressl-2.6.5.ebuild55
-rw-r--r--dev-libs/libressl/libressl-2.7.4.ebuild53
-rw-r--r--dev-libs/libsavitar/Manifest4
-rw-r--r--dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch119
-rw-r--r--dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild (renamed from dev-libs/libarcus/libarcus-2.6.0.ebuild)29
-rw-r--r--dev-libs/libsavitar/metadata.xml30
-rw-r--r--dev-libs/libsodium/Manifest2
-rw-r--r--dev-libs/libsodium/libsodium-1.0.15.ebuild2
-rw-r--r--dev-libs/libutf8proc/Manifest2
-rw-r--r--dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild2
-rw-r--r--dev-libs/log4shib/Manifest1
-rw-r--r--dev-libs/log4shib/files/log4shib-doc.patch11
-rw-r--r--dev-libs/mpfr/Manifest14
-rw-r--r--dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild4
-rw-r--r--dev-libs/mpfr/mpfr-3.1.3_p4.ebuild4
-rw-r--r--dev-libs/mpfr/mpfr-3.1.4.ebuild4
-rw-r--r--dev-libs/mpfr/mpfr-3.1.5_p2.ebuild4
-rw-r--r--dev-libs/mpfr/mpfr-3.1.6.ebuild4
-rw-r--r--dev-libs/mpfr/mpfr-4.0.0-r1.ebuild4
-rw-r--r--dev-libs/mpfr/mpfr-4.0.1.ebuild4
-rw-r--r--dev-libs/nettle/Manifest2
-rw-r--r--dev-libs/nettle/nettle-3.4.ebuild2
-rw-r--r--dev-libs/onigmo/Manifest2
-rw-r--r--dev-libs/onigmo/onigmo-6.1.3.ebuild4
-rw-r--r--dev-libs/oniguruma/Manifest7
-rw-r--r--dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch25
-rw-r--r--dev-libs/oniguruma/oniguruma-6.6.1.ebuild42
-rw-r--r--dev-libs/oniguruma/oniguruma-6.7.0.ebuild33
-rw-r--r--dev-libs/oniguruma/oniguruma-6.8.2.ebuild2
-rw-r--r--dev-libs/openssl/Manifest10
-rw-r--r--dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch39
-rw-r--r--dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch290
-rw-r--r--dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch39
-rw-r--r--dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch39
-rw-r--r--dev-libs/openssl/openssl-1.0.2o-r6.ebuild (renamed from dev-libs/openssl/openssl-1.0.2o-r4.ebuild)3
-rw-r--r--dev-libs/openssl/openssl-1.1.0h-r2.ebuild (renamed from dev-libs/openssl/openssl-1.1.0h-r1.ebuild)1
-rw-r--r--dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild (renamed from dev-libs/openssl/openssl-1.1.1_pre7.ebuild)1
-rw-r--r--dev-libs/pkcs11-helper/Manifest4
-rw-r--r--dev-libs/pkcs11-helper/pkcs11-helper-1.24.ebuild (renamed from dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild)0
-rw-r--r--dev-libs/poco/Manifest2
-rw-r--r--dev-libs/poco/poco-1.9.0.ebuild115
-rw-r--r--dev-libs/protobuf-c/Manifest2
-rw-r--r--dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild2
-rw-r--r--dev-libs/re2/Manifest2
-rw-r--r--dev-libs/re2/re2-0.2018.04.01.ebuild2
-rw-r--r--dev-libs/spdlog/Manifest10
-rw-r--r--dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch35
-rw-r--r--dev-libs/spdlog/files/spdlog-unbundle-fmt.patch90
-rw-r--r--dev-libs/spdlog/spdlog-0.16.2.ebuild38
-rw-r--r--dev-libs/spdlog/spdlog-0.17.0.ebuild (renamed from dev-libs/spdlog/spdlog-0.16.3.ebuild)15
-rw-r--r--dev-libs/spdlog/spdlog-9999.ebuild15
-rw-r--r--dev-libs/xerces-c/Manifest2
-rw-r--r--dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild8
123 files changed, 1821 insertions, 1381 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index abff4052fc33..36d5d73646a1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index b23e6e2196ef..80b7b06cff49 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7746 BLAKE2B 7cb981529e715fd22bcebf4287c53161426e4fc6ef8d8d6ba79f1c5c412658133ada5e75306e44b86f5caae88f70c1953c14402616f14317f7979d513bc79750 SHA512 287a7346773e49e40fd7365089748dabc31e692bf6e0ccc3a5304a4d0792962bb4105ccf150bdafa8a12185928a2ddd3938d44f9f73436dc99c42adca19078be
-EBUILD cyrus-sasl-2.1.26-r11.ebuild 8396 BLAKE2B 65825008f1e4716dd5ba1326368460d9140413cd49fe4686f897e81dd95f071146dacf337a68f0e6fb85378c7a8ef59a30dd9e905b08b0abd82bb30a7d3e1e93 SHA512 844c7b5dd20fb1784bbce69daeb8c795e6e13195afd944cf10a795457cf2d2b7482ad53b4e54d7a0cad19d9eef73ca12e855a263d0392a1da26b7474b27dba08
-EBUILD cyrus-sasl-2.1.26-r9.ebuild 7655 BLAKE2B 1a5e6fc14b7b983d78d91f2846cc38bef0ad6e37dbd2f5659a3a3f1fc8b321024454a6e0de6dd2f4e5a0fcdc9ca18eff9b7fedd663c15da08cb293ee571caa23 SHA512 8026e9e7b2d58892a4405b1965a7080cbef7eb95e4fd57642197a625dc27bc04b9c41f01145f89c0fb82e999cef49897596cacc52194f1ff27dbc02987b9e5d3
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7749 BLAKE2B c37e7ba228f4cf3777a0ff769f92b265f59e0029417239360c801bb15a146beb05e78d1b94f3b781295515321423752daf36d55fb0d6858286198f19520ec9bb SHA512 108c1e6747841f1344af3e2bae387a8b55479883f9ecccad4a272f2ad33c7b4bc543f3afeabbf8defec75f07d58d07ecb8e6b7734205b4170d42842a3adfd780
+EBUILD cyrus-sasl-2.1.26-r11.ebuild 8399 BLAKE2B 24d061e613baea0c9dca4e6efd424adf3046700fb3b7c49775817afa65c597a4ca775ef1b348a7de5b082a0445b6dc43f8fa91d8349d91ad6330155533a4acfc SHA512 1de7c68f7f46de0729825c5818170a1824529c045abfb34785ad9a9496cac8cbb58f7ed607818900cd2bcd8175d91f6fd99c046daa2dddc017dc6622a252a487
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7658 BLAKE2B a223be2a7e75e6609bda11740115cad087732b8fe6e4992ec80a5c4ebe576c4d6d5d3965bd525bd8bc2df4e2e226d4f8835a2d40cd44846cad1e802c8925f875 SHA512 b33c28fd73a673fbab30fa2281226d889b855e7562e666ce3ed2f98662999b60abaa496e1f44b5d28c524f5955050e8489aaca60843e82c7ef26eddebd976d8c
MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index 6f56b4363945..33e0266d5480 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -28,8 +28,8 @@ DEPEND="net-mail/mailbase
postgres? ( dev-db/postgresql:= )
sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
java? ( >=virtual/jdk-1.4:= )"
RDEPEND="${DEPEND}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
index 4d0f5e31e81d..ed27f67acc27 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
@@ -29,8 +29,8 @@ DEPEND="
postgres? ( dev-db/postgresql:= )
sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
java? ( >=virtual/jdk-1.6:= )"
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
index e62db2b188e1..a4e9d78047f1 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@@ -27,7 +27,7 @@ DEPEND="net-mail/mailbase
pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
postgres? ( dev-db/postgresql:= )
sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
- ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
java? ( >=virtual/jdk-1.4:= )"
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-sasl )"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index b18546047980..18abaa224db3 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -5,5 +5,4 @@ DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae
EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
EBUILD efl-1.18.4.ebuild 7236 BLAKE2B 2da08d09505f7b2181b942f8c36b7ebb4b228b1634da871e3bd091ace2beb68e824361c163b474cf47ad21ff4166b3195d7b0ae592250deb6a95b04a739590f4 SHA512 966bf8069f1c7e2a87e21973a877c3ccaa530a18b2f9f6f772245e988fd18c34bae7dd37648299a3b87344b1bf6da4b7e6270d44b4d90a00bbe334e0d83a21cc
EBUILD efl-1.20.7.ebuild 8726 BLAKE2B 340202316bf86613902028e84626e9c9973624c5986649e2a2e2f705278f75b2c418d6560d09ff22997aad29a05fedd1e82d044dfbd4af13975f19abb918a2cf SHA512 8096f235e961c0fab334499795b04634757adcf289060cff1ac49dde4464788b5a73646d922f2cb37799aa0a5b1fb3b9bebf59f1fa108371d3cb20bd8ee9252b
-EBUILD efl-9999.ebuild 7236 BLAKE2B 2da08d09505f7b2181b942f8c36b7ebb4b228b1634da871e3bd091ace2beb68e824361c163b474cf47ad21ff4166b3195d7b0ae592250deb6a95b04a739590f4 SHA512 966bf8069f1c7e2a87e21973a877c3ccaa530a18b2f9f6f772245e988fd18c34bae7dd37648299a3b87344b1bf6da4b7e6270d44b4d90a00bbe334e0d83a21cc
MISC metadata.xml 2091 BLAKE2B 3c97d0f22ba6ae0a6aa2a75b60590414da3a25f955990be2cec07991f779a3e63034f19e8b826fa7632fb546162d8d4619413882e379dea46ee6d45bb42e6ceb SHA512 1ebe31d782aa8fd4eb8e21f2bdc030d1d88d2ceab85f3b3713a5da51d55f6342473fbbd41ee7b99d82b1d67ddabe52a1003e02d850c71645eb370d26c08b7556
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild
deleted file mode 100644
index 6047e25ff9fd..000000000000
--- a/dev-libs/efl/efl-9999.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
- MY_P=${P%%_*}
- SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-inherit enlightenment pax-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-
-REQUIRED_USE="
- pulseaudio? ( sound )
- opengl? ( || ( X sdl wayland ) )
- gles? ( || ( X wayland ) )
- gles? ( !sdl )
- gles? ( egl )
- sdl? ( opengl )
- wayland? ( egl !opengl gles )
- xim? ( X )
-"
-
-RDEPEND="
- drm? (
- >=dev-libs/libinput-0.8
- media-libs/mesa[gbm]
- >=x11-libs/libdrm-2.4
- >=x11-libs/libxkbcommon-0.3.0
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib )
- glib? ( dev-libs/glib:2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:0 )
- !oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua:* )
- physics? ( >=sci-physics/bullet-2.80 )
- pixman? ( x11-libs/pixman )
- postscript? ( app-text/libspectre )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- raw? ( media-libs/libraw )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0= )
- tslib? ( x11-libs/tslib )
- unwind? ( sys-libs/libunwind )
- valgrind? ( dev-util/valgrind )
- wayland? (
- >=dev-libs/wayland-1.8.0
- >=x11-libs/libxkbcommon-0.3.1
- media-libs/mesa[gles2,wayland]
- )
- webp? ( media-libs/libwebp )
- X? (
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
-
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
-
- gles? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- )
- xine? ( >=media-libs/xine-lib-1.1.1 )
- xpm? ( x11-libs/libXpm )
-
- sys-apps/dbus
- >=sys-apps/util-linux-2.20.0
- sys-libs/zlib
- virtual/jpeg:0=
-
- !dev-libs/ecore
- !dev-libs/edbus
- !dev-libs/eet
- !dev-libs/eeze
- !dev-libs/efreet
- !dev-libs/eina
- !dev-libs/eio
- !dev-libs/embryo
- !dev-libs/eobj
- !dev-libs/ephysics
- !media-libs/edje
- !media-libs/elementary
- !media-libs/emotion
- !media-libs/ethumb
- !media-libs/evas
- !media-plugins/emotion_generic_players
- !media-plugins/evas_generic_loaders
-"
-#external lz4 support currently broken because of unstable ABI/API
-# app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
- !!dev-libs/ecore
- !!dev-libs/edbus
- !!dev-libs/eet
- !!dev-libs/eeze
- !!dev-libs/efreet
- !!dev-libs/eina
- !!dev-libs/eio
- !!dev-libs/embryo
- !!dev-libs/eobj
- !!dev-libs/ephysics
- !!media-libs/edje
- !!media-libs/emotion
- !!media-libs/ethumb
- !!media-libs/evas
-"
-
-DEPEND="
- ${CORE_EFL_CONFLICTS}
-
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- enlightenment_src_prepare
-
- # Remove stupid sleep command.
- # Also back out gnu make hack that causes regen of Makefiles.
- # Delete var setting that causes the build to abort.
- sed -i \
- -e '/sleep 10/d' \
- -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
- -e '/BARF_OK=/s:=.*:=:' \
- configure || die
-
- # Upstream doesn't offer a configure flag. #611108
- if ! use unwind ; then
- sed -i \
- -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
- configure || die
- fi
-}
-
-src_configure() {
- if use ssl && use gnutls ; then
- einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
- einfo "gnutls has been selected for you."
- fi
- if use opengl && use gles ; then
- einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
- einfo "opengl has been selected for you."
- fi
-
- E_ECONF=(
- --with-profile=$(usex debug debug release)
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-x11=$(usex X xlib none)
- $(use_with X x)
- --with-opengl=$(usex opengl full $(usex gles es none))
- --with-glib=$(usex glib)
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable drm)
- $(use_enable doc)
- $(use_enable eet image-loader-eet)
- $(use_enable egl)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable oldlua lua-old)
- $(use_enable physics)
- $(use_enable pixman)
- $(use_enable pixman pixman-font)
- $(use_enable pixman pixman-rect)
- $(use_enable pixman pixman-line)
- $(use_enable pixman pixman-poly)
- $(use_enable pixman pixman-image)
- $(use_enable pixman pixman-image-scale-sample)
- $(use_enable png image-loader-png)
- $(use_enable postscript spectre)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable raw libraw)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l v4l2)
- $(use_enable valgrind)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- --enable-cserve
- --enable-image-loader-generic
- --enable-image-loader-jpeg
-
- --disable-tizen
- --disable-gesture
- --disable-gstreamer
- --enable-xinput2
- --disable-xinput22
- --enable-libmount
-
- # external lz4 support currently broken because of unstable ABI/API
- #--enable-liblz4
- )
-
- enlightenment_src_configure
-}
-
-src_compile() {
- if host-is-pax && ! use oldlua ; then
- # We need to build the lua code first so we can pax-mark it. #547076
- local target='_e_built_sources_target_gogogo_'
- printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
- emake -C src "${target}"
- emake -C src bin/elua/elua
- pax-mark m src/bin/elua/.libs/elua
- fi
- enlightenment_src_compile
-}
-
-src_install() {
- MAKEOPTS+=" -j1"
-
- enlightenment_src_install
-}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 006cfd9d4001..b56bbc6047da 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,7 +1,9 @@
AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
DIST elfutils-0.169.tar.bz2 8067758 BLAKE2B cf4c11619442fe19a5df95b79546af879771890b069de44743440ca5f6b44ac471125cce21fb4b1533d5265760e9fdf2ea3371c36bca39713c3e587987b69cd9 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9
DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
+DIST elfutils-0.171.tar.bz2 8654558 BLAKE2B 709b5a4090867ec536563ed31178f7fb820f6b0ca8fb7c379b9081fa0d0027c8c2904cf17e9ee36245dd1fea8d2853ee3e7af457167e007fb7b08eec2e921a30 SHA512 777be2d63ca9b11440bf358a33428d9ca974e2612a880934156c9f7194af596ed627c1ed2d48dbd47a3761c94913b8f39565f9dcb6b62c92bf229f04c96d5ee3
EBUILD elfutils-0.169-r1.ebuild 1813 BLAKE2B 3050d7c94ab236306795626353c96b1c28fb060a3fbf1df64be0a32c62984e7108c560bce4fd7bcc09840de99008e0f3ac7e705c452b5e02802e217b64265128 SHA512 4bebf168549fc83432752f167445814ee78ae0b3f583f8f2ad9a30ec8f111c7bc8658204038ddb61cb2c924686f92376dbfb76180a922b008048b38d6bb53f7d
EBUILD elfutils-0.170-r1.ebuild 1801 BLAKE2B d4052f7c28551fe5fdb97bf6dd59b72dfdf399a928fb218ba644c45131dbd18e3ab022e6d1b895ddbc13b65e0477813ce9aa8193aca88b4496bff9efc066cbe1 SHA512 c7ca487e67420bbcc9d0ac30a8338c0088f9b49ad23344dd7e0054596b20b1808ce123e1868d807afc87529ccc710f1a8fe1096461445fcbb77aa5d25ba3a4cf
EBUILD elfutils-0.170.ebuild 1811 BLAKE2B 460aafa4c30eecc5cebae1409280fd9a334f8c9dc3ebcbc96903eebe69805ab62668d1b467427e9feea035ce564aff0bbf1be195f78d63c7e49b0f8359cbccb1 SHA512 c86b7cf333da96fb7704aacf2bb836a42dabfb30d3aec60fcfa524b96ce549607b4ad25aee69f1fde9753cf7b8b82bb4590ed15a2980fc0329be7629476a37d8
+EBUILD elfutils-0.171.ebuild 1814 BLAKE2B 97d472102a5d75ab527ee84e92f13a2bdeea10ee7542a0ac09eee94673deb854af5b2c99d3be08b3372c3dcaaf66b3b81dc21f284eb840170f802dd401cbd47b SHA512 0f11ae704495140b4ba028c8e6aa6517f013278355a6db9334d66d812cb0e8acf148a94daacd8b79a6bcd4001f629c6b260fe5af95a5d72cd4165957f8d40243
MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.171.ebuild b/dev-libs/elfutils/elfutils-0.171.ebuild
new file mode 100644
index 000000000000..9ac835cad361
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.171.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+ !dev-libs/libelf"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ >=sys-devel/flex-2.5.4a
+ sys-devel/m4"
+
+PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
+
+src_prepare() {
+ default
+
+ if ! use static-libs; then
+ sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+ fi
+ sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+ use test && append-flags -g #407135
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable nls) \
+ $(use_enable threads thread-safety) \
+ --program-prefix="eu-" \
+ --with-zlib \
+ $(use_with bzip2 bzlib) \
+ $(use_with lzma)
+}
+
+multilib_src_test() {
+ env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+ LC_ALL="C" \
+ emake check
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dodoc NOTES
+ # These build quick, and are needed for most tests, so don't
+ # disable their building when the USE flag is disabled.
+ if ! use utils; then
+ rm -rf "${ED}"/usr/bin || die
+ fi
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e44c0245bbc1..d392fbae4d50 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,8 +1,12 @@
AUX glib-2.50.0-external-gdbus-codegen.patch 3854 BLAKE2B 87d6a4f372f557a9d861d0d637ec9289688999dea65e9ccc5ca595a0a139e286d0f9d84d864eba45e9c931ba486ce6ab342f6e247ed86b9ab79886ec91d1dd7e SHA512 dd5fb2f7f82be85326c37851cbb5d41307f7efcdd214b523f8ab0adc4e30830234f69b08dfbaa50bf7ace78bb0f07e7d7a6c5f87a2d06d2c11e0ed6f2d1d2045
AUX glib-2.50.3-fix-gdatetime-tests.patch 2052 BLAKE2B 198e6215f6466065ee171e0a75854e8c9f30d3f8271533f49ae83b52ffdec7052c5c5e237323641bee29a9916390e32ffdaacf7e56f619e1ece4be500e0d721b SHA512 7701cd1116626ef2b5a79e0d31f4c445a609b8b4481745f443fbac290670c776fbf4196a33a80629bf13bd9e405579715758e6c7ffcee72b6129d444d1dfa724
+AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94da1847152a87064eb5c9f9b0ae6996eca84e89c7807bea5cb7c58b8d42dee07eee96647d2439b8c62af023b37849d4465e0c013eca6 SHA512 70d942086f6181532b5f95c5a3e0d8bfc7d204ca2d4ee68850af82062b572cc146ac4a5516547011ef39386e10bc291deea32a19fe518e649f4f8ac60271b69c
DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
+DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
EBUILD glib-2.50.3-r1.ebuild 9645 BLAKE2B 14c0111687ec100a63f69ccca1f3e09da4e5bdd19ecf28382dd754cb199bf71cb798858b14f21e1ecbbd720a8682de42df0903f1feab3ba920bff76d40ae8137 SHA512 867357f01c61921249afe92cbf868f457fcf5e29fcf6e7667ad7390dc9456a5d558d5fab46acc0bcf66c7d13d4a0895ac127eb37068ab32011b4b1048703ac3b
EBUILD glib-2.52.3.ebuild 9549 BLAKE2B 7000c56a5068dd351145a412d24d6fca498ec3feffd2edeb061cc5496630d5720d01eeb1e44db976341ea15bea7d6a44bbbc140e3d62b5655bca2fe04a4dbcfc SHA512 d06032f1f76bbf2cd20e61d0b816475cbbed1b0b4d579fce94121d19e8063eaa54fbf9010d594886be26d7cd9790d43725e0a51eb8292572408bc5e7d86112b7
+EBUILD glib-2.54.3-r6.ebuild 9994 BLAKE2B 8a9162033333ef27f21acbd0fb50e6dd3a4013526b26c552e0341696c76d00c8ca10cb63c4c23c0294ab3a2320a86a0c06b517255a67ef523260fac773fbd0f7 SHA512 e7ded5b7f76af59137d7b7fb5d97dee7c09d2e1c246d1fc285103c95454beb81bdd7f1f48d80ee946f4073d4d53f34e3b8365a6b715dd7442022de8bb8a46c11
MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch
new file mode 100644
index 000000000000..a27966e0391d
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch
@@ -0,0 +1,86 @@
+From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Fri, 23 Feb 2018 15:27:33 +0330
+Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
+
+---
+ configure.ac | 1 -
+ docs/reference/gio/Makefile.am | 1 -
+ gio/Makefile.am | 2 +-
+ gio/tests/Makefile.am | 6 ++----
+ gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
+ 5 files changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0457c90..07166c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 5741a3e..d38e768 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -177,7 +177,6 @@ man_MANS += \
+ gsettings.1 \
+ gresource.1 \
+ gdbus.1 \
+- gdbus-codegen.1 \
+ gio.1 \
+ $(NULL)
+
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index b2db995..53d7162 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS =
+
+ if OS_UNIX
+ if !OS_COCOA
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index acc1da4..7c51eab 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica
+
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++ $(AM_V_GEN) gdbus-codegen \
+ --interface-prefix org.project. \
+ --generate-c-code gdbus-test-codegen-generated \
+ --c-generate-object-manager \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
+index 1d0464c..f390dca 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+ gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
+ $(NULL)
+
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
++ $(AM_V_GEN) gdbus-codegen \
+ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ --c-namespace Example \
+ --c-generate-object-manager \
+--
+2.16.1
+
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild
new file mode 100644
index 000000000000..4d02ca0b7766
--- /dev/null
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
+ multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
+ https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ test? ( ${PYTHON_REQUIRED_USE} )
+" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
+
+RDEPEND="
+ !<dev-util/gdbus-codegen-${PV}
+ >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+ xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+ ${PYTHON_DEPS}
+ utils? (
+ >=dev-util/gdbus-codegen-${PV}
+ virtual/libelf:0=
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-libs/libxslt-1.0
+ >=sys-devel/gettext-0.11
+ >=dev-util/gtk-doc-am-1.20
+ systemtap? ( >=dev-util/systemtap-1.3 )
+ test? (
+ sys-devel/gdb
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}
+ >=sys-apps/dbus-1.2.14 )
+ !<dev-util/gtk-doc-1.15-r2
+"
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+ dbus? ( gnome-base/dconf )
+ mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ if use test ; then
+ CONFIG_CHECK="~IPV6"
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+ fi
+ linux-info_pkg_setup
+ fi
+ # FIXME: Move python deps that are only required at build time of other packages to a split package
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+ if use test; then
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+ if ! has_version dev-util/desktop-file-utils ; then
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+ ewarn "think on installing it to get these tests run."
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+ sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+ fi
+
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any
+ # other), falling back to xterm if one doesn't exist
+ if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+ ewarn "Some tests will be skipped due to missing terminal program"
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+ fi
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=722604
+ sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+ sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+ ewarn "Tests for search-utils have been skipped"
+ sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+ else
+ # Don't build tests, also prevents extra deps, bug #512022
+ sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+ fi
+
+ # gdbus-codegen is a separate package
+ eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
+
+ # Upstream glib-2-54 branch; includes fixups for potential libreoffice lockups
+ eapply "${WORKDIR}"/patches/
+
+ # Leave gtester-report python shebang alone - handled by python_fix_shebang
+ sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die
+
+ # Also needed to prevent cross-compile failures, see bug #267603
+ eautoreconf
+
+ gnome2_src_prepare
+
+ epunt_cxx
+}
+
+multilib_src_configure() {
+ # Avoid circular depend with dev-util/pkgconfig and
+ # native builds (cross-compiles won't need pkg-config
+ # in the target ROOT to work here)
+ if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+ if has_version sys-apps/dbus; then
+ export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+ export DBUS1_LIBS="-ldbus-1"
+ fi
+ export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+ export LIBFFI_LIBS="-lffi"
+ export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+ export PCRE_LIBS="-lpcre"
+ fi
+
+ # These configure tests don't work when cross-compiling.
+ if tc-is-cross-compiler ; then
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756473
+ case ${CHOST} in
+ hppa*|metag*) export glib_cv_stack_grows=yes ;;
+ *) export glib_cv_stack_grows=no ;;
+ esac
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756474
+ export glib_cv_uscore=no
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756475
+ export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+ fi
+
+ local myconf
+
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
+ # libelf used only by the gresource bin
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable xattr) \
+ $(use_enable fam) \
+ $(use_enable kernel_linux libmount) \
+ $(use_enable selinux) \
+ $(use_enable static-libs static) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable systemtap systemtap) \
+ $(multilib_native_use_enable utils libelf) \
+ --with-python=${EPYTHON} \
+ --disable-compile-warnings \
+ --enable-man \
+ --with-pcre=system \
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+ if multilib_is_native_abi; then
+ local d
+ for d in glib gio gobject; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ export XDG_CONFIG_DIRS=/etc/xdg
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+ export LC_TIME=C # bug #411967
+ unset GSETTINGS_BACKEND # bug #596380
+ python_setup
+
+ # Related test is a bit nitpicking
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+ # Hardened: gdb needs this, bug #338891
+ if host-is-pax ; then
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+ || die "Hardened adjustment failed"
+ fi
+
+ # Need X for dbus-launch session X11 initialization
+ virtx emake check
+}
+
+multilib_src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+ keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use utils ; then
+ python_fix_shebang "${ED}"/usr/bin/gtester-report
+ else
+ # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
+ rm "${ED}usr/bin/gtester-report"
+ rm "${ED}usr/share/man/man1/gtester-report.1"
+ fi
+
+ # Do not install charset.alias even if generated, leave it to libiconv
+ rm -f "${ED}/usr/lib/charset.alias"
+
+ # Don't install gdb python macros, bug 291328
+ rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ # Make gschemas.compiled belong to glib alone
+ local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+
+ multilib_pkg_preinst() {
+ # Make giomodule.cache belong to glib alone
+ local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+ # file due to inability to create it and GIO might not look at any of the modules there
+ if ! tc-is-cross-compiler ; then
+ multilib_foreach_abi multilib_pkg_preinst
+ fi
+}
+
+pkg_postinst() {
+ # force (re)generation of gschemas.compiled
+ GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_giomodule_cache_update \
+ || die "Update GIO modules cache failed (for ${ABI})"
+ }
+ if ! tc-is-cross-compiler ; then
+ multilib_foreach_abi multilib_pkg_postinst
+ else
+ ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+ ewarn "You might want to run gio-querymodules manually on the target for"
+ ewarn "your final image for performance reasons and re-run it when packages"
+ ewarn "installing GIO modules get upgraded or added to the image."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+ fi
+}
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 7ad64da8ac54..fa48ebc3aeed 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -15,10 +15,10 @@ DIST gmp-man-6.0.0a.pdf 1187496 BLAKE2B 6d10b139cc9d54a5c5a3264393623dc0d8efa561
DIST gmp-man-6.1.0.pdf 825716 BLAKE2B aec5a26abaae4451aad621ee8594f67caf705e6fd730b225ee25dbdd7f4f9fb2447f9234c8763b6f8b2cbd9522b9e1bd6c0c486cf6209bd119884d39178863c1 SHA512 cec172766c6f5dce6b7306edbd542a63788df590391b8b2e6fb4e9d48947b2fbb47dd23acaf74eab6d35cb627bcb804e7ebb1d63aa5f043e4daa4558b698a5a0
DIST gmp-man-6.1.1.pdf 825669 BLAKE2B c33e5c77069a39f96d1fb27885adf4851ef4bff806f9709f9cc75161d0c00bfe0cda907471e908e9db76ab4c3d5fdcf42e42ef6da93b906d57ab469eecfd5cb3 SHA512 18e6aca87f5ff8848f82456d86233f127328bfbe309e67902c8dd6f25228db344bd3e6cc3a55e48f2c3f19d0a57358bc4ada7cd623799b273030a5119fb1257b
DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
-EBUILD gmp-4.3.2-r1.ebuild 1697 BLAKE2B 2485e688b5d75b96c5cc97e819b8aea9297c217d746ea14ad62120f0d928e7120207c100a20c18f0bba0d971cac7ddee58c70f13e9afa2ca051d132c50907ca0 SHA512 353025a9406d061eb5e8c54b037e4dc34d8d5639502b573f3d7434cb4994c1eaf8497110e7dae7245f8cfba880eae86ea2803a038f84026c15724df13135a931
-EBUILD gmp-6.0.0a.ebuild 2886 BLAKE2B 7ec35c00eea809640936ba484b676330c812f2b9a34f5d868c84e1403db20d76d1f914af2fde7e4815fd096bc9a1a9bf75c4f8ac9af720f918ba0ec0acfb5fde SHA512 d177ddccd7e211779a30b1020f5358137314beb44e0712750e8ac1f690adef02007627cc7ae744340b79c9939bbf134f30c582bd00329106f1c6c926ba2b3127
-EBUILD gmp-6.1.0.ebuild 3012 BLAKE2B ced6929c84e0718d3f46fe434d372f0e1ef929a11fd2bc3e219378809d96d6ae4d8f9cca1e542be516c127d652a7741604f84578eee6cbfbc84104ce592dff73 SHA512 4d74dfbd2a3ec15ea87644bc142ed472ed1b9ae60c382cbec9a1a1f06de742cc5a492d775fbfcb720eb0f28301b195c631db99decb83b5f05fd1bccdb2818b97
-EBUILD gmp-6.1.1.ebuild 3025 BLAKE2B fd8b00e769787bd092e34f21a4c06c9f52c26d2acd2ceb1e7622514371337e70a088cd8578e78d0f86c70a602b52a01cff9b963b881df9461f198e6dfbbf9113 SHA512 8a042992fa08f825b9c8b715677ba1a55e1be2aaced085b3776fd82eb8a97097eb8ca389f3b184c245ed2b6c28d1df63d235bd2feee72cc36277c753fe4454e6
-EBUILD gmp-6.1.2-r1.ebuild 2955 BLAKE2B 3580f25174177ec6aa4c6ed163ea9eb6e98bef35d31d558f1b0ead96059d28a3a407042246684e12c8b64da5b394a5525b983876c04148a156668807f96d9dc4 SHA512 1dde8f10c5a1bf3b34f395cd7e2bd98eefb8f3d617eb7c6cee8c9c0b2dc3f32d91a5bbfdd9bad1a7c36f80290bdd3307a97fca63fe7a445b2393e8ae6478ae11
-EBUILD gmp-6.1.2.ebuild 3277 BLAKE2B a05108385e65f57492ee257c77db16dbd43bc53f87d7d311c8e285d1c991ef3f665b69cfba8631d90dbf56f852586f73cfa2ef6ec31c905d505c0f64957fe4e8 SHA512 8ecc349abc523fb6914160c7ffae905b14605f130942fa7092acf3bef170f7d09b38fa8c16e1cb47b27ef1bca0e16fcde413609e56a329ed70c7b415ac1b6ad1
+EBUILD gmp-4.3.2-r1.ebuild 1699 BLAKE2B 7f600a9d920bf53a0de5954675d3cf72738ab7f74f2e552b0fbbcf3ec891835153ac6e3b5d0180171fc0356d9b9b1384882d9c4fc13b2d1e03c79b53b8c3d312 SHA512 2df5767cb8e4ae67f0264ad5cdd99888ec465774ddd079c9bc6648058138a28dbe4203552233c62ee02b7b2c6ccf2747ec70d2d078dba1528ffca7fae2fb40b6
+EBUILD gmp-6.0.0a.ebuild 2889 BLAKE2B 59d9bd1fa8c98fb58207d11eb691ef8da083f171eb74b1e6a1bafab1f2d59d304609b9f6fe8fd969a2e04ed9757b108cbc4b41aaa1d37f042d69e09d75fc0596 SHA512 a6930908c70e09da57ab7dc221fe23109293d0564a2e40b54c6b17dc9d5b9523a340626181911eaaa591eb964efb62435b6d93a80dcc261829d74de98e1a2b63
+EBUILD gmp-6.1.0.ebuild 3015 BLAKE2B 029305d00fb61c5867f5b5298b3e3e18ae03243e6498f3ffaf2e303e8b23b6311e7f32800ab20daaccbaf0d438b94a85b2e60ee94c3a641f1894032f69d04f79 SHA512 52ce1f6b7c2e826f0825cecb1b557768051b6a9d1f403b530732cb24924422bcc596937bee22475bda86518d12d3e757bd8cb8f7e7ae9c5b827c805530b4d13c
+EBUILD gmp-6.1.1.ebuild 3028 BLAKE2B 159bd4f2bfdb7ba5a6ff72d1ac65cdfe69bcc67f200fbb750472080e1fdd0fe22ff96eb07c084a06ce42f572f31738171469aa2845442a6b3408fcc9af682985 SHA512 8dcc6c3a5973edd4904827c4a91046c4577184da8c6664930007e60c59197c5e9c66822ea6c4bd5e8b311e42072b376feb7ff5249753ff73be025fe9f89beaac
+EBUILD gmp-6.1.2-r1.ebuild 2958 BLAKE2B de0265f9c529f831d2ca59ae5a639193038ce0b2536eb47a1dc71ca7be3914115f1241806cc2ddf0017676674968dd3ae492eda449581a9ffb46f764a41364ba SHA512 554f7ce0602cbde43f7a731ab2e40d3ba11509f4f0664b362abb0fe285d7c1be5d824133e01591bca5a5693b2874761413411c16fe8740aa3cc2b4e2209b63cb
+EBUILD gmp-6.1.2.ebuild 3280 BLAKE2B a16ae5ff9ceeaa79202cd447e64257862d9f551514a44902c5d5f3b4f3698f1c6137b50eecd513ae3f08b40baf52fbfbc839f3bd00e29c1ffbd5d8b56f039f69 SHA512 ec377c3d66be37a5232fc431039fb38672ff6200d24a8c1d780effbb2da1c6f336f478781a5f01af9d67e59f5657cfb22485e67632fe051356fc21f8f76582ea
MISC metadata.xml 501 BLAKE2B f72cb10582beb651fddf6d5abe85920d6f8c9d7a87b82e6778a641bc75202213432105da5cfefbdcd9d343180cca7f2f56638f27c9e059d68afa92d6ee0d6665 SHA512 bde33c241d1e7026e86e7a445bcd929f8a2f6d2dc7a0e71994f2130459910a0ac51d6d3d8cad0fd45baea0d0a38c818348d2427035ef393ac6343ee993c95dd7
diff --git a/dev-libs/gmp/gmp-4.3.2-r1.ebuild b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
index deeb2652409f..119a7b9dd487 100644
--- a/dev-libs/gmp/gmp-4.3.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
@@ -8,7 +8,7 @@ EAPI="5"
inherit eutils libtool toolchain-funcs multilib-minimal
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="http://gmplib.org/"
+HOMEPAGE="https://gmplib.org/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="LGPL-3"
@@ -38,7 +38,7 @@ src_prepare() {
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+ # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index 6bbf335105ef..84c305ca602a 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -9,10 +9,10 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="http://gmplib.org/"
+HOMEPAGE="https://gmplib.org/"
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
- doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+ doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
SLOT="0"
@@ -48,7 +48,7 @@ src_prepare() {
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+ # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild
index 5f06f13d2e9c..c679c5b9630e 100644
--- a/dev-libs/gmp/gmp-6.1.0.ebuild
+++ b/dev-libs/gmp/gmp-6.1.0.ebuild
@@ -10,10 +10,10 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="http://gmplib.org/"
+HOMEPAGE="https://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
mirror://gnu/${PN}/${MY_P}.tar.xz
- doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+ doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
@@ -54,7 +54,7 @@ src_prepare() {
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+ # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
diff --git a/dev-libs/gmp/gmp-6.1.1.ebuild b/dev-libs/gmp/gmp-6.1.1.ebuild
index d2e8cc6dc926..a8231bd54b5c 100644
--- a/dev-libs/gmp/gmp-6.1.1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.1.ebuild
@@ -10,10 +10,10 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="http://gmplib.org/"
+HOMEPAGE="https://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
mirror://gnu/${PN}/${MY_P}.tar.xz
- doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+ doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
@@ -54,7 +54,7 @@ src_prepare() {
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+ # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
diff --git a/dev-libs/gmp/gmp-6.1.2-r1.ebuild b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
index 8ee5a2ba140f..4f9a4359fca7 100644
--- a/dev-libs/gmp/gmp-6.1.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
@@ -10,10 +10,10 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="http://gmplib.org/"
+HOMEPAGE="https://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
mirror://gnu/${PN}/${MY_P}.tar.xz
- doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+ doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
@@ -59,7 +59,7 @@ src_prepare() {
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+ # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index bdee22559239..6481d95238be 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -10,10 +10,10 @@ MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="http://gmplib.org/"
+HOMEPAGE="https://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
mirror://gnu/${PN}/${MY_P}.tar.xz
- doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+ doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
@@ -57,7 +57,7 @@ src_prepare() {
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+ # https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index e681e3bcfb24..d719587c943e 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,12 +1,3 @@
-AUX granite-0.3.0-build-fix.patch 906 BLAKE2B 9fc49e348df7aa44e4fac204afe4c984f1491f8841cbaed691f9d7a2bbd8f7025d6441e3a9838e1c92f74c28e9bf422014b7cd6e142fca92144acc79819ee747 SHA512 dbbc67a006153d122f6b48759e7077e2deca73ef0d33b70243764141ccda89f5998d99e39fe6a05a9f527f43989b9ad66b191e65772fa5027365a333bf53e558
-AUX granite-0.3.0-build-fix2.patch 521 BLAKE2B 65257ed93fb744d09948bdc3c7a188f5353cb9fb6b638961c9550362a003674888291a036b7444b92badb24da3c3d3ff1d8e96b9f779f9682a006bc877de675c SHA512 7e9e7c39f63e845275b998f437648ea4c38c1043140b02b6474c215ba7ef78b258f9aabe1c83c5533d37c0dc8f502a1425a573578238f786c9903764644d4f19
-AUX granite-0.3.0-build-fix3.patch 916 BLAKE2B da10ad2ab1024b5e0f1e7ae9847dfe231c9bd8a74073b6ea237fba4438593c83e47e1e7817e198325ab787947260a692ae4946f1f79ec693943aa16210c75ad0 SHA512 61e49768fbe13a88dfbbd5bbd5c481320fd90af65900d359d680502364795f0eb3cc94fc116dc0e720b94e994705a183d77c9e1243415ffcae6629b2b29937bc
-DIST granite-0.2.1.tar.gz 146871 BLAKE2B 300aac52a3d383adbc0668169abcfa1d171705694d909c0053fc8c0881f7e8ff9724a86f218316245a2e0b88a4d986c14e68e0d37e7a159fc2e619d62c9cdc72 SHA512 a9cbe43e836c1e5430260bb8643b63b6712c17a60c184ed7105a9e96eb68e8107c09de655f58262a1dcab85cfb59beb18352b49a5ddb0817f9aff7b86d1e2bb1
-DIST granite-0.2.3.1.tgz 152607 BLAKE2B 57720ad6ab0502adde57a89a291f3114f217e931399db34356cb97687c5ae4bc7973bf33285e86a1f2227c0982bc1a13bfffc52cafbc0d6cd01d980050ad1f9b SHA512 c4db7d3a9e65178fa961761355fdf4d3795513a5a8d0ba5a448761336817a0de027382421a86213b434449f257f3c869b6275357acb732b6dd382cf5ea86eca8
-DIST granite-0.3.0.tar.gz 285072 BLAKE2B 21cb3d7216fd18d18f96e50b69a75db5127319c36129bd584b29cb359905cf4439163969b727dfa1decc642d03902390fbb656a5a76da6ad474475694d122590 SHA512 3ebbb7453b770f8b5b98cee0f96db8443d7583af0117b2d34c9daa82bf36d25418e0fcf61118e7551ced91e751d8b032998dc9cca2569e61c7227666c4383872
DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
-EBUILD granite-0.2.1.ebuild 1127 BLAKE2B 48ee04ee9ce192ded09395562504a27eb2e1142f50d66745730d406f0a8a5b3193cd62a25125364d7314fa80b5b4b7a07634e7340785266444ade3c0c6bf0747 SHA512 9ce2f40a076bd92979ab82801004d10ace1d6b808cf80aae983381a1bd17993fa4ed7ca571d6e7e01bddac34b65fb9b41ca9497933bf7c35cd7479a1ca07d2f2
-EBUILD granite-0.2.3.1.ebuild 1108 BLAKE2B c3d4f34c9324418ed55441e319d7c1b1e144146cfce5043fa019d69abe970475789db63f497f3afb3a7dda194179baaf602117becd5096eb4d8ac2daa9780a83 SHA512 734946b6d7233bdc2255df030171e1c8143e382aa800e2a635774374fb906f73a9148bbb913e0070e9508c651354f0f9a5bafe089171197ef91c4e26a02bb059
-EBUILD granite-0.3.0.ebuild 1256 BLAKE2B a44f997842e38f848a8e0d8c74cff3851bc0f8bcf92c3042d123133b2f9aac1b4134041200352e4cfd46a1cb323d46dfef6bb64d991a83bea095df6b36d21f92 SHA512 f7d7c73328fa0ad6d90533b7d3fa2254cc69153ad21567f5876bb29fb13e870c3a83f6a2e9d58f2014f0f7c5b59fd8dfde3fe60c37bdf8308383d96b7729091a
-EBUILD granite-0.5.0.ebuild 1269 BLAKE2B faacde90516725b304e429325274ecb41f5d79802d15e4891d4d3b7b7cfe053e55f583a1824ba732b8c725d16bce4f6fef2e10feb61d8a8c50920b656ca889e2 SHA512 bedb4d7b8eb802489dc161cb129239c3db93dc28cacb2fb2421049a9a1a13a8c07bb625714a555473f71e427a6ebf35be6d2ea9c0c4a5efdf2ef99cca2f60523
+EBUILD granite-0.5.0.ebuild 1267 BLAKE2B c6043b9761e43c643a1d45c0c4ee940f6e597e49c2f97b3fca1bcc2eefb545341c67b0dfdae127c82a36865893e1541daa10e00c6bb392fc4567b6b89a0d0508 SHA512 d16d0e0f029cb967a802b2550b9a65402f89e8d0429561429e1dcccec3eea20efb3675041348328ec5313aefffccc0440bbb0052fa4bf91224f3a77add2e66b3
MISC metadata.xml 829 BLAKE2B 39f7f389875b4e27aa0657a3f2dde9d99e6cc18de9e2cbd24e9a7e7b441823255a04972cd470e04bccfd4db803ff05c0c5be74d592564129d1dff137294fc934 SHA512 152c9807840842a1388a9e10723af0eb7aeb198444f85eb27cd19a3a0233374e3c60c9c2c34319b1549a5cb59d71cdeba075f0f36fb784c69fd78059367e1a91
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix.patch b/dev-libs/granite/files/granite-0.3.0-build-fix.patch
deleted file mode 100644
index f93a3c65df33..000000000000
--- a/dev-libs/granite/files/granite-0.3.0-build-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'lib/Widgets/ContractorView.vala'
---- lib/Widgets/ContractorView.vala 2014-09-04 12:39:00 +0000
-+++ lib/Widgets/ContractorView.vala 2015-03-23 05:21:46 +0000
-@@ -35,7 +35,7 @@
- public delegate void ContractCallback ();
- private Gee.HashMap<int, DelegateWrapper?> outsiders;
- private int[] blacklisted_pos;
-- private ListStore list;
-+ private Gtk.ListStore list;
-
- private struct DelegateWrapper { unowned ContractCallback method; }
-
-@@ -73,7 +73,7 @@
- */
- public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) {
- /* Setup the ListStore */
-- list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
-+ list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
- outsiders = new Gee.HashMap<int, DelegateWrapper?> ();
- this.model = list;
-
-
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix2.patch b/dev-libs/granite/files/granite-0.3.0-build-fix2.patch
deleted file mode 100644
index 7c6bcb9236e5..000000000000
--- a/dev-libs/granite/files/granite-0.3.0-build-fix2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'lib/Widgets/DynamicNotebook.vala'
---- lib/Widgets/DynamicNotebook.vala 2014-08-30 13:28:37 +0000
-+++ lib/Widgets/DynamicNotebook.vala 2014-09-23 13:43:11 +0000
-@@ -941,7 +941,7 @@
- notebook.create_window.connect (on_create_window);
- }
-
-- ~Notebook () {
-+ ~DynamicNotebook () {
- notebook.switch_page.disconnect (on_switch_page);
- notebook.page_added.disconnect (on_page_added);
- notebook.page_removed.disconnect (on_page_removed);
-
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix3.patch b/dev-libs/granite/files/granite-0.3.0-build-fix3.patch
deleted file mode 100644
index 145d552c7a04..000000000000
--- a/dev-libs/granite/files/granite-0.3.0-build-fix3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-=== modified file 'lib/Widgets/DynamicNotebook.vala'
---- lib/Widgets/DynamicNotebook.vala 2014-07-31 12:41:52 +0000
-+++ lib/Widgets/DynamicNotebook.vala 2014-08-30 13:28:37 +0000
-@@ -658,10 +658,19 @@
- /**
- * The text shown in the add button tooltip
- */
-+#if VALA_0_26
-+ public string add_button_tooltip {
-+ get { _add_button_tooltip = add_button.tooltip_text; return _add_button_tooltip; }
-+ set { add_button.tooltip_text = value; }
-+ }
-+ // Use temporary field to avoid breaking API this can be dropped while preparing for 0.4
-+ string _add_button_tooltip;
-+#else
- public string add_button_tooltip {
- get { return add_button.tooltip_text; }
- set { add_button.tooltip_text = value; }
- }
-+#endif
-
- public Tab current {
- get { return tabs.nth_data (notebook.get_current_page ()); }
-
diff --git a/dev-libs/granite/granite-0.2.1.ebuild b/dev-libs/granite/granite-0.2.1.ebuild
deleted file mode 100644
index 5cde39d696ef..000000000000
--- a/dev-libs/granite/granite-0.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.14"
-
-inherit cmake-utils gnome2-utils multilib vala versionator
-
-DESCRIPTION="A development library for elementary development"
-HOMEPAGE="https://launchpad.net/granite"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-libs/libgee:0[introspection]
- x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
- $(vala_depend)
- virtual/pkgconfig
- sys-devel/gettext"
-
-DOCS=( AUTHORS )
-
-src_prepare() {
- vala_src_prepare
- sed -i -e "/NAMES/s:valac:${VALAC}:" cmake/FindVala.cmake || die
- sed -i -e "/DESTINATION/s:lib:$(get_libdir):" lib/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- HTML_DOCS=( doc/. )
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/dev-libs/granite/granite-0.2.3.1.ebuild b/dev-libs/granite/granite-0.2.3.1.ebuild
deleted file mode 100644
index 70b6abf0e83d..000000000000
--- a/dev-libs/granite/granite-0.2.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.16
-
-inherit cmake-utils gnome2-utils multilib vala versionator
-
-DESCRIPTION="A development library for elementary development"
-HOMEPAGE="https://launchpad.net/granite"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.32
- dev-libs/gobject-introspection
- dev-libs/libgee:0[introspection]
- >=x11-libs/gtk+-3.3.14:3"
-DEPEND="${RDEPEND}
- $(vala_depend)
- sys-devel/gettext
- virtual/pkgconfig"
-
-DOCS=( AUTHORS )
-
-src_prepare() {
- vala_src_prepare
- sed -i -e "/NAMES/s:valac:${VALAC}:" cmake/FindVala.cmake || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- HTML_DOCS=( doc/. )
- cmake-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/dev-libs/granite/granite-0.3.0.ebuild b/dev-libs/granite/granite-0.3.0.ebuild
deleted file mode 100644
index 1c0f1295ae48..000000000000
--- a/dev-libs/granite/granite-0.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-VALA_MIN_API_VERSION="0.24"
-
-inherit cmake-utils gnome2-utils multilib vala versionator
-
-DESCRIPTION="A development library for elementary development"
-HOMEPAGE="https://launchpad.net/granite"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- dev-libs/gobject-introspection:=
- dev-libs/libgee:0.8[introspection]
- >=x11-libs/gtk+-3.11.6:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS )
-PATCHES=(
- # https://bugs.launchpad.net/granite/+bug/1453526
- "${FILESDIR}"/${P}-build-fix{,2,3}.patch
-)
-
-src_prepare() {
- vala_src_prepare
- sed -i -e "/NAMES/s:valac:${VALAC}:" cmake/FindVala.cmake || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- HTML_DOCS=( doc/. )
- cmake-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/dev-libs/granite/granite-0.5.0.ebuild b/dev-libs/granite/granite-0.5.0.ebuild
index 1073ddfa413e..94fbcf91b3ab 100644
--- a/dev-libs/granite/granite-0.5.0.ebuild
+++ b/dev-libs/granite/granite-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/elementary/${PN}/archive/$(get_version_component_ran
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="demo nls test"
RDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 24a5c89115ba..f466f3f6cc54 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -7,6 +7,6 @@ DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc
DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
-EBUILD icu-60.2.ebuild 3711 BLAKE2B 7648c3553e8f2cc982c1db0f400ebdb6ee1e78f4a3150e5948b980a85acc6fab36df567e7605cfe0924ffaf12a91ebfa2a0644e3b8d34aceb9129b98b24488bd SHA512 3ac7caf661f63df5030fcf75007d201e387bb3d80c2231bf08ff4feae66dc238aee16ba90acbe7699bacce00a8bcf0b9805e139cda72406d05ebe64567391776
+EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
EBUILD icu-61.1.ebuild 3721 BLAKE2B 72fd1527eb1bd7425397de5eccf60ed03c22a58dc113f6fe4c9a1853f0553c3cde723583d24c875e2f928393ff8b494a889a98800bfb9948a314fa804c15f6eb SHA512 d766de018dfe7a908dd23914ac0994dbd98c9d515ba0cee76a4b7d6c1a9f44809cefe414c9a8ca556aef08e3e7f3a4d249b6af12449651cd2ea303818f12effd
MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
index f83d866e2c79..31e541168d99 100644
--- a/dev-libs/icu/icu-60.2.ebuild
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples static-libs"
DEPEND="
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 61138c15fbe8..116db0d19373 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,3 +1,5 @@
DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
+DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
EBUILD ivykis-0.42.2.ebuild 398 BLAKE2B fac3edcd4ae4d8fbb87d0fdee90c7b552169ee974c98f8be8240d708ba31a6bc9a5367af488446bd336620d8125da605e0a6c4608d0c09fd4df6222c30a07980 SHA512 894739b11b5350cd722112e69ae6661f0dd7e2f37dae832f9861e94ff698c7d534273a4d1841d1133c08718e44acf9f98a4d0c329f043bafd3979ed02fafc0ba
+EBUILD ivykis-0.42.3.ebuild 403 BLAKE2B 8439b203af880ddf82257b705fb8024b80b21b4d9d7fac1f3cf7627ae774cbaa57127200bf88393c60eab59b1917c877be0d1460cbfb3258e9a698056e1978f4 SHA512 e955cbaf3e35b079a173c60fa7ff6c338d5bb4c8a8ddd41ed7d5d7b19a53abef8585987bce045b6e22f291d16272ced4309607dfe9a00380654ba2b838432028
MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3.ebuild b/dev-libs/ivykis/ivykis-0.42.3.ebuild
new file mode 100644
index 000000000000..0660fddcca95
--- /dev/null
+++ b/dev-libs/ivykis/ivykis-0.42.3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for asynchronous I/O readiness notification"
+HOMEPAGE="https://github.com/buytenh/ivykis"
+SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 34e12f5fc9fb..da13ec413200 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,8 +1,3 @@
-AUX libarcus-1.0.0-fix-install-paths.patch 2987 BLAKE2B 5302e2f8fabefb0b20a5baf93b02f5e4d3f5ed79b3a009de292b3549974e5a0cbd13f579ced0e88ae1d339d8669724c4f2524ad7886d3fc1940ba2dc3c720266 SHA512 971da6d467f9843a9e86c49cff63b517a1666d23277ccbb90a7a87d0c1ea259c38f00a7a51372fcaea8a1d6fb373a730b4beca02f787b500e2831a5ad02404b5
-DIST libarcus-1.0.0_pre20160307.tar.gz 40461 BLAKE2B 8f39ae9451c4cb7af1792717c9c205893fadaa0a0c41de408f34a0f83962905a8c200806c77e881a7cee50bb9818c8d72354790ce2c6a07d50198119a89b98e2 SHA512 ec654fbe2d34ad60afd0c1f3745e9f0ef5709e3698ea78d17089dad5e86cb686f38a0ea4cca07b6911058ebdf61c17b51a89c002cbf74cbbd4a68a133d8984e5
-DIST libarcus-2.3.1.tar.gz 41641 BLAKE2B d45b71b987bb7fe04060cf398a26a10094e9f44f75102db878846dd5c709181bb6dc36c62dc5fee41c551f8bf039977f91a2ed5d3b10da1763e599510c2ff33e SHA512 24ac5dd784993658e823dc7111e0ff31e77f8d95c4f024a84a7db731577ba595427de0917911fe7e0ba5848241ad33237fe6edb90a5191741e9523f616dd06a6
-DIST libarcus-2.6.0.tar.gz 39516 BLAKE2B 6d187d9b095fc9b86e548a8f1ca9709677ee8deb22e7270ee27a2e93a30f8514adbc7846f78415286dba00d56025eacb70e5077bf9aa71ae5e0ef641ec417edb SHA512 1a2c7ec83999f7874b9e82874e83550c7595fcbb0d4fcee2d84c2a06f4ec1147df30ac2e06e55552c718889fbd21146c43a9f8cf08ff282908b866bf87729ca8
-EBUILD libarcus-1.0.0_pre20160307.ebuild 1212 BLAKE2B 18847501c97b9653e36f5acc477a6138235b115b063c0443d4f9157084d32cedd2bde0bc0560c91d9a1d22709bb140fcbbb725304e9b3146be5e9ff8a1601d75 SHA512 29a5f6443d823715eeb78b3b93ff6a64902398fbdf42a1f1920300f4967ca98fd865c4f1dbcac479ff6c092cc3cfc6df837ef56231b1357eaf40eaf3b0c86c5f
-EBUILD libarcus-2.3.1.ebuild 1092 BLAKE2B dabf53030447fc48a1c4870f79dbeb966aaaebf5064edb5c5da858fcfa5b4b48faf8ba87902554e9c0342c80ba9535f3e419f91f8883524ed72c8bba83fd104f SHA512 c0d0653662c38aa651c3736e22b9278a6d4df5dfe9e460b53467c932a17096a7bcd2dc361c3376036b7ea2baae0b650e60b076348fa7969901469bd179b029ec
-EBUILD libarcus-2.6.0.ebuild 1102 BLAKE2B 0ded4b2a7af62a372db322b236d08569460774062315bd85387f762ca295b89db210ac448f9e807802a1580e7429643689956ec682ee18a5672603895f70068a SHA512 449610a36974d7aa91d537f0f03f87cb63376c5b5e9f096ec5e033c7139040b53e52dd811fc7e31014d5d6071e7ae3b5d60d9e1367f1a14fb956c1e4e27ae5b3
-MISC metadata.xml 455 BLAKE2B 0747982c4a0875f1a04ccc8f048ab9c2316012b5d6538090da9ba134505b40e82df9eac90169b0aa0e7877081e6d76bb26bb4b9e5ef3fc082b512082ec45a0dd SHA512 a46c0797922eb1543db0252d0b7988ea1ad2c8c3f958b6ce3430e12e055a8b7d95ba29a577ce69218e5268c5aac507ba03ab788abb782b67adbe8e74f7ba3833
+DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9
+EBUILD libarcus-3.3.0.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
+MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch b/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch
deleted file mode 100644
index b1473f7f661c..000000000000
--- a/dev-libs/libarcus/files/libarcus-1.0.0-fix-install-paths.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-03-07 10:36:38.000000000 +0100
-+++ b/CMakeLists.txt 2016-04-16 11:54:15.499524812 +0200
-@@ -1,6 +1,7 @@
- project(arcus)
- cmake_minimum_required(VERSION 2.8.12)
-
-+include(GNUInstallDirs)
- include(CMakePackageConfigHelpers)
-
- option(BUILD_PYTHON "Build " ON)
-@@ -14,10 +15,12 @@
-
- if(BUILD_PYTHON)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-- if(APPLE OR WIN32)
-- set(PYTHON_SITE_PACKAGES_DIR lib/python3.4/site-packages CACHE STRING "Directory to install Python bindings to")
-- else()
-- set(PYTHON_SITE_PACKAGES_DIR lib/python3/dist-packages CACHE STRING "Directory to install Python bindings to")
-+ if(NOT PYTHON_SITE_PACKAGES_DIR)
-+ if(APPLE OR WIN32)
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE STRING "Directory to install Python bindings to")
-+ else()
-+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE STRING "Directory to install Python bindings to")
-+ endif()
- endif()
- find_package(SIP REQUIRED)
- include_directories(python/ src/ ${PYTHON_INCLUDE_DIR} ${SIP_INCLUDE_DIR})
-@@ -57,7 +60,7 @@
- set(ARCUS_VERSION 1.0.0)
- set(ARCUS_SOVERSION 2)
-
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-
- if(BUILD_STATIC)
- add_library(Arcus STATIC ${arcus_SRCS})
-@@ -89,7 +92,7 @@
- target_include_directories(Arcus PUBLIC
- ${PROTOBUF_INCLUDE_DIR}
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-- $<INSTALL_INTERFACE:include>
-+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- )
- target_link_libraries(Arcus PUBLIC
- ${PROTOBUF_LIBRARY}
-@@ -120,23 +123,23 @@
-
- install(TARGETS Arcus
- EXPORT Arcus-targets
-- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-- PUBLIC_HEADER DESTINATION include/Arcus
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Arcus
- )
-
- install(EXPORT Arcus-targets
-- DESTINATION lib/cmake/Arcus
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus
- )
-
--configure_package_config_file(ArcusConfig.cmake.in ${CMAKE_BINARY_DIR}/ArcusConfig.cmake INSTALL_DESTINATION lib/cmake/Arcus)
-+configure_package_config_file(ArcusConfig.cmake.in ${CMAKE_BINARY_DIR}/ArcusConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus)
- write_basic_package_version_file(${CMAKE_BINARY_DIR}/ArcusConfigVersion.cmake VERSION ${ARCUS_VERSION} COMPATIBILITY SameMajorVersion)
-
- install(FILES
- ${CMAKE_BINARY_DIR}/ArcusConfig.cmake
- ${CMAKE_BINARY_DIR}/ArcusConfigVersion.cmake
-- DESTINATION lib/cmake/Arcus
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Arcus
- )
-
- include(CPackConfig.cmake)
diff --git a/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild b/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild
deleted file mode 100644
index cbd6bec86cef..000000000000
--- a/dev-libs/libarcus/libarcus-1.0.0_pre20160307.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-COMMIT="1db8a8e57dbf0d68d9e9f85ef9022b8eae17c9ec"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0/2"
-IUSE="examples python static-libs"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/sip[${PYTHON_USEDEP}]
- >=dev-libs/protobuf-3:=
- >=dev-python/protobuf-python-3:*[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-fix-install-paths.patch" )
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_PYTHON=$(usex python ON OFF)
- -DBUILD_EXAMPLES=$(usex examples ON OFF)
- -DBUILD_STATIC=$(usex static-libs ON OFF)
- )
- use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-2.3.1.ebuild b/dev-libs/libarcus/libarcus-3.3.0.ebuild
index 9ac3d493cf1f..d0e49ef66b98 100644
--- a/dev-libs/libarcus/libarcus-2.3.1.ebuild
+++ b/dev-libs/libarcus/libarcus-3.3.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_COMPAT=( python3_4 python3_5 )
inherit cmake-utils python-single-r1
MY_PN="libArcus"
@@ -12,18 +13,19 @@ DESCRIPTION="This library facilitates communication between Cura and its backend
HOMEPAGE="https://github.com/Ultimaker/libArcus"
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="AGPL-3+"
-SLOT="0/2"
-IUSE="examples python static-libs"
+LICENSE="LGPL-3"
+SLOT="0/3"
KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
dev-python/sip[${PYTHON_USEDEP}]
- >=dev-libs/protobuf-3:=
- >=dev-python/protobuf-python-3:*[${PYTHON_USEDEP}]"
+ dev-libs/protobuf
+ python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}"
+
S="${WORKDIR}/${MY_PN}-${PV}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
pkg_setup() {
use python && python-single-r1_pkg_setup
diff --git a/dev-libs/libarcus/metadata.xml b/dev-libs/libarcus/metadata.xml
index 545a04075c56..dce895cd5780 100644
--- a/dev-libs/libarcus/metadata.xml
+++ b/dev-libs/libarcus/metadata.xml
@@ -1,14 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>3dprint@gentoo.org</email>
- <name>Gentoo 3D Printer Project</name>
- </maintainer>
- <slots>
- <subslots>soname major version number</subslots>
- </slots>
- <upstream>
- <remote-id type="github">Ultimaker/libArcus</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
+ <upstream>
+ <remote-id type="github">Ultimaker/libArcus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 124865670d61..a367f6cd28fe 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,8 +1,3 @@
-AUX libatomic_ops-1.2-fix-makefile-am-generic.patch 885 BLAKE2B fb1c39e5cf81f7ca056ce24d580163910bff8a526103e3e59d27f424956277d1b0f1be0c5864f4c9e87a88685956deb815dfaca7b52d814e4a45cbe3d984a3e7 SHA512 042e8f4c136f5c30a6cba856f2d8778881edc8aab53da7ab4d830e5c12c95699fa56cc0eef3d36d84d9bbfa9379c5dfb889fbc17a70353584b15166479fb8fdf
-AUX libatomic_ops-1.2-ppc-asm.patch 406 BLAKE2B 9ecaba1e870277f17d019d22c041b0e1f7c537b1345da39583ab133bb6411b4edafa573b87ec4d24559ead547be24af726db56ec05a2dc61eae2681590c82fe1 SHA512 469d4487e206ac79cdd6495435338cd141cebae23115dd40421fad785517ef06181bbaf70e3f211ce06df8eb8ed43d154eb0acb11617a106d600cde9a60fde22
-AUX libatomic_ops-1.2-ppc64-load_acquire.patch 1383 BLAKE2B b98e24388962a96a495caca6c635492582307b00bfcd7abdf0b5f38231d0e7dbbbd700a01b622a9e49920026103b5bb2b143aad6b69e36ffc4c95f5dcfd8d284 SHA512 8847007dba55fb6ee1e849bdd0796b28ae4a5065e3273d71c9586e7232e6b9784f85156639c7f647f8fb29f41c335163d4ca642e95d3f153ec9d12e98c740054
-AUX libatomic_ops-1.2-sh4.patch 1839 BLAKE2B d4bf68112f5422a8da74ded9ee6696eb80ed077f1770028093f18ca97e944be68753b6e19eec5fdb8b49f3ab6b55247c3c3e1e5c7b676dad78f2ab14feb01c6c SHA512 1df158a404b4ab6de593b07017c9d69a2a7d036580a639d3df184181216f8500fae9b52636482504c03456bd51fdc0aa91177742fd36cecbe686e2e22c3c5d5f
-AUX libatomic_ops-1.2-x32.patch 1651 BLAKE2B 43f4690942a015f18fa62a745456b26bb13b01c6d991039d04ccb7e6de57a08759d513473ab7e9b33452832f64566c3f733213db035cd84cafca3ae18374b208 SHA512 c85f02e34213b433cde7769ee734ec5b065720cc656bb3cf2581be842ef6160d22ab268323de7736a604aaa002f1ba4b4fed4da918fe8da3aa4a8464943af6bb
AUX libatomic_ops-7.2_alpha4-x32.patch 1644 BLAKE2B 482c7c24651b1eccb928434a51491c0b27fc37f555109500ed5c4b743e652c0be1baf5b3e70b641ad8e3120fc6ae7e6bd2d100babbac041bdab0dc912376216b SHA512 59e148fc48ee15f29aebbe8e100796e0c959e8a21daffd54c9678929123faff3d126ba06132a6b42c64f26f15f63db37add1a062d3d664763104eab2c54ff1c8
AUX libatomic_ops-7.2_alpha6-x32.patch 1960 BLAKE2B 347cf180b524edaa4c55c1884d33fe9716ea282fb33aaecdaecbbe931d35dc728362ffe2cc4325d730caa40f2bda4f7052a49145f380b13ce2a9d4ecd9537bfe SHA512 6b0dfdcccc51494015b842ef41419f3a6b56c6b60b242bdecd98b5aefbd4039ae43912f1823effab3352ec3566257294ae823febf27b95bed6d3fc2f1097a02d
AUX libatomic_ops-7.4.0-docs.patch 544 BLAKE2B 1ff5a857607a6b96b819f4958c852a91ad4e24288becf7116ebbc2e436013a238fd31b60845c439ff92618ea8f65e6e94a90fcf1714f07a20a71bdc2fd9c1618 SHA512 1dcabd372e62cf4ced7ba1f2e2dcb3ccd0c2d7d98aa1ac2c2ac20fc141c94e8bda46bf03dee1d6785d8bff510375ab28ecc24983407d62b2960bdb195728ce3a
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch
deleted file mode 100644
index 7b1f898ef9b6..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r a//doc/Makefile.am b//doc/Makefile.am
---- a//doc/Makefile.am 2005-03-22 00:05:19.000000000 +0200
-+++ b//doc/Makefile.am 2010-04-18 20:08:13.000000000 +0300
-@@ -1,3 +1,3 @@
- # installed documentation
- #
--dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
-+dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
-diff -u -r a//src/atomic_ops/sysdeps/Makefile.am b//src/atomic_ops/sysdeps/Makefile.am
---- a//src/atomic_ops/sysdeps/Makefile.am 2005-09-28 02:53:16.000000000 +0300
-+++ b//src/atomic_ops/sysdeps/Makefile.am 2010-04-18 20:04:03.000000000 +0300
-@@ -25,7 +25,6 @@
- README \
- \
- gcc/alpha.h gcc/arm.h gcc/x86.h \
-- gcc/hppa.h gcc/ia64.h \
- gcc/powerpc.h gcc/sparc.h \
- gcc/hppa.h gcc/m68k.h gcc/s390.h \
- gcc/ia64.h gcc/x86_64.h gcc/cris.h \
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch
deleted file mode 100644
index 41171ed86e69..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/atomic_ops/sysdeps/gcc/powerpc.h 2006-03-29 09:49:14.000000000 +1100
-+++ src/atomic_ops/sysdeps/gcc/powerpc.h 2007-08-27 10:51:00.000000000 +1000
-@@ -72,7 +72,7 @@
- /* registers. I always got "impossible constraint" when I */
- /* tried the "y" constraint. */
- __asm__ __volatile__ (
-- "lwz %0,%1\n"
-+ "lwz%X1 %0,%1\n"
- "cmpw cr7,%0,%0\n"
- "bne- cr7,1f\n"
- "1: isync\n"
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch
deleted file mode 100644
index 9b6baa188cf7..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/atomic_ops/sysdeps/gcc/powerpc.h.orig 2006-03-28 22:49:14.000000000 +0000
-+++ src/atomic_ops/sysdeps/gcc/powerpc.h 2007-06-08 23:10:07.000000000 +0000
-@@ -63,6 +63,8 @@
- /* seems to be that a data dependent branch followed by an isync is */
- /* cheaper. And the documentation is fairly explicit that this also */
- /* has acquire semantics. */
-+/* ppc64 uses ld not lwz */
-+#if defined(__powerpc64__) || defined(__ppc64__) || defined(__64BIT__)
- AO_INLINE AO_t
- AO_load_acquire(volatile AO_t *addr)
- {
-@@ -72,7 +74,7 @@
- /* registers. I always got "impossible constraint" when I */
- /* tried the "y" constraint. */
- __asm__ __volatile__ (
-- "lwz %0,%1\n"
-+ "ld %0,%1\n"
- "cmpw cr7,%0,%0\n"
- "bne- cr7,1f\n"
- "1: isync\n"
-@@ -80,7 +82,25 @@
- : "m"(*addr) : "memory", "cc");
- return result;
- }
-+#else
-+AO_INLINE AO_t
-+AO_load_acquire(volatile AO_t *addr)
-+{
-+ AO_t result;
-
-+ /* FIXME: We should get gcc to allocate one of the condition */
-+ /* registers. I always got "impossible constraint" when I */
-+ /* tried the "y" constraint. */
-+ __asm__ __volatile__ (
-+ "lwz %0,%1\n"
-+ "cmpw cr7,%0,%0\n"
-+ "bne- cr7,1f\n"
-+ "1: isync\n"
-+ : "=r" (result)
-+ : "m"(*addr) : "memory", "cc");
-+ return result;
-+}
-+#endif
- #define AO_HAVE_load_acquire
-
- /* We explicitly specify store_release, since it relies */
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch
deleted file mode 100644
index 4e8dd66a3554..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- libatomic_ops/src/atomic_ops.h
-+++ libatomic_ops/src/atomic_ops.h
-@@ -228,6 +228,10 @@
- # if defined(__cris__) || defined(CRIS)
- # include "atomic_ops/sysdeps/gcc/cris.h"
- # endif
-+# if defined(__sh__) || defined(SH4)
-+# include "atomic_ops/sysdeps/gcc/sh.h"
-+# define AO_CAN_EMUL_CAS
-+# endif /* __sh__ */
- #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */
-
- #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS)
-only in patch2:
-unchanged:
---- libatomic_ops/src/atomic_ops/sysdeps/Makefile.am
-+++ libatomic_ops/src/atomic_ops/sysdeps/Makefile.am
-@@ -29,6 +29,7 @@
- gcc/powerpc.h gcc/sparc.h \
- gcc/hppa.h gcc/m68k.h gcc/s390.h \
- gcc/ia64.h gcc/x86_64.h gcc/cris.h \
-+ gcc/sh.h \
- \
- icc/ia64.h \
- \
---- libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h
-+++ libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright (c) 2009 by Takashi YOSHII. All rights reserved.
-+ *
-+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
-+ *
-+ * Permission is hereby granted to use or copy this program
-+ * for any purpose, provided the above notices are retained on all copies.
-+ * Permission to modify the code and to distribute modified code is granted,
-+ * provided the above notices are retained, and a notice that the code was
-+ * modified is included with the above copyright notice.
-+ */
-+
-+#include "../all_atomic_load_store.h"
-+#include "../ordered.h"
-+
-+/* sh has tas.b(byte) only */
-+#include "../test_and_set_t_is_char.h"
-+
-+AO_INLINE AO_TS_VAL_t
-+AO_test_and_set_full(volatile AO_TS_t *addr)
-+{
-+ int oldval;
-+ __asm__ __volatile__(
-+ "tas.b @%1; movt %0"
-+ : "=r" (oldval)
-+ : "r" (addr)
-+ : "t", "memory");
-+ return oldval? AO_TS_CLEAR : AO_TS_SET;
-+}
-+#define AO_HAVE_test_and_set_full
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch
deleted file mode 100644
index 2edc6958f360..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-x32.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e3a384578f677c05d812d99c2c92aa13670bd06a
-
-Upstream-Status: Pending
-
-Remove the `q' suffix on x86-64 atomic instructions.
-
-We don't need the `q' suffix on x86_64 atomic instructions for AO_t,
-which is defined as "unsigned long". "unsigned long" is 32bit for x32
-and 64bit for x86-64. The register operand in x86-64 atomic instructions
-is sufficient to properly determine the register size.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/02
-
---- libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/x86_64.h.x32 2005-09-28 17:16:38.000000000 -0700
-+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/x86_64.h 2011-12-02 09:29:54.265251875 -0800
-@@ -60,7 +60,7 @@ AO_fetch_and_add_full (volatile AO_t *p,
- {
- AO_t result;
-
-- __asm__ __volatile__ ("lock; xaddq %0, %1" :
-+ __asm__ __volatile__ ("lock; xadd %0, %1" :
- "=r" (result), "=m" (*p) : "0" (incr), "m" (*p)
- : "memory");
- return result;
-@@ -111,7 +111,7 @@ AO_int_fetch_and_add_full (volatile unsi
- AO_INLINE void
- AO_or_full (volatile AO_t *p, AO_t incr)
- {
-- __asm__ __volatile__ ("lock; orq %1, %0" :
-+ __asm__ __volatile__ ("lock; or %1, %0" :
- "=m" (*p) : "r" (incr), "m" (*p) : "memory");
- }
-
-@@ -136,7 +136,7 @@ AO_compare_and_swap_full(volatile AO_t *
- AO_t old, AO_t new_val)
- {
- char result;
-- __asm__ __volatile__("lock; cmpxchgq %3, %0; setz %1"
-+ __asm__ __volatile__("lock; cmpxchg %3, %0; setz %1"
- : "=m"(*addr), "=q"(result)
- : "m"(*addr), "r" (new_val), "a"(old) : "memory");
- return (int) result;
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
new file mode 100644
index 000000000000..2fdc063f0be3
--- /dev/null
+++ b/dev-libs/libcharon/Manifest
@@ -0,0 +1,3 @@
+DIST libcharon-3.3.0.tar.gz 141001 BLAKE2B 80d880ac274a53dc6673d9993ef8474091a036e6faac8fa44df3ace0f4b2fcf0102229b0f407acf9f7df7c56fb08a60c7ac3b7078e5e5daf86e1f0fe3fa453fa SHA512 92e7a33c77d05224f0b07c92f105d66010e727f67ec51e6dc314c001953e14047a7d59e2e0887950dcd38d25595df5186161ff1c0272a1193bcd8ccd64b0033b
+EBUILD libcharon-3.3.0.ebuild 504 BLAKE2B 188e3bfd6a13b1525123e03a0280de11a4b7a2b67d5cae076e42451fea4ff5e8b2a8d4f5d4a75c3dd92f0d64afa16998fa470d160e42df06dc344ba090953772 SHA512 dfa8d0be05a34962782ca993312882155f1b945e35d2ba4257825639e13b3b1fece2b97cee65bf3595ff38d6424f59c680adab0ddb06e796b076d571e1f1f7c8
+MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-3.3.0.ebuild b/dev-libs/libcharon/libcharon-3.3.0.ebuild
new file mode 100644
index 000000000000..c2de02822b82
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-3.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
new file mode 100644
index 000000000000..56f0a7df8630
--- /dev/null
+++ b/dev-libs/libcharon/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
+ <upstream>
+ <remote-id type="github">Ultimaker/libCharon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 734b3ca72ae0..0b24fe10aea0 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -2,8 +2,10 @@ DIST libclc-0.2.0_pre20160921.tar.gz 127817 BLAKE2B 831bdc4a82d50ec33eb3199ef707
DIST libclc-0.2.0_pre20170118.tar.gz 130793 BLAKE2B 5083e821c5a0e481d3b6b638ac93c8c936972dcdb78e20a86de5f6873f300d7065e8aba242b332d4a91d494bb3a9e67f1f60a566bfbef78891d7c438bebbf41c SHA512 d94a58ebcafb7bbdbcded84574676537ae7b4ba86c7c2270cc1cd7aa3113104e018e53396b570e821c2fd473b6dd63677f59d990e36e15a7cdb43cdb96cd058c
DIST libclc-0.2.0_pre20170929.tar.gz 138719 BLAKE2B 05a3d47626a5e1918f32510b1254f846c88c642f60920377dda73568d34656fecd53872ebc01114b2cc8b2161b196c89efe119bfd785875f723fcee4c1ce3662 SHA512 08f3a21fb1dc103a3b33980c420506fd142294b2d8b4a3eeb100ea55036fb87b9740a2489a0a9a5793d71ebb157e6f3ad7854d1916fc1fa472de72374cdeaea3
DIST libclc-0.2.0_pre20180319.tar.gz 161608 BLAKE2B b8e4f2d475c0425cbe5b41a5ba3b7b40d14c045f5c23d007e87cdfedc7a01a8317218e5f3b881e944256f04b9fb68a130bff2a137e51cb961b3d5bb7f2e2261d SHA512 5a4130eeb416f90901b66708adc17c825baa757d00d983a12e217f36503e4ed5d208f3a49cc26d7f9b71134ee3d258748153bf52cf7769bcbc06ec0510087a36
+DIST libclc-0.2.0_pre20180610.tar.gz 170102 BLAKE2B 3f8c33a9961db34e68cebc328a88a71173000972b5540d099fa79fe89fd186b7f2f8791a86b45b1be135383d26a92fd4ccdc2827b5620b5f86f0b48467fc092f SHA512 0c75c3e7b81754c175c5c43614ad313cda2fa09a1865794c904675b8d2527f78ffa357178f7d4a471b52ac3d7d96b0184303439b69060df4bf482a01871fcb95
EBUILD libclc-0.2.0_pre20160921.ebuild 988 BLAKE2B 206c8e5c6b19d0e0b6a18c4ebc2a5ba8d102492366650900f9ee725e888c3c39175238eb1c37f23152f4d932a4325b9b39c77fe672848a907727e22a2c04f127 SHA512 eb5a022ca76cd80bacacd7c538326df3b25cb5f29fdd5d9d5774e223c69ba1b087f7704d1ad660eef6ac3c6a4b32fac29c4ae64040da43eeebfdb01514f34907
EBUILD libclc-0.2.0_pre20170118.ebuild 1207 BLAKE2B 9fea7ead38a05076b4d93813f9bcdbd9069ccc55e5932a01499f17eeeef2304fd1da2718cc85a785d348d81f9c5bd29bfcf9defddf8c067bce0ca6c5949b9610 SHA512 f0d7c5c773b6fd9ed2fe5e703f2270612a68aa3f5c868825de241396c64f444b7673dcff8540733f2cc2256e310579f392333b155adc35a8d9e41c586e3ec5f3
EBUILD libclc-0.2.0_pre20170929.ebuild 1391 BLAKE2B 45569e8b40dee2c80bf035bc719becde88dfdf3dac19eec45563c35d0edcf565bfe2ececece4285b0cb20c0f45fbbd424c7526c9eb376443f645c92f9ca04aed SHA512 d97c5ad240eacb62d73fa079c48b30ef2af61fce5e06a833f1e857605e6ff02f7a9e7cf90ae6f4386151a044df16077bd0e98346af87c410b1df88cfb0ffba27
EBUILD libclc-0.2.0_pre20180319.ebuild 1433 BLAKE2B 3fa277010d42c6398ffa618c06397df166d2e37c38d9d9932813a979ec8a57ba57893dc67cbbacefa2fd47fad5aeac2799eefceadfbfa20a7096d53a571e3715 SHA512 ce2cdc8905a750c428a4a706cc2e4eeccabb27b800c37997414586fc3c43588b37b15b05f5e8c81a87199c9727c8f8de1b2af4bc37629f88f129aaeea54f3fdf
+EBUILD libclc-0.2.0_pre20180610.ebuild 1934 BLAKE2B d35749cdba040817e6bbea60be46fa4b4ce183818c17e08329d3938075c7f0d6d04ac6ebac6bbe1748cb5863b6101c0fce8bf7b8cfa77d58506da6e777c9ce97 SHA512 f9a7d649723475cf42043b7ab1a82aff2df1566347ac21501ba8027e0857526f6994021a78d047d6474c8fb2e12a28f2910cd446685bea120fb33cad3539d624
MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild
new file mode 100644
index 000000000000..c7b0adde63bf
--- /dev/null
+++ b/dev-libs/libclc/libclc-0.2.0_pre20180610.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+EGIT_REPO_URI="https://llvm.org/git/${PN}.git
+ https://github.com/llvm-mirror/${PN}.git"
+EGIT_COMMIT="96627043299f52bf08f6a68aa6d00b8037a0a2b0"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+else
+ GIT_ECLASS=""
+ S="${WORKDIR}/libclc-${EGIT_COMMIT}"
+fi
+
+inherit llvm prefix python-any-r1 toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="http://libclc.llvm.org/"
+
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI="${SRC_PATCHES}"
+else
+ SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ ${SRC_PATCHES}"
+fi
+
+LICENSE="|| ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+DEPEND="
+ || (
+ sys-devel/clang:7
+ sys-devel/clang:6
+ sys-devel/clang:5
+ sys-devel/clang:4
+ >=sys-devel/clang-3.9:0
+ )
+ ${PYTHON_DEPS}"
+
+LLVM_MAX_SLOT=7
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+ default
+ if use prefix; then
+ hprefixify configure.py
+ fi
+}
+
+pkg_setup() {
+ # we do not need llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libclc_targets=()
+
+ use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
+ use video_cards_r600 && libclc_targets+=("r600--")
+ use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
+
+ [[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+ ./configure.py \
+ --with-cxx-compiler="$(tc-getCXX)" \
+ --with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
+ --prefix="${EPREFIX}/usr" "${libclc_targets[@]}" || die
+}
+
+src_compile() {
+ emake VERBOSE=1
+}
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 683ddae90fe8..eee135d9c0a3 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -2,7 +2,7 @@ AUX libconfig-1.5-out-of-source-build.patch 344 BLAKE2B 6612bc819dcba54f45899b01
DIST libconfig-1.5.tar.gz 644432 BLAKE2B 9eaec8aca0692f30d6b51221a5d1bc624540da74f599292b1a161054dec8188b2ad2ee100a97c1e19f7b4763614206a5bf6ad03f6f7bbd33b40d57c51646e520 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd
DIST libconfig-1.7.1.tar.gz 2290501 BLAKE2B 6c55e0d41c1475434bcc61203bda40c478d0802ccb544866df4b7d9b69538ca1e2eab8642867b0ee7c56e26027d8fb326e470a5c9bdcbc37534fe23092be15e0 SHA512 b58b468e9e2d5175fbde1ad9765c6604dc9b3f3944613a88404a45d0d232e7d79a47321bf3c06b97cb46a2104b4313fad5c7f8944149f550b7af51ad523e775e
DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
-EBUILD libconfig-1.5.ebuild 1139 BLAKE2B 18c1b9113113be055fdc4730088c39f50fc7b9a93406fe137989ec4bc53c0f4b410b8d48592e7604b6604fb8cbe0f3e06146c5498f3fe0881642103a20c66e6d SHA512 570084908592ae662544d21755cdd5b8a636f22124a964178c2e6b7ed906442dfaca3de5517bdcd0867c32c068495b263bd8abd5d357c6f607c4e128083712a7
+EBUILD libconfig-1.5.ebuild 1144 BLAKE2B cf1a4c0e4fda42ee884b36350498ae0a0442e69a994dc5d9da9d9dd274de6053f143744cff876a08d243780c0fa9b66f648e157d12adce85080dcf604445f08d SHA512 c490914f77e4b24fa2f7393703bb13d0988db80543134ca352c87aa229f3252b67bfbeac475b258aabd519672871ffbc5dcfeca034ce396a3bcf4e018d602ae2
EBUILD libconfig-1.7.1.ebuild 1076 BLAKE2B 1b8c80e4857b37cca1f1deb67b71b600b2ce33cb57a7db19dc71e11a3decb9a38ad9ac836f8cb50da89bfda3e6b3b071b674496afa79e1d24cb0cecf97c906b6 SHA512 c35cdddd1f21754a10b37c172fff74b01fb243d9c42796af975a60fc1eb2087ef0fd1bfcf56d4740a025116f203dcf8368714ae570448ca1ab609a4f1feb4c28
EBUILD libconfig-1.7.2.ebuild 1028 BLAKE2B bc3c4b4b9fa2d4e0ad5ec8f3e703f32507d0f0d881b0242e482462a17f80f68ada03235cc13a0f4b85724be60d1b0406a0655501ab24f03b66eab13624acf482 SHA512 fff5f380251fd0439508f8275d40c1ddfb8ab651b2eacd614286d5ce85794d74ed5d4a957a28241e231c058b131d89bbd7f5ba37f3a4e4a99b5b194bffcb0e67
MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild
index 1f9cc4f295f0..ba09057dd62a 100644
--- a/dev-libs/libconfig/libconfig-1.5.ebuild
+++ b/dev-libs/libconfig/libconfig-1.5.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=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~x86-linux"
IUSE="+cxx examples static-libs"
DEPEND="
diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
index b9f444d52148..cde9e8634905 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -1,3 +1,5 @@
DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
+DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
EBUILD libdbh-5.0.19.ebuild 703 BLAKE2B 009c0f29c71d43599abb6b523aa2998b4c6f3ad4f3a2073d346b2551bd5f9f50440168a19954f488e49f284e5116f831aa00b0faa42b31102aa867fba52196a4 SHA512 a717d9b3cbfbe4da717f3bf6ad358ad8f708f4abf5f53d86f3902ec547e57237bbc63644d5ff3c0babfbf2ea1c4e38f3bec212af1091ef98630d28fd35c144a1
-MISC metadata.xml 212 BLAKE2B 194010bc567a936b4a170c71acbc9fada2548dd1d07ba93b4f1fd612c54b39783ac4573721000bd18728019bc000bc8bc23d9d41d509158a78951bfbfc9b26c3 SHA512 427caa93b253fae497d27fcf90d059c9e109014a354e041bb0d0da5b40e512f0d8ae0dad52442300d086a06ada7e8d244a51bef1c30bfc92fe4db14a8b08a0c8
+EBUILD libdbh-5.0.22.ebuild 705 BLAKE2B 8f346677cb5e394eec35d1aa223e57ba671b04bf16dc9d231eb11c3a6ffed1d241594af7ab5654dadb24590f97979197611e6ca69f6bb75a5464a64d74c84815 SHA512 2da38bb65e367e80e7ea78a5ecc89f4da8bff8d9120fed18f6329ab11a3aa017a6fed290fecadcdba19f0ab669285a0ca4456cc0849a6d321c5441a68b50ea5b
+MISC metadata.xml 436 BLAKE2B 8817621c260b3c6153ddebeb5b7d3b0877340f4b2eafb10318713ed7b8ac07a7a76c09480d25fc33ecc900b27e7750c1ee3b538d2280241bea4f7bab3cd91c20 SHA512 a43a689f3355779e44fcbe6aefbebd84f1e339736a58b6783c9b62a35b00139250899adc62e633d8ba209d68245df46f4041aa68e8d13184a934f5ba4d834e79
diff --git a/dev-libs/libdbh/libdbh-5.0.22.ebuild b/dev-libs/libdbh/libdbh-5.0.22.ebuild
new file mode 100644
index 000000000000..a32cdfb61dfe
--- /dev/null
+++ b/dev-libs/libdbh/libdbh-5.0.22.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="A small library to create and manage 64-bit disk based hash tables"
+HOMEPAGE="https://www.gnu.org/software/libdbh/"
+SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/gtk-doc-am
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Make sure user defined CFLAGS are respected
+ sed -i -e 's:-O2:${CFLAGS}:' m4/rfm-conditionals.m4 || die "sed failed"
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml
index 1284f7758ccf..d22f1a83844d 100644
--- a/dev-libs/libdbh/metadata.xml
+++ b/dev-libs/libdbh/metadata.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>gentoo@culot.org</email>
+ <name>Frederic Culot</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dbh</remote-id>
</upstream>
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index ecab36a845be..02733873fa17 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,3 +1,3 @@
DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
-EBUILD libevdev-1.5.9.ebuild 656 BLAKE2B c6f48c52e90b4ba0fd742254df043f3ba9338a3b7512a45b144c36209d4493a9cd86cc5bb899a9c21727363821c19503c30257ff2e2ae296a37120ae572c6c1e SHA512 cdf8c5606518b0200e7394673e9dc29fd8a4c51015cf510207a7a058c9e9d1c8e01e29d319313d0ebb86a978a4ef3039e7708527ca9eb8da5ae1a0acbccc3b43
+EBUILD libevdev-1.5.9.ebuild 661 BLAKE2B 7652efcfaec06d2115d750a2ea48b82e3126af8ae9b017b7b90e706f05a44f5a5dc361870a2b4cbe5ea356a009c44078419b234fefaf9fa83175d2de2ec0645f SHA512 2274dca24677c9e60ca05c2430eb1903da437e6c3dcd81843750378d0a9570d206933baab589be3050296e95e8cd6e15c70a96278ed04db0b2210f81ec02fb0b
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9.ebuild b/dev-libs/libevdev/libevdev-1.5.9.ebuild
index 3677c0f3cdd2..be72884a0198 100644
--- a/dev-libs/libevdev/libevdev-1.5.9.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.9.ebuild
@@ -19,7 +19,7 @@ else
fi
RESTRICT="test" # Tests need to run as root.
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index bd352338b1e9..78fff3a53cb9 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,4 +1,4 @@
DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-EBUILD libevent-2.1.8.ebuild 1702 BLAKE2B ae0008bebd1c156bf718eb1983a46a3ba0f9e3ec72d1d71da46454b89e7b8de02253ce11d5905986b9548250f8afb2ba0e9657dba18729a8a219e1646dd99c91 SHA512 3369117b19423a719fc063f58896cfaa1944796607c2abe12ac663b521d07f7cba6c3400dda0e881925e3ff57c84dcbde6d92a741970711a2c92a3e51b3a1473
-EBUILD libevent-9999.ebuild 1205 BLAKE2B caab3f55b9ad0f1d9dae12bed8799ce42aa13f26da2dfd2de128821a753645820eb0303ba4bc1a907e16489c93a8092ed6c74b70b7dea07876956ffb387a1fb5 SHA512 ecb96696ecccaf8fffbdf147d3d75c8521cf746498bae305280adc4849f9e0dc740b5e364057a1299a196410fe0204d98edfa6058bd9c0a1c821b8f590264931
+EBUILD libevent-2.1.8.ebuild 1705 BLAKE2B d483a5f882b40db3891d48f3e7de7f7b4916c45711e60e83d92249988f6afdece6808c71a7212680548d45f58ed3163cad4bcdbb2ad67d2a8a62df5ea66658ca SHA512 b44f94eb5db73acad177149232465f1dd11eb2bd37fb3680e4ef050ef5429d49080f978046e9a8af7aa203fa0504580f24dae9d51ed7b624e6a6aeca1bde1f3f
+EBUILD libevent-9999.ebuild 1208 BLAKE2B 6ea4d42704767130afa83bf8a16b49e842ea396cf9ebf001b4429b4a1ed8ee0e5a06c3d24f6be55bfa32429107878526faf7a0119191443a7a63cf7985f0a130 SHA512 ef82c099ef65a2938ad7dca4e095a8cc01022e071dcca3be5e09fb482c04e2c8aab5717f80656f5c3a07e37c79a9a7c183ee3abc8b57ef84ec80e997054af51a
MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index 455964b38ff9..61f244304c9f 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -16,8 +16,8 @@ IUSE="debug libressl +ssl static-libs test +threads"
DEPEND="
ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
"
RDEPEND="
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 708484a46c36..27b07d37b42e 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.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
@@ -16,8 +16,8 @@ RESTRICT="test"
DEPEND="
ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
"
RDEPEND="
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index de5f03db60fc..ade720112e50 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -5,9 +5,11 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
+DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
EBUILD libgcrypt-1.5.6-r101.ebuild 1679 BLAKE2B 8e65e4e836227b5701e1111e27aba14c7656df9f286aeada02410c6413240f3689620ba2b57a92b3482912766ee2f462ca5b930212dd5e0ce1a73fba34c0c3e2 SHA512 3ec645179ac9836eeaf369f12e654186e171d3cd04c42857df75d1ced9b35b70c098ff5697d20ff66396d9438c37bc7c0733a200587781edc2f9db5b0d344ea5
EBUILD libgcrypt-1.8.1.ebuild 2098 BLAKE2B 05f395da3900dcc66b319f25c1a4ad57fe51acbf7fbe042956577291325abadd2cc76e8fe4e7dfc8828b792771aecfd39af0a529b6978390a2e704557c1d5d77 SHA512 ce773db8eda9b5e64191974da00ae9cfdee292d6bacdfa8a79074501dc9120ade518a2dc7f007a13733a7fa67342d1ae1793e55f792d5b8222b70e22c6e1c987
EBUILD libgcrypt-1.8.2-r1.ebuild 2145 BLAKE2B bf0273a1c467077406890da14fcd055dc7b144a834b04554fbd1cf9949530a6c4905dc701a42fa945b93bea6d6ae031b2dc22073d9873487906b75aed60fa0d4 SHA512 e3aeeafeccff8e5c70c7d3c5784dd26c7f250f08a8dba378856ed065e1e7dfa18da989fce814872a36d548829ebeddd48758ebaf40d4c9031ebfd012575fa580
EBUILD libgcrypt-1.8.2-r2.ebuild 2210 BLAKE2B f34057ad59eca6355567b72bbfdf1985e44e4746d7fbb1b0522f2306ebf645aa73f4760561520beed81ff51ad713787fcced4f4af0fbbeec3f6865e325a95850 SHA512 d2e53d31e04a409b5dd58012416ed0470dadae9cc8a0eabaeffc35131d390a9a77466c2a8bd61ce3e4a90585db9a8352660ca7e66df7849a90dbf1c23edc807d
EBUILD libgcrypt-1.8.2.ebuild 2111 BLAKE2B 8102d7a2504f12054a8a6b99960651930b22df9961d9df8efd72ba4f5ce76e89741a4607ee96118eadc2cd91cf2f1c2467405d2aaae145e709d382091b1ace08 SHA512 e8977abb9bc4313b09222d4945f487b0f3dd39e7bd1455e2186cb65965f77f653c7618b7c8b10d9d8028d50ff3d054b06b9565df7ecfd0f8849188fc783d78d1
+EBUILD libgcrypt-1.8.3.ebuild 2207 BLAKE2B f383e6c6d2eecd74db672140c0a3d6ee7fd7f2e23c2b9e6cd9df2df18d4fec4294a254e265c547f951f2700e089a9709449207ac60c49dd011a9f2d33060dd66 SHA512 ab6333ea85dbc50949d9f83709fc06fe8c7293dc4b917dc0f4e9aaf5160c95d0bd2527e2986d34f07778ebd3f7311ecd09c81fbd0a473e0e11e5261e901cd8cb
MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
new file mode 100644
index 000000000000..e74a7d587ac5
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-uscore.patch
+ "${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ if [[ ${CHOST} == *86*-solaris* ]] ; then
+ # ASM code uses GNU ELF syntax, divide in particular, we need to
+ # allow this via ASFLAGS, since we don't have a flag-o-matic
+ # function for that, we'll have to abuse cflags for this
+ append-cflags -Wa,--divide
+ fi
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --enable-noexecstack
+ $(use_enable o-flag-munging O-flag-munging)
+ $(use_enable static-libs static)
+
+ # disabled due to various applications requiring privileges
+ # after libgcrypt drops them (bug #468616)
+ --without-capabilities
+
+ # http://trac.videolan.org/vlc/ticket/620
+ # causes bus-errors on sparc64-solaris
+ $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+ $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+ GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+ default
+ prune_libtool_files
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 5fec0324d775..b4236a212013 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,9 +2,11 @@ DIST libgit2-0.26.3.tar.gz 4728289 BLAKE2B b437732cb30d85487a7a1a16efd41d19fe767
DIST libgit2-0.26.4.tar.gz 4733342 BLAKE2B 76dfacbf6df9128625e52f4c554814a971f446a44c9706a915200976f5a873a2add1869c0534360ccad821df11246faacfff43765f311162bcb6afca46088a77 SHA512 c65a0ef8e7ef2dc60d07bced36b8cfd26ce9c40f99978058fc67b30e5bbda8d6b15e26aec7b1277bb277123685e763d106bab175540fceb449bb5b50f776473a
DIST libgit2-0.27.0.tar.gz 4761312 BLAKE2B 4b39ab7609b8031751cff826523a6989872d2a8508b3928461680f03e5e5e2db0782f396e03c69d6d484568958d4eb018a41ebdd4502555c41bf5b7b9756cd82 SHA512 1304f0b6182e1e6e7fccbec1a568aefb662e144a1aea4fff5901f3c012ff0f3d28720f17d19b9a1bc6c892c32fe602766fe98a15538a94a468d65d3e4a1680ca
DIST libgit2-0.27.1.tar.gz 4765926 BLAKE2B 2eb34a621d61b1fb3b770081e27b92d662fd235750fc6ea580ddabeac5cfd20e40a70ce830d45144531c333239d173a322d0de343bb98cc02ce9bfb7822432bf SHA512 4cdee4aec0f0c7b36226ee29276b8802d6b59817f95b1357f35225c23a8d6de70242b2dd9a5fb3b765c3242f4ed1848933e20fc24899071d8b443d46c43ce99d
+DIST libgit2-0.27.2.tar.gz 4770842 BLAKE2B 8a46589a17c4bbd0e821412ad259099a77755073736c7ba469a593252160bb1e5601c8b91e1e26e17c11ae3fd6e3d2bf87d22b638b1d473371311487e96ca39b SHA512 4fa2b6c1bb340d5dbc3106ababb630a4634cee2415d478be986d315ef9c659d772574a56f0b8fa77d26bd793aea92893fddf64b5f21d7c965069f928b9ce5cff
EBUILD libgit2-0.26.3.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
EBUILD libgit2-0.26.4.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
EBUILD libgit2-0.27.0.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
EBUILD libgit2-0.27.1.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
+EBUILD libgit2-0.27.2.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.27.2.ebuild b/dev-libs/libgit2/libgit2-0.27.2.ebuild
new file mode 100644
index 000000000000..456ded8f18df
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.27.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/27"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sys-libs/zlib
+ net-libs/http-parser:=
+ curl? (
+ !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+ libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+ )
+ gssapi? ( virtual/krb5 )
+ ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+ # skip online tests
+ sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ -DBUILD_CLAR=$(usex test)
+ -DENABLE_TRACE=$(usex trace)
+ -DUSE_GSSAPI=$(usex gssapi)
+ -DUSE_SSH=$(usex ssh)
+ -DTHREADSAFE=$(usex threads)
+ -DCURL=$(usex curl)
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]] ; then
+ # repo::iterator::fs_preserves_error fails if run as root
+ # since root can still access dirs with 0000 perms
+ ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+ else
+ local TEST_VERBOSE=1
+ cmake-utils_src_test
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples ; then
+ find examples -name '.gitignore' -delete || die
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 39d5aff14eb4..f5504f69f72e 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,5 @@
DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
EBUILD libgpg-error-1.27-r1.ebuild 1298 BLAKE2B ab43e3a8adb285b7932a607cd242af87aa1e7db2731fef7d77227d058ff1737802fda662e1f2b96e6116ee60f3d41dde98ca9a742a97caf5a2dc7ea34bdf8231 SHA512 9e285f2989b2e9fbf2a2e8a8ce1cbd3cd93433c302ecc0216ab8a977cada3f3edf753c02ef24b57b44af8bc6be23cdbf42dc46ba7846b55dcfa73b33db26f139
-EBUILD libgpg-error-1.29.ebuild 1311 BLAKE2B 4d114d8dcadbf6f89df3c20fdf0d0b31bafa84c46bdd4098975c12b3774ae448f00c2628d22fa9f0a3bc51a873823df25cbc95efdca9e6d4d646f2d69fb2380f SHA512 2f13e457f63751fb4f03051d7ccb0f4d1f30bd5a36d37ab2274b14af748f9e3f38afc17a7f4241ca9fbc8501a7627984e2a2c92212d509f44c4d7835d30e6fe4
+EBUILD libgpg-error-1.29.ebuild 1309 BLAKE2B 2f84fcfa98ffd6fe7dd709ff24a86574db2d8b9b0d191addb6ae72e8882bd7baef444c4342a6cb17dd18a6cbc8419eae2756bf1ffb5a8792fb13c6f813063aec SHA512 fa21e6a2a860aa53df76d17578f8b884ac959c759e3aec586b39c65a70eb7376b80612e4adb2adaf9ead3b70943cfe1a982095b9168976b7ec9d3882ba8dd47b
MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index 2576649e58dd..878d9a18ace1 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libmemcache/Manifest b/dev-libs/libmemcache/Manifest
deleted file mode 100644
index d216f4d12fe6..000000000000
--- a/dev-libs/libmemcache/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libmemcache-1.4.0_rc2-implicit_pointer.patch 385 BLAKE2B af014156d4168b9216d4fcfd23d9a8fcaac34f0fe6fca989c74d376937ab9ea7acca9e97df2e7a4e613eff9620fed294651a2e8041a8f7c107809c476e445813 SHA512 be3f29a1ff78a7a676ae054754d5c3641d2d75f40365e2a55e9223b05ea53c8e1172e20fb64742cac23a7e386de15833a4de7d75f4937befc71a51fa9b9f5583
-AUX libmemcache-1.4.0_rc2-inline.patch 2051 BLAKE2B 80b6b6afdb818f8f27d574f30aa2b8f32d627a94d3d92c31879328f0f0d1ecf1a6afa6c445a04efc1a8bea966de936c33ff1b13729c4651d7467b15c7080df97 SHA512 f5f817ffffeaccd930e83f099c0786302748afd13946b408ca63fd89c5d77d0fe7a6190ef9db7ea9da3882c00ef6ebeeed109c527bbc1ebeadef193e193a0cc6
-AUX libmemcache-1.4.0_rc2-ppc_ftbfs.patch 983 BLAKE2B 15a7b9e02216ed68375d7aba2b5b0b65d9da522db74d6ccb200ceaaf1cc1ff61872db6f657cf832894a02cf0c59448bed52795496d0edd9a86d3366348c052c4 SHA512 4ae7d6b99982934e7a28f7e0dd103341e9f4b7eb514e20cef3c02e428ee8c555c71c8bfdc06f0771ff0b73827251fa5eb4e7bce8014cd5cf2f5148d18b1f56b1
-DIST libmemcache-1.4.0.rc2.tar.bz2 301136 BLAKE2B bd30932811012e0d6e383c42fc3e61096d3a4d38f111bb70f04313119aaa1ea65c8709198b3edcad5dd136a809656dcad58603715115cc44affab333bf750302 SHA512 4b8c09c425d48d0ad040d3f01ec3c0d88babefb702b666d5cb3d10eac9993be88d00120b57b6224f7d55ae979d3136de10d5ddc793d9aa7f8b9531b5d79449d0
-EBUILD libmemcache-1.4.0_rc2-r2.ebuild 1049 BLAKE2B 5ed7c99d2660abd11eaaa687789c9acd4985c2c7686d08a87153ebdcbbd6a24028a9019823ba023ab2f1bb3704de91c822800e697dc8352581050f7a1da87045 SHA512 cb342ba5a13ab8a980739c8bdfba0061a2278cc7c6bcbf230e6f23331e15e482e20a8e312ecf26e5235994194ef7b645d6d3ddf1a6deb3c05453452ce05caa41
-MISC metadata.xml 304 BLAKE2B cf6f26fa6563aa19ef922e08b525d5f70af1e8df8ad6396a67ac6f956b75879ab0af1f7d65d2306518f56d52480bb27a7936fc32e31b858eb4cdb4db9ed19fdc SHA512 de92a462028eebdb520fd2a745eeffd845615fbace7691bc954997113a2b0f273f5b9fdcaebc299ae510d3fafa611397ac468b8b13fd44c00488fbc210b3358c
diff --git a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-implicit_pointer.patch b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-implicit_pointer.patch
deleted file mode 100644
index e944ce1725a9..000000000000
--- a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-implicit_pointer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libmemcache-1.4.0.rc2/test/benchmark/benchmark.c
-===================================================================
---- libmemcache-1.4.0.rc2.orig/test/benchmark/benchmark.c
-+++ libmemcache-1.4.0.rc2/test/benchmark/benchmark.c
-@@ -29,6 +29,7 @@
-
- #include "memcache.h"
-
-+char *strdup(const char *s1);
- double tt(const struct timeval *t1, const struct timeval *t2);
-
- double
diff --git a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch
deleted file mode 100644
index 6eba5dffd135..000000000000
--- a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-inline.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/276571
-
---- include/memcache.h.in
-+++ include/memcache.h.in
-@@ -923,7 +923,7 @@ int mcMemGet(mcFreeFunc *freeFunc, mcMallocFunc *mallocFunc,
- mcMallocFunc *mallocAtomicFunc, mcReallocFunc *reallocFunc);
-
- /* Returns a pointer to the global context. */
--inline struct memcache_ctxt *mc_global_ctxt(void);
-+struct memcache_ctxt *mc_global_ctxt(void);
-
- /* The next two functions are used to setup an error handler. */
- int mcErrSetup(mcErrFunc errFunc);
---- include/memcache/buffer.h
-+++ include/memcache/buffer.h
-@@ -63,14 +63,14 @@ struct memcache_buf *mcm_buf_find_replace(struct memcache_ctxt *, struct memcach
- struct memcache_buf *mcm_buf_find_replace2(struct memcache_ctxt *, struct memcache_buf *,
- const char *, struct memcache_buf *);
- int mcm_buf_free(struct memcache_ctxt *, struct memcache_buf **);
--inline u_int32_t mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
-+u_int32_t mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
- struct memcache_buf *mcm_buf_new(struct memcache_ctxt *);
- struct memcache_buf *mcm_buf_new2(struct memcache_ctxt *, const char *, const u_int32_t);
- struct memcache_buf *mcm_buf_new3(struct memcache_ctxt *, const char *);
- size_t mcm_buf_read(struct memcache_ctxt *, struct memcache_buf *, int);
- int mcm_buf_realloc(struct memcache_ctxt *, struct memcache_buf *, const u_int32_t);
--inline size_t mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
--inline size_t mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
-+size_t mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
-+size_t mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
- int mcm_buf_replace(struct memcache_ctxt *, struct memcache_buf *, const char *, const u_int32_t);
- int mcm_buf_replace2(struct memcache_ctxt *, struct memcache_buf *, const char *);
- int mcm_buf_replace_buf(struct memcache_ctxt *, struct memcache_buf *, struct memcache_buf *);
diff --git a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch b/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch
deleted file mode 100644
index dbeee57b1c6b..000000000000
--- a/dev-libs/libmemcache/files/libmemcache-1.4.0_rc2-ppc_ftbfs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Debian patch: 10_ftbfs_fix_powerpc.patch
-Fixing build on PowerPC
-https://bugs.gentoo.org/show_bug.cgi?id=365303
-
---- a/include/memcache.h.in
-+++ b/include/memcache.h.in
-@@ -61,6 +61,11 @@
- #ifndef MEMCACHE_H
- #define MEMCACHE_H
-
-+/* fix FTBFS on powerpc for Debian libmemcache */
-+#ifndef __USE_POSIX
-+#define __USE_POSIX
-+#endif
-+
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/time.h>
---- a/src/memcache.c
-+++ b/src/memcache.c
-@@ -39,12 +39,17 @@
- #include <sysexits.h>
- #include <errno.h>
- #include <sys/types.h>
--#ifdef __linux
-+
-+/* fix FTBFS on powerpc for Debian libmemcache. I personally think this
-+ * shouldnt be the case, as Debian Bug#345587 seems to show. */
-+
-+/* #ifdef __linux */
- # ifndef __USE_POSIX
- # define __USE_POSIX
- #warning "Working around busted-ass Linux header include problems: use FreeBSD instead"
- #warning "http://www.FreeBSD.org/ - you won't regret it"
--# endif
-+/* #endif */
-+
- #endif
- #include <sys/time.h>
- #include <sys/socket.h>
diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
deleted file mode 100644
index b3b5eb44e9a0..000000000000
--- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/.}
-
-DESCRIPTION="C API for memcached"
-HOMEPAGE="http://people.freebsd.org/~seanc/libmemcache/"
-SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-inline.patch
- epatch "${FILESDIR}"/${P}-implicit_pointer.patch
- [[ $(tc-arch) == ppc* ]] && epatch "${FILESDIR}"/${P}-ppc_ftbfs.patch
-
- rm -rf test/unit || die
- sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die
- sed -i \
- -e 's,test/unit/Makefile,,g' \
- -e '/^CFLAGS=.*Wall.*pipe/s,-Wall,${CFLAGS} -Wall,g' \
- -e '/^OPTIMIZE=/d' \
- -e '/^PROFILE=/d' \
- configure.ac || die
-
- eautoreconf
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog
-}
diff --git a/dev-libs/libmemcache/metadata.xml b/dev-libs/libmemcache/metadata.xml
deleted file mode 100644
index 58bfe2058b7a..000000000000
--- a/dev-libs/libmemcache/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 53fc31c1c2b6..0545ea27cc90 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,6 +1,10 @@
AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
+DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
+DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
EBUILD libressl-2.6.4.ebuild 1431 BLAKE2B 84f8669b2e544e7f226969999abedadf72879296a07b736b080aa9e103ebd49a52c5ea1fcc6bb7008ab3870ee74ca7a3b9ae40bafb4b2a9cf8de314e62303eba SHA512 b15cc16115a1b8e46159c9b1e384df4d97107ab634fcdfd6fb048ace13eb0527a79763239892c36116bc3872f74dd5149df5e21ff071c4a43b409beb759abcca
+EBUILD libressl-2.6.5.ebuild 1438 BLAKE2B 72de0f0538220d7244c551c6eb9788640f52c4e78d462a4048730aa4be2d9ea3e19dbbb7f4f3502ed4e08d31b3436922b466dd52da1fb3464aa10082c2e94544 SHA512 0f1c7ab2e3a3a139ba87c95c173d3a9e929232f110b81d8e4a538fe500406ccbd4bf145e5ca58affe65df8bc0213a8bc87674f8c03c7af18b4bafa06e52db2c6
EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
+EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5.ebuild
new file mode 100644
index 000000000000..9031ee476cfa
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.6.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/44"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=( "${FILESDIR}/libressl-2.6.4-hppa-asm.patch" )
+
+src_prepare() {
+ touch crypto/Makefile.in
+
+ sed -i \
+ -e '/^[ \t]*CFLAGS=/s#-g ##' \
+ -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+ -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+ configure || die "fixing CFLAGS failed"
+
+ default
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable asm) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ emake check
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libressl/libressl-2.7.4.ebuild b/dev-libs/libressl/libressl-2.7.4.ebuild
new file mode 100644
index 000000000000..1c15a09a5faa
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.7.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/45"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+ touch crypto/Makefile.in
+
+ sed -i \
+ -e '/^[ \t]*CFLAGS=/s#-g ##' \
+ -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+ -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+ configure || die "fixing CFLAGS failed"
+
+ eapply_user
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable asm) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ emake check
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
new file mode 100644
index 000000000000..e0ec95fc8f86
--- /dev/null
+++ b/dev-libs/libsavitar/Manifest
@@ -0,0 +1,4 @@
+AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
+DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba
+EBUILD libsavitar-3.3.0-r1.ebuild 1016 BLAKE2B f81a89e2d509e44aaf12e483e5a855bae712c4b17ebd4b75e79296320c260f5a6f1bdcb89bba4b3729c6674c7cc6999e071e6750d430a6be2b5a4753f936ec9b SHA512 523b35d258d51151fb47a001e3531c21d5a604723bc963f9b9ec0d2284f210230e3957cf8ae457a9369dde60bc3a0e5c2a1dfeab62148a5ee5cfd2b55d65977b
+MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch
new file mode 100644
index 000000000000..629e8edb51a2
--- /dev/null
+++ b/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch
@@ -0,0 +1,119 @@
+From 91aa70c6320461ae65600dce954b5ffb905b7039 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 9 Apr 2018 12:36:35 -0400
+Subject: [PATCH] Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+---
+ CMakeLists.txt | 3 +-
+ pugixml/CMakeLists.txt | 80 -
+ pugixml/src/pugiconfig.hpp | 74 -
+ pugixml/src/pugixml.cpp | 12622 -------------------------------------------
+ pugixml/src/pugixml.hpp | 1434 -----
+ src/MeshData.cpp | 7 +-
+ src/Scene.cpp | 2 +-
+ src/SceneNode.cpp | 3 +-
+ src/ThreeMFParser.h | 4 +-
+ 9 files changed, 7 insertions(+), 14222 deletions(-)
+ delete mode 100644 pugixml/CMakeLists.txt
+ delete mode 100644 pugixml/src/pugiconfig.hpp
+ delete mode 100644 pugixml/src/pugixml.cpp
+ delete mode 100644 pugixml/src/pugixml.hpp
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e991a7..1077c7f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,8 +7,7 @@ include(CMakePackageConfigHelpers)
+ option(BUILD_PYTHON "Build " ON)
+ option(BUILD_STATIC "Build as a static library" OFF)
+
+-
+-add_subdirectory(pugixml)
++find_package(pugixml REQUIRED)
+
+ if(BUILD_PYTHON)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+diff --git a/src/MeshData.cpp b/src/MeshData.cpp
+index 03e5089..701122d 100644
+--- a/src/MeshData.cpp
++++ b/src/MeshData.cpp
+@@ -17,7 +17,7 @@
+ */
+
+ #include "MeshData.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+
+ using namespace Savitar;
+@@ -85,7 +85,7 @@ bytearray MeshData::getFlatVerticesAsBytes()
+ int v1 = faces.at(i).getV1();
+ int v2 = faces.at(i).getV2();
+ int v3 = faces.at(i).getV3();
+-
++
+ // Add vertices for face 1
+ float x = vertices.at(v1).getX();
+ float y = vertices.at(v1).getY();
+@@ -188,6 +188,3 @@ std::vector< Vertex > MeshData::getVertices()
+ {
+ return vertices;
+ }
+-
+-
+-
+diff --git a/src/Scene.cpp b/src/Scene.cpp
+index 4612f78..f218b71 100644
+--- a/src/Scene.cpp
++++ b/src/Scene.cpp
+@@ -17,7 +17,7 @@
+ */
+
+ #include "Scene.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ #include <string>
+ using namespace Savitar;
+diff --git a/src/SceneNode.cpp b/src/SceneNode.cpp
+index 5c95b6f..c4782bc 100644
+--- a/src/SceneNode.cpp
++++ b/src/SceneNode.cpp
+@@ -17,7 +17,7 @@
+ */
+
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ using namespace Savitar;
+
+@@ -121,4 +121,3 @@ std::vector< SceneNode*> SceneNode::getAllChildren()
+ }
+ return all_children;
+ }
+-
+diff --git a/src/ThreeMFParser.h b/src/ThreeMFParser.h
+index 3394683..89da659 100644
+--- a/src/ThreeMFParser.h
++++ b/src/ThreeMFParser.h
+@@ -21,7 +21,7 @@
+
+ #include "SavitarExport.h"
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+
+ #include <string>
+ namespace Savitar
+@@ -44,4 +44,4 @@ namespace Savitar
+ std::string sceneToString(Scene scene);
+ };
+ }
+-#endif
+\ No newline at end of file
++#endif
diff --git a/dev-libs/libarcus/libarcus-2.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild
index 59d80b0d81b0..3aca6609e16c 100644
--- a/dev-libs/libarcus/libarcus-2.6.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6} )
inherit cmake-utils python-single-r1
-MY_PN="libArcus"
+MY_PN="libSavitar"
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="AGPL-3+"
-SLOT="0/2"
-IUSE="examples python static-libs"
+LICENSE="LGPL-3"
+SLOT="0/3"
KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
- dev-python/sip[${PYTHON_USEDEP}]
- >=dev-libs/protobuf-3:=
- >=dev-python/protobuf-python-3:*[${PYTHON_USEDEP}]"
+ dev-python/sip[${PYTHON_USEDEP}]"
+
DEPEND="${RDEPEND}"
+
S="${WORKDIR}/${MY_PN}-${PV}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}"/${P}-remove-packaged-pugixml.patch )
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -32,7 +34,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DBUILD_PYTHON=$(usex python ON OFF)
- -DBUILD_EXAMPLES=$(usex examples ON OFF)
-DBUILD_STATIC=$(usex static-libs ON OFF)
)
use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
diff --git a/dev-libs/libsavitar/metadata.xml b/dev-libs/libsavitar/metadata.xml
new file mode 100644
index 000000000000..3ed5b1ace790
--- /dev/null
+++ b/dev-libs/libsavitar/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
+ <upstream>
+ <remote-id type="github">Ultimaker/libSavitar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index ad18438ab009..817455b54ea9 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -7,7 +7,7 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93cb7c09dced6eb2b0b7c772c18811b82ce9db2e41adeb7e91a0ec94a58103ca129b4f7fe8e4d5013e0a75606858be SHA512 d70a16a7e9c752f7d649b23f697f7f8b52e1b51ff5bf8904b73ebe2bc830ca314ca7dd574b91ecc28e7458776a98b79bd36f3c5457081e1576242cfb5bb8955b
EBUILD libsodium-1.0.13.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
EBUILD libsodium-1.0.14.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.15.ebuild 1042 BLAKE2B 33c8ec9b305324a49fb2fd6c45e0744174c47afeb2043385ae3766f199251cc4a98b7c865c4b776e62b73f65503afc6bdc698fe69db75f5208602a993f2099f2 SHA512 08d31bbbc435aa483d8834913e342c5c8c91a254523b26cd88e8650de2648aba4e53e3e8f7e0a08c5fd570db54cebe6af8f96616c57cf495d5d9dec0362b3013
+EBUILD libsodium-1.0.15.ebuild 1047 BLAKE2B 1cff6b973068f72f2e2810760be7bd51416bfe6ae7a79cd8a266e234577046d52ff49f9a3cf940dc2538a952e8c566614f7918d11dd44d17d78d5b2a7c2e662c SHA512 613ba210222df239cbb6c986e472b08e27a83e48016016adcf2d14280587390a7807c0f7d6b5f1c3fd24d506d8dbee40de030329e3329a7d004fa37e0aa131fe
EBUILD libsodium-1.0.16-r1.ebuild 1204 BLAKE2B 7b3cc043c5cd3c91e75177878156cc2c4d63b3e8c109801bd604b9f9d8e0e94f593c983da16e065c9650dce785f67fece9d71cc835f1457b5092dcb20e14c711 SHA512 1a7d8bc354f2cc6b76706e4e202e6a0ad997fd0523c50598d92f56b13a3e370f0245f3571a4304de92a680178e1f696ac1bb588933af1f4edb8ad593f0f9d42d
EBUILD libsodium-1.0.16.ebuild 1064 BLAKE2B 80b0f5bb116fc2da72b1d21f824c7a859feab1ae105222dfbcdf734ae23f10dacbe712c0320d4172b6b57b1928bf4432dd2c49cda21c803a061361bd9e2c6f2c SHA512 f21c78a4250393a583ec41f1f13fa14e2aff7106abf63d529ee92a65c346b5b62ce75ffb4528d538a02fbacdc018faee67e9440a9cd534b59863817900a7f19a
MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15.ebuild
index 0f36d3222bb9..cfce5ad6f4cf 100644
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/23"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 5eeb40255a24..aee35d30b0a6 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -4,5 +4,5 @@ DIST libutf8proc-1.3.1-3-src.tar.gz 144985 BLAKE2B 92f21863df1a65a552cefa526a02e
DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
EBUILD libutf8proc-1.3.1_p2-r1.ebuild 556 BLAKE2B 1009d675af19af1f876b1fbeb34aab259a96df9a49282ff7e27c3d0b0b56c81bdc94c32d637ee6c200a6a67f737b83a444f98f60139c0b187bc8430a254c8de7 SHA512 21984bb51d6f313321146870d03b9c9ac2b82b235ff29710efa62f86afc50dc18574867747546eab6bde16fe923737b356a4632a784ae2c73459661a53d13086
-EBUILD libutf8proc-1.3.1_p3.ebuild 576 BLAKE2B ff53f73408c3ac1fa054624a6c0ac799ed17a326c19be4482c61b48a217efbbda8e237e8d50c471564084828224bce170160d9277542036e9b69d8fc5b73c6c1 SHA512 a3e5e56b486a9db474a6fd67f3557b823b3f120289c60d16214d770eb5c330f31fd9e4da0d776d28732f3746e4429410a3684f86dbc283f3d90396110062fb53
+EBUILD libutf8proc-1.3.1_p3.ebuild 581 BLAKE2B 1a92a09758f36de86465611afdc282b12ef3e2970cb40f4117ed0ac1eadc6b4fd4e78e15382d9d9279cb2fd57d881651a36a299b10eb97646f95f98936f719b0 SHA512 169645082503a0cb0a639e877efc0659cdddb781099df255670454728dad4bc3708f18ae94a815257b3d8dfb6a3aa7a950ae799f2223635810c643ba79aa41d2
MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild b/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
index 6815f6a79803..bb3c286ff9b6 100644
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-libs/log4shib/Manifest b/dev-libs/log4shib/Manifest
index d2ff3b1b28e3..d33b29061c78 100644
--- a/dev-libs/log4shib/Manifest
+++ b/dev-libs/log4shib/Manifest
@@ -1,4 +1,3 @@
-AUX log4shib-doc.patch 366 BLAKE2B b5c3221816d6fdffdca807a056f64eeae414321695ef362000dab7e0dd08c3a7d575d49aa3ffb1144535a88d1e928c73bf8a968a8726075b3be024db915f642c SHA512 4327359e95f0d1be02524313fe8818d299bd3bf6d7143215c6f550efac1a03a26da8210292c92cebdef8dc4844afe52e0d43242975fa8ef4ced7ddd3338ab0c3
DIST log4shib-1.0.4.tar.gz 487529 BLAKE2B 8ba4dd17e2f35c6566ba4736b5450c41fab1c5506ab6e994136b97ccab4d399281afb32fcf13935c25acd7ba063d2ed6595bab564614ffbb0d944074b68a5bba SHA512 af31bb436393e1a6a2674c0f4804148dea4f4081bb07b78f158f4109157bef4ed40647a3e4da7ec5eef0ed38b6286aee6d8b8a3320572c2b55df2998850d5245
EBUILD log4shib-1.0.4.ebuild 699 BLAKE2B f35f4578fdf625bd2d743ffe732c09a6f22e0f9bb8660d08bd6183a86dd7fa3655de908fc395409604b787038b25c1dd08d1d85e3059aa888807a7a83e0e1f47 SHA512 7b4a9b2a52c72161c281f9b78b4ccca40f9919af31aa2c9429d3ff861affd2dcab690e2181e2d74c7a8c35bfadd973dce237c5c9a5cf86499293b3854ddb9745
MISC metadata.xml 396 BLAKE2B d9c3e97cacd4d4d4e9b26f9e78a9a56293ab4569232c63e599c89376723af4b8dd250c9a8642d835d1bc4eb7b53eb5a6b78a80eba1c95fec7f5edc11f8b0efbe SHA512 4232880b47191b4e89f07dc4987e8f24833a0f42a21355f943b03f88487f50f2401e1a51aa7a150ad27659e7ebf9d61509fb232191dc4836d8ee4a9c7345df70
diff --git a/dev-libs/log4shib/files/log4shib-doc.patch b/dev-libs/log4shib/files/log4shib-doc.patch
deleted file mode 100644
index c7c58f0781a9..000000000000
--- a/dev-libs/log4shib/files/log4shib-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.am.orig 2008-10-18 09:03:48.000000000 +0200
-+++ doc/Makefile.am 2008-10-18 09:05:16.000000000 +0200
-@@ -1,7 +1,7 @@
- SUBDIRS = html
-
- man3dir = $(DESTDIR)$(mandir)/man3
--docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-+docdir = $(DESTDIR)/$(datarootdir)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-
- EXTRA_DIST = \
- mainPage.txt
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index f2498835ee1e..1c4fffc76464 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -9,11 +9,11 @@ DIST mpfr-3.1.5.tar.xz 1126668 BLAKE2B f902925036a4310e7b10461438bae5d5770b95ca6
DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
DIST mpfr-4.0.1.tar.xz 1412692 BLAKE2B 3e8d5cf558071571c21417088e74b8cb94a2e179667af41f734a68c7bd89d4beff245b9344c4c37d2f6558036a1a8c9ad3ea5ec8fbde16d2c7ebbf37a22cf424 SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f
-EBUILD mpfr-2.4.2_p3-r1.ebuild 1495 BLAKE2B 8fc020a3ae219fb48c8fa3b52ba25b4aba7cbc589f04582a9ba0cfe8e35377ab7f4f9838b964a67a836850412a77e0394aae7c40daa0d4a6e2e277be369ef726 SHA512 d747c698c589f666ca47d7c49df6d6cd0989594742261c20c693bb1a4323f06aaceab02b55c7dc89316f4eb0997246e58ea811638b4877cac78236c2d8e5bce8
-EBUILD mpfr-3.1.3_p4.ebuild 1814 BLAKE2B 3d5e9461e43a11e45cab33b48ce9a0ee6a9b0794fe6d4cf9bc7f09d611f057bc3f4c5e9103da79f6cbde944c055468c378eda50478332367621b5d85184d865d SHA512 ef68f09708002739845ee4f3f8f128bf087f5caf3c75b9466f3660b81b8e2dc0f704815e0d748870e70e27797d3ed8d713ae8dd583ca4bd0bf03b0a57caf5cf4
-EBUILD mpfr-3.1.4.ebuild 1643 BLAKE2B 4af7ae247a28d27cc068f5494b6cf2b9a57540c57da149853132be888ff106193ca8eaf0c47ee1058bc626eaca9559f5ab73a8ecf7045c3400dcee7d530ef2aa SHA512 c413312ad6955ebe236bc2f5b0a1f14f8ca6ba615b87cf7bcb7e3a4a7395c0c0a0c0a786fbbd510842e4b78f7e5d4ca2d8e52bc4177d358f6c242f8e2953db89
-EBUILD mpfr-3.1.5_p2.ebuild 1703 BLAKE2B 20734b9c27f4cbe24c2932db42ed248602e6ba94d8d07dbe28b2129404f009c1b0525a96cad3756cee4b431b13ee82ff3ea69bcaebdf91638d7b6a0d5828a43c SHA512 23529a7c5489d717c0f67295914a8310683e5fe6fccd553558ca3476747451061932752d04092a2ac9e91dc172939b63975a463f5f10c54d5fc0399a170f2a10
-EBUILD mpfr-3.1.6.ebuild 1622 BLAKE2B d5bba8dff9524a015e10a9a507e45a0ba3494d0789dae98e892b7d241cd8ecaff89e928b947e47535ee13b6bd035c5492b906e87d6e574b29968a74c03a523fe SHA512 b7d9bc01795567cb1b2e2474a93bad4fa72997feb4fb9d017dfbef57544799d054b90fd990f7a0c6a9110e51cd2933e781270b317b912f823d6970733dc6e2da
-EBUILD mpfr-4.0.0-r1.ebuild 1722 BLAKE2B 1c533cfda6e087a382abf603503821cdb20c4ebbfdafb5e95cb5898ec0726b7b6e00e8c1e2209f6387160642a4283cde17e1643d043d95b847a5fdd656ddf4ac SHA512 0aaae4b8d57f498b3da129e0fb9f8869958715121b33c5b4ce341d0e99f11aa0735bd4f9bde419ab1391514dde1d997e8e0dbe09b313a639426264ed44c66013
-EBUILD mpfr-4.0.1.ebuild 1722 BLAKE2B 1c533cfda6e087a382abf603503821cdb20c4ebbfdafb5e95cb5898ec0726b7b6e00e8c1e2209f6387160642a4283cde17e1643d043d95b847a5fdd656ddf4ac SHA512 0aaae4b8d57f498b3da129e0fb9f8869958715121b33c5b4ce341d0e99f11aa0735bd4f9bde419ab1391514dde1d997e8e0dbe09b313a639426264ed44c66013
+EBUILD mpfr-2.4.2_p3-r1.ebuild 1497 BLAKE2B 7161fc539fd4de18e4c66a057bbddf9633e45a964fa628051c800a265140fdbea1652c3e8fa8ef1e9f156dcab58d8283761218382c5af7056dcbef2b63405342 SHA512 6634ef915f69bbd2ee2f27c01a4aef7f6c8e3258adc270fca97e55c8f2155fd66b6ab827c2152db1d9ce93aba7a96b884a05220dac3ae92c02b869efb8e9f6a4
+EBUILD mpfr-3.1.3_p4.ebuild 1816 BLAKE2B 26863fe5a481decacb975bd953597001facde8933efb1bd121a52ee0a994aa8b5a2e01b8a502fa568ba7974d06a0f414f3706e9a0eb5c8466d025c868f7c9764 SHA512 8e27bac1af6a25b853ec8c9d9bcddb157016a0fce060d85eb6e47a89581d10f4b85296766102648af2fe26313b054e015bcf81222efe261687e1c04251917a2f
+EBUILD mpfr-3.1.4.ebuild 1645 BLAKE2B 4dcdecbc94e30f09cd4b4619585309f40a52e0845b07cb3455fda73125a064b20bff587d894a2487a67ee75bc1448336903cf84b4267a19d2f9fb735e8e062e4 SHA512 b482c8e4d47251cd0cf9298d4a2881532844e86a7302f787d9f4b5f80c0597c170516ea33ed754c20bf587d4480d465fa2440d33db0ca984570de4e4d1716f4f
+EBUILD mpfr-3.1.5_p2.ebuild 1705 BLAKE2B 4f83cc7b2078c2649afefac597628bef22a87814bd314c294ba0659c50c16b17ee7e4ed74b66d00d9be733c0cfb3110e2528f482d549d9f5561d462422f96a5b SHA512 d257664f34a7a69fa414dc141023bf13314afa55194b66070dbf90cc43c48ee28775b6a22d17a8a5e33e2ae050c7157197136c22b6164418b5c16a171c54f3ab
+EBUILD mpfr-3.1.6.ebuild 1624 BLAKE2B 3b035335d20d7dbb20f385d54c3fc04241cb448f6ef9a02d7fc60145e20ba8834bdfbb8149714b4593832d6f8fcbb6fcc8edd17d4dc8b3a61841fd49922b7176 SHA512 88318ce5042b52c77e7a7ff3099bd23b9255a299df7a2eda382a9f41e774dd55652f1455cd30f831bb1bf01ea75ea2c93c6128c25c11bda9a8d84ba6b8e17174
+EBUILD mpfr-4.0.0-r1.ebuild 1724 BLAKE2B dcaef3b9234b7f9c9db8ada77bd7a8008d8fee5b9efcc247837f3ad2fe8284d101c669c3fa6c99007a023c1c3b8747ffda7a700a626839af39e2e6cf9f5695f7 SHA512 a95afbbb9dd3005a00306e78958d07d5293632784051da0169e164668179665c4bc44066accdcc236132056b11be0eb89f26354f7467c2514c518a1f07b8643e
+EBUILD mpfr-4.0.1.ebuild 1724 BLAKE2B dcaef3b9234b7f9c9db8ada77bd7a8008d8fee5b9efcc247837f3ad2fe8284d101c669c3fa6c99007a023c1c3b8747ffda7a700a626839af39e2e6cf9f5695f7 SHA512 a95afbbb9dd3005a00306e78958d07d5293632784051da0169e164668179665c4bc44066accdcc236132056b11be0eb89f26354f7467c2514c518a1f07b8643e
MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
index 68a9758e2ff8..7967195aea45 100644
--- a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
@@ -10,8 +10,8 @@ inherit eutils libtool multilib multilib-minimal flag-o-matic
MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/${MY_P}-patchset.tar.bz2"
LICENSE="LGPL-2.1"
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index c66635fdc46c..ea96ab6369f0 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -10,8 +10,8 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
https://dev.gentoo.org/~mgorny/dist/${MY_P}-patchset.tar.xz"
LICENSE="LGPL-2.1"
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index 64e99d579059..aed000a2fde4 100644
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild
@@ -10,8 +10,8 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
index 318769f20370..09e5460b545c 100644
--- a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
@@ -10,8 +10,8 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
https://dev.gentoo.org/~mgorny/dist/${MY_P}-patchset.tar.xz"
LICENSE="LGPL-2.1"
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index 199e7df47fe8..adc199a660fd 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -10,8 +10,8 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/4" # libmpfr.so version
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index 6d382c4eccb2..272e4e3f30cc 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
@@ -10,8 +10,8 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/6" # libmpfr.so version
diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
index 6d382c4eccb2..272e4e3f30cc 100644
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.1.ebuild
@@ -10,8 +10,8 @@ MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/6" # libmpfr.so version
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 186ad163dced..aa51a379074b 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -2,5 +2,5 @@ AUX nettle-3.3-ecc-add-eh.patch 977 BLAKE2B c33cfc4c8903d92a98ef853f72772f7ad2e5
DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
EBUILD nettle-3.3-r2.ebuild 1776 BLAKE2B d95d5f8d9fcc9574bef63f41678ad8b86ce03dad9d1aae27fd3a8129aa59431f9ed3842b72cd330c1aad44ab159bce5c5bd6df9709f6342bebc4242df6d1874f SHA512 299663b4f58b51e66488fef27c78e0db0164e7bcfc3f990e811ee920dc9b09b952d1a69799cd5112fc97a911ba3c6f74962b9063e26a6cdbe5500556b27119e6
-EBUILD nettle-3.4.ebuild 1764 BLAKE2B 4267304efbc214460e8aa8bb2f5863f1c4c3d90a45990ae3e86279321a1f86113129df29e89e9f6817f01934fbf85c2cf34b8b824f72208aac3dc70ea996af4d SHA512 9f83b35a86080ea931be0613033d5a79598f3f1e8c7f9f698f8e2bd71f2165ad0156b90c7e3e67a53550aa1b95198d090a94e54e0172a83bb36afcc214b6e3d7
+EBUILD nettle-3.4.ebuild 1763 BLAKE2B dff04a774b1698987c57710cfa329fc2ac1ecc7f4ecf5b646137c4b9ca3ff4c3a3a57b95f7bceac60d72c348785d7bdcd85a7b7b31daf998c9dad8469b5a6bee SHA512 0b241e5b35c78540ebcea244b41c4fc5c38e1436c8491d23000b6b5cc0cc56808eda0361349cba925374024f239d405361368bd5f0f5cbcb94469fde972e126d
MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
index 255c4da1857f..7646376f7968 100644
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index db8e9f965be6..db29021bc521 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,3 +1,3 @@
DIST onigmo-6.1.3.tar.gz 834303 BLAKE2B f9b0a49716b817baa71d99bd3aaa6161b96f8073c4b4f87ea5eb70ebc7f7104b4844bb9763924c16a4ed90276bc2a2a18ab2f93dd546892b07fe81235b027f3d SHA512 dbae545ca79f8976b5e7f90f08301eb53a2c2f36c1ea62492badfbcfdd61679b68e3197765a2f9753bc033829c15d7fb24db307654b0ddb65774c88d122476fe
-EBUILD onigmo-6.1.3.ebuild 875 BLAKE2B 247c2bd83c48e1b2e9da826c4f2c58f0c31298e4e0d3ab72a31e9898b5c63161b9efacbcdc669a4bf5367c4b5d90d5bccf356838173d0ae1c96da86a1b8bda7e SHA512 f27cca6aeb43f983898fc66a675c2d417e4a45d3d3ba46444f2ec4f0fc8d239fcf2dd7cda84cc47e0ca66f4bb26126dc3e596e7c0c00f5d11274123edd802e7e
+EBUILD onigmo-6.1.3.ebuild 880 BLAKE2B 871414d33ef128a8bf05b679b9526aface35b23c78f53d98179652470f92a568ded402bffbe379018270856069dade7c6278133553684cf866f7dfe59ce0ebdb SHA512 e3ca3ece250e328a81a43a941a87545d654d9ae733a88b378e495a42cbeb75d42dd6a93a17a464fdceb795af6d0663cedded635c3ad0569f8dfb7bb7ea251292
MISC metadata.xml 618 BLAKE2B 6a4014979b0da612d5d5652a89000c4625afd0ad794511eacec0495fb8962a9b935f073d67c62bd5158b06e8cad0de1974cb84db787a913526c4de2028ab8de4 SHA512 02cb2407a4b5583bd40729731a6039ff673e63fd1ee5b97d8b69f307d34f37c2adf47ee178819483f4c13f4cdf93ddaf7d14c7648885205866f8cad979bf8223
diff --git a/dev-libs/onigmo/onigmo-6.1.3.ebuild b/dev-libs/onigmo/onigmo-6.1.3.ebuild
index 559e33955305..ec34f26b6f16 100644
--- a/dev-libs/onigmo/onigmo-6.1.3.ebuild
+++ b/dev-libs/onigmo/onigmo-6.1.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/k-takata/${PN}/archive/Onigmo-${PV}.tar.gz -> ${P}.t
LICENSE="BSD-2"
SLOT="0/6"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
S="${WORKDIR}/Onigmo-Onigmo-${PV}"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 2e025b9eb4d0..b86fbced1412 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,12 +1,7 @@
-AUX oniguruma-6.6.1-build.patch 656 BLAKE2B 0fff5eababc1a4fa732ea797c0790418c8d152623724e4f7d23f2e21a280a8ccce65f91026c686f7063091e298ed0f2c3691384d45933ceb9efe17749f061f86 SHA512 44190842324010cf9389b6269e041bac5e128324f5ba7cfdf5cbe6770020325d7e802c71f1c138b4e181d81fb6f53f7cdfe58f9b1c25cc4ca90e23d4d63c3397
-DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
-DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
-EBUILD oniguruma-6.6.1.ebuild 1112 BLAKE2B 4bf1ae4b3f3b0b4f1202ab94498ccfd27bf5fb761547c84cfb132502ace2b47d709b3fb023d0bdb86dc9c7de15e55587402ec51a0f7235ba6019429c8c56cb3b SHA512 93e21e61a4d46e321088809332b560748adebf2db65f8b690b8945928c09e6199495b2a8b9ecafcb383938debb8ee279e724b5e5c08227e9cebdb43a971dbfd5
-EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
-EBUILD oniguruma-6.8.2.ebuild 981 BLAKE2B eb7e8614e362b145ab843d73d2cdeb7a57fd6f6f5a093f1a8768bcff61cc88e676964bbb460996755c55143f5e4ff531452716c3a061c2dd0345b73687d96292 SHA512 cd0148a53c4aaf4b6e27fea5aaf9aa4cdae3912b764b88f3500f53d8ec3b1864cfdd4c39e4f486c60909f94f87503722754fb29142186f3fc1b362e98e6fded5
+EBUILD oniguruma-6.8.2.ebuild 978 BLAKE2B 63de756a2eff6deb1f2f9cdd4727d1f805b748a9a6cb7ae4650a1c898192a769aa4c47cfba3df9a3c69ff7918642e52bd0a6d4baa21790ff075de202d5c9d6aa SHA512 a8fce2c4e081e0f8cd2632fdbfd7a5be87f83b68275141787866dab7c336f4a202c50d89a26c7dc517f4cb688299b0f735ea6f0d0eb07506fe3ae0cba63b2d85
MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch b/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch
deleted file mode 100644
index 452347c90baf..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/kkos/oniguruma/issues/68
-https://github.com/kkos/oniguruma/commit/1337755c2758a62057ef95f1cff1b9466f533301
-
---- /sample/Makefile.am
-+++ /sample/Makefile.am
-@@ -4,7 +4,7 @@
- LDADD = $(lib_onig)
-
- AM_LDFLAGS = -L$(prefix)/lib
--AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
-
- TESTS = encode listcap names posix simple sql syntax user_property bug_fix
-
---- /test/Makefile.am
-+++ /test/Makefile.am
-@@ -3,7 +3,7 @@
-
- AM_LDFLAGS = -L$(prefix)/lib
- AM_CFLAGS =
--AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
-
- TESTS = test_utf8 testc testp testcu
-
diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
deleted file mode 100644
index 40d5fd7170d7..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable combination-explosion-check) \
- $(use_enable crnl-as-line-terminator) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild b/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
deleted file mode 100644
index d040e1b6cb1c..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable combination-explosion-check) \
- $(use_enable crnl-as-line-terminator) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
index 977725c6e82b..c8d8f54c0eeb 100644
--- a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="crnl-as-line-terminator static-libs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 3c14bfb05af4..784fa3175082 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -5,7 +5,11 @@ AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d0
AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04
AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
+AUX openssl-1.0.2o-CVE-2018-0732.patch 1194 BLAKE2B bd06c5b1289f7a3dca52bbfab7ae17c9d103b07ffd2649c5b5a8cc60163aa3056e4bd86108548dfcd3690d2ef94c3e0d3a911694199b5a3822215dd01c7467d6 SHA512 ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4
+AUX openssl-1.0.2o-hobble-ecc.patch 11987 BLAKE2B 28c1217e500a9d6578dac3ee8aeb08f6e3b1d2c6749336ef05e4142828c7c4b176ec16707dcbbf97e1e2e91d51f85f2a02c076cfcc8bcef1aa9d3fd5ba50eb6a SHA512 817a5a1cbab171d9e6d3fce9c612985d2ce3f9f0b3781b3681ef42da1ac6389d8a8a11e6d696eb7f051d3bfc2d045f1999cc4076d1257b10e9fb65620aee3ee2
+AUX openssl-1.1.0h-CVE-2018-0732.patch 1192 BLAKE2B 4a13508674020519756b3d33530673527f31a66a731bb79a6081692901a7d0bf7e6e9345d7a9613407a485f4b7961de26e3c87c1cd76756449821ae4b890e472 SHA512 27d55677ff3d60cf7ae0b8f1a5fb8ab529fc9d3e7072eb4cfabd2b50aefcf9cb88291262eccf68efc44a432ba25424b25dec40dc03bb85b7c6c3003260cd5012
AUX openssl-1.1.0h-CVE-2018-0737.patch 996 BLAKE2B 4b4d6e619a508f36f4fdc00c0066d1160ff7f6cd301cd799405d37b3236ebb69b11a4ccf9baa9ea3a69f21c6fe8550b440c1a3503ec27a5a9c5d1e4d472e2b57 SHA512 833712f0ae355aed6547ccf49447d50bdb7be1ea3c3b3b51f182f6e0eb17692c78ca90341a151985b35b86800cf6229926f3e3af936741d437ab9ac5444987c0
+AUX openssl-1.1.1_pre7-CVE-2018-0732.patch 1237 BLAKE2B b1cc71eb69cebc87aa1673c98534e8b478a836b504dc3695993908fd836c485e78adf159ca9093945cec5c0b689d63a8fefd770c9a35be05ffdc1b6dcba20e91 SHA512 f2c3314066043a795325913dfb57538e701a7cde673abb34eca3f46a62fb875b25d1028b8936de7c03940dd38497a6255accc0c9dc742b933dccb463958c31aa
DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
@@ -22,7 +26,7 @@ DIST openssl-1.1.1-pre7.tar.gz 8308876 BLAKE2B 621cc6c541d81c2fa62e12eb75b62f144
EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
EBUILD openssl-1.0.2o-r3.ebuild 8092 BLAKE2B 66f9d07e6757aeffde65bd525f3a6bd66c0da6b6f503778de37a8172cb37656baf0c5a501699d426b18d63d0dac5bb1e7df9ea9f7d30dc19021c15985e8f2114 SHA512 f6aa3f6a4b89aa947d78ea28b8de2c9d3efd3eae2dac98de742784542d71700b5fb68b79392523d41a06dc9784522206637ee525e9fd1635f3907af172dab7a8
-EBUILD openssl-1.0.2o-r4.ebuild 9688 BLAKE2B b26ba5064dfcfa26556f2f9fd01a5b33b23f7b6b193ae6e7c7b680db6a0ebbd184ee4555c93d98718ed02f49cbd78d048f8bc867ec26b629e826d27bcca83bac SHA512 2357e22ede357e7326bf24f13b68e55f56521863df058297cef9123286ebf112fd2bd735a1a58658b2922131c8c5e57b991eedc326d001d7fd305824663de8de
-EBUILD openssl-1.1.0h-r1.ebuild 9158 BLAKE2B c0c4257218e9ef0a2460d5b19a9d43741d3c67a4cbed2714f352951c6d051973a6851bb9a33733e539ad98f0f5be6051b4da157adb421fb79704f995b119f894 SHA512 b1e6dec42afd6c9ca00697cc7942c6b192aebf6ef914c45949c8e3592a11162ce3954b07b484166331035ce421a4dd0a6d463652ab21c25fb3bcfc14239a4cac
-EBUILD openssl-1.1.1_pre7.ebuild 7587 BLAKE2B 34eb743824c977e7b5f793a1837251dd29621ea5949497023a2254f5fad1e49fcf8b91b0962f0405f298e10e6a1b86326c0d0409cb9b4d75a795efa4f1978e52 SHA512 ab71eff89c32dea33dfe95bc52dbee60be75c837730b0324a20d13922aff380c9615576c6712971cbeba86bf2c70366e25fafaaaac20188f471eca9e7684a288
+EBUILD openssl-1.0.2o-r6.ebuild 9818 BLAKE2B 193ff450b056ceb4a496d79bd8afa1f2313918eb703de5e8c79375180ff385751f2bdd777a35d1e9d793ce3054703e785f73dc5941b0a05a4a18254d364a0593 SHA512 a15e7bf3d03c6c5fd8d9eda699d82a15ee693417844a328a0eff0ffc80593d783f589a253796dcd416496bb454938706157e85574eea7461e03c173ebef12040
+EBUILD openssl-1.1.0h-r2.ebuild 9198 BLAKE2B a65f3b3bc4104901ca271003f3363596279077273c0b2cbfd5eb54fb315db0974269673abedef3de103b2d85d436ab167cb973ae4d546ae2a4ebf4ae5f60599a SHA512 82ab0bab945bbb723c5329376c629e9dab88dc8f81d74e201f428bc5fc519d677ea21807c2d32d3517657a80db24e71170a4bed4ef4cfb25009a4d32ea9b15a3
+EBUILD openssl-1.1.1_pre7-r1.ebuild 7627 BLAKE2B 1b8929c2f8395d8296dd37f4b543eee3c49c378f6292587e7db7346d6f587d58a2d8279813978aec39fad867b872cdd8a5511233acf190c32fdf879af2b303bb SHA512 84e4a8608dfb52c6d10c74cbc80175632f35ed52b6befac88e9f27add5612933120f7d2f97c535c3a6d62370040d26614e6a0b9f2101c81637942d2146a866ba
MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch
new file mode 100644
index 000000000000..148e7c3bc1a1
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2o-CVE-2018-0732.patch
@@ -0,0 +1,39 @@
+From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001
+From: Guido Vranken <guidovranken@gmail.com>
+Date: Mon, 11 Jun 2018 19:38:54 +0200
+Subject: [PATCH] Reject excessively large primes in DH key generation.
+
+CVE-2018-0732
+
+Signed-off-by: Guido Vranken <guidovranken@gmail.com>
+
+(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe)
+
+Reviewed-by: Tim Hudson <tjh@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/6457)
+---
+ crypto/dh/dh_key.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
+index 387558f1467..f235e0d682b 100644
+--- a/crypto/dh/dh_key.c
++++ b/crypto/dh/dh_key.c
+@@ -130,10 +130,15 @@ static int generate_key(DH *dh)
+ int ok = 0;
+ int generate_new_key = 0;
+ unsigned l;
+- BN_CTX *ctx;
++ BN_CTX *ctx = NULL;
+ BN_MONT_CTX *mont = NULL;
+ BIGNUM *pub_key = NULL, *priv_key = NULL;
+
++ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
++ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
++ return 0;
++ }
++
+ ctx = BN_CTX_new();
+ if (ctx == NULL)
+ goto err;
diff --git a/dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch b/dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch
new file mode 100644
index 000000000000..e105fe45e459
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2o-hobble-ecc.patch
@@ -0,0 +1,290 @@
+Port of Fedora's Hobble-EC patches for OpenSSL 1.0 series.
+
+From https://src.fedoraproject.org/git/rpms/openssl.git
+
+Contains parts of the following patches, rediffed. The patches are on various
+different branches.
+f23 openssl-1.0.2c-ecc-suiteb.patch
+f23 openssl-1.0.2a-fips-ec.patch
+f28 openssl-1.1.0-ec-curves.patch
+
+Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude ec_curve.c -p openssl-1.0.2m.hobble/apps/speed.c openssl-1.0.2m.mod/apps/speed.c
+--- openssl-1.0.2m.hobble/apps/speed.c 2017-11-02 07:32:57.000000000 -0700
++++ openssl-1.0.2m.mod/apps/speed.c 2018-06-10 19:00:09.264550382 -0700
+@@ -989,10 +989,7 @@ int MAIN(int argc, char **argv)
+ } else
+ # endif
+ # ifndef OPENSSL_NO_ECDSA
+- if (strcmp(*argv, "ecdsap160") == 0)
+- ecdsa_doit[R_EC_P160] = 2;
+- else if (strcmp(*argv, "ecdsap192") == 0)
+- ecdsa_doit[R_EC_P192] = 2;
++ if (0) {}
+ else if (strcmp(*argv, "ecdsap224") == 0)
+ ecdsa_doit[R_EC_P224] = 2;
+ else if (strcmp(*argv, "ecdsap256") == 0)
+@@ -1001,36 +998,13 @@ int MAIN(int argc, char **argv)
+ ecdsa_doit[R_EC_P384] = 2;
+ else if (strcmp(*argv, "ecdsap521") == 0)
+ ecdsa_doit[R_EC_P521] = 2;
+- else if (strcmp(*argv, "ecdsak163") == 0)
+- ecdsa_doit[R_EC_K163] = 2;
+- else if (strcmp(*argv, "ecdsak233") == 0)
+- ecdsa_doit[R_EC_K233] = 2;
+- else if (strcmp(*argv, "ecdsak283") == 0)
+- ecdsa_doit[R_EC_K283] = 2;
+- else if (strcmp(*argv, "ecdsak409") == 0)
+- ecdsa_doit[R_EC_K409] = 2;
+- else if (strcmp(*argv, "ecdsak571") == 0)
+- ecdsa_doit[R_EC_K571] = 2;
+- else if (strcmp(*argv, "ecdsab163") == 0)
+- ecdsa_doit[R_EC_B163] = 2;
+- else if (strcmp(*argv, "ecdsab233") == 0)
+- ecdsa_doit[R_EC_B233] = 2;
+- else if (strcmp(*argv, "ecdsab283") == 0)
+- ecdsa_doit[R_EC_B283] = 2;
+- else if (strcmp(*argv, "ecdsab409") == 0)
+- ecdsa_doit[R_EC_B409] = 2;
+- else if (strcmp(*argv, "ecdsab571") == 0)
+- ecdsa_doit[R_EC_B571] = 2;
+ else if (strcmp(*argv, "ecdsa") == 0) {
+- for (i = 0; i < EC_NUM; i++)
++ for (i = R_EC_P224; i < R_EC_P521; i++)
+ ecdsa_doit[i] = 1;
+ } else
+ # endif
+ # ifndef OPENSSL_NO_ECDH
+- if (strcmp(*argv, "ecdhp160") == 0)
+- ecdh_doit[R_EC_P160] = 2;
+- else if (strcmp(*argv, "ecdhp192") == 0)
+- ecdh_doit[R_EC_P192] = 2;
++ if (0) {}
+ else if (strcmp(*argv, "ecdhp224") == 0)
+ ecdh_doit[R_EC_P224] = 2;
+ else if (strcmp(*argv, "ecdhp256") == 0)
+@@ -1039,28 +1013,8 @@ int MAIN(int argc, char **argv)
+ ecdh_doit[R_EC_P384] = 2;
+ else if (strcmp(*argv, "ecdhp521") == 0)
+ ecdh_doit[R_EC_P521] = 2;
+- else if (strcmp(*argv, "ecdhk163") == 0)
+- ecdh_doit[R_EC_K163] = 2;
+- else if (strcmp(*argv, "ecdhk233") == 0)
+- ecdh_doit[R_EC_K233] = 2;
+- else if (strcmp(*argv, "ecdhk283") == 0)
+- ecdh_doit[R_EC_K283] = 2;
+- else if (strcmp(*argv, "ecdhk409") == 0)
+- ecdh_doit[R_EC_K409] = 2;
+- else if (strcmp(*argv, "ecdhk571") == 0)
+- ecdh_doit[R_EC_K571] = 2;
+- else if (strcmp(*argv, "ecdhb163") == 0)
+- ecdh_doit[R_EC_B163] = 2;
+- else if (strcmp(*argv, "ecdhb233") == 0)
+- ecdh_doit[R_EC_B233] = 2;
+- else if (strcmp(*argv, "ecdhb283") == 0)
+- ecdh_doit[R_EC_B283] = 2;
+- else if (strcmp(*argv, "ecdhb409") == 0)
+- ecdh_doit[R_EC_B409] = 2;
+- else if (strcmp(*argv, "ecdhb571") == 0)
+- ecdh_doit[R_EC_B571] = 2;
+ else if (strcmp(*argv, "ecdh") == 0) {
+- for (i = 0; i < EC_NUM; i++)
++ for (i = R_EC_P224; i <= R_EC_P521; i++)
+ ecdh_doit[i] = 1;
+ } else
+ # endif
+@@ -1149,21 +1103,13 @@ int MAIN(int argc, char **argv)
+ BIO_printf(bio_err, "dsa512 dsa1024 dsa2048\n");
+ # endif
+ # ifndef OPENSSL_NO_ECDSA
+- BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
++ BIO_printf(bio_err, "ecdsap224 "
+ "ecdsap256 ecdsap384 ecdsap521\n");
+- BIO_printf(bio_err,
+- "ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
+- BIO_printf(bio_err,
+- "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
+ BIO_printf(bio_err, "ecdsa\n");
+ # endif
+ # ifndef OPENSSL_NO_ECDH
+- BIO_printf(bio_err, "ecdhp160 ecdhp192 ecdhp224 "
++ BIO_printf(bio_err, "ecdhp224 "
+ "ecdhp256 ecdhp384 ecdhp521\n");
+- BIO_printf(bio_err,
+- "ecdhk163 ecdhk233 ecdhk283 ecdhk409 ecdhk571\n");
+- BIO_printf(bio_err,
+- "ecdhb163 ecdhb233 ecdhb283 ecdhb409 ecdhb571\n");
+ BIO_printf(bio_err, "ecdh\n");
+ # endif
+
+@@ -1242,11 +1188,11 @@ int MAIN(int argc, char **argv)
+ for (i = 0; i < DSA_NUM; i++)
+ dsa_doit[i] = 1;
+ # ifndef OPENSSL_NO_ECDSA
+- for (i = 0; i < EC_NUM; i++)
++ for (i = R_EC_P224; i <= R_EC_P521; i++)
+ ecdsa_doit[i] = 1;
+ # endif
+ # ifndef OPENSSL_NO_ECDH
+- for (i = 0; i < EC_NUM; i++)
++ for (i = R_EC_P224; i <= R_EC_P521; i++)
+ ecdh_doit[i] = 1;
+ # endif
+ }
+diff -Nuar --exclude ec_curve.c -p openssl-1.0.2m.hobble/crypto/ec/ecp_smpl.c openssl-1.0.2m.mod/crypto/ec/ecp_smpl.c
+--- openssl-1.0.2m.hobble/crypto/ec/ecp_smpl.c 2017-11-02 07:32:57.000000000 -0700
++++ openssl-1.0.2m.mod/crypto/ec/ecp_smpl.c 2018-06-10 18:45:36.909911848 -0700
+@@ -187,6 +187,11 @@ int ec_GFp_simple_group_set_curve(EC_GRO
+ return 0;
+ }
+
++ if (BN_num_bits(p) < 224) {
++ ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
++ return 0;
++ }
++
+ if (ctx == NULL) {
+ ctx = new_ctx = BN_CTX_new();
+ if (ctx == NULL)
+diff -Nuar --exclude ec_curve.c -p openssl-1.0.2m.hobble/ssl/t1_lib.c openssl-1.0.2m.mod/ssl/t1_lib.c
+--- openssl-1.0.2m.hobble/ssl/t1_lib.c 2017-11-02 07:32:58.000000000 -0700
++++ openssl-1.0.2m.mod/ssl/t1_lib.c 2018-06-10 18:46:55.329811812 -0700
+@@ -271,10 +271,7 @@ static const unsigned char eccurves_auto
+ 0, 23, /* secp256r1 (23) */
+ /* Other >= 256-bit prime curves. */
+ 0, 25, /* secp521r1 (25) */
+- 0, 28, /* brainpool512r1 (28) */
+- 0, 27, /* brainpoolP384r1 (27) */
+ 0, 24, /* secp384r1 (24) */
+- 0, 26, /* brainpoolP256r1 (26) */
+ 0, 22, /* secp256k1 (22) */
+ # ifndef OPENSSL_NO_EC2M
+ /* >= 256-bit binary curves. */
+@@ -292,10 +289,7 @@ static const unsigned char eccurves_all[
+ 0, 23, /* secp256r1 (23) */
+ /* Other >= 256-bit prime curves. */
+ 0, 25, /* secp521r1 (25) */
+- 0, 28, /* brainpool512r1 (28) */
+- 0, 27, /* brainpoolP384r1 (27) */
+ 0, 24, /* secp384r1 (24) */
+- 0, 26, /* brainpoolP256r1 (26) */
+ 0, 22, /* secp256k1 (22) */
+ # ifndef OPENSSL_NO_EC2M
+ /* >= 256-bit binary curves. */
+@@ -310,13 +304,6 @@ static const unsigned char eccurves_all[
+ * Remaining curves disabled by default but still permitted if set
+ * via an explicit callback or parameters.
+ */
+- 0, 20, /* secp224k1 (20) */
+- 0, 21, /* secp224r1 (21) */
+- 0, 18, /* secp192k1 (18) */
+- 0, 19, /* secp192r1 (19) */
+- 0, 15, /* secp160k1 (15) */
+- 0, 16, /* secp160r1 (16) */
+- 0, 17, /* secp160r2 (17) */
+ # ifndef OPENSSL_NO_EC2M
+ 0, 8, /* sect239k1 (8) */
+ 0, 6, /* sect233k1 (6) */
+@@ -351,29 +338,21 @@ static const unsigned char fips_curves_d
+ 0, 9, /* sect283k1 (9) */
+ 0, 10, /* sect283r1 (10) */
+ # endif
+- 0, 22, /* secp256k1 (22) */
+ 0, 23, /* secp256r1 (23) */
+ # ifndef OPENSSL_NO_EC2M
+ 0, 8, /* sect239k1 (8) */
+ 0, 6, /* sect233k1 (6) */
+ 0, 7, /* sect233r1 (7) */
+ # endif
+- 0, 20, /* secp224k1 (20) */
+- 0, 21, /* secp224r1 (21) */
+ # ifndef OPENSSL_NO_EC2M
+ 0, 4, /* sect193r1 (4) */
+ 0, 5, /* sect193r2 (5) */
+ # endif
+- 0, 18, /* secp192k1 (18) */
+- 0, 19, /* secp192r1 (19) */
+ # ifndef OPENSSL_NO_EC2M
+ 0, 1, /* sect163k1 (1) */
+ 0, 2, /* sect163r1 (2) */
+ 0, 3, /* sect163r2 (3) */
+ # endif
+- 0, 15, /* secp160k1 (15) */
+- 0, 16, /* secp160r1 (16) */
+- 0, 17, /* secp160r2 (17) */
+ };
+ # endif
+
+diff -up openssl-1.0.2a/crypto/ecdh/ecdhtest.c.fips-ec openssl-1.0.2a/crypto/ecdh/ecdhtest.c
+--- openssl-1.0.2a/crypto/ecdh/ecdhtest.c.fips-ec 2015-03-19 14:30:36.000000000 +0100
++++ openssl-1.0.2a/crypto/ecdh/ecdhtest.c 2015-04-22 19:00:19.721884512 +0200
+@@ -501,11 +501,13 @@ int main(int argc, char *argv[])
+ goto err;
+
+ /* NIST PRIME CURVES TESTS */
++# if 0
+ if (!test_ecdh_curve
+ (NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out))
+ goto err;
+ if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))
+ goto err;
++# endif
+ if (!test_ecdh_curve
+ (NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out))
+ goto err;
+@@ -536,13 +538,14 @@ int main(int argc, char *argv[])
+ if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out))
+ goto err;
+ # endif
++# if 0
+ if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))
+ goto err;
+ if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))
+ goto err;
+ if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))
+ goto err;
+-
++# endif
+ ret = 0;
+
+ err:
+diff -up openssl-1.0.2a/crypto/ecdsa/ecdsatest.c.fips-ec openssl-1.0.2a/crypto/ecdsa/ecdsatest.c
+--- openssl-1.0.2a/crypto/ecdsa/ecdsatest.c.fips-ec 2015-03-19 14:19:00.000000000 +0100
++++ openssl-1.0.2a/crypto/ecdsa/ecdsatest.c 2015-04-22 19:00:19.722884536 +0200
+@@ -138,11 +138,14 @@ int restore_rand(void)
+ }
+
+ static int fbytes_counter = 0;
+-static const char *numbers[8] = {
++static const char *numbers[10] = {
++ "651056770906015076056810763456358567190100156695615665659",
+ "651056770906015076056810763456358567190100156695615665659",
+ "6140507067065001063065065565667405560006161556565665656654",
+ "8763001015071075675010661307616710783570106710677817767166"
+ "71676178726717",
++ "8763001015071075675010661307616710783570106710677817767166"
++ "71676178726717",
+ "7000000175690566466555057817571571075705015757757057795755"
+ "55657156756655",
+ "1275552191113212300012030439187146164646146646466749494799",
+@@ -158,7 +161,7 @@ int fbytes(unsigned char *buf, int num)
+ int ret;
+ BIGNUM *tmp = NULL;
+
+- if (fbytes_counter >= 8)
++ if (fbytes_counter >= 10)
+ return 0;
+ tmp = BN_new();
+ if (!tmp)
+@@ -532,8 +535,10 @@ int main(void)
+ RAND_seed(rnd_seed, sizeof(rnd_seed));
+
+ /* the tests */
++# if 0
+ if (!x9_62_tests(out))
+ goto err;
++# endif
+ if (!test_builtin(out))
+ goto err;
+
diff --git a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch
new file mode 100644
index 000000000000..e7dfba43f2a5
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch
@@ -0,0 +1,39 @@
+From ea7abeeabf92b7aca160bdd0208636d4da69f4f4 Mon Sep 17 00:00:00 2001
+From: Guido Vranken <guidovranken@gmail.com>
+Date: Mon, 11 Jun 2018 19:38:54 +0200
+Subject: [PATCH] Reject excessively large primes in DH key generation.
+
+CVE-2018-0732
+
+Signed-off-by: Guido Vranken <guidovranken@gmail.com>
+
+(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe)
+
+Reviewed-by: Tim Hudson <tjh@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/6457)
+---
+ crypto/dh/dh_key.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
+index fce9ff47f36..58003d70878 100644
+--- a/crypto/dh/dh_key.c
++++ b/crypto/dh/dh_key.c
+@@ -78,10 +78,15 @@ static int generate_key(DH *dh)
+ int ok = 0;
+ int generate_new_key = 0;
+ unsigned l;
+- BN_CTX *ctx;
++ BN_CTX *ctx = NULL;
+ BN_MONT_CTX *mont = NULL;
+ BIGNUM *pub_key = NULL, *priv_key = NULL;
+
++ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
++ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
++ return 0;
++ }
++
+ ctx = BN_CTX_new();
+ if (ctx == NULL)
+ goto err;
diff --git a/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch
new file mode 100644
index 000000000000..6c336f2507a7
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch
@@ -0,0 +1,39 @@
+From 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe Mon Sep 17 00:00:00 2001
+From: Guido Vranken <guidovranken@gmail.com>
+Date: Mon, 11 Jun 2018 19:38:54 +0200
+Subject: [PATCH] Reject excessively large primes in DH key generation.
+
+CVE-2018-0732
+
+Signed-off-by: Guido Vranken <guidovranken@gmail.com>
+
+Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
+Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
+Reviewed-by: Rich Salz <rsalz@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/6457)
+---
+ crypto/dh/dh_key.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
+index 6901548ed69..752542b5563 100644
+--- a/crypto/dh/dh_key.c
++++ b/crypto/dh/dh_key.c
+@@ -78,10 +78,15 @@ static int generate_key(DH *dh)
+ int ok = 0;
+ int generate_new_key = 0;
+ unsigned l;
+- BN_CTX *ctx;
++ BN_CTX *ctx = NULL;
+ BN_MONT_CTX *mont = NULL;
+ BIGNUM *pub_key = NULL, *priv_key = NULL;
+
++ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
++ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
++ return 0;
++ }
++
+ ctx = BN_CTX_new();
+ if (ctx == NULL)
+ goto err;
diff --git a/dev-libs/openssl/openssl-1.0.2o-r4.ebuild b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
index 335dce5ded3c..f7ae84bae162 100644
--- a/dev-libs/openssl/openssl-1.0.2o-r4.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
@@ -39,6 +39,7 @@ PDEPEND="app-misc/ca-certificates"
SOURCE1=hobble-openssl
SOURCE12=ec_curve.c
SOURCE13=ectest.c
+# These are ported instead
#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
#PATCH37=openssl-1.1.0-ec-curves.patch
FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
@@ -73,6 +74,7 @@ src_prepare() {
for i in "${FEDORA_PATCH[@]}" ; do
eapply "${DISTDIR}"/"${i}"
done
+ eapply "${FILESDIR}"/openssl-1.0.2o-hobble-ecc.patch
# Also see the configure parts below:
# enable-ec \
# $(use_ssl !bindist ec2m) \
@@ -88,6 +90,7 @@ src_prepare() {
if ! use vanilla ; then
eapply "${WORKDIR}"/patch/*.patch
+ eapply "${FILESDIR}"/${P}-CVE-2018-0732.patch
fi
eapply_user
diff --git a/dev-libs/openssl/openssl-1.1.0h-r1.ebuild b/dev-libs/openssl/openssl-1.1.0h-r2.ebuild
index 6e38d19eaf54..5881fe74d35e 100644
--- a/dev-libs/openssl/openssl-1.1.0h-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0h-r2.ebuild
@@ -57,6 +57,7 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
"${FILESDIR}"/${P}-CVE-2018-0737.patch
+ "${FILESDIR}"/${P}-CVE-2018-0732.patch
)
src_prepare() {
diff --git a/dev-libs/openssl/openssl-1.1.1_pre7.ebuild b/dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild
index e022bf39b778..d7246b0d043e 100644
--- a/dev-libs/openssl/openssl-1.1.1_pre7.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild
@@ -36,6 +36,7 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+ "${FILESDIR}"/${P}-CVE-2018-0732.patch
)
src_prepare() {
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 3bb81d8fbbfe..929bd80077fe 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,5 +1,5 @@
DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
-DIST pkcs11-helper-1.23.tar.bz2 425238 BLAKE2B d67c6d299dbb5e23330ab44dd4f3b3133843a0018503e8d9c53ab18343dd3206ea7a1110db8cb0c8c5c1a6569b876a2b81ca7496302cc073691abd3693fd00ea SHA512 d2116e602edf98ec409163d7e1d4eed7b849dd9680fcb7b46e37022a49581a2e88605f3420dbc0936133084715bdf431b34ae96b7dedadcb13ffeb4798f92c54
+DIST pkcs11-helper-1.24.tar.bz2 425627 BLAKE2B 2489af89dc4be6d056facedecf38fc42079c18ee74ca4f9621cf11b1060e2f463318d0efc263df5009eab01771c98e44a3efe7246ccbdc8982a130592327beca SHA512 28e9b53dd36e4e3fa8e30b7ad76af3bcfce1947d228f07e607a26aa6b06ee3bf1fd6f5a0ebf8ec581a16074de7b21e53f3b225e1cb1f58d4ded7bff2c50a6376
EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
-EBUILD pkcs11-helper-1.23.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
+EBUILD pkcs11-helper-1.24.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.24.ebuild
index 02e44a3a603b..02e44a3a603b 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.24.ebuild
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index bb695e475608..f74ed4df0421 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -4,7 +4,9 @@ AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a
DIST poco-1.4.6-all-doc.zip 2072762 BLAKE2B 51b8426d050e7ae373fbb0f3959657e37f1c3aeda75f5bf5cd3dc99e08414a9e65f61ea71dee6d8c40148f41157e2eac0888e64c5020707352c74b262ffae741 SHA512 458e1a3c6a6017b5ae5efcbd0d7b2bbf50aedd6ddc7ae7befddac07ed133b7243208aadd6ecdb17b3fa273e04eb0da4d73b1d3e5591aee98b754e430b2248e52
DIST poco-1.4.6p4-all.tar.bz2 3158594 BLAKE2B 76accf617ddd087131a5960c131680451959704fee4b17b65bf85367a172d2fe023c9c7efde59fe5bd4142c7ca153734fb4ccbbf06bd5d0365a59d6e75a328a5 SHA512 ae4e1190a0ba719f807d0abaf1c47ff445a8f5867157f209260672546f3755ff021c7073bc8d5e656be383d5667dc15ad7eae8208728053fb61439c4c80a7fca
DIST poco-1.7.6.tar.gz 8044937 BLAKE2B ad9bf61eb00ce4e1ef5079e07be04ceff79bf823cba49ffb0e144a1e579d9de4f6f8d3df6b629c522de5c2b7b4c7df0933777686b72190d717e407bc28ae2a49 SHA512 a02b7ff66acf080942517b3b8644d6e5c7136c5edc6e58fd13083a74b97b5619253fc9db7863284a565226f95410ad4da1fa9738d14885f560aeb03c1f7c18aa
+DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
EBUILD poco-1.4.6_p4-r1.ebuild 3450 BLAKE2B bf27e0ab8a20a5fa04add798f24e6c2199bb0688266a963a020e858d7f77b0e709da65c5d3e0527880d57803341fa6b0dd95b5f1aa13977a364b310a17a14dde SHA512 3d69fe0e340a9406e26902577004c8314192a1794942c70a7f56342f9644fee87909a11ec3172b6d2f7b4c0f3687157f79130e88b60115442e74daafe6cfeb42
EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B a14df4b50fac726746d4692ac651e25ecfbfc487a7322d307d145b6e41de501c727e3d5729c6183275809cd8be3817e3f9ca256069abea147b01366c15375466 SHA512 dd0a231de34a03305f756d676ba6bd7e71bb919fac8752028610a4cbdd89807e058b74b1eba0a50b30878190dd42f2ca20cb84ea0cccbcd8cac8659ea9436a41
EBUILD poco-1.7.6.ebuild 3302 BLAKE2B f1a53d2e9aefc01c2ea7c34d742e0bb974f2961613a887fc6e5a6a182600e9e9387e5581216d2a5529ca7aa65dba3ba2470dd2aa31bae86f2f4e867373ecc1eb SHA512 fc9587211f348abb68a5d94e76d926ae9e74ae840551d2ca493b0cd680d5be1b1193161ee69aa647f63c7a429465cf2dcfd5a0bbd6494e67156d46c796faf07e
+EBUILD poco-1.9.0.ebuild 3301 BLAKE2B f11aacf22526c8a2532f51117cc610b916e848e0e51672329b438e37e0a8710b3f75d3a378d524f56e18969b83f1e141b4d677c016f49a5b4078556a82097374 SHA512 6a2a8bf3b653ab812eab8023778ccec89d675fdb2b71a1f80a18453a2f05e9e210da4f68717e3d57ac3a52f3338b41affb68215af6ac263e1ebd8dc2c605a78c
MISC metadata.xml 2516 BLAKE2B b47d63bb959634ff62322bd2fbbb270d9521a2f7d3a40d75adc10420ca725fa9efba7ca0fa9fd956abffd2b74f093e83453395269c13ca3681ca5c96091310bb SHA512 a85a369be9cff2d225b6bedeba4a8fbaaf5735b811367ca6c213c56ffde6165f4e4fac9018243308d0a6b15ff416298a76738f35db10528c20571d5e71998a47
diff --git a/dev-libs/poco/poco-1.9.0.ebuild b/dev-libs/poco/poco-1.9.0.ebuild
new file mode 100644
index 000000000000..b6b741001baa
--- /dev/null
+++ b/dev-libs/poco/poco-1.9.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C++ libraries for building network-based applications"
+HOMEPAGE="http://pocoproject.org/"
+SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="7z? ( xml )
+ apache? ( net util )
+ file2pagecompiler? ( pagecompiler )
+ iodbc? ( odbc )
+ mongodb? ( data )
+ mysql? ( data )
+ odbc? ( data )
+ pagecompiler? ( json net util xml )
+ pocodoc? ( cppparser util xml )
+ sqlite? ( data )
+ test? ( data? ( sqlite ) json util xml )"
+
+RDEPEND=">=dev-libs/libpcre-8.13
+ xml? ( dev-libs/expat )
+ apache? ( dev-libs/apr
+ dev-libs/apr-util
+ www-servers/apache )
+ mysql? ( virtual/mysql )
+ odbc? ( iodbc? ( dev-db/libiodbc )
+ !iodbc? ( dev-db/unixODBC ) )
+ ssl? (
+ !libressl? ( <dev-libs/openssl-1.1.0:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ zip? ( sys-libs/zlib )"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P}-release"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
+
+src_prepare() {
+ if use test ; then
+ # ignore missing tests on experimental library
+ # and tests requiring running DB-servers, internet connections, etc.
+ sed -i \
+ -e '/testsuite/d' \
+ {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF}/CMakeLists.txt || die
+ # Poco expands ~ using passwd, which does not match $HOME in the build environment
+ sed -i \
+ -e '/CppUnit_addTest.*testExpand/d' \
+ Foundation/testsuite/src/PathTest.cpp || die
+ # ignore failing Crypto test since upstream does not seem to care,
+ # see https://github.com/pocoproject/poco/issues/1209
+ sed -i \
+ -e '/RSATest, testRSACipherLarge/d' \
+ Crypto/testsuite/src/RSATest.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPOCO_UNBUNDLED=ON
+ -DENABLE_APACHECONNECTOR="$(usex apache)"
+ -DENABLE_CPPPARSER="$(usex cppparser)"
+ -DENABLE_CRYPTO="$(usex ssl)"
+ -DENABLE_DATA="$(usex data)"
+ -DENABLE_DATA_MYSQL="$(usex mysql)"
+ -DENABLE_DATA_ODBC="$(usex odbc)"
+ -DENABLE_DATA_SQLITE="$(usex sqlite)"
+ -DENABLE_JSON="$(usex util)"
+ -DENABLE_MONGODB="$(usex mongodb)"
+ -DENABLE_NET="$(usex net)"
+ -DENABLE_NETSSL="$(usex ssl)"
+ -DENABLE_NETSSL_WIN=OFF
+ -DENABLE_PAGECOMPILER="$(usex pagecompiler)"
+ -DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
+ -DENABLE_PDF="$(usex pdf)"
+ -DENABLE_POCODOC="$(usex pocodoc)"
+ -DENABLE_SEVENZIP="$(usex 7z)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_UTIL="$(usex util)"
+ -DENABLE_XML="$(usex xml)"
+ -DENABLE_ZIP="$(usex zip)"
+ )
+
+ if ! use iodbc ; then
+ sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use examples ; then
+ for sd in */samples ; do
+ insinto /usr/share/doc/${PF}/examples/${sd%/samples}
+ doins -r ${sd}
+ done
+ find "${D}/usr/share/doc/${PF}/examples" \
+ -iname "*.sln" -or -iname "*.vcproj" -or \
+ -iname "*.vmsbuild" -or -iname "*.properties" \
+ | xargs rm
+ fi
+}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 031b8c0574bb..e653a2be7a75 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,5 +1,5 @@
AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
AUX protobuf-c-1.3.0-restore-protobuf-2-compatibility.patch 1182 BLAKE2B b05104b82aed8dbe5620cea73d366788355dd7041489ef3994dcdcb9fdc8b1d1265f6a8f8a10b310675fece850f11570210d63b6ce047acbd6968f5a68b6a247 SHA512 82761f41d60ad7ab69f3ca9479593bd25d4d2225b9e6f8b2b4d9f577f0ca36572432b0dc6f94ba8729da87d4b5474b977037fbf5b4dd27c3fda186e7307d8eba
DIST protobuf-c-1.3.0.tar.gz 488443 BLAKE2B 8eca559ad06aaa5cb09984b3d2e7c5767cd341c2e439b94c2d219226c612992808da091d01f5e0ad5f14e47292d4a621037953b58a5bea827e7c22837234ffe6 SHA512 ba49bf45a9ae93d41f200f4f18c4f9469c63fcc2a2392b3b45f083c378a6876891890448ceba216083ad351aa35f4669cd920973f53e5780de9ec4c8f61279bb
-EBUILD protobuf-c-1.3.0-r1.ebuild 990 BLAKE2B 6bd6e49b29e3fb4a76b9cc03ffe440270ed8752ebb14254a70318d92fb2e59dd9bc11737fb4f703cad8de7161fdd1296e3adf39ea07e899d66e262ec67ce8ccd SHA512 bcb97716ba6fbad625f921f954d0fe2bf05db921928d2b6d1d0bf1eba567e9c6ea1595d80400bbb8c3f5bd2b8660ac847e00433e4d5e3214d4c4aad057a12734
+EBUILD protobuf-c-1.3.0-r1.ebuild 995 BLAKE2B e1419f8ab9d675337c6c5364f7ecbf0703344b8d1426345309422d17b3c248c379fdc29e85d0c4209c2831e3093dd4c716e11765ada853441a4b043b5d600d07 SHA512 f7f3f8ead86eec25574ae6ef5400b8a82dd95c5226a1cf356e689df231da111da6a80678455f12e90abb6876fe95bba981ac5dfa0db5df99641c7823dab13806
MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
index 6ae85be95c2a..1d5c6ad3dce1 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
LICENSE="BSD-2"
# Subslot == SONAME version
SLOT="0/1.0.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="static-libs test"
RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 92e52fc6fcf2..4e25d8ff89e2 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -6,5 +6,5 @@ DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba630
EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
-EBUILD re2-0.2018.04.01.ebuild 1305 BLAKE2B 27e7d0f8b457025bff2cf52b913c27510b1297e82656b8dd9ab479d723dfbf162d9c79b91dcfa6db9df71328a5891305910bdf345d6f679e0d28fe02041160eb SHA512 d72ddc4c55c49f9f338d83dcf9fc806072e672bd819e7662bae5580f063c982c802a4b210f68a1cf268ebba763d797d2a66ba01a47fcb59f6132d22329274333
+EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.04.01.ebuild b/dev-libs/re2/re2-0.2018.04.01.ebuild
index 4aca3dcc7871..a8253f099304 100644
--- a/dev-libs/re2/re2-0.2018.04.01.ebuild
+++ b/dev-libs/re2/re2-0.2018.04.01.ebuild
@@ -9,7 +9,7 @@ inherit multilib-minimal toolchain-funcs
RE2_VER=${PV#0.}
RE2_VER=${RE2_VER//./-}
-DESCRIPTION="An efficent, principled regular expression library"
+DESCRIPTION="An efficient, principled regular expression library"
HOMEPAGE="https://github.com/google/re2"
SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index fe182e4301b8..0db89a277723 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,7 +1,5 @@
-AUX spdlog-unbundle-fmt.patch 2765 BLAKE2B 0ef7974992efcd82442dd658ffd93c2605b4ae6eb6a63dee0892b5c9ec1fbec22f76821ba7c4715ec4f42f88f4bc626c0b5b92b656ff7f8e4f4b299dac4f85c6 SHA512 14e3dd4cf5c3604547d01c0e940c0ee4771667039601c769e941a4719bef7a23fcb6e14455abda0365e708b81d1fd36160c238dba3c01b4124866a59de4e3991
-DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559
-DIST spdlog-0.16.3.tar.gz 163636 BLAKE2B bebed0811976c5000481d9fa70107f79c3fb6180484afec611df9b3621349a91809e0f824583171a1c8bc89dae58a659c990fb4c6761da404f01a70868494f06 SHA512 6e08473825cf97dfb10b0e919b77996c1023bbfb583d851e961ec4a95094e4afffd1fc6f6e7e728ce8c2c69c9fb280c59f8d6494b50224bdf8cc68914ffd21e8
-EBUILD spdlog-0.16.2.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
-EBUILD spdlog-0.16.3.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
-EBUILD spdlog-9999.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
+AUX spdlog-0.17.0-unbundle-fmt.patch 790 BLAKE2B 68a51e9dde9d25f0ec8978f4037c10fb6c8aa6cdc24d6a9b374b51ae85a0ff78a5bb6803c4a6ee1c9b2a68134e7ece90832c79dd0c86ef615b4e469dcb97cb05 SHA512 884893c67e3753efc7565aaa30694dcd0709cd472cd2e08a47584aca6b8aed4385b7f1da860777ba7f93eaf96c068b270f520c5a7aaa21c0d279994edc2addd1
+DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
+EBUILD spdlog-0.17.0.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
+EBUILD spdlog-9999.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
new file mode 100644
index 000000000000..e3e0df833537
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-0.17.0-unbundle-fmt.patch
@@ -0,0 +1,35 @@
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+--- a/include/spdlog/fmt/fmt.h
++++ b/include/spdlog/fmt/fmt.h
+@@ -18,16 +18,11 @@
+ #ifndef FMT_USE_WINDOWS_H
+ #define FMT_USE_WINDOWS_H 0
+ #endif
+-#include "bundled/format.h"
+-#if defined(SPDLOG_FMT_PRINTF)
+-#include "bundled/printf.h"
+-#endif
+
+-#else // external fmtlib
++#endif // external fmtlib
+
+ #include <fmt/format.h>
+ #if defined(SPDLOG_FMT_PRINTF)
+ #include <fmt/printf.h>
+ #endif
+
+-#endif
+diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
+--- a/include/spdlog/fmt/ostr.h
++++ b/include/spdlog/fmt/ostr.h
+@@ -11,8 +11,6 @@
+ #ifndef FMT_HEADER_ONLY
+ #define FMT_HEADER_ONLY
+ #endif
+-#include "bundled/ostream.h"
+-#include "fmt.h"
+-#else
+-#include <fmt/ostream.h>
+ #endif
++
++#include <fmt/ostream.h>
diff --git a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
deleted file mode 100644
index 1b2449949bfe..000000000000
--- a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52d2953..d132d26 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,6 +80,7 @@ install(
- install(
- DIRECTORY "${HEADER_BASE}/${PROJECT_NAME}"
- DESTINATION "${include_install_dir}"
-+ PATTERN "bundled*" EXCLUDE
- )
-
- # install project version file
-diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
-index 92ca4e5..55f1fa8 100644
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -10,25 +10,7 @@
- // By default spdlog include its own copy.
- //
-
--#if !defined(SPDLOG_FMT_EXTERNAL)
--
--#ifndef FMT_HEADER_ONLY
--#define FMT_HEADER_ONLY
--#endif
--#ifndef FMT_USE_WINDOWS_H
--#define FMT_USE_WINDOWS_H 0
--#endif
--#include "bundled/format.h"
--#if defined(SPDLOG_FMT_PRINTF)
--#include "bundled/printf.h"
--#endif
--
--#else //external fmtlib
--
- #include <fmt/format.h>
- #if defined(SPDLOG_FMT_PRINTF)
- #include <fmt/printf.h>
- #endif
--
--#endif
--
-diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
-index 5cdd5cd..d70c6b3 100644
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -7,11 +7,6 @@
-
- // include external or bundled copy of fmtlib's ostream support
- //
--#if !defined(SPDLOG_FMT_EXTERNAL)
--#include "fmt.h"
--#include "bundled/ostream.h"
--#else
- #include <fmt/ostream.h>
--#endif
-
-
-diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
-index ad01a09..9a1bec4 100644
---- a/include/spdlog/tweakme.h
-+++ b/include/spdlog/tweakme.h
-@@ -98,14 +98,6 @@
- ///////////////////////////////////////////////////////////////////////////////
-
-
--///////////////////////////////////////////////////////////////////////////////
--// Uncomment to use your own copy of the fmt library instead of spdlog's copy.
--// In this case spdlog will try to include <fmt/format.h> so set your -I flag accordingly.
--//
--// #define SPDLOG_FMT_EXTERNAL
--///////////////////////////////////////////////////////////////////////////////
--
--
- ///////////////////////////////////////////////////////////////////////////////
- // Uncomment to use printf-style messages in your logs instead of the usual
- // format-style used by default.
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 22329b4..44dad86 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -13,7 +13,7 @@ target_include_directories(catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
- file(GLOB catch_tests LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp)
-
- add_executable(catch_tests ${catch_tests})
--target_link_libraries(catch_tests spdlog ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries(catch_tests spdlog fmt ${CMAKE_THREAD_LIBS_INIT})
- add_test(NAME catch_tests COMMAND catch_tests)
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
-
diff --git a/dev-libs/spdlog/spdlog-0.16.2.ebuild b/dev-libs/spdlog/spdlog-0.16.2.ebuild
deleted file mode 100644
index b22d880ad039..000000000000
--- a/dev-libs/spdlog/spdlog-0.16.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Very fast, header only, C++ logging library."
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gabime/spdlog"
-else
- SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
- dev-libs/libfmt
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLES=no
- -DSPDLOG_BUILD_TESTING=$(usex test)
- )
-
- cmake-utils_src_configure
-
-}
diff --git a/dev-libs/spdlog/spdlog-0.16.3.ebuild b/dev-libs/spdlog/spdlog-0.17.0.ebuild
index b22d880ad039..e42aaade7db6 100644
--- a/dev-libs/spdlog/spdlog-0.16.3.ebuild
+++ b/dev-libs/spdlog/spdlog-0.17.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils
-DESCRIPTION="Very fast, header only, C++ logging library."
+DESCRIPTION="Very fast, header only, C++ logging library"
HOMEPAGE="https://github.com/gabime/spdlog"
if [[ ${PV} == *9999 ]]; then
@@ -21,18 +21,19 @@ SLOT="0"
IUSE="test"
DEPEND="
- dev-libs/libfmt
+ <=dev-libs/libfmt-4.1.0
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
src_configure() {
+ rm -r include/spdlog/fmt/bundled || die
+
local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLES=no
- -DSPDLOG_BUILD_TESTING=$(usex test)
+ -DSPDLOG_BUILD_EXAMPLES=no
+ -DSPDLOG_BUILD_TESTING=$(usex test)
)
cmake-utils_src_configure
-
}
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index b22d880ad039..e42aaade7db6 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils
-DESCRIPTION="Very fast, header only, C++ logging library."
+DESCRIPTION="Very fast, header only, C++ logging library"
HOMEPAGE="https://github.com/gabime/spdlog"
if [[ ${PV} == *9999 ]]; then
@@ -21,18 +21,19 @@ SLOT="0"
IUSE="test"
DEPEND="
- dev-libs/libfmt
+ <=dev-libs/libfmt-4.1.0
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.17.0-unbundle-fmt.patch" )
src_configure() {
+ rm -r include/spdlog/fmt/bundled || die
+
local mycmakeargs=(
- -DSPDLOG_BUILD_EXAMPLES=no
- -DSPDLOG_BUILD_TESTING=$(usex test)
+ -DSPDLOG_BUILD_EXAMPLES=no
+ -DSPDLOG_BUILD_TESTING=$(usex test)
)
cmake-utils_src_configure
-
}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 9cf7e9e8d32f..e2bc73f06982 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,5 +1,5 @@
AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
AUX xerces-c-3.1.4-fix-build-system.patch 2080 BLAKE2B 02e67cf0c737c30405b967619aa8deee0c1f1c8b9635265226b111ca729b23bcc1bb1d094ba3342269051cb9a819b281b0985d2c1785bfa524f3844b29d65636 SHA512 38ec4237425e63aaf00e4b969ad0c478bb788b803272f7406f38ea250e5ed1ba4e78f061959fbe180956058d1d7f3b56d31451450872809999b2c6be29add4dc
DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
-EBUILD xerces-c-3.1.4-r1.ebuild 2798 BLAKE2B d260fccd840a6570abbff41cbb437c963bb2dde07306802060923ed8cda362fd9c74cc2c52e082beb2ab335f57d35a12172882e26ec479ad9ded8ee01dd1a45b SHA512 f0d2125e5c5f0e4f3a12a7cb1b8b80e7c2d2fe3968c7a741d02dc2fd3884c6ad7f8d34aa0c0bb98611da9756f6e1c4d96d012a6dd6d70aae76a06251875f5a8c
+EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
MISC metadata.xml 849 BLAKE2B 4d7f00d4864bd2b347723a029ff58cc7c9f84867ebcc45392a94b2d063cdbde84a4290e2302d9fbdabf98c7cf3a3edb04a18ce60d6c5bd9c474a492f5acc4b2f SHA512 e1aaa46f73a6cc929dc87530053ab0f15d632a1998d3ac13991ac94610d578deeeb8e4e786bbe42512c7231d99701c9bf59047cffba0bb48044e80f96f36663b
diff --git a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
index fb393626069d..7ccfabeb38f0 100644
--- a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools
+inherit autotools prefix
DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="http://xerces.apache.org/xerces-c/"
+HOMEPAGE="https://xerces.apache.org/xerces-c/"
SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
LICENSE="Apache-2.0"
@@ -111,6 +111,6 @@ src_install () {
# To make sure an appropriate NLS msg file is around when using
# the iconv msgloader ICU has the messages compiled in.
if use iconv && ! use icu; then
- doenvd "${FILESDIR}/50xerces-c"
+ doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
fi
}