From ccf84bcd604130256d1377cd58f0a634ae6ee20f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2017 04:06:07 +0000 Subject: gentoo resync : 28.12.2017 --- dev-libs/Manifest.gz | Bin 85499 -> 85498 bytes dev-libs/chmlib/Manifest | 6 +- dev-libs/chmlib/chmlib-0.40-r1.ebuild | 19 +- dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch | 4 +- dev-libs/chmlib/files/chmlib-0.40-headers.patch | 4 +- dev-libs/libbytesize/Manifest | 2 +- dev-libs/libbytesize/libbytesize-1.2-r1.ebuild | 2 +- dev-libs/libgee/Manifest | 4 +- dev-libs/libgee/libgee-0.18.1.ebuild | 29 -- dev-libs/libgee/libgee-0.20.0.ebuild | 2 +- dev-libs/libgudev/Manifest | 4 +- dev-libs/libgudev/libgudev-231.ebuild | 46 --- dev-libs/libgudev/libgudev-232.ebuild | 2 +- dev-libs/liblist/Manifest | 4 +- dev-libs/liblist/liblist-2.3.1-r1.ebuild | 53 --- dev-libs/liblist/liblist-2.4.ebuild | 2 +- dev-libs/libmelf/Manifest | 4 +- .../libmelf-0.4.0-r1-gcc-makefile-cleanup.patch | 86 ++--- dev-libs/libmelf/libmelf-0.4.0-r1.ebuild | 42 ++- dev-libs/libpwquality/Manifest | 2 +- dev-libs/libpwquality/libpwquality-1.4.0.ebuild | 2 +- dev-libs/libxml2/Manifest | 2 +- dev-libs/libxml2/libxml2-2.9.6.ebuild | 2 +- dev-libs/libxslt/Manifest | 2 +- dev-libs/libxslt/libxslt-1.1.30-r2.ebuild | 6 +- dev-libs/mpc/Manifest | 4 +- dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch | 25 ++ dev-libs/mpc/mpc-1.0.3-r1.ebuild | 40 +++ dev-libs/mpc/mpc-1.0.3.ebuild | 4 +- dev-libs/mpfr/Manifest | 2 +- dev-libs/mpfr/mpfr-4.0.0-r1.ebuild | 60 ++++ dev-libs/mpfr/mpfr-4.0.0.ebuild | 52 --- dev-libs/quazip/Manifest | 1 + dev-libs/quazip/quazip-0.7.3-r1.ebuild | 51 +++ dev-libs/sway/Manifest | 5 +- dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch | 370 +++++++++++++++++++++ dev-libs/sway/sway-0.15.0.ebuild | 2 + dev-libs/sway/sway-9999.ebuild | 2 + dev-libs/tre/Manifest | 2 +- dev-libs/tre/tre-0.8.0-r1.ebuild | 2 +- dev-libs/vala-common/Manifest | 4 +- dev-libs/vala-common/vala-common-0.34.8.ebuild | 76 ----- dev-libs/vala-common/vala-common-0.34.9.ebuild | 2 +- dev-libs/wayland-protocols/Manifest | 4 +- .../wayland-protocols-1.11.ebuild | 2 +- .../wayland-protocols/wayland-protocols-1.7.ebuild | 39 --- 46 files changed, 658 insertions(+), 422 deletions(-) delete mode 100644 dev-libs/libgee/libgee-0.18.1.ebuild delete mode 100644 dev-libs/libgudev/libgudev-231.ebuild delete mode 100644 dev-libs/liblist/liblist-2.3.1-r1.ebuild create mode 100644 dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch create mode 100644 dev-libs/mpc/mpc-1.0.3-r1.ebuild create mode 100644 dev-libs/mpfr/mpfr-4.0.0-r1.ebuild delete mode 100644 dev-libs/mpfr/mpfr-4.0.0.ebuild create mode 100644 dev-libs/quazip/quazip-0.7.3-r1.ebuild create mode 100644 dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch delete mode 100644 dev-libs/vala-common/vala-common-0.34.8.ebuild delete mode 100644 dev-libs/wayland-protocols/wayland-protocols-1.7.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index e424fdf25b51..1d02310bc064 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest index af4fb6cc1c9c..b917c338a81a 100644 --- a/dev-libs/chmlib/Manifest +++ b/dev-libs/chmlib/Manifest @@ -1,5 +1,5 @@ -AUX chmlib-0.39-stdtypes.patch 620 BLAKE2B 84c5f394df2f52568b30a259256bd14d42351540e00eae0868a8f8eaa3eb85a5c701d8a781f1d5e10fa3c7d2f6233313520812c00b4420b303e09562f1a258c8 SHA512 afd879f78d4d532be3f3253a645b54588b0faff7445bc856b461ceba4ad0fb8d4d1fd9d1497675894cfb40c2174e21a8a2842a35e66deb6ab8adab6cbb996319 -AUX chmlib-0.40-headers.patch 357 BLAKE2B b8bfbcc4ded1c68c6981be92d24e7bd70ce9dc081e9ee47192b646f0e4f8bcb2bafa40e61dc08e91b4d336b3cabf2d24c52b74613e3dc039ef5e2daefff97efa SHA512 940d6b766ada58cbdad31a4748de1f5bcad83170d2b233397dee80f4bd92e13c0f3fa2a027b5834c8547018f67e12726cbd6a8de7540ca9b3d12fda45db02d1d +AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194 +AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3 -EBUILD chmlib-0.40-r1.ebuild 614 BLAKE2B 66e1f99ce5898830c5e18b21411f5b465d36fb727b48fd62f4027541a8c931eb181a408b661ef5743c9998fb92644c9a466927beb2c6092e3ac2d170d0f2c9c1 SHA512 15ea961cc15635e2aa208a3930b9b170e5f107645ee45ff56ccebaf2673ab2e8fdda40dcc8f861aaaa76bbbb1eb1892167cc23cbf937eec9be2f687a5f2142ae +EBUILD chmlib-0.40-r1.ebuild 669 BLAKE2B 8804aa8b64200cfeb05054774cf51c9131a4a09cdf34a19efd90de35cde20cbee1b5609f7073a48285a4d30d3d379f6a742a89efebda938fb606f505c4ab5951 SHA512 5c372f8308f04e2d697778e6132d66156409e9eb1da8ad505cb97365d4c27dde453f35fde7a479fde1a204362eff6816e1f3f5aa60497cedf122113a9eee14bc MISC metadata.xml 241 BLAKE2B 5ca3ee4480fe623f9125f798230d47ff7674992dc1d259df78394a1af2144b1be364369132ff44fe515e3df3562c5bfdccd27ede02c7beb28ce165d58eba7fe1 SHA512 61925ba4f992d28d12c1c3168059072f1b826d4a54a061e3aeb8311143db068492b15136a730eb8f83249b2cce5a37ea72de187b510297bcab5092143fb6aa4a diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild index 88496bdb5c54..f1e56dc52863 100644 --- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild +++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 -inherit autotools-utils +inherit out-of-source DESCRIPTION="Library for MS CHM (compressed html) file format" HOMEPAGE="http://www.jedrea.com/chmlib/" @@ -14,13 +14,18 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86" IUSE="+examples static-libs" -DOCS=(AUTHORS NEWS README) PATCHES=( "${FILESDIR}"/${PN}-0.39-stdtypes.patch "${FILESDIR}"/${P}-headers.patch ) -src_configure() { - myeconfargs=($(use_enable examples)) - autotools-utils_src_configure +my_src_configure() { + econf \ + $(use_enable examples) \ + $(use_enable static-libs static) +} + +my_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch index 0f9232017689..c0b809b2d9db 100644 --- a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch +++ b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch @@ -1,5 +1,5 @@ ---- src/chm_lib.c -+++ src/chm_lib.c +--- a/src/chm_lib.c ++++ b/src/chm_lib.c @@ -149,6 +149,17 @@ typedef unsigned __int32 UInt32; typedef __int64 Int64; typedef unsigned __int64 UInt64; diff --git a/dev-libs/chmlib/files/chmlib-0.40-headers.patch b/dev-libs/chmlib/files/chmlib-0.40-headers.patch index d60af28639fd..5daa458be8a5 100644 --- a/dev-libs/chmlib/files/chmlib-0.40-headers.patch +++ b/dev-libs/chmlib/files/chmlib-0.40-headers.patch @@ -1,5 +1,5 @@ ---- src/chm_http.c -+++ src/chm_http.c +--- a/src/chm_http.c ++++ b/src/chm_http.c @@ -34,6 +34,7 @@ #include #include diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest index 2dc63a107eca..7a4cf24c8e57 100644 --- a/dev-libs/libbytesize/Manifest +++ b/dev-libs/libbytesize/Manifest @@ -1,3 +1,3 @@ DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2 -EBUILD libbytesize-1.2-r1.ebuild 1106 BLAKE2B d3fa4b63b936074626f5da79a1af7ea722be8f4fd6ae5850204ec1e8f7576252a80500ff1c406d4a57ae1178a5bf3159220538f2ff0db69267994746b45c305e SHA512 2eab0bcf07686989b3009953c1ff7142161a51b397468403e63765fd98d1059c34cbe32f33669b323dbdf7693ff7f39403786d625f0714e075fe5be44cc409dd +EBUILD libbytesize-1.2-r1.ebuild 1113 BLAKE2B bb1685edeca7e5cec14a4623ce34e38017783dea664af072ccd808edeab324f0216ef72ad9be6051bd78b11b4447e2ae91494fb6a71eff910f9f3cdf80c15d81 SHA512 51ac25d92aa0bb734c9d604109650f33a2a2de3a6fee49159d85e6f1527a235337e469c4ddbef2cbc84b504ed100745fa350aa4866913beb5ae3b0c81f6ccc5f MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild index 094677e48afd..138f004f19a0 100644 --- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild +++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/rhinstaller/libbytesize" SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="doc test" RDEPEND=" diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest index e7a03da602e1..0717f0a7c0af 100644 --- a/dev-libs/libgee/Manifest +++ b/dev-libs/libgee/Manifest @@ -1,7 +1,5 @@ -DIST libgee-0.18.1.tar.xz 677908 BLAKE2B 8384b37cbe9034444dca1edd2c591c9e0345cf6afa0602d5ded0fd22db3a90bfb003a049cc9ee3991ead72ffa645977f4267a0c13bc2b4445f65bd4945495969 SHA512 b6e8be0f629c6df04db49a4be6b242280b87c6239af6294b39d8b0898331644cbed91f026302fd41aabf465510dc68c913d65085922bb5fee9b6af8947d207a5 DIST libgee-0.20.0.tar.xz 678972 BLAKE2B 0c656ad7f934933422102d0e4da1591ca4637ff33e91b9f3c031e8a08d6300c3f4ffdf4a0cac814d7b8cd41f7e0f02dc188a1c7d1b418ffc4381f7a49171f85f SHA512 c01611ed34862888fa038111010ec9899465f43423c9c90a18050dc0b0c2a53cf0fe3c7affcbdee91e225622ccbfa08bfd0c08f0eb7935611b3d461b5b919e66 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a -EBUILD libgee-0.18.1.ebuild 680 BLAKE2B 020ff7b524df551e92a5c263f6e07297dcff9e00ae2e262c3a68c0c05d9d7a29d44e8fc2533b9967a51de21867a723e11fddcf69c5741a2590837df81be0eab3 SHA512 2a7637bc3e7ab859851389a220e3fe1f632772999924ab7e5bab9ae5e1793afc5400f9696c5301c134dc17f70f6702f5ffa1d5f9cfab293d1d152acd687e66f2 -EBUILD libgee-0.20.0.ebuild 681 BLAKE2B 9e4cdaefc33ab0c435b7f4c7e36092e1c1ab2a15030d038ad2e531399475049e2641a4edac045018550f6305421a933c1595c15255f3e09b819d8df1d4d6e54d SHA512 ba3f2ce1ad68848c73d7decf3493a9b2fb8eb6bcd9680b180550c0f136bece4fa3f92adf6aa070cba2f92f4bbae824ed489a0271d8e0f8da23b7a6d7a781364e +EBUILD libgee-0.20.0.ebuild 680 BLAKE2B 020ff7b524df551e92a5c263f6e07297dcff9e00ae2e262c3a68c0c05d9d7a29d44e8fc2533b9967a51de21867a723e11fddcf69c5741a2590837df81be0eab3 SHA512 2a7637bc3e7ab859851389a220e3fe1f632772999924ab7e5bab9ae5e1793afc5400f9696c5301c134dc17f70f6702f5ffa1d5f9cfab293d1d152acd687e66f2 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285 diff --git a/dev-libs/libgee/libgee-0.18.1.ebuild b/dev-libs/libgee/libgee-0.18.1.ebuild deleted file mode 100644 index 679b7a9e5f4e..000000000000 --- a/dev-libs/libgee/libgee-0.18.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2 - -DESCRIPTION="GObject-based interfaces and classes for commonly used data structures" -HOMEPAGE="https://wiki.gnome.org/Projects/Libgee" - -LICENSE="LGPL-2.1+" -SLOT="0.8/2" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux" -IUSE="+introspection" - -# FIXME: add doc support, requires valadoc -RDEPEND=" - >=dev-libs/glib-2.36:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure \ - $(use_enable introspection) - VALAC="$(type -P false)" -} diff --git a/dev-libs/libgee/libgee-0.20.0.ebuild b/dev-libs/libgee/libgee-0.20.0.ebuild index 5eb9bc52eb7d..679b7a9e5f4e 100644 --- a/dev-libs/libgee/libgee-0.20.0.ebuild +++ b/dev-libs/libgee/libgee-0.20.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee" LICENSE="LGPL-2.1+" SLOT="0.8/2" -KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux" IUSE="+introspection" # FIXME: add doc support, requires valadoc diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest index 33b817efa7e8..5bdcf875d3a0 100644 --- a/dev-libs/libgudev/Manifest +++ b/dev-libs/libgudev/Manifest @@ -1,5 +1,3 @@ -DIST libgudev-231.tar.xz 270088 BLAKE2B fd258c9d187b72262916d70af29924727dd739bfd66f315a221021e6c2cfa0c6e451ed3d22097af4c9a91581985126cf4bc96f7c9eee40e84a4d54fc542bcc0f SHA512 3989025168c9e7e5e3f7813ee903a63f697ad390d3060121d0f45ee31031014c23a26f4287f3e6ad97d582131d0d568be31baa0b68f6f64ae337e926b3fe2625 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc -EBUILD libgudev-231.ebuild 1091 BLAKE2B 59588a6254ed309b11870f2914b7e36b0943862114afb1d28df48639a8a2ce94365e63bb51bc6d19485134d5fdd15b29837e1bf97e383eec312bf7d7da46bb19 SHA512 ee901c98f33607ed81cd0343fddac24e260eccf941d05d478b1f7ae99105d7932f2fdd008feb1cca935c157a675abaa5ce2c2f1a7312f02797ae34d254885e74 -EBUILD libgudev-232.ebuild 1091 BLAKE2B b7f335a9839acf21c7eb2a85b54cb1c8998dbbd0c04e7bc68ed6dc50bdfeb2fee4e6c477d8a7126d62aa4990b6c23ac4a0b411b6d27fb29fd6c88115d2a0795a SHA512 936d9ee0234d5418be2679009c6d90899cbbb0ebdc47741fe7a66778e1428b3752b4be904d549887e49fcf1a34a371505e0be686b9a8ea58208563a1154ebc27 +EBUILD libgudev-232.ebuild 1090 BLAKE2B 17414da92d40308472fc0339d908ce4812cc09dbdb6ac53e908e6d44a02e91a27c9226e179a5d859180cad2e93ae49e0875bb66fcac86e62e482f7785ead65cc SHA512 4d7f88448d7ef6ac5333e71dd940fc7b0e1f6d116fd42964f1a133814bc32b0299f1a7147847d88a1d943e2fcb64a7e55444f4ee1862f0be14b8eebbd020c7c7 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f diff --git a/dev-libs/libgudev/libgudev-231.ebuild b/dev-libs/libgudev/libgudev-231.ebuild deleted file mode 100644 index 530c506d3e19..000000000000 --- a/dev-libs/libgudev/libgudev-231.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2 multilib-minimal - -DESCRIPTION="GObject bindings for libudev" -HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" - -LICENSE="LGPL-2.1" -SLOT="0/0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="introspection static-libs" - -COMMON_DEPEND=" - >=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP},static-libs?] - >=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs?] - introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) -" -RDEPEND="${COMMON_DEPEND} - !sys-fs/eudev[gudev(-)] - !sys-fs/udev[gudev(-)] - !sys-apps/systemd[gudev(-)] -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gtk-doc-am-1.18 - virtual/pkgconfig[${MULTILIB_USEDEP}] -" - -# Needs multilib dev-util/umockdev -RESTRICT="test" - -multilib_src_configure() { - local myconf=( - $(multilib_native_use_enable introspection) - $(use_enable static-libs static) - --disable-umockdev - ) - local ECONF_SOURCE="${S}" - gnome2_src_configure "${myconf[@]}" -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild index 1a559846b77f..c79e4b9556c7 100644 --- a/dev-libs/libgudev/libgudev-232.ebuild +++ b/dev-libs/libgudev/libgudev-232.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" LICENSE="LGPL-2.1" SLOT="0/0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86" IUSE="introspection static-libs" COMMON_DEPEND=" diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest index 3739165b016a..5a52eed00da3 100644 --- a/dev-libs/liblist/Manifest +++ b/dev-libs/liblist/Manifest @@ -1,5 +1,3 @@ -DIST liblist-2.3.1.tar.bz2 257253 BLAKE2B 3ae30654d39db79e26aacb3f101bf217a7d97dcb8f29f261b0d8840f24a069759fc7d4a1b53d345828b96bdb3c30656a099bef3d1ce29cf6f5608950971414cc SHA512 4bb9cc678bafc3be68f94d028aa9a9a9c9dd792043adc6e7916955afa07b6e94653bd235ee81880307e433e07130823daf1fd36ba0663da7d09e5f4eb84efc6c DIST liblist-2.4.tar.bz2 275234 BLAKE2B 2f18d8b85476bd9369ef597553a546450fd33b3f3b4486ca371e6efd810a51b23ca3880300e0ecf826e9a9e8591f2b90a6a0006d224b34552f77416a83f7175e SHA512 814a02e4e47de8d234e592b87156533c30563c64c3a7515712fb9b75119bcee21796232b2a5abf7e4ab892932fa256890ad175aecb75aad8fb4614c6f4fbe3dd -EBUILD liblist-2.3.1-r1.ebuild 1379 BLAKE2B 6b7c341d478051f4b506c09ef926e833c1a7b1eb0e8946eb2189e8b5f2edbb0f6755c2340676b4dd9486c8c399256ffd2fb952d8ce161d5b7d5b1b43d35cb2a9 SHA512 605425c69136ac9e7445a5056f5aea1acf1afc678301fbc69c70d7c3729252300a679ab0dbacd6cba6e88a6daefb5c0804520f52f37d80adacfe0d24f4b2daa9 -EBUILD liblist-2.4.ebuild 1314 BLAKE2B f3bab86cf0f2a853b248c8de5dd7ef125f05c481d8a90ff9d9412a1eac2cb1cfb2a877f600af84d62be6ab1740ded36043262baa0b6af5d6111f38ef455ab4fa SHA512 30bb549fbcdd4a8846669bbb779faf765b2e1f2726d605dbbe7866dd207c2accc5d51663865f61a46c39b41882644eaed5ba3de6849a9d88a8721634568cfefb +EBUILD liblist-2.4.ebuild 1313 BLAKE2B be3464f685e9699c9ec98c67bf6874597700a73193eaad4f31c893c554a92d04b13943d6f911500899f72091d3a1f5508a60520d29727ceb108fe4bfb30c35a0 SHA512 9a6dc3507516c4f138544a702328ac2b7360cfdf86295751f913299670b00e8f13e1cd15a8baf0e235ce45050415cc8a2c64d79eb7b33ff42b6be06c03c42bbc MISC metadata.xml 329 BLAKE2B cfab16b6b8ca6091ab9be14dd10c450705a04efa707d7ce91fe695502929bdf91140af0b9a898c28d9b4b3236bf5bcc35222e367234575bd61ac160c6c29d0a2 SHA512 4e63a82dc13d3606b920b15ebc720ff19ea775dd6d37f494166ab89c23013cb5610b747063e768f7959c83bac48ab11f69233304f1e3314845e94fbe053fae71 diff --git a/dev-libs/liblist/liblist-2.3.1-r1.ebuild b/dev-libs/liblist/liblist-2.3.1-r1.ebuild deleted file mode 100644 index 325032cde687..000000000000 --- a/dev-libs/liblist/liblist-2.3.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 - -inherit multilib - -DESCRIPTION="Generic linked-list manipulation routines, plus queues and stacks" -HOMEPAGE="http://ohnopub.net/liblist" -SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" -IUSE="doc examples static-libs" - -DEPEND="doc? ( media-gfx/transfig - dev-texlive/texlive-metapost - virtual/latex-base )" - -src_configure() { - econf --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable doc docs) \ - $(use_enable examples) \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc README || die - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/{*.c,Makefile,README} || die - insinto /usr/share/doc/${PF}/examples/cache - doins examples/cache/{*.c,README} || die - fi - - if ! use static-libs; then - rm -v "${ED}"/usr/$(get_libdir)/liblist.la || die - if use examples; then - rm -v "${ED}"/usr/$(get_libdir)/libcache.la || die - fi - fi -} - -pkg_postinst() { - elog "Note the man pages for this package have been renamed to avoid" - elog "name collisions with some system functions, however, the libs" - elog "and header files have not been changed." - elog "The new names are llist, lcache, lqueue, and lstack." -} diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4.ebuild index 7999fd600cfa..0133d56da438 100644 --- a/dev-libs/liblist/liblist-2.4.ebuild +++ b/dev-libs/liblist/liblist-2.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" IUSE="doc examples static-libs" RDEPEND="doc? ( media-gfx/transfig diff --git a/dev-libs/libmelf/Manifest b/dev-libs/libmelf/Manifest index dcac07954f61..8a18e046e0b8 100644 --- a/dev-libs/libmelf/Manifest +++ b/dev-libs/libmelf/Manifest @@ -1,5 +1,5 @@ -AUX libmelf-0.4.0-r1-gcc-makefile-cleanup.patch 3132 BLAKE2B 7c38137d36ff4d0d26b7b4ac376a38229a75759e99ea6d41ada8c82245d786a42a4fe7dee44873eb9a379f0dc36f8b3c5669eaa6f301f9aad2d1f9f1aa858a79 SHA512 c68e718e9e49c636be58028a03d53d81998e5cb9b8940c2c431f93acc77019be0a58486c0f7663241bd5d281f7638897a5baeca953e504c885c8dd6aea0c2fe4 +AUX libmelf-0.4.0-r1-gcc-makefile-cleanup.patch 1819 BLAKE2B bc8c9e09d56be3daca289cdfe4d2c740261f283453307f154f1c973a8589523beda7e33c95f0c6401b99d2574e23d10e1d13066bd6a57952554d463c006ee3e7 SHA512 7fe79182f35906104bd9f7bad3590e0fdfa4fbe93f0d0548063169b7385a962b36eda39e435b8fde31a7ed0bdae6300989c869dc2bf32d817597190582c72584 AUX libmelf-0.4.1-unfinal-release.patch 5246 BLAKE2B 67cf2513222d11edcb03afd7210f62a1a8b7510c1f986f0499785a2bb55e929c2a85d21624d9878bd4240ea7b5ddbf7e277a42e4dacacb4d0ac9cd5d704d5faf SHA512 4d828c626e7b9f9399bd0bfe6428970995d2b386cb60ebf80ba68be67dae23a1671ed4cf766675e17d72d5d4e4b9265ae99dd40c022c20cf233b237f88ab94ec DIST libmelf-0.4.0.tar.gz 163173 BLAKE2B 64627de126d941bc8fa05a0e6a44158c35483e85de0294837e0537e0923f49ff8c7d406f22094480a3cf6505227b80e3081597a161219aedf48064f43091b7d6 SHA512 c702c72026f494b0d3ee665d6734cbd302c002c904721c0b58f71850f20c3249e5cabca4fcc5ecfe0a4e114df2e31c6faed84634ad593ff61de2e5acffd70227 -EBUILD libmelf-0.4.0-r1.ebuild 938 BLAKE2B ab6fb9efc54238de466f35f027fb1e20e39e3e15a9d797b946b8a3be69e8cfa73fef28b00e305b682b48fba92ada247e2b726582059fee41c9926e9825e52b7b SHA512 200583eeca05cabb3b1b58390dffaeb8389e8938f908848ca17e84dbc8fbd56460e6ce7d32639cc50bc833dd21001b40634a3459999a031070967cfc0f7421fc +EBUILD libmelf-0.4.0-r1.ebuild 1136 BLAKE2B 8841bbbed818c61813f7c7eb916c2b7f8272a3f8890c31b313b9d94f5509a0c368779ae5a4f2f2331445fcbccee8539ef19b871c5befd9e006474c32a372e08e SHA512 26eb64c6316d61297932c01b42954f315cedcebfd3ca726e951810c6e39b0caba49cc256b3e052a8071a8559a99a45b753e782d1f632318c7a2515f2d000dd64 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850 diff --git a/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch b/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch index 384818f57630..10bda2a476a8 100644 --- a/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch +++ b/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch @@ -1,11 +1,9 @@ -diff -Nuar --exclude '*~' libmelf-0.4.0.orig/example/Makefile.in libmelf-0.4.0/example/Makefile.in ---- libmelf-0.4.0.orig/example/Makefile.in 2003-03-24 00:48:22.000000000 -0800 -+++ libmelf-0.4.0/example/Makefile.in 2010-05-31 19:56:43.546947560 -0700 -@@ -1,7 +1,13 @@ - cc=@CC@ +--- a/example/Makefile.in ++++ b/example/Makefile.in +@@ -1,7 +1,11 @@ +-cc=@CC@ DEFINES=@DEFINES@ -+OPTFLAGS=-Wall -O3 -+CFLAGS=${DEFINES} ${OPTFLAGS} -I.. ++CFLAGS=$(DEFINES) $(OPTFLAGS) -I.. +BINS = sign test new -all: @@ -13,25 +11,27 @@ diff -Nuar --exclude '*~' libmelf-0.4.0.orig/example/Makefile.in libmelf-0.4.0/e - ${CC} ${DEFINES} -I.. -Wall -O3 test.c -o test ../libmelf.a - ${CC} ${DEFINES} -I.. -Wall -O3 new.c -o new ../libmelf.a +%: %.c -+ ${CC} $(CFLAGS) $^ -o $@ -L.. -lmelf ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -L.. -lmelf + +all: $(BINS) + +clean: + -rm -f $(BINS) -diff -Nuar --exclude '*~' libmelf-0.4.0.orig/Makefile.in libmelf-0.4.0/Makefile.in ---- libmelf-0.4.0.orig/Makefile.in 2003-11-07 22:09:10.000000000 -0800 -+++ libmelf-0.4.0/Makefile.in 2010-05-31 19:58:12.172822406 -0700 -@@ -6,35 +6,43 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,25 +1,23 @@ +-CC=gcc +- + STATICBIN=libmelf.a + DYNAMICBIN=libmelf.so + DEBUG= DEFINES=@DEFINES@ -DMELF_COMP INCLUDES=-I. PREFIX=@PREFIX@ -CFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} -Wall -O3 -fPIC -LFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} -Wall -O3 -o -+OPTFLAGS=-Wall -O3 +CFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} ${OPTFLAGS} +LFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} ${OPTFLAGS} -o -+LIBDIR=lib LIBS= OBJS=melf.o melf_dynamic.o melf_elf.o melf_list.o melf_note.o melf_program.o melf_reloc.o \ melf_res.o melf_section.o melf_string.o melf_symbol.o melf_symbolTable.o @@ -42,64 +42,32 @@ diff -Nuar --exclude '*~' libmelf-0.4.0.orig/Makefile.in libmelf-0.4.0/Makefile. - cd example && make - cd tools && make +all: ${STATICBIN} ${DYNAMICBIN} -+ cd example && $(MAKE) -+ cd tools && $(MAKE) - - *.c.${O}: - ${CC} ${CFLAGS} $*.c ++ $(MAKE) -C example ++ $(MAKE) -C tools +-*.c.${O}: +- ${CC} ${CFLAGS} $*.c +${STATICBIN}: ${OBJS} -+ ar rc ${STATICBIN} ${OBJS} && ranlib ${STATICBIN} ++ $(AR) rc ${STATICBIN} ${OBJS} && $(RANLIB) ${STATICBIN} +${DYNAMICBIN}: ${OBJS} + @SHAREDEXEC@ -+ + clean: rm -f *.o ${STATICBIN} ${DYNAMICBIN} example/test example/new example/sign tools/elfres config.* -- cd tools && make clean -+ cd tools && $(MAKE) clean - --distclean: -- make clean -+distclean: clean - rm -f Makefile example/Makefile stdelf.h -- cd tools && make distclean -+ cd tools && $(MAKE) distclean - - install: ${OBJS} ${STATICBIN} -- cp libmelf.a ${PREFIX}/lib -- cp libmelf.so ${PREFIX}/lib -+ cp ${STATICBIN} ${PREFIX}/$(LIBDIR) -+ cp ${DYNAMICBIN} ${PREFIX}/$(LIBDIR) - cp melf.h ${PREFIX}/include - cp stdelf.h ${PREFIX}/include - - uninstall: -- rm -f ${PREFIX}/lib/libmelf.a ${PREFIX}/lib/libmelf.so ${PREFIX}/include/melf.h ${PREFIX}/include/stdelf.h -+ -rm -f \ -+ ${PREFIX}/$(LIBDIR)/${STATICBIN} \ -+ ${PREFIX}/$(LIBDIR)/${DYNAMICBIN} \ -+ ${PREFIX}/include/melf.h \ -+ ${PREFIX}/include/stdelf.h -diff -Nuar --exclude '*~' libmelf-0.4.0.orig/tools/Makefile.in libmelf-0.4.0/tools/Makefile.in ---- libmelf-0.4.0.orig/tools/Makefile.in 2003-09-17 01:03:49.000000000 -0700 -+++ libmelf-0.4.0/tools/Makefile.in 2010-05-31 19:57:55.126198024 -0700 -@@ -1,11 +1,15 @@ - cc=@CC@ +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -1,8 +1,11 @@ +-cc=@CC@ DEFINES=@DEFINES@ -+CFLAGS=${DEFINES} ${OPTFLAGS} -I.. ++CFLAGS=$(DEFINES) $(OPTFLAGS) -I.. +BINS=elfres -all: - ${CC} ${DEFINES} -I.. -Wall -O3 elfres.c -o elfres ../libmelf.a +%: %.c -+ ${CC} $(CFLAGS) $^ -o $@ -L.. -lmelf ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -L.. -lmelf + +all: $(BINS) clean: -- rm -f elfres -+ -rm -f $(BINS) - - distclean: -- rm -f elfres Makefile -+ -rm -f $(BINS) Makefile + rm -f elfres diff --git a/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild b/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild index ecc5ecc76d3a..be54175c6c62 100644 --- a/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild +++ b/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit eutils flag-o-matic toolchain-funcs +EAPI=6 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="libmelf is a library interface for manipulating ELF object files" HOMEPAGE="http://www.hick.org/code/skape/libmelf/" @@ -11,30 +12,45 @@ SRC_URI="http://www.hick.org/code/skape/${PN}/${P}.tar.gz" LICENSE="Artistic" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="static-libs" DEPEND="" RDEPEND="${DEPEND}" -src_prepare() { +PATCHES=( # This patch was gained from the elfsign-0.2.2 release - epatch "${FILESDIR}"/${PN}-0.4.1-unfinal-release.patch + "${FILESDIR}"/${PN}-0.4.1-unfinal-release.patch # Cleanup stuff - epatch "${FILESDIR}"/${PN}-0.4.0-r1-gcc-makefile-cleanup.patch + "${FILESDIR}"/${PN}-0.4.0-r1-gcc-makefile-cleanup.patch +) + +src_prepare() { + default + + # * QA Notice: The following shared libraries lack a SONAME + # * /usr/lib64/libmelf.so + sed 's/\(-shared -fPIC\)/\1 -Wl,-soname,libmelf.so/' -i configure || die } -src_compile() { +src_configure() { + tc-export CC AR RANLIB append-flags -fPIC - emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed" + default +} + +src_compile() { + emake OPTFLAGS="${CFLAGS}" } src_install() { - into /usr dobin tools/elfres - dolib.a libmelf.a + dolib.so libmelf.so + use static-libs && dolib.a libmelf.a + insinto /usr/include doins melf.h stdelf.h - dodoc ChangeLog README - dohtml -r docs/html + + HTML_DOCS=( docs/html/. ) + einstalldocs } diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest index 8b2024a90b45..096f030ae8e8 100644 --- a/dev-libs/libpwquality/Manifest +++ b/dev-libs/libpwquality/Manifest @@ -1,5 +1,5 @@ DIST libpwquality-1.3.0.tar.bz2 423910 BLAKE2B 83b1d54258f3e5385e054671f32ad6a8287ed8ff7ef1162f2ff982750d8d3a10926acca2aa6dc2a46f546254430be1cc0d29e33f6ebdd18ce17b9386615c1a6e SHA512 c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea DIST libpwquality-1.4.0.tar.bz2 450384 BLAKE2B 52a6f1c1bf90f6f01fb07667937b9792935729be77042bfc97dee8faa923212fa02410ad4e5c56f778bc9a8d248655f0b738889f5a0e73dc201d62d0c79093d0 SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 EBUILD libpwquality-1.3.0.ebuild 1971 BLAKE2B 2b503383430357539afaa869cba8d5e7cb6c7d972bbb785803be44135182f6d0774de831217cd46926f3931ee5696ab0ae147272708ccbc76f427d8715f3683b SHA512 c06e54adcfa58128cb98014a3df614955ed00c2939c21a11d56d3dc8e7644e64c10c88876d58397a4c3918690f372f1583120bc75063de733189bdebfba2c137 -EBUILD libpwquality-1.4.0.ebuild 1991 BLAKE2B a0d317a358caf3bead990e34ec50f67b1f2036ea86448ec5c0d02bd5e43004f88008f7575d153d8f976e3dbd8d43b6b8d104e04369fe4378aa93163e61130a5c SHA512 42764ab189191a690f98507b636cd93a62521e61e103e8e8ac8766b2c7dc0ea29c8f72ad0e1aba606cd291dbdd9ae1f14204538073dfa8ed454258e575ca017e +EBUILD libpwquality-1.4.0.ebuild 1990 BLAKE2B 9b7a192a751781bcc3afc86165ea62aaf945c5e5552d9412637adb95b49bfc759412e818d3cc63d440d0adfcf8438b84a35b48c5b36c4a74f5759bbf6c4d6bec SHA512 d1eebffcb17678022ab05e79e44da7ac812d771c490efbc1fc6f0073b9153e9bba24c89c64753c23be9f70ac5be06c80b472393282a50d97394ec1c4b61bb9f8 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild index aec388854fb9..e2158b900677 100644 --- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild +++ b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="pam python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 69050b6bea62..74a6f54fe092 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -24,6 +24,6 @@ DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862f DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe EBUILD libxml2-2.9.4-r1.ebuild 6888 BLAKE2B cad917e8d19e16fcb5736b39be4760f976b9aa20b320f6bd486c455192eb3c3e6bbf94c8742691a34ebc399f9b6ae42804871319ed99be075f126fa97f9de5d0 SHA512 3bfaae862504766bbe9c673046e8eda870d309173f9ec43cc7ad1649c34f9115b7be71e4b6cbb6fd38d01d57cbb10137ea23482c4e517c9f056213a16c974b29 EBUILD libxml2-2.9.4-r3.ebuild 7671 BLAKE2B 6e8054440bf2dd8387f689513e834c42bf643e60c3f270f5aa9d128fb7e3d30ee04f90e20b6f2ff37b525c23ec6b62d5531dcc6ffadae59bf73a81e0721ebc49 SHA512 ce3cd2d3db2a4f489f9024cbe8c7d343fd94b1b8736debbe98084ebe76d828cb1e236169b9ab114e7278c886d58814835f4639b865bf198af528cc681236fa54 -EBUILD libxml2-2.9.6.ebuild 6379 BLAKE2B 265d71b1a69960f16833291e916dd1eb119a004cefe3e042f73fd6197d79cbb07b442b58a65afa92f7978562ceddf58f1fb5f0eee37b04c281f40fc10360b22f SHA512 346da6da7bf41631ef7d3d52a35797e9cf30d3aea453c0d73bf536ab393439a0487a371cc1b816daa46b1eeaaa3f9de4fb52ccaf811dcf2f24d66a6a3dd53452 +EBUILD libxml2-2.9.6.ebuild 6378 BLAKE2B 189a86bd8a949429e0908b46c8f9f2262a8ac33986b4134c61353edf3f5aad5f536ae34d1482db68917564ac944eec1184df134af3254df9ad20d1ab848ce348 SHA512 52dc4ecb3fe1c468273b7170f310275a27edbeca1a32b5eb9d37f181be08d2643fff0dc75682a8f6c71d6ab88a7650c7170b6c268dfb19818f8c8a41f4f4a732 EBUILD libxml2-2.9.7.ebuild 6378 BLAKE2B 87b3a4353bb5ec93642122e5b042620ef980ca4b8060af2d4c1d8ab9ed55559c11aa495c038e2fc3f77d1a17c0c4f853f7991180d95c64aa74682006883c1cf9 SHA512 7c072e202140707b610a6ff9cf9ae988d546ef0ed186d7a8f7e63b4141ed92b7390301cb232d993e620ede2e4e86d272ad15af3cfe21e1da44876c3c1ca64531 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild index f4d974ef3b36..e051d48f6e72 100644 --- a/dev-libs/libxml2/libxml2-2.9.6.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.6.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~x86-winnt" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~x86-winnt" IUSE="debug examples icu ipv6 lzma python readline static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 635e6e7271d3..7070488f86c5 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -8,5 +8,5 @@ AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485 DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 EBUILD libxslt-1.1.29-r1.ebuild 3252 BLAKE2B 46ca2f9ebfda27d0795ad4f041028eac85fc456733d1e91e8bb3b57999fbad4d7e6e12b12584eaeb0db9d48c5d0bf9dc23f038d3fc8ca8e4823aa7f2beeb1b91 SHA512 719a10deac3cbb09b7b2ac407f80cabbdb44457d8308d9760a253322244a96f4f8af048037875df7da87357ae3cf00576c8dac292eef47f5c009f7bd13463c68 -EBUILD libxslt-1.1.30-r2.ebuild 3665 BLAKE2B 982b56e721411a3e5e00cfcc799deaacd76c963b4c9edde53fd586f0531acba81b03067a8f3b28adfce72ace0d854acaf89e44315dea21f8518fed0799ec20ea SHA512 35f6c61706022d4e272f502f6a8510bf1ae2beff230713cf201a635342c2fa3873524d52a4dcc3fe0c8419983a5e4b3193e48a55964025c9ca8fa71479527a5e +EBUILD libxslt-1.1.30-r2.ebuild 3713 BLAKE2B 6f1d15a8364518229b8aef49defa08d94e5d2ffd66a156e9c855377380365c53499ad7e822b39b83ae814d136cb2ce06fcc699aff6c1c48da43eaa33eb1cc499 SHA512 db83c94a6f60b9ca077c1beef507b83395c4b8f2f18fd6729480f12beb255f17357c0ec86dc201cfb0030bea8fbdde7438e6b7a2e4c936696d4d5cc87f021b3a MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild index 13a3fe82942c..f303699289ba 100644 --- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="crypt debug examples python static-libs" +IUSE="crypt debug examples python static-libs elibc_Darwin" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" @@ -52,8 +52,8 @@ src_prepare() { # https://bugs.gentoo.org/630784 eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch - # Fix build and headers with glibc-2.26, bug 632214 - eapply "${FILESDIR}"/${PN}-1.1.30-glibc226.patch + # Fix build and headers with glibc-2.26, bug 632214, breaks Darwin + use elibc_Darwin || eapply "${FILESDIR}"/${PN}-1.1.30-glibc226.patch mv configure.{in,ac} || die diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest index 2ff5c7129456..dc14c1f8162c 100644 --- a/dev-libs/mpc/Manifest +++ b/dev-libs/mpc/Manifest @@ -1,9 +1,11 @@ AUX mpc-1.0.3-mpfr-4.0.0.patch 3095 BLAKE2B abc3625c12590b3cdab86f81f211b0235e2553a92a32e57fc08b43312dffab126d7ea063dc91aaa93b6df72203f44d1a266b47c2f764ecaf2819f5ac3df3c7d7 SHA512 ecaf150fffba88b613d0526c9d8fcb948fffb9fa38b8a4b2d08410a9948847c3409cffe424fb9f4ccac74f9b7cfdb010db3c6cf861fe44fe8f789a1a5c1837e6 +AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6 DIST mpc-1.0.1.tar.gz 624125 BLAKE2B ba5c63f5e0cdcff2cfd5b93d152f70422232bca472b5153209b525794e338f11bdd0e371a055535aa31bb3b8991a5f6ef645b1bf2393027803bf84c0d4346991 SHA512 fa381e75999bba626ba08d73225285b03c6d2f6cca87881b28829925d1624eaed1c9b544f75e7281cf5d8dcdd7831025a4eafc05f88f13375f9e08239a8a9303 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43 EBUILD mpc-1.0.1.ebuild 1234 BLAKE2B 6dead805fb50ba9ba666489508a3651fa9caeaf96941aacd3a387ea071b4e78a42cb1f14b5f847873fe402377ef0fcc7dd325d0567318f20f42f2d892729c8b8 SHA512 f4c78bc29a2f787fc88ca6b9a3f6f6058a152d4aa1367672c99fec73e5c5baaa3659da9db77d8c03f1d792331e0d2983987425f1a75afb7dbbde3db0b9fc366f EBUILD mpc-1.0.2-r1.ebuild 996 BLAKE2B 9c36199c2f71d9eeeab7eb92ccfb9db51763cf49ab7888524a5e4b801fe28f0a4173b591b2bb057cca186eda9d55101237d906544a686960a765b07e78396949 SHA512 282f0cb69c00a7777fd4a37a6f750e30ad4af8e68d5c5c47399582d5a509ec7a4756f9c0a85152d2042e612e4d4576d0ebf9b45a1fa25cdf88e40bfd20aa0535 EBUILD mpc-1.0.2.ebuild 924 BLAKE2B fc40ac815a768a881d9f649345f44c1b9506368ec78b1a27b2703860ad70a1b672e59ad9232a0158716703d3ab4322fe317e6e4079c32bd048d8f79bd718ccc9 SHA512 072141030433d3646010b1a94f5a623bad734dc7e68756b37d3dce20a9f4e8c1482c0958c1bf3628c6251a46cdd82e2a85d364f3187e2bb8cf945b26a7622416 -EBUILD mpc-1.0.3.ebuild 1077 BLAKE2B 0bcc6bf08281c1707c7c23f7ddad442a6c0c17ab9fcc0b24dd6e166da93231c40d0e1187fec941119dc8f4f12263e550b129f1f89165701f5dcd049d6ea1dfc7 SHA512 903265d0b159ea09f93eb6d855eb775ed400c01fd04300840fe117ee9e6864694f586835ce0d39185179e29566cdb94cbd619b53c595de2832419b41702791ac +EBUILD mpc-1.0.3-r1.ebuild 1138 BLAKE2B 45c91b468a2d84794a03e415295fe430ff70b1e6d0e4bbab8f0bf4009c0f1cd5b80901b309007f72fd3e15dc9a1d5ced8b3c1d148534a4418e03c6f32b87ed39 SHA512 f683e3615ef491ed160fe782bf5a1a5ce380b88a9be00b34de837fab324841016c405a467250e2546510f26e75c58cea5bb00ef96ef88d6f70bc8eec2feab27b +EBUILD mpc-1.0.3.ebuild 1010 BLAKE2B 0a3d2092c5164964148e96ecefc789cbc842ae4cd013c310d8c37c10c168d782a3f70c2480dfe03958505498e87c6ee6a135f87eede1f3831ba13e7b40e33053 SHA512 0ff8e3a6ed9c7c8ec8c937e3aa7acd31384044a06d7c90a59994108b320dd2eb480e0c90828d0ee29341c24934c898c4b2217435c4cfc536811efe07d40ab19f MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c diff --git a/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch new file mode 100644 index 000000000000..445e94191030 --- /dev/null +++ b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch @@ -0,0 +1,25 @@ +mpfr-4.0.0 removed 'mpfr_add_one_ulp' and 'mpfr_sub_one_ulp' + +From 5eaa17651b759c7856a118835802fecbebcf46ad Mon Sep 17 00:00:00 2001 +From: Paul Zimmermann +Date: Wed, 4 Oct 2017 22:09:40 +0200 +Subject: [PATCH] replace obsolete mpfr_add_one_ulp/mpfr_sub_one_ulp functions + +--- + src/mpc-impl.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/mpc-impl.h b/src/mpc-impl.h +index 4026765..5420691 100644 +--- a/src/mpc-impl.h ++++ b/src/mpc-impl.h +@@ -60,2 +60,4 @@ along with this program. If not, see http://www.gnu.org/licenses/ . +-#define MPFR_ADD_ONE_ULP(x) mpfr_add_one_ulp (x, GMP_RNDN) +-#define MPFR_SUB_ONE_ULP(x) mpfr_sub_one_ulp (x, GMP_RNDN) ++#define MPFR_ADD_ONE_ULP(x) \ ++ (mpfr_sgn (x) > 0 ? mpfr_nextabove (x) : mpfr_nextbelow (x)) ++#define MPFR_SUB_ONE_ULP(x) \ ++ (mpfr_sgn (x) > 0 ? mpfr_nextbelow (x) : mpfr_nextabove (x)) +-- +2.15.1 + diff --git a/dev-libs/mpc/mpc-1.0.3-r1.ebuild b/dev-libs/mpc/mpc-1.0.3-r1.ebuild new file mode 100644 index 000000000000..c35082341337 --- /dev/null +++ b/dev-libs/mpc/mpc-1.0.3-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils libtool multilib-minimal + +DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" +HOMEPAGE="http://mpc.multiprecision.org/" +SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="static-libs" + +DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-mpfr-4.0.0.patch + "${FILESDIR}"/${P}-no-ulp.patch +) + +src_prepare() { + default + + eautoreconf + elibtoolize #347317 +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild index 66845b9d3d0b..198111c0b081 100644 --- a/dev-libs/mpc/mpc-1.0.3.ebuild +++ b/dev-libs/mpc/mpc-1.0.3.ebuild @@ -3,7 +3,7 @@ EAPI="4" -inherit autotools eutils libtool multilib-minimal +inherit eutils libtool multilib-minimal DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding" HOMEPAGE="http://mpc.multiprecision.org/" @@ -19,8 +19,6 @@ DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?] RDEPEND="${DEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-mpfr-4.0.0.patch - eautoreconf elibtoolize #347317 } diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest index aa1c030a2a05..3fa96aff53a4 100644 --- a/dev-libs/mpfr/Manifest +++ b/dev-libs/mpfr/Manifest @@ -13,5 +13,5 @@ EBUILD mpfr-3.1.3_p4.ebuild 1826 BLAKE2B cb2c4252b7c1c5dbc39b147f5d109a2b40f67ca EBUILD mpfr-3.1.4.ebuild 1655 BLAKE2B feffc8a44671a6a4d3fdee5e7bb4b30a679cbf5960c3eb9ed83a0b8b0985e4e8ad6e7bc7394f075dddb9f06185318028c048fe967cca2bc910c704ac20ac5f1e SHA512 6b9f4b4a769e485fa0fccdcb7af0d79c18c9ef22c197c19f11a721dcb039399f6163458520e5d3744bc9d13209eac7c83ba339b9a2d0aa6589740475c828ccdf EBUILD mpfr-3.1.5_p2.ebuild 1715 BLAKE2B 8deffe623eafe5b560cd336e5e7b2db7bd064f7ecefcafa20f79dfde0eaff7943ae8aedde69a159ef5117371875daece701a509a0e18c7b3fbc7b779ee9feac1 SHA512 d4706305aaf08f64ad52a9573f724a637f8b5972e7e36adf8ef3cbc77d41a241127f175fea584bc2e5558f487a17aea8d31fbca12ca337a624357f38d4fd70b9 EBUILD mpfr-3.1.6.ebuild 1639 BLAKE2B 7c1beeb915f4aec01c005ba27d6703268b7890eea4e3bb1d4a207009b350d5b72cf304c391dd95ce70c5feb81890376c4f14a6d8df3ea68817ba37adc0585358 SHA512 32c2c9cea50d4d4b19af36c7cabe9a2b329fcc7c6f245ceaef78c77e89d6ba94bb99c5e3ff20cc87f6e4814b993ead058a7dfe38938a598d83e8e99c705173a8 -EBUILD mpfr-4.0.0.ebuild 1566 BLAKE2B 70b75564be5969103c7517dd0c034ca64f07ba166d040873b98232c15e298c047d35ee2b1c34da8fdb564830ade78199bf8905bde1dbe8aad3e515cc81f8817d SHA512 6ac7f3e62c5898b041d45ea528be47f1a68c268211bb575a2261fe4959d0b5529c6f5a3ab43154a12321692de0878742a8d60f5c373cf3d5562be6c94b3ed132 +EBUILD mpfr-4.0.0-r1.ebuild 1734 BLAKE2B 374e288ec1e303177c0c36195b05304c5304a8e78679747d38689ec3cd8f09c3937706b9570b832221f1d7be8ce42146d77587ba8e25318f26d99cb2538a03d5 SHA512 17802798613c3e906c9542ba420e2be1dbf0cce8219b3c5e16fbabf3652caf60b9ae30f8e94d543f650dbcb984502a7eda9f61f8b4d9edec12e6ac4cf090a59f MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild new file mode 100644 index 000000000000..fa5e936f4991 --- /dev/null +++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# NOTE: we cannot depend on autotools here starting with gcc-4.3.x +inherit eutils libtool multilib-minimal + +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" + +LICENSE="LGPL-2.1" +SLOT="0/6" # libmpfr.so version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="static-libs" + +RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +HTML_DOCS=( doc/FAQ.html ) + +src_prepare() { + if [[ ${PLEVEL} != ${PV} ]] ; then + local i + for (( i = 1; i <= PLEVEL; ++i )) ; do + epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i}) + done + fi + eapply_user + find . -type f -exec touch -r configure {} + + elibtoolize +} + +multilib_src_configure() { + # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19 + ECONF_SOURCE=${S} \ + user_redefine_cc=yes \ + econf \ + --docdir="\$(datarootdir)/doc/${PF}" \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + rm "${ED}"/usr/share/doc/"${P}"/COPYING* + use static-libs || find "${ED}"/usr -name '*.la' -delete +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 4) +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 4) +} diff --git a/dev-libs/mpfr/mpfr-4.0.0.ebuild b/dev-libs/mpfr/mpfr-4.0.0.ebuild deleted file mode 100644 index d74928dff902..000000000000 --- a/dev-libs/mpfr/mpfr-4.0.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# NOTE: we cannot depend on autotools here starting with gcc-4.3.x -inherit eutils libtool multilib-minimal - -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" - -LICENSE="LGPL-2.1" -SLOT="0/6" # libmpfr.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="static-libs" - -RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -HTML_DOCS=( doc/FAQ.html ) - -src_prepare() { - if [[ ${PLEVEL} != ${PV} ]] ; then - local i - for (( i = 1; i <= PLEVEL; ++i )) ; do - epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i}) - done - fi - eapply_user - find . -type f -exec touch -r configure {} + - elibtoolize -} - -multilib_src_configure() { - # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19 - ECONF_SOURCE=${S} \ - user_redefine_cc=yes \ - econf \ - --docdir="\$(datarootdir)/doc/${PF}" \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - rm "${ED}"/usr/share/doc/"${P}"/COPYING* - use static-libs || find "${ED}"/usr -name '*.la' -delete -} diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index 54e83b2070ef..333d9b2a5ce7 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1,5 +1,6 @@ DIST quazip-0.7.2.tar.gz 466915 BLAKE2B fe96398e86e9066ddeea09d225b775371fc72479291f4cdefa9b5657adb2646e42b7cfbc2de920c4a4cdd024e9dcf1dfc12f30caec8f78494b1c7128847ca66d SHA512 669efb01edefee084ae755728aa2392bf160331fb13db62b7fac5e91bd45c29bb824a41ec63dd4a74c4a9780848d3308c0dcdb503f907a0fcccfbe969c291dd0 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe EBUILD quazip-0.7.2-r1.ebuild 1958 BLAKE2B ea1a623974ca241edb1469a86d0fd2eb2fa6a322181fbba395ab27bcc02675d6e4e5cae62ac71a934e7ac1e60537d26a96c15e768f814548b74000805dabc8bc SHA512 219c47ea0e5b592fe85221016c2e21268ea7344769c4dcd186c18dba2cb56d0be1506df294f7dd1ea19ed8b11a10672889a6df17214de8b80189804b50983325 +EBUILD quazip-0.7.3-r1.ebuild 1157 BLAKE2B 8fde1ed5d34a24fbefb71369186a118af39a809e9ada0a6c747d46b75ecb1413de821a1cda6571ae48127982f706fae33188ad7c1ed935d4841425ccae1b66a2 SHA512 3663a087b15dddef640a62e641c063455ec4279d5b8b778774e9da8098ba488bc15fb99195ddc5303a300d818e35de21b5d792b7b78902e08854a365bbf3f00b EBUILD quazip-0.7.3.ebuild 1987 BLAKE2B ebafb8141b72be86b4f961accf68f492c6d6a2f8988f4a59dc6c9587189b7e87dfba405b11d3a5a9a242b1235038b61a5d20c62dd0552821ff5c47bb73221eda SHA512 31e5a19d6fb9f3dfaf6dca1f1114974b56794b9776c0648b921e435378edfdfc35712f79272933ae025f3aae1b86649cf7f27fa94d40f8df4143d1bb876bb2ed MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98 diff --git a/dev-libs/quazip/quazip-0.7.3-r1.ebuild b/dev-libs/quazip/quazip-0.7.3-r1.ebuild new file mode 100644 index 000000000000..831f129d5a6b --- /dev/null +++ b/dev-libs/quazip/quazip-0.7.3-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils flag-o-matic qmake-utils + +DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package" +HOMEPAGE="http://quazip.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="static-libs" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + sys-libs/zlib[minizip] +" +DEPEND="${RDEPEND}" + +DOCS=( NEWS.txt README.txt ) +HTML_DOCS=( doc/html/. ) + +src_prepare() { + if ! use static-libs ; then + sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt || die + fi + cmake-utils_src_prepare +} + +src_configure() { + local libdir=$(get_libdir) + local -x CXXFLAGS="${CXXFLAGS}" + append-cxxflags -std=c++11 -fPIC + + local mycmakeargs=( + -DBUILD_WITH_QT4=OFF + -DLIB_SUFFIX=${libdir/lib/} + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # compatibility with not yet fixed rdeps (Gentoo bug #598136) + dosym libquazip5.so /usr/$(get_libdir)/libquazip.so +} diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index 41dd9d6c2f5a..34e4770ce060 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1,6 +1,7 @@ +AUX sway-0.15.0-json-c-fixes.patch 11281 BLAKE2B 85da7be6f1179c6177f982048da54eec994a0266f1f351ea17c63aebca18d43aa7d9693dbe2d4e10270d1d33a895caf6ed111a0737a677783d090feae33b6944 SHA512 29ffd1a613f43d0dc706c2cdc3196691dffb7cf1f855a42cb638492d1e563068db9f0d6cd65a722677f0657c8d110e84373c22e603fb819fb64d1767813dd11d DIST sway-0.14.0.tar.gz 5376243 BLAKE2B 9990db2d0a17831ac55669236533737a3422a8cb8faa338acae3e897586e410bb95f83f395462332889886be148d0151cad5465bce7786bc8e1a1aa3ceba721c SHA512 2c2e45ddc935504bd240288386662d05f284eb0d540e05b6e56ca577e9b1f2303929b9659eaa3cb99b8cdadb60bd1bfa4104624bf2574e41365e1b3df5361410 DIST sway-0.15.0.tar.gz 5394917 BLAKE2B 40b12e4c276bda3f6364f1a8d9f55604535632ce0186c0706ff6020bc6ff1b8f5b4b560ae52d281f5cc549547c7f1455bcf30e9b854db26b231e68e648819905 SHA512 2ac448f16cae83563b4ed7039b355c238cdf45bf16af58002c56781fbbac640a5b61b2fd05eb8bcfea5cc06a65707a48e093a68e80be44c14cf1d5d0a9410331 EBUILD sway-0.14.0.ebuild 1906 BLAKE2B aba3a6e43bf908e01ef087b407fe6396bb2fe8212ce6d72398aa0828ce64de2a5f75b0b204a0ad2fe2a254a174577158857c5816754102e4eff58305d5546ff9 SHA512 1f9d9f4706d2334f04d088330b977269cbf917c0a9e5e2c99b311ec29127c8daa88d69b27a3e4002729d42a5ee172deada44c5e307a9e4496d7dcbc84355545d -EBUILD sway-0.15.0.ebuild 1930 BLAKE2B 56767e8d8d105cd96a7b4c45315b6c14dbccffb59afd69643ab4a7ba6cb4568c3a738f00b415ab681efb48ae00ff56bf1811ab01bed64f456caa849404e392fd SHA512 3eb9da2a95b3cf737605b41e96ce2598a453285e3ec3563020dad6baf8ab8ee9f8f42c058a48e8d194c7cc3d67660934f370d00bf01b3057ab63b9860d3431a7 -EBUILD sway-9999.ebuild 1878 BLAKE2B 7c3745bc07b3656f78c11519ba6026f3c9a1e3fd69cf1a6cc6212f590d989c4ef508bb9d655833e063e7e9426c352da82d9d7b6100190c3122bf10ae9fc63fbe SHA512 e5ca4c3664bf89029d42e83777892bafd5afdc9c82e9842aef744abbd7e85f9c6f8a538d2a350dc1c2655340f46a81dcb93699ea8cd564feef9bb294d13caea6 +EBUILD sway-0.15.0.ebuild 1988 BLAKE2B 6e3899699af109735744ad82c3378de89538d0c64facc80b8e019d7ef15c876384a5d52e1a3dfd26b55a2425b30af9f9c3b38447b4faec249871b85088a5d826 SHA512 cf97d366c9de0de7edc7f162c39b41dad039b5105c61e2577915d9e80578a050f9d83053bcdf1826e2e80e1600c1bd9e74b28ec2f19d06a0637b421698727ad8 +EBUILD sway-9999.ebuild 1936 BLAKE2B eb363ec691e8b51714a497a27decdb685de670c23215e9070a753a37a39c170213d70604248c2881e773d95f514b696512dd03533bee98fd700071829023328e SHA512 6712f338c32dc43f67d28f7cb560c2190544922a092cfe91e9d1dfdc7b2f0d0b66c106d765931e44008094d548fd380e8a7ec45fcd30df683958525519ea23fd MISC metadata.xml 1756 BLAKE2B 98c5ea811df7218a945de7d8ae3891692ae7fa137f320ab316f985c99ac288ac62fe006879cdd539f48ea9207a953434f3a5dbaf815f32a40a5c7ff73376c594 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a diff --git a/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch b/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch new file mode 100644 index 000000000000..1e43eda62e81 --- /dev/null +++ b/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch @@ -0,0 +1,370 @@ +From c6e12368a531dd4bbb0778c9a1dd5d3fb935c197 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Thu, 14 Dec 2017 01:30:54 +0100 +Subject: [PATCH 1/3] Lift restriction on json-c <= 0.12.1 + +--- + CMakeLists.txt | 2 +- + README.de.md | 2 +- + README.el.md | 2 +- + README.fr.md | 2 +- + README.it.md | 2 +- + README.ja.md | 2 +- + README.md | 2 +- + README.pt.md | 2 +- + README.ru.md | 2 +- + README.uk.md | 2 +- + 10 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc521570..bd12b191 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ if (LD_LIBRARY_PATH) + add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") + endif() + +-find_package(JsonC 0.12.1 REQUIRED) ++find_package(JsonC REQUIRED) + find_package(PCRE REQUIRED) + find_package(WLC REQUIRED) + find_package(Wayland REQUIRED) +diff --git a/README.de.md b/README.de.md +index 701cc34f..293ffe70 100644 +--- a/README.de.md ++++ b/README.de.md +@@ -60,7 +60,7 @@ Abhängigkeiten: + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.el.md b/README.el.md +index df39364f..eba97b9c 100644 +--- a/README.el.md ++++ b/README.el.md +@@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.fr.md b/README.fr.md +index 47b6c410..a4ff7cb9 100644 +--- a/README.fr.md ++++ b/README.fr.md +@@ -55,7 +55,7 @@ Installez les dépendances : + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.it.md b/README.it.md +index f5e0d8e2..ded441c3 100644 +--- a/README.it.md ++++ b/README.it.md +@@ -56,7 +56,7 @@ Installa queste dipendenze: + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.ja.md b/README.ja.md +index 2e8f9bfb..94b4ce9d 100644 +--- a/README.ja.md ++++ b/README.ja.md +@@ -46,7 +46,7 @@ Swayは沢山のディストリビューションで提供されています。" + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.md b/README.md +index 29e8a674..eeca9f88 100644 +--- a/README.md ++++ b/README.md +@@ -61,7 +61,7 @@ Install dependencies: + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.pt.md b/README.pt.md +index b5ca132f..e35849ec 100644 +--- a/README.pt.md ++++ b/README.pt.md +@@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências: + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.ru.md b/README.ru.md +index 4035b0fc..1551caa0 100644 +--- a/README.ru.md ++++ b/README.ru.md +@@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * +diff --git a/README.uk.md b/README.uk.md +index 2e107afc..c8520e4b 100644 +--- a/README.uk.md ++++ b/README.uk.md +@@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а + * libcap + * asciidoc + * pcre +-* json-c <= 0.12.1 ++* json-c + * pango + * cairo + * gdk-pixbuf2 * + +From 8272a9bae0d288b479c517dde3e831ea3889dc7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Thu, 14 Dec 2017 16:44:18 +0100 +Subject: [PATCH 2/3] ipc-server: Acquire ownership of referenced json_object + properly + +When adding a referenced json_object with an unknown lifetime to +another json_object, it must be done with a wrapped call to +json_object_get() to acquire the ownership of that json_object. +--- + sway/ipc-server.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sway/ipc-server.c b/sway/ipc-server.c +index b560b930..80f4e5d0 100644 +--- a/sway/ipc-server.c ++++ b/sway/ipc-server.c +@@ -1126,7 +1126,8 @@ static void ipc_event_binding(json_object *sb_obj) { + sway_log(L_DEBUG, "Sending binding::run event"); + json_object *obj = json_object_new_object(); + json_object_object_add(obj, "change", json_object_new_string("run")); +- json_object_object_add(obj, "binding", sb_obj); ++ // sb_obj gets owned by the temporary json_object, too. ++ json_object_object_add(obj, "binding", json_object_get(sb_obj)); + + const char *json_string = json_object_to_json_string(obj); + ipc_send_event(json_string, IPC_EVENT_BINDING); + +From 02da9c4e7cafb36083566e511cc7913d8922aaa6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Thu, 14 Dec 2017 17:14:47 +0100 +Subject: [PATCH 3/3] Adaptions for API change in json-c v0.13 + +--- + include/sway_json_helper.h | 16 ++++++++++++++++ + include/swaygrab/json.h | 2 +- + sway/ipc-server.c | 4 ++-- + swaybar/status_line.c | 5 ++--- + swaygrab/json.c | 9 ++++----- + swaylock/main.c | 4 ++-- + swaymsg/main.c | 4 ++-- + 7 files changed, 29 insertions(+), 15 deletions(-) + create mode 100644 include/sway_json_helper.h + +diff --git a/include/sway_json_helper.h b/include/sway_json_helper.h +new file mode 100644 +index 00000000..66f9cff1 +--- /dev/null ++++ b/include/sway_json_helper.h +@@ -0,0 +1,16 @@ ++#ifndef _SWAY_JSON_HELPER_H ++#define _SWAY_JSON_HELPER_H ++ ++#include ++ ++// Macros for checking a specific version. ++#define JSON_C_VERSION_013 (13 << 8) ++ ++// json-c v0.13 uses size_t for array_list_length(). ++#if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013 ++typedef size_t json_ar_len_t; ++#else ++typedef int json_ar_len_t; ++#endif ++ ++#endif // _SWAY_JSON_HELPER_H +diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h +index c1093ef1..c0bd8587 100644 +--- a/include/swaygrab/json.h ++++ b/include/swaygrab/json.h +@@ -1,4 +1,4 @@ +-#include ++#include "sway_json_helper.h" + #include "wlc/wlc.h" + + void init_json_tree(int socketfd); +diff --git a/sway/ipc-server.c b/sway/ipc-server.c +index 80f4e5d0..e10445cf 100644 +--- a/sway/ipc-server.c ++++ b/sway/ipc-server.c +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #ifdef __linux__ +@@ -25,6 +24,7 @@ struct ucred { + gid_t gid; + }; + #endif ++#include "sway_json_helper.h" + #include "sway/ipc-json.h" + #include "sway/ipc-server.h" + #include "sway/security.h" +@@ -724,7 +724,7 @@ void ipc_client_handle_command(struct ipc_client *client) { + } + + // parse requested event types +- for (int i = 0; i < json_object_array_length(request); i++) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(request); i++) { + const char *event_type = json_object_get_string(json_object_array_get_idx(request, i)); + if (strcmp(event_type, "workspace") == 0) { + client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE); +diff --git a/swaybar/status_line.c b/swaybar/status_line.c +index 87e90caf..e3cc0bf4 100644 +--- a/swaybar/status_line.c ++++ b/swaybar/status_line.c +@@ -2,8 +2,8 @@ + #include + #include + #include +-#include + ++#include "sway_json_helper.h" + #include "swaybar/config.h" + #include "swaybar/status_line.h" + #include "log.h" +@@ -70,8 +70,7 @@ static void parse_json(struct bar *bar, const char *text) { + + bar->status->block_line = create_list(); + +- int i; +- for (i = 0; i < json_object_array_length(results); ++i) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) { + json_object *full_text, *short_text, *color, *min_width, *align, *urgent; + json_object *name, *instance, *separator, *separator_block_width; + json_object *background, *border, *border_top, *border_bottom; +diff --git a/swaygrab/json.c b/swaygrab/json.c +index 286085c3..f0e8fa90 100644 +--- a/swaygrab/json.c ++++ b/swaygrab/json.c +@@ -50,8 +50,7 @@ static json_object *get_focused_container_r(json_object *c) { + } else { + json_object *nodes, *node, *child; + json_object_object_get_ex(c, "nodes", &nodes); +- int i; +- for (i = 0; i < json_object_array_length(nodes); i++) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { + node = json_object_array_get_idx(nodes, i); + + if ((child = get_focused_container_r(node))) { +@@ -60,7 +59,7 @@ static json_object *get_focused_container_r(json_object *c) { + } + + json_object_object_get_ex(c, "floating_nodes", &nodes); +- for (i = 0; i < json_object_array_length(nodes); i++) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { + node = json_object_array_get_idx(nodes, i); + + if ((child = get_focused_container_r(node))) { +@@ -83,7 +82,7 @@ char *get_focused_output() { + if (!outputs) { + sway_abort("Unabled to get focused output. No nodes in tree."); + } +- for (int i = 0; i < json_object_array_length(outputs); i++) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { + output = json_object_array_get_idx(outputs, i); + + if (get_focused_container_r(output)) { +@@ -131,7 +130,7 @@ json_object *get_output_container(const char *output) { + json_object *outputs, *json_output, *name; + json_object_object_get_ex(tree, "nodes", &outputs); + +- for (int i = 0; i < json_object_array_length(outputs); i++) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { + json_output = json_object_array_get_idx(outputs, i); + json_object_object_get_ex(json_output, "name", &name); + +diff --git a/swaylock/main.c b/swaylock/main.c +index c2615951..7b7dd601 100644 +--- a/swaylock/main.c ++++ b/swaylock/main.c +@@ -3,7 +3,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -13,6 +12,7 @@ + #include + #include + #include ++#include "sway_json_helper.h" + #include "client/window.h" + #include "client/registry.h" + #include "client/cairo.h" +@@ -584,7 +584,7 @@ int main(int argc, char **argv) { + + for (i = 0; i < registry->outputs->length; ++i) { + if (displays_paths[i * 2] != NULL) { +- for (int j = 0;; ++j) { ++ for (json_ar_len_t j = 0;; ++j) { + if (j >= json_object_array_length(json_outputs)) { + sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]); + exit(EXIT_FAILURE); +diff --git a/swaymsg/main.c b/swaymsg/main.c +index 2f9cfb14..0ee7c76f 100644 +--- a/swaymsg/main.c ++++ b/swaymsg/main.c +@@ -9,7 +9,7 @@ + #include + #include + #include +-#include ++#include "sway_json_helper.h" + #include "stringop.h" + #include "ipc-client.h" + #include "readline.h" +@@ -149,7 +149,7 @@ static void pretty_print_version(json_object *v) { + static void pretty_print_clipboard(json_object *v) { + if (success(v, true)) { + if (json_object_is_type(v, json_type_array)) { +- for (int i = 0; i < json_object_array_length(v); ++i) { ++ for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) { + json_object *o = json_object_array_get_idx(v, i); + printf("%s\n", json_object_get_string(o)); + } diff --git a/dev-libs/sway/sway-0.15.0.ebuild b/dev-libs/sway/sway-0.15.0.ebuild index 2b14a8ebf6b1..4763bcbcc74a 100644 --- a/dev-libs/sway/sway-0.15.0.ebuild +++ b/dev-libs/sway/sway-0.15.0.ebuild @@ -34,6 +34,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig app-text/asciidoc" +PATCHES=( "${FILESDIR}/sway-0.15.0-json-c-fixes.patch" ) + src_prepare() { cmake-utils_src_prepare diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild index 041564b463d5..f7250762bfe6 100644 --- a/dev-libs/sway/sway-9999.ebuild +++ b/dev-libs/sway/sway-9999.ebuild @@ -34,6 +34,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig app-text/asciidoc" +PATCHES=( "${FILESDIR}/sway-0.15.0-json-c-fixes.patch" ) + src_prepare() { cmake-utils_src_prepare diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest index d1d6c80c4525..d83d86e33932 100644 --- a/dev-libs/tre/Manifest +++ b/dev-libs/tre/Manifest @@ -1,4 +1,4 @@ AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263 -EBUILD tre-0.8.0-r1.ebuild 1404 BLAKE2B d41c368e13bb229327ff0a88ce04264156c4affb999c4e449f001a37c5bd4743bccfc4a347a311b318fb58cd99e93f201dbf923dfa3f6eeb8e0668d98eca54d5 SHA512 80b0906b24788287b6b88d5c0e36c71840919d3eefdb7bdc972d86b6d92a4d2c2829a69da8b3e70d12b33deba2926215410a4e039f8f226266946aaf0a576125 +EBUILD tre-0.8.0-r1.ebuild 1409 BLAKE2B b0dbf221a6e38d15c45fa394f5b046f0bb29ed01af21b4cde418a707662de15f81a015e72739ff1b2f8b26574f833133e7fae41fc7c764926366ff11f3b08667 SHA512 1c5f276ca6af50f67e5ef827f60c376beeab7f90b3bcece5d5bd77743cc9ca954ff394ffd40a2c83dc8d7854976138b2aaac3df639ba6c19634d55617a490e95 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild index de7f289bd586..80637c34ec08 100644 --- a/dev-libs/tre/tre-0.8.0-r1.ebuild +++ b/dev-libs/tre/tre-0.8.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://laurikari.net/tre/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="nls static-libs" RDEPEND=" diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index 04daa1d03977..ba4eecfb65c5 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,7 +1,5 @@ -DIST vala-0.34.8.tar.xz 2778228 BLAKE2B ce48baeaa2ba88e09234c8a6e14c6aed60771476f4f2d25d1654ed07e0de78bb98f506fbf9f3990f13e2946ed541a0da2364a6fd1834c36e58c99e905afdf15b SHA512 03739173aa2b4e5d476037c77ac86543b97bd6eeb94f40dcce952da127e32baefa0dfa83f9d6e8ea254d4aee5ecd557964520926239bd119da72c771e30ece14 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b -EBUILD vala-common-0.34.8.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de -EBUILD vala-common-0.34.9.ebuild 2534 BLAKE2B 2f8318c02c59b3ecd29e69280fec0aecead781eab9eaa6620c04757dcfd3175d235816292503dc984bdc3f28cff5daa2887e3492cdcf30d8da26107a67e959ff SHA512 876ba791e3c801c0b7b2b358257dcce45d229e95f119584b64cc229af9c469b859ab090888e5f06e1071b61f5d4d7f02c76c4958e2adcf5809c1ef45a113b60b +EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de EBUILD vala-common-0.36.7.ebuild 2542 BLAKE2B 115fde004f43b28050b2ba90f834b3c06c953bc29b8c7581920cce6d876ea5f80ff96bc57b0b7a05e953a773631ee15419d97359e80a4ec80000943f3eebab2b SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/vala-common/vala-common-0.34.8.ebuild b/dev-libs/vala-common/vala-common-0.34.8.ebuild deleted file mode 100644 index 743737dd7b56..000000000000 --- a/dev-libs/vala-common/vala-common-0.34.8.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="vala" - -inherit gnome.org - -DESCRIPTION="Build infrastructure for packages that use Vala" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris" -IUSE="" - -# Previously ${PN} was part of dev-lang/vala -RDEPEND=" - ! /dev/null - eend $? - fi - if has_version ' /dev/null - eend $? - fi - if has_version ' /dev/null - eend $? - fi - if has_version ' /dev/null - eend $? - if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then - ebegin "Removing old vala-0.16 makefile template" - rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null - eend $? - fi - fi - if has_version ' /dev/null - eend $? - if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then - ebegin "Removing old vala-0.18 makefile template" - rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null - eend $? - fi - fi -} diff --git a/dev-libs/vala-common/vala-common-0.34.9.ebuild b/dev-libs/vala-common/vala-common-0.34.9.ebuild index b038cb76143b..743737dd7b56 100644 --- a/dev-libs/vala-common/vala-common-0.34.9.ebuild +++ b/dev-libs/vala-common/vala-common-0.34.9.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="" # Previously ${PN} was part of dev-lang/vala diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest index 66fc27e2ca72..db39712b2cb0 100644 --- a/dev-libs/wayland-protocols/Manifest +++ b/dev-libs/wayland-protocols/Manifest @@ -1,6 +1,4 @@ DIST wayland-protocols-1.11.tar.xz 117852 BLAKE2B 314f247efdffd0dbc46664e2abe7fade0cb0a36ef77310660f978ea9677c33acd60b1512a5dc2fdbfc40b8e1444da7bb4089e091433bbf2bc4b5ab41e97514ca SHA512 6a6f816dd24f338182ddf11e2daa2db4f048f9153c618bd75712b6e02fccc41294c6c5f33692e858f54bab6b644b1dff49ca223ca2c8410a4afb8aa1b39e34a6 -DIST wayland-protocols-1.7.tar.xz 113220 BLAKE2B 262465cd3daa21709071f37d1e2345923055b5f183dd422c5f83e8e5b3b697e19276a37c76637cab4177a1ef91b22f0f41198daf4872c38ad08a03f07eece957 SHA512 291a3226cc538de3b81bdffa5de513b305a946bfc3481e21c254fcc6a023e0cf2ff1869509c7ae193da02460f1d4a3c5cd5f1ca13b2550886acffcc636fb30d2 -EBUILD wayland-protocols-1.11.ebuild 892 BLAKE2B 5fa4daff96fb380aa6ae7e40098697a419657f5da98908e61b90d2c6973776f86491a29168bd1b72ce21d2892a054dedb04de21ced1c20422360ae2ff8578d6a SHA512 ec28296386830417110a9293fd13abf88c54b0febd06d97439697c4142b43ba85a8138c3ba113cf467a542dfe478524dd67f55994810f97d33fde7f8ed62a28a -EBUILD wayland-protocols-1.7.ebuild 891 BLAKE2B 89bd528ac051ac71795318ed2bb4b68a32585dbf28ee72dd5e1284819d9acc28154d6bf7c0e6acc784461a8ee948bb0e25dabfe8d1745e0ea41ae62f027604f7 SHA512 d246c9ff9a9520dbf039f67cede7150892366748a26f8f3eb7d6f4650efa1f43a2bfcfe33961a98174061dbbb74665edd7cd74d0b2a1b2e7acd971862a60791f +EBUILD wayland-protocols-1.11.ebuild 891 BLAKE2B 89bd528ac051ac71795318ed2bb4b68a32585dbf28ee72dd5e1284819d9acc28154d6bf7c0e6acc784461a8ee948bb0e25dabfe8d1745e0ea41ae62f027604f7 SHA512 d246c9ff9a9520dbf039f67cede7150892366748a26f8f3eb7d6f4650efa1f43a2bfcfe33961a98174061dbbb74665edd7cd74d0b2a1b2e7acd971862a60791f EBUILD wayland-protocols-9999.ebuild 900 BLAKE2B 526608e7ef610933915839746260b1689bddc97b2964300ac301b55f4d7b9663ee1c008894c03893877a0f1509044eefb9d59919c5be1543d28cda74a2747377 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild index e945a9bee27e..bf2247666d78 100644 --- a/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild +++ b/dev-libs/wayland-protocols/wayland-protocols-1.11.ebuild @@ -19,7 +19,7 @@ if [[ $PV = 9999* ]]; then SRC_URI="${SRC_PATCHES}" else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" fi LICENSE="MIT" diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.7.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.7.ebuild deleted file mode 100644 index bf2247666d78..000000000000 --- a/dev-libs/wayland-protocols/wayland-protocols-1.7.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" - AUTOTOOLS_AUTORECONF=1 -fi - -inherit autotools-utils ${GIT_ECLASS} - -DESCRIPTION="Wayland protocol files" -HOMEPAGE="https://wayland.freedesktop.org/" - -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -RDEPEND="dev-libs/wayland" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_test() { - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - autotools-utils_src_test -} -- cgit v1.2.3