summaryrefslogtreecommitdiff
path: root/dev-libs
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/Manifest.gzbin85434 -> 85420 bytes
-rw-r--r--dev-libs/dietlibc/Manifest1
-rw-r--r--dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild64
-rw-r--r--dev-libs/libassuan/Manifest2
-rw-r--r--dev-libs/libassuan/libassuan-2.5.1.ebuild4
-rw-r--r--dev-libs/libffi/Manifest5
-rw-r--r--dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch4
-rw-r--r--dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch56
-rw-r--r--dev-libs/libffi/files/libffi-3.2.1-include-path.patch39
-rw-r--r--dev-libs/libffi/libffi-3.2.1-r1.ebuild69
-rw-r--r--dev-libs/libical/Manifest9
-rw-r--r--dev-libs/libical/files/libical-2.0.0-tests.patch38
-rw-r--r--dev-libs/libical/libical-2.0.0-r2.ebuild12
-rw-r--r--dev-libs/libical/libical-2.0.0-r3.ebuild8
-rw-r--r--dev-libs/libical/libical-3.0.1.ebuild24
-rw-r--r--dev-libs/libical/metadata.xml8
-rw-r--r--dev-libs/nspr/Manifest6
-rw-r--r--dev-libs/nspr/nspr-4.13.1.ebuild3
-rw-r--r--dev-libs/nspr/nspr-4.16.ebuild3
-rw-r--r--dev-libs/nspr/nspr-4.17.ebuild3
-rw-r--r--dev-libs/pslib/Manifest2
-rw-r--r--dev-libs/pslib/pslib-0.4.1-r2.ebuild5
-rw-r--r--dev-libs/quazip/Manifest2
-rw-r--r--dev-libs/quazip/quazip-0.7.3-r1.ebuild4
-rw-r--r--dev-libs/spdlog/Manifest12
-rw-r--r--dev-libs/spdlog/files/spdlog-unbundle-fmt.patch90
-rw-r--r--dev-libs/spdlog/spdlog-0.14.0-r1.ebuild40
-rw-r--r--dev-libs/spdlog/spdlog-0.14.0.ebuild34
-rw-r--r--dev-libs/spdlog/spdlog-0.16.1.ebuild34
-rw-r--r--dev-libs/spdlog/spdlog-0.16.2.ebuild (renamed from dev-libs/spdlog/spdlog-0.13.0.ebuild)6
-rw-r--r--dev-libs/spdlog/spdlog-9999.ebuild7
-rw-r--r--dev-libs/uriparser/Manifest8
-rw-r--r--dev-libs/uriparser/uriparser-0.7.9.ebuild44
-rw-r--r--dev-libs/uriparser/uriparser-0.8.1.ebuild49
-rw-r--r--dev-libs/uriparser/uriparser-0.8.2.ebuild42
-rw-r--r--dev-libs/uriparser/uriparser-0.8.3.ebuild41
36 files changed, 433 insertions, 345 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index df1f726456df..059e5278a4f0 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 7234e90ee167..fad333496efc 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,5 +1,6 @@
DIST dietlibc-0.33_pre20110403.tar.gz 743758 BLAKE2B e6c4a6bf3198833ef309ce8035453d0c75b2e365dd4da3710c00200004ca6200f8f629bacfcaa1a4507dc43ab3b5c13ddc79ef285a77426a5c64608e308559fb SHA512 32f9d752a77bcca5703a388ba64dcb53de75999043c1b2fabe973eba05fce4e9f48a6bdb71e061939eee339ca723234d33d2acb3677a8030accaccba31a5932e
DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
EBUILD dietlibc-0.33_pre20110403.ebuild 1688 BLAKE2B 26dddfa9f951ffec44b53749403ebb2ceca663778874b1498ae7a53e375b4069b19cbb201a398af8c2adf92f81fbbbeab170cb35530aaa0f75fe32bb6cfc1831 SHA512 96382993aeb9d91f4512f354691988a6683957a5bfb4a4009fee48b9d0ec1205a13bb574bab953839b20a4b278f41e94fce31c811bd125d5d138609fa90487ec
+EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1578 BLAKE2B 98afe30dfd64a7adbeddd1236eac393e50f0be6a621208dd1f7988dcebc282fc7cbbf29fd624cb69739365b621a466d2a7677e39cf7ff8a4c3995c02752e6441 SHA512 5f7a30d563188980e751d78afc7aced3f157f6de4889f2aa46b9f0b48756da8182d73b3a6a2bde48d6701cb19032dd1c0e32c154438973d703400c38abd7e452
EBUILD dietlibc-0.34_pre20140729.ebuild 1577 BLAKE2B f4aa508e7c55a86917295819b54f963c5e19117801bde8dba4d0463430f751e749bf72f241b0302ea9ff4ebe42f9ca50d7f2947f06e76ce8bcd47cc9f74009d6 SHA512 fb72a140962341c26031080959a5da32f156e92e97b53c72e46256d86c9c325577ea868643d4474dd15e93c279fc6ec636493ce0c4e0f83d32a3cd966c140143
MISC metadata.xml 416 BLAKE2B 1484805b8b75b745a2cb7409aeab9f5d934f3c6f92cae880c650a34e0d05e4e97a889a9390a9c0a25da93458f8f74349006737307dfe86382d5b07cfc9fb9be4 SHA512 7d39c127ffecbfc46fc6987189f2d28e92b35effbd71d4aadc465ac5fe1e47d088574700b26bb0bc27f1fd17b3487de85317f34a87393597f99b38a9be3c0c0d
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
new file mode 100644
index 000000000000..ab312bfd8734
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A libc optimized for small size"
+HOMEPAGE="http://www.fefe.de/dietlibc/"
+SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DIETHOME=/usr/diet
+
+S=${WORKDIR}/dietlibc
+
+src_prepare() {
+ # Replace sparc64 related C[XX]FLAGS (see bug #45716)
+ use sparc && replace-sparc64-flags
+
+ # gcc-hppa suffers support for SSP, compilation will fail
+ use hppa && strip-unsupported-flags
+
+ # Makefile does not append CFLAGS
+ append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
+ -Wmissing-prototypes -Wmissing-declarations -Wno-switch \
+ -Wno-unused -Wredundant-decls -fno-strict-aliasing
+
+ # Disable ssp for we default to it on >=gcc-4.8.3
+ append-flags $(test-flags -fno-stack-protector)
+
+ # only use -nopie on archs that support it
+ tc-enables-pie && append-flags -no-pie
+
+ sed -i -e 's:strip::' Makefile || die
+ append-flags -Wa,--noexecstack
+}
+
+src_compile() {
+ emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ STRIP=":"
+}
+
+src_install() {
+ emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+ DESTDIR="${D}" \
+ install-bin \
+ install-headers \
+ install-profiling
+
+ dobin "${ED}"${DIETHOME}/bin/*
+ doman "${ED}"${DIETHOME}/man/*/*
+ rm -r "${ED}"${DIETHOME}/{man,bin} || die
+
+ dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
+}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 1ac37feb1f13..298a8447744c 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
EBUILD libassuan-2.4.3-r1.ebuild 1099 BLAKE2B b2df568fcd4c2e50fde71a384e85a829753915a74164582f01a0be20f30d5a8a4dfa61d645b6f90ede321cf7bcffc674cb7872c6ef313cc06bb0689f3facea45 SHA512 a3cab0a03de279a18d49db4bc521dbfd04340f66edddb1cb05ac1dfdf6ab4096d1f082c3115e8cfa281873f2d25f810fdbe514aa083313e66a2c470e0e752db8
-EBUILD libassuan-2.5.1.ebuild 1109 BLAKE2B 1ed8a8a443346c91f4118f07d14489f8d29ca49f05007aacd6f399e08b61758f49c204e8896789af6b757333fb3217fdb13764e3a8bd7e22c828c1c39bdf7a3c SHA512 fbd68a18c5c24f58efa7d2e18452b280fae022b1176e3c315f7ca937fece8694c36ffd9529b82d6ec879ae0355eb1bd55b88b02cd09aa9601e991221b620550e
+EBUILD libassuan-2.5.1.ebuild 1105 BLAKE2B 76235871d5b75ed30b029246739992625a2c009180112cd2591b7554c911e002784577ed534f0a18cd6ee5c9cbe7b163ed2f68d59879b55e86ec9ff9d2240af3 SHA512 5a179ed0e6676460075492748bb40107b18a9d9ec06c17ed5e4711d086ea6f1baa17d3e03fd07c0f06ff8bf10250ec1d74ad0bac3a157af0327145ed779a4ea4
MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index 603a783a7515..e8ee8fadb458 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.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="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index c2a9f043c867..d9b3a2e62d80 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,7 +1,10 @@
AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24
AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1
-AUX libffi-3.2.1-complex_alpha.patch 601 BLAKE2B f66926263810dd06424cfb8eb0cca20ffdc52e615ca0691af3e473d0a8aa60a2e7efd9a09c7bfd7b496da70f47325a20df53c08efff1be6a1c42686c80c0f399 SHA512 66890bf241236f08e0e726c820e2ff82df6071c1a3b25aa4f3f005b6431b94ec5a5f730db56de82c006e26415d72fe665d6ced37567bcdec6d84357faeb24bec
+AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b
+AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
+AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
+EBUILD libffi-3.2.1-r1.ebuild 2417 BLAKE2B e36f4348b79be67ee641f275e93e133c54729d3878c66cdde71c0d840f4c7b4984c425adfc3969ab662c0f3964c114cae2a6688ec14bc27a63b2810af1ded4b2 SHA512 6de380334852f5b340918d288fd96f8b0818a08c9d8ebbb6bfc8e521de5184f4d1152c12c6c5f9ca6fce26f1c510afcc085107b0b6559acf7d09ee96459e2e78
EBUILD libffi-3.2.1.ebuild 2119 BLAKE2B 93326ccfd9a400250a4eaf65e4f79e58f79e7cf57c7eef8eb3304ebeec08af1d24f2abd9b1808d1c1ef1f43b1e4d652617ff1da5e9df0a98697560b6f4f82a7b SHA512 65f465f7457d035f723060ffa4c3fbee29149b1ca40be4d5bbcc2395d4778a3c5b376f9670d6612368d7216baedfe793a11a5a28c91b3b9b9791e38384bd9454
MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
index 0d6e0bc29007..5e8c943eee38 100644
--- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
+++ b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
@@ -1,5 +1,5 @@
---- src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100
-+++ src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100
+--- a/src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100
++++ b/src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100
@@ -279,6 +279,7 @@
.gprel32 $load_64 # FFI_TYPE_SINT64
.gprel32 $load_none # FFI_TYPE_STRUCT
diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
new file mode 100644
index 000000000000..522e1fa9c486
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
@@ -0,0 +1,56 @@
+Autogenerated part of libffi-3.2.1-include-path.patch
+
+https://bugs.gentoo.org/643582
+diff --git a/include/Makefile.in b/include/Makefile.in
+index 9d747e8..99ecfd7 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \
+-am__installdirs = "$(DESTDIR)$(includesdir)"
+-HEADERS = $(nodist_includes_HEADERS)
++am__installdirs = "$(DESTDIR)$(includedir)"
++HEADERS = $(nodist_include_HEADERS)
+@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+-nodist_includes_HEADERS = ffi.h ffitarget.h
++nodist_include_HEADERS = ffi.h ffitarget.h
+@@ -360 +359 @@ clean-libtool:
+-install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
++install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
++ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+- echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
+- $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
++ echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
+- $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+-uninstall-nodist_includesHEADERS:
++uninstall-nodist_includeHEADERS:
+@@ -378 +377 @@ uninstall-nodist_includesHEADERS:
+- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
++ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+@@ -380 +379 @@ uninstall-nodist_includesHEADERS:
+- dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
++ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+@@ -468 +467 @@ installdirs:
+- for dir in "$(DESTDIR)$(includesdir)"; do \
++ for dir in "$(DESTDIR)$(includedir)"; do \
+@@ -522 +521 @@ info-am:
+-install-data-am: install-nodist_includesHEADERS
++install-data-am: install-nodist_includeHEADERS
+@@ -566 +565 @@ ps-am:
+-uninstall-am: uninstall-nodist_includesHEADERS
++uninstall-am: uninstall-nodist_includeHEADERS
+@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS
+- install-nodist_includesHEADERS install-pdf install-pdf-am \
++ install-nodist_includeHEADERS install-pdf install-pdf-am \
+@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS
+- uninstall-am uninstall-nodist_includesHEADERS
++ uninstall-am uninstall-nodist_includeHEADERS
diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
new file mode 100644
index 000000000000..e1269b2398a4
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/643582
+
+From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
+From: Yen Chi Hsuan <yan12125@gmail.com>
+Date: Sun, 13 Nov 2016 19:17:19 +0800
+Subject: [PATCH] Install public headers in the standard path
+
+---
+ include/Makefile.am | 3 +--
+ libffi.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index bb241e8..c59df9f 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
+ noinst_HEADERS=ffi_common.h ffi_cfi.h
+ EXTRA_DIST=ffi.h.in
+
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+-nodist_includes_HEADERS = ffi.h ffitarget.h
++nodist_include_HEADERS = ffi.h ffitarget.h
+diff --git a/libffi.pc.in b/libffi.pc.in
+index edf6fde..6fad83b 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+--
+2.15.1
+
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..134d518b54b9
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils libtool multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+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="debug pax_kernel static-libs test"
+
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+ "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch
+ "${FILESDIR}"/${PN}-3.1-darwin-x32.patch
+ "${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch
+ "${FILESDIR}"/${PN}-3.2.1-include-path.patch
+ "${FILESDIR}"/${PN}-3.2.1-include-path-autogen.patch
+)
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+ # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+ if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+ local base="${T}"/conftest
+ echo 'int main() { }' > "${base}".c
+ $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+ if [ $? -eq 0 ]; then
+ eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+ eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+ die "The system is in inconsistent state with unknown libffi installed."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
+ elibtoolize
+}
+
+multilib_src_configure() {
+ use userland_BSD && export HOST="${CHOST}"
+ # python does not like miltilib-wrapped headers: bug #643582
+ # thus we install includes into ABI-specific paths
+ local includes="${EPREFIX}"/usr/$(get_libdir)/${P}/include/
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable pax_kernel pax_emutramp) \
+ $(use_enable debug) \
+ --includedir="${includes}"
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+ einstalldocs
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index ee44e6efd46f..a0129ce48302 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,12 +3,13 @@ AUX libical-2.0.0-libical.pc-fix-libdir-location.patch 917 BLAKE2B 6fcc8482d11e0
AUX libical-2.0.0-libical.pc-icu-move-to-requires.patch 1443 BLAKE2B ebdabe7edd03b1b416c42335a292723715b74ef62044e5ee52887cbcbc0425e94bbd51e9167dc479b31be7120926814afd7dd6eda6b65a6b498e47a3036f3d1d SHA512 e21cd8dbb5df05f9e90289d1869521e0258bfe89fc72cd78fa89f41177a7100950b3cc0c08498f7f9e19a9ed53813f706334aae67536f1b2f581e579cda45021
AUX libical-2.0.0-libical.pc-icu-remove-full-paths.patch 1358 BLAKE2B 5f29ec8e534b9d249c4feae41c8c35cb876435e74c998308d1e368874e2fd49ceddc7007f92daff7d2f2802e47981d702f0d75d4606ff58e1350c442cf023882 SHA512 24f9f49de882abb8e49c8a74899dc4bd9438c828e111e158826bbf396928d55b91adbbbda727310f249d8226ed23fdcc8f538b0ef55ba4c99f963ab475649409
AUX libical-2.0.0-libical.pc-set-full-version.patch 629 BLAKE2B e7d17235c6993c1ad4ae446d36020849db14c534d517c0f6e48ac96af7e51a9e3285eb1d9cb9886101c38f88b65aafd985cf35099e140ee537468fa585e60bbb SHA512 a30127d93d1366d65e464c6d4ad08a42b9de142eac6e14a905cad3e0e094e6deafa689e8deaaa3bc8746adfc9667f8a6657088a2a1e0643035a5a3c2fbde173f
+AUX libical-2.0.0-tests.patch 1176 BLAKE2B 4e96464d103095452ef7be6ebaf5331a9bc51cc3e1f2aa3afd74326ce5809bc577e36299f0293f34348d6b65c404d995399bcf28e2809968c91253409f60bbbe SHA512 c818aed46b64c7ecd72356506ccc36508521040886d9049b2ac0c20f2943f26b5f3ef10d3850b164132a08545f1ea86852db3b4b9ac17f3e4b2f56398a7ed1fe
AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
DIST libical-1.0.1.tar.gz 720618 BLAKE2B 7506db93346c1104dbc6572d69e6de1f38730e906ec863badb38f4b7f635a175110f5eb1d9784e5baf74bc509bbf7875e5769ca3e47660012845cbbe6d92309e SHA512 efce88c73352fc34e9f7eda2234bdb593e917b33d1373cc6e6a21a72db1b14f2ed72976d6084dddcd8f07b08a15d5f04370bc825695d2fd40cc7b8488a7a977f
DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
EBUILD libical-1.0.1.ebuild 1276 BLAKE2B 4190c6409f897dfe7755b1e81a11b1e3ca10fbf60cc62a9117f7ec23d0186f64235d0b8f831ff7c0de26490582eb4399050443ecece277e23fdbccb8948412eb SHA512 712364e9a0276b05cd98e6ca57fa974f653540da3e884a5ae3ce9d9d08e75910860396daf839a9dd086afbdf2cfbc8ef3bf16c5d0640828750cbd616ce5f8117
-EBUILD libical-2.0.0-r2.ebuild 1410 BLAKE2B 62396cfaf56e8d2c83768a807be5df756d7f0dc8a794d7e184140647014416916d580c76a2ffd20c05345fe733ce226775855a565c02fb896befbc26c9f88942 SHA512 6f4eab47e67718a9852ea95dca84e33b4c4dfaaadc0045cc3a3c0119c25766f21d93e62259f9f717e47fa94b5b72d9ae62a032285f07890957a6939a1d9caa85
-EBUILD libical-2.0.0-r3.ebuild 1607 BLAKE2B 5837219c94bab6acc3099bd4063c4877265ab7d4b9a88f507110f2aab3bba808cf1af7a0149a6f473c566116e27812404eeaa6a9264ff528dabb9f8e5099118e SHA512 dcb14367aa777a3031f284e35502c79be2da970bf68667d15c6b56c23f8a50bcf5dd4093c4ad3829a5f78da4c34e8e74b6f89b1b407a2b466b46d429850bbca9
-EBUILD libical-3.0.1.ebuild 1884 BLAKE2B 6d93808f40ff35d5e3f3baaaed6ed05a51926ecf77a8086337a94878836f3c349e8e44da33294d0d8375430f790fd8f87f6128efa8333aeca790ab96e9ff1101 SHA512 90866d79b84c606c0514f919bcb4523427256d2732d97bceb42d857ad439a32941aab3bbb602b60989ff9472d7b2120b6eb1abed2a9376259e18864ddd349958
-MISC metadata.xml 347 BLAKE2B f4f3eac1a1781d9922b06a2730eeba02dc35f380fbfe24e5b1ac4dd5d4da1e4286a185d82111a3c7b8b6c4e7d6ebd484c5df7649aa7b9dbf6185f288231e0d0f SHA512 b68df5186e55a781fe29b8a64261286c38f054e0c597b7cb265a4f9583d8978c2c6209add980e74064151ea5c5b5c6749ecfbeefaee58327ccfc4b03ace1aecc
+EBUILD libical-2.0.0-r2.ebuild 1520 BLAKE2B 9ad414a45f931658615a4844fa2ff3aba21b94ba335c5fd9635c8cb4fed0c92a9ffdceadaac653e0ebe2ac92f589122dfdeafb1044a5733c17b6a795b37b8ded SHA512 2c4c9120e6ef37e9f5e71452cfb73c24354afc53b8abc8f5d43fc0f7357a91ff6041efa46fcf1e6ce6586fde3c80ce92b0c5518bf1116e95726197ffa8dee09a
+EBUILD libical-2.0.0-r3.ebuild 1716 BLAKE2B 8e769d8440e6f00260bf0a5118ad1d21014541570b63b236cfcec038aaf185b42f3a758f1f93062a925fa8485bbb519bc5700767a5d71bf6cbfe85d5280503a7 SHA512 af97e27b3e8530018ff7e9fed1f03a96f03e823d52c935527649ca776e7b6884a34953a2519d00ba129dc30508ea99655ff5b4d5848deaa77878ca3328d1a8d5
+EBUILD libical-3.0.1.ebuild 1988 BLAKE2B 3138c3a6640cb94572fe9d18fab0249e46c086ae3e8ede7fed91d3d157ff99ef9095641d864dab397e749ec08d8a10b5574cc51a74cf2817838495634a895bba SHA512 ccc842bf0e764eaf001777daf54c0328d305aba2ce199f5ac46845dbc046f55f52b3a5eaf230fafefb35e1292011887f94210f8e639daa218891dc2a61ffe7f5
+MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
new file mode 100644
index 000000000000..a274382b3152
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-tests.patch
@@ -0,0 +1,38 @@
+From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Thu, 24 Mar 2016 16:28:02 -0400
+Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
+ data thereby fixing in-source building ISSUE#228
+ https://bugs.gentoo.org/show_bug.cgi?id=532296
+
+---
+ src/test/recur.c | 2 +-
+ src/test/testvcal.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/recur.c b/src/test/recur.c
+index d427137a..873ec48a 100644
+--- a/src/test/recur.c
++++ b/src/test/recur.c
+@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
+ #endif
+
+ if (argc <= 1) {
+- file = "../../test-data/recur.txt";
++ file = TEST_DATADIR "/recur.txt";
+ } else if (argc == 2) {
+ file = argv[1];
+ } else {
+diff --git a/src/test/testvcal.c b/src/test/testvcal.c
+index feee8147..024bbe99 100644
+--- a/src/test/testvcal.c
++++ b/src/test/testvcal.c
+@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
+ char *file;
+
+ if (argc != 2) {
+- file = "../../test-data/user-cal.vcf";
++ file = TEST_DATADIR "/user-cal.vcf";
+ } else {
+ file = argv[1];
+ }
diff --git a/dev-libs/libical/libical-2.0.0-r2.ebuild b/dev-libs/libical/libical-2.0.0-r2.ebuild
index 32dc6201e26a..c0e34d96a4ea 100644
--- a/dev-libs/libical/libical-2.0.0-r2.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r2.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
@@ -27,7 +27,10 @@ DOCS=(
doc/{AddingOrModifyingComponents,UsingLibical}.txt
)
-PATCHES=( "${FILESDIR}/fix-libdir-location.patch" )
+PATCHES=(
+ "${FILESDIR}/fix-libdir-location.patch"
+ "${FILESDIR}/${P}-tests.patch" #bug 532296
+)
src_configure() {
# See above, introspection is disabled for v2.0.0 at least.
@@ -38,6 +41,11 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ local myctestargs=( -j1 )
+ cmake-utils_src_test
+}
+
src_install() {
cmake-utils_src_install
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
index d3d88590688d..18915f35433a 100644
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r3.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
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
"${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
"${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
+ "${FILESDIR}/${P}-tests.patch" #bug 532296
)
src_configure() {
@@ -44,6 +45,11 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ local myctestargs=( -j1 )
+ cmake-utils_src_test
+}
+
src_install() {
cmake-utils_src_install
diff --git a/dev-libs/libical/libical-3.0.1.ebuild b/dev-libs/libical/libical-3.0.1.ebuild
index d34fc5db5a0d..4ad4a28d615e 100644
--- a/dev-libs/libical/libical-3.0.1.ebuild
+++ b/dev-libs/libical/libical-3.0.1.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
@@ -13,16 +13,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
SLOT="0/3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="berkdb doc examples glib introspection static-libs test"
-
+IUSE="berkdb doc examples static-libs test"
+
+# TODO: disabled until useful
+# glib? (
+# dev-libs/glib:2
+# dev-libs/libxml2:2
+# )
+# introspection? ( dev-libs/gobject-introspection:= )
COMMON_DEPEND="
dev-libs/icu:=
berkdb? ( sys-libs/db:= )
- glib? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- )
- introspection? ( dev-libs/gobject-introspection:= )
"
DEPEND="${COMMON_DEPEND}
dev-lang/perl
@@ -53,11 +54,14 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DICAL_GLIB=OFF
+ -DGOBJECT_INTROSPECTION=OFF
$(cmake-utils_use_find_package berkdb BDB)
- -DICAL_GLIB=$(usex glib)
- -DGOBJECT_INTROSPECTION=$(usex introspection)
-DSHARED_ONLY=$(usex !static-libs)
)
+# TODO: disabled until useful
+# -DICAL_GLIB=$(usex glib)
+# -DGOBJECT_INTROSPECTION=$(usex introspection)
cmake-utils_src_configure
}
diff --git a/dev-libs/libical/metadata.xml b/dev-libs/libical/metadata.xml
index 3bd1d0151050..002b34042a96 100644
--- a/dev-libs/libical/metadata.xml
+++ b/dev-libs/libical/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>asturm@gentoo.org</email>
+ <name>Andreas Sturmlechner</name>
+ </maintainer>
<upstream>
<remote-id type="github">libical/libical</remote-id>
</upstream>
- <use>
- <flag name="glib">Enable <pkg>dev-libs/glib</pkg> GObject interface support</flag>
- </use>
</pkgmetadata>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 0cac2caceb3f..dc51dc1f530f 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -7,7 +7,7 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
DIST nspr-4.13.1.tar.gz 1136646 BLAKE2B 68a756f16f3bed7b75e26ce67b8216b06a61c71f669f29970ff6caec624d39a98496f22e643478b20d1bf2b3e753dd4a98aa5fc685929cbece365dda7302a6d0 SHA512 4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
DIST nspr-4.16.tar.gz 1140681 BLAKE2B 68088ddcf14ad71e9f35cea024f754cc507444910a7cb55878e51f0fac086217c6703d1c96e48287b98a035a3b8f2a5309a036e58c4e98029804ee1fc978c933 SHA512 38cb8b26c2ee44063357a9484f1f6b24bab00a0d28a8f1644f64356205e7a407a1858d7a4d5cd2d6b62a39d3c0aea0cf2bddaa95fe61df272a633fe5fdee41b6
DIST nspr-4.17.tar.gz 1141300 BLAKE2B 6c038836017c4b09b820f53ee209a8cc49dcd3c31de43bea33011ed26065cdebf506a310e40fb682c2f057a636e5bc623f6cd21cd3c903500d6a850ca8604c74 SHA512 3589f533b88d7dbbdee078c2a836bf7f7cb48466cb8861b6a42b05f12a5c6ce49426aa8fb3b153d548acd1c9ccf0376feea5649b48e3d72f3da1af5df3bed882
-EBUILD nspr-4.13.1.ebuild 4017 BLAKE2B aa8e8c38c24123b0af718e6db4c3d5dd396c89136f07800d739911f1120e3342650e1795aa5e74cf3bd1ed633cb6cec1dbc667d065f1a56341aa3ff2c3cac79b SHA512 28de383935ca9910cd6c5562f02bfd6166964a55b96fe674f17f9247979bcec6103ff13731ba87d740358587916f60195dfb195a730e7e68516f8e7b2606396f
-EBUILD nspr-4.16.ebuild 4028 BLAKE2B 3acf50765084908c1aced1d00d3cf5e1c35bc30d988038f3b291d320f794e249cf6ec0a6fbb9a6d13290ebc8ca8a87c46d149e6a0b8199d48bdfd3f2db8388f8 SHA512 5bb012ae45b2bab34453e20e973bc3029650362a52f499181c453ad425db6e5a4f7774794508a497c9ceebe6f7c60ab71e87a7f7ebaebe7fdbdb5868c79e73c4
-EBUILD nspr-4.17.ebuild 4028 BLAKE2B 3acf50765084908c1aced1d00d3cf5e1c35bc30d988038f3b291d320f794e249cf6ec0a6fbb9a6d13290ebc8ca8a87c46d149e6a0b8199d48bdfd3f2db8388f8 SHA512 5bb012ae45b2bab34453e20e973bc3029650362a52f499181c453ad425db6e5a4f7774794508a497c9ceebe6f7c60ab71e87a7f7ebaebe7fdbdb5868c79e73c4
+EBUILD nspr-4.13.1.ebuild 3997 BLAKE2B 64e90ec2a3201d29a26356ec7b7de8ec672672675ccf45fd75128c8031c4614e9c9965d03b9e8eed6f89b4cd103f7b331db67609d9d713f24053a4ccd0ca52f6 SHA512 da816f07ad8fc9dd48c0bfd7708021e5185871207a0c6f9451fc20380719ff64ef9d61790f0714d63149ad730666530b2856fef35073a23d3c2a5109e0adbccc
+EBUILD nspr-4.16.ebuild 4008 BLAKE2B babc74c157ea600ccaac6b0d4cb67bf3c1116e461151d4dbbb4d321dbc1a22521e7d6a793aa007ef5df25ca5286583c1bc5357562f3541196f1b39bde669b87d SHA512 6188974b1a79e7fffebf9a46f777ad6713dca640514b57f6bd9e50ace2f93a53584339f89009c76a2363c7291e5cca589b5c2dac530b1a1c7ab611023985bf8f
+EBUILD nspr-4.17.ebuild 4008 BLAKE2B babc74c157ea600ccaac6b0d4cb67bf3c1116e461151d4dbbb4d321dbc1a22521e7d6a793aa007ef5df25ca5286583c1bc5357562f3541196f1b39bde669b87d SHA512 6188974b1a79e7fffebf9a46f777ad6713dca640514b57f6bd9e50ace2f93a53584339f89009c76a2363c7291e5cca589b5c2dac530b1a1c7ab611023985bf8f
MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.13.1.ebuild b/dev-libs/nspr/nspr-4.13.1.ebuild
index 5523b8726d78..1f044860766f 100644
--- a/dev-libs/nspr/nspr-4.13.1.ebuild
+++ b/dev-libs/nspr/nspr-4.13.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-WANT_AUTOCONF="2.5"
inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
diff --git a/dev-libs/nspr/nspr-4.16.ebuild b/dev-libs/nspr/nspr-4.16.ebuild
index 56daac76f50e..75a05840da0c 100644
--- a/dev-libs/nspr/nspr-4.16.ebuild
+++ b/dev-libs/nspr/nspr-4.16.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-WANT_AUTOCONF="2.5"
inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
diff --git a/dev-libs/nspr/nspr-4.17.ebuild b/dev-libs/nspr/nspr-4.17.ebuild
index 56daac76f50e..75a05840da0c 100644
--- a/dev-libs/nspr/nspr-4.17.ebuild
+++ b/dev-libs/nspr/nspr-4.17.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-WANT_AUTOCONF="2.5"
inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index 137e6b4e0d60..e76dda1109fd 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -3,6 +3,6 @@ AUX pslib-getline.patch 1249 BLAKE2B 02dfbb72459468618f472f6c09c229b22d241a8c442
AUX pslib-lm.patch 317 BLAKE2B 4ee5ef10537a6535f8fd4b9a3c2dc65feead6d8ba4f41516d6e171d7638314fbeb6c1a63a5e834d8638b8609d9f453267451bb9c904195a1dbd85f7f460fcebc SHA512 e3cb1e8a48d29a9215d681c051f0a6b66155037d0ddd4b1eea68e5aec446b30ad26f71a1129bd887e291e8118dd3334761909d33bfa7afd4f4267e70ea566bf4
DIST pslib-0.4.1.tar.gz 531797 BLAKE2B 28224be5411739d20118e3457050b7fc388ad0c5f1f14403080732588b16b2bfc89bad5ce8383db5d5da85fceca466fe81588550c949d18c5c4965889c26f9bc SHA512 012c0b2de1cb151fc41498ca4e6f62ec15138b35afddd0199c6366b818c7b544877eea9575df0e1aee49a67cd52dcac47eae405854e7390abeb64fda221327cf
DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
-EBUILD pslib-0.4.1-r2.ebuild 1094 BLAKE2B f1723233d1e6a94818b926a4b3552658cdf3be9d2aa22518d65475419977cd2ea835e9520665fcbea9d022425cf3eb79386d1350a3e2083c8918f3ff28c9bd2c SHA512 6258000303c0729c472875a4d4569fa13d2b3b7585a9769d3698049dd12436c904574fed7532815f037489881b2a555b6cc1c8781910f09139d3eedd1556b324
+EBUILD pslib-0.4.1-r2.ebuild 1031 BLAKE2B fdb5e5e99ee16ab15286a2049f0049f240e7d3264d4c3f7734e2a89d2ea62084068aedd7736e79a401c34791e191a0ffbabb1423a13b1e4105dba5330d04eec1 SHA512 9ac74edaf68a11c17dcc78ada74837cda8be00923544759df187e90eaac3ecdd0a3955b5ecd86c7f7f67039e00f26b08d21f9f7a0f38ee071f62b9b9ed546beb
EBUILD pslib-0.4.5.ebuild 1060 BLAKE2B e5fd165c8ae4c77adcd146bc7494bfd4f9ce03f0d71489a3d88eae39ff315eeeaa1b171093e3136fcf4519caf48c274e89b06665538a58dd576449121a3e8372 SHA512 c94021a8bdad8f9c4628cf9ee63c619261bf1d8e2c947bcdae6380e73702b6467a2306b1f00e9816272241f89fbb6c3e9fc3e4a1c32f485edff63b1fed2af4b4
MISC metadata.xml 444 BLAKE2B 62c386b9fc2facb334d02520386624241580034bfb227c243f5b589eafef655084b84cb5e5f6dac3cfe73afbd0dfbf41c161261ede4e780bd84bec56a2302a14 SHA512 e50857e3a1c443849c5eafbeb72d41558c1bd8c6a58f22a4ab6b1590647db278e598bfb123eac6a8b50754d8bbd524dc574c3181c1e08bc24fdcce3f13a148bb
diff --git a/dev-libs/pslib/pslib-0.4.1-r2.ebuild b/dev-libs/pslib/pslib-0.4.1-r2.ebuild
index fe6397aa1657..e0f19c00b2f6 100644
--- a/dev-libs/pslib/pslib-0.4.1-r2.ebuild
+++ b/dev-libs/pslib/pslib-0.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
-IUSE="debug jpeg linguas_de png tiff"
+IUSE="debug jpeg png tiff"
RDEPEND="png? ( >=media-libs/libpng-1.2.43-r2:0 )
jpeg? ( virtual/jpeg )
@@ -45,5 +45,4 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS README
- use linguas_de || rm -r "${D}/usr/share/locale/de"
}
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 333d9b2a5ce7..88460df0950a 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,6 +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-r1.ebuild 1156 BLAKE2B 4663dcf28aa3af30e16327f4a68e4d31ed6960b652ea53515fede9b7a9ae1452fba7be4320adb36941da56a3511297f21d2b15b10556e1c8eaad7f3559c3a37f SHA512 2fbaa2b0e4aa00c9e06e119a10ef4a6baf9e75915bc97d42e501651a1d1559670930108c0b0334485dc358c484f6dd586184b05af77b887296c74d03072f8101
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
index 831f129d5a6b..cce11f14f446 100644
--- a/dev-libs/quazip/quazip-0.7.3-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.7.3-r1.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="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"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 863ca2b86d5c..4d288d8bf6d8 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,6 @@
AUX spdlog-0.14.0-CMakeLists.txt 3333 BLAKE2B 1ea839f706f91d648ae143099599b680f995996732e62325333b97a4a0a9cb4e96dff2cebd7c533a556ac79ff01e2fdb1dcb27cca88510ac0889670bfb3f2169 SHA512 0bd9c7da1ef0a55c82bb3242d894d550e392b921bb50cdd16a842b33c05fffec9be42aef6aa91c3c11f30e6a6924e63c20ac4c89367bdac65dc40556dc60fc36
-DIST spdlog-0.13.0.tar.gz 154551 BLAKE2B 1b20393a305ac020aa422b174d5b707bbffd8efb38708807e40a3a13d3483fe5c73ea8e47a5ded89e49b9699ab844b25ce7bff7fa07bd6f79212bdc9fc0afb64 SHA512 5bb89cbeb17a054832ce70f6013d54e7641c1aa36cbad08388b4a2e63f4851943edfe292551ff01de6de1ed6325617384325a67f3e1024f346c6d22a1148c80c
-DIST spdlog-0.14.0.tar.gz 155590 BLAKE2B fb070e1049977ded34fef4953e743b7a3c4c745093e2d1974d0749f065799d6021046f5e913cee3b17e5ace9cdbd8a787532f7426ffc47bd8a7f1ab8d4fd4869 SHA512 f49b7f26f4fde57fe16f32ab89082f0c590645c627f5b4646f633a16f3eec2926b3465e742bc4899cb802e7b974978c547638205065e9955ed9696fbcaf0b444
-DIST spdlog-0.16.1.tar.gz 162408 BLAKE2B c90b94bac128f8b143d85522d224223b1361f7d552d9caa8b253e494dd72de56a2149cbd8d568eb4305224d7caf80d8067fbce606a1071bd94f74c43b3245782 SHA512 0ef741f2abcae7c925808b44bba7d2e55aa8bd3b07a77ab6e785068beb505cdbcd7835d7d103e8e96094235e262954969a176d9f4977e9d373f1bee8e2716ff2
-EBUILD spdlog-0.13.0.ebuild 655 BLAKE2B 7efc471cc3f96964966c4f85831c2f66e5d643d9da5d5b2d97c3081039bc71407eabedd82f921ecc7ffd02506bdea04ac216d350da0f8f8c78b094738b1cafc3 SHA512 591f8661dbb8c37b15e5206db62bd1b06046e93d0071cbcb4624126561fd4825d37e956e6a7a9e6c9429ff69f0d9be68f3046e0b091f9278820a449043a1274f
-EBUILD spdlog-0.14.0-r1.ebuild 811 BLAKE2B 97445c23b72cd63c4b22a4cd7252a7dd709b9f9539194f291113f9b119259e4244725daa3c0066afba0c9d29a2fd56d40cda8d1192a8520097651ad2b8e313d8 SHA512 36fa654c0130d38e8d0cbe99a9c2e7ead09f611681cbe31e6e6d03101502b4fb0d6633c5a6e1f9edf9853ec065bcaf6f8139146934a74805d3240df9bbc08253
-EBUILD spdlog-0.14.0.ebuild 655 BLAKE2B 7efc471cc3f96964966c4f85831c2f66e5d643d9da5d5b2d97c3081039bc71407eabedd82f921ecc7ffd02506bdea04ac216d350da0f8f8c78b094738b1cafc3 SHA512 591f8661dbb8c37b15e5206db62bd1b06046e93d0071cbcb4624126561fd4825d37e956e6a7a9e6c9429ff69f0d9be68f3046e0b091f9278820a449043a1274f
-EBUILD spdlog-0.16.1.ebuild 655 BLAKE2B 7efc471cc3f96964966c4f85831c2f66e5d643d9da5d5b2d97c3081039bc71407eabedd82f921ecc7ffd02506bdea04ac216d350da0f8f8c78b094738b1cafc3 SHA512 591f8661dbb8c37b15e5206db62bd1b06046e93d0071cbcb4624126561fd4825d37e956e6a7a9e6c9429ff69f0d9be68f3046e0b091f9278820a449043a1274f
-EBUILD spdlog-9999.ebuild 654 BLAKE2B f8096b999c466f452802f5749079324b25a1712f2206a98b7e040ffdec49ba6c19e5c5af8e1a94b9217b8f7a51be6d6785dd8d41a9b7af6cf05713f4a689249f SHA512 9b05944a4315d580517e83876ac4578ccab130b9565699d987cdccf6782f3c2fc9252628ad09f730932e58fb950aa67b721571771d6bc9535e39e29019782915
+AUX spdlog-unbundle-fmt.patch 2765 BLAKE2B 0ef7974992efcd82442dd658ffd93c2605b4ae6eb6a63dee0892b5c9ec1fbec22f76821ba7c4715ec4f42f88f4bc626c0b5b92b656ff7f8e4f4b299dac4f85c6 SHA512 14e3dd4cf5c3604547d01c0e940c0ee4771667039601c769e941a4719bef7a23fcb6e14455abda0365e708b81d1fd36160c238dba3c01b4124866a59de4e3991
+DIST spdlog-0.16.2.tar.gz 162709 BLAKE2B 7cd031bd9b1e01aa11186334ada9aad50cdc063942e0eb5b9d36e918e305db4c0e5657a215f24f458dbf792e05c38f74409bc7f5f88049bd1c4a759ccab0167e SHA512 454da17d75fa6dae074fb2ef10d93a1f9ccbf23b625521d32ce463a1362411ffc35ca33b081bee3cfb27bb647472de73899c9a15d24f09c8a3c9222560bcf559
+EBUILD spdlog-0.16.2.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
+EBUILD spdlog-9999.ebuild 725 BLAKE2B 69820598625c70fab029d489d75daf828d173d3698ff76b38115275de88381354a207d0b927ac637bee31a6acfd9ddb1219c2206fc8024e672d9fb157d442980 SHA512 3e9ff83aa2b588683059e6c4cd9c5ef2d38c0fb86359e0fdb2753ad77530d06cd966d7864810786003bff9a786c1e60a10d5c0c224a82ffa20cec6456d920f6a
MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
new file mode 100644
index 000000000000..1b2449949bfe
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-unbundle-fmt.patch
@@ -0,0 +1,90 @@
+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.14.0-r1.ebuild b/dev-libs/spdlog/spdlog-0.14.0-r1.ebuild
deleted file mode 100644
index 0118dd39d236..000000000000
--- a/dev-libs/spdlog/spdlog-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # root CMakeLists.txt is CRLF line terminated, so...
- cp "${FILESDIR}"/${P}-CMakeLists.txt CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-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.14.0.ebuild b/dev-libs/spdlog/spdlog-0.14.0.ebuild
deleted file mode 100644
index c3fad9652964..000000000000
--- a/dev-libs/spdlog/spdlog-0.14.0.ebuild
+++ /dev/null
@@ -1,34 +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=""
-RDEPEND="${DEPEND}"
-
-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.1.ebuild b/dev-libs/spdlog/spdlog-0.16.1.ebuild
deleted file mode 100644
index c3fad9652964..000000000000
--- a/dev-libs/spdlog/spdlog-0.16.1.ebuild
+++ /dev/null
@@ -1,34 +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=""
-RDEPEND="${DEPEND}"
-
-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.13.0.ebuild b/dev-libs/spdlog/spdlog-0.16.2.ebuild
index c3fad9652964..b22d880ad039 100644
--- a/dev-libs/spdlog/spdlog-0.13.0.ebuild
+++ b/dev-libs/spdlog/spdlog-0.16.2.ebuild
@@ -20,9 +20,13 @@ LICENSE="MIT"
SLOT="0"
IUSE="test"
-DEPEND=""
+DEPEND="
+ dev-libs/libfmt
+"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+
src_configure() {
local mycmakeargs=(
-DSPDLOG_BUILD_EXAMPLES=no
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 4c9cf2286540..b22d880ad039 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -20,9 +20,13 @@ LICENSE="MIT"
SLOT="0"
IUSE="test"
-DEPEND=""
+DEPEND="
+ dev-libs/libfmt
+"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-unbundle-fmt.patch" )
+
src_configure() {
local mycmakeargs=(
-DSPDLOG_BUILD_EXAMPLES=no
@@ -30,4 +34,5 @@ src_configure() {
)
cmake-utils_src_configure
+
}
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 148690c9ee60..af15020943b0 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,14 +1,6 @@
AUX uriparser-0.8.1-doc-install.patch 665 BLAKE2B 2e5b60d69a0d4b845f6716d8f8e10e2cce31a0c9f66c15f80c21c35d90c3c466178d46a21c446826d1c5cf12120bea046fc07a2b8198ea05fbcbda990f89f365 SHA512 7197ec7169e3712c216599de5874ee3de53750f176c881274cfa0b11e380ab4f0dd6a3d58f61cfde43f69002911f0fb6310e601d67941e94dd5691f89f1bcab1
-DIST uriparser-0.7.9.tar.bz2 430215 BLAKE2B ca6582768a4c626ac9010f9e35047765c3f7ca219692031d3252ae3e1771656575bde6e33ad20e4faf955b1ac37ee6da562c40a108497e60675cc81fbdc1f72a SHA512 a08d700078c7238d71db05e4de622f841069b38a82b718107943041518a56dd343e6b8a6256f7330119f946b4b5aed05659fc67e566ed96f99e6206584132b01
DIST uriparser-0.8.0.tar.bz2 433581 BLAKE2B 0f39f891634de86fe1696c5d000c6325203561347c83f3144fef2319c9dc58657d82b92bd8499efda15bfa966230f3c2ca4b9051caced0fe15c7e480e564ac86 SHA512 e80efc8484f0b67107cad317cef72db9de906a86020c3ab31178e06e958782f0a744fe257b1e6cd130dd25c6747e684ece93ce5f755864303df34c6b763d2e5b
-DIST uriparser-0.8.1.tar.bz2 341433 BLAKE2B e2bf98afa5a7c28b8ad3af6c22183503eeea8c418ffea7c6d57f7f7df4b1b519bd55b1f0c18dc2fdf16c532e77c01584dec9989cef3819dd5c785894d0f766e2 SHA512 6a1f4cc72a62cd74fa814e262233bd44d882ce4ee189a2ca7a6ef1cb3893492adf801b0391d3eea1f8ef443971f7195cbe8143158514225c875e76d677a9040e
-DIST uriparser-0.8.2.tar.bz2 341959 BLAKE2B 06f22e826cd1d1a9f3abc2042d1d4c87f65266be4309db9989c2838fba9b4d6f40e68881ba4bcc50e10d67aa0a9a2943f972686210af7fc551e2a598a2f57167 SHA512 857c12229aece80065f923b6191e5771c6cd26e7eb42e62a35ae5793174df72b818a59c7b4d9a8dbd8f3f5d4b5885b43a05f0e40aa1be9d9b6f6a9b323c56ca9
-DIST uriparser-0.8.3.tar.bz2 358228 BLAKE2B 6a51abf79c3521316ad3f77ba8ec75c90cf482c2fd3d1fcc1653ba21d259cfabc6f19f156cf013640f716500c81554c018c65f621a9f47cba01c4f486116bef0 SHA512 e8fe7f0e48af84d165038ba8c4a324cd0cd9fbabe4b37b0035681f24cf69470d34bdcb15bda36594dd770383b475a91ed8d33e1a897fb8bf9dcb1d2454c55fc1
DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
-EBUILD uriparser-0.7.9.ebuild 1101 BLAKE2B 6850c724cc27cfdac2196e2d6d3089f38006d1dc4f52e347fdd7223a0f2df1b0152af3a5ee7746caa4cd252a97e4189cbfbe40c7c36a192fad995f19726b2419 SHA512 61e7b24259bd1b4bd117bfe1081912b42ffc49a8d4e2250d8bf194f3bcc2ea37a602f28acfe8ea1f23a78e33bdd47c6877503037ed095fc2074ac850e62ba66a
EBUILD uriparser-0.8.0.ebuild 1101 BLAKE2B 1ce433e4c4b04b16f8d7d3b988795e42f3358bf7ef8b07f87d0eec3dea0b0d6be6655518ae950a04a21ca773c385085cb6c8b6222ff6d4d3f7314b35f7a559d7 SHA512 7a554f51d594177792b935b19b1b2b964936b5d27c9d50bc4faebc35479fca38f3d612273af6ca04a2d65e63263d06286dddcf84ef7fbd5b899ceb50f42f7c10
-EBUILD uriparser-0.8.1.ebuild 1181 BLAKE2B eb01d3626841ad1a15af59ac4a836679bc7579eba67e364be6a33df71f6afc0b8f8ad37314252acec688938cc2ddd504490d032f5a67157cb4c96c49dc8d1d09 SHA512 777af89fa40025b074c0836b2ac9f85d6c435aaa5606aa94acad9464c18cf24196543ddf1dead6608e3cfc1a8f801fdddf6174d77a4111f13a53ed36683d11df
-EBUILD uriparser-0.8.2.ebuild 1078 BLAKE2B 44b31bc8043d1647a66144b05e59323b634ee94673eb53807da8e9688d0be4b912f20f3842b8443652962cc0b11dbb438cd85a65ff276659eea178ea21d0b01a SHA512 d9f89173b19be0675a1e108d0894ce78a96635ca40d48fab625faa207eeaa7a16ec5659d3f17feeabd6413b865e73150644fd6203d93f0356bb0764123321413
-EBUILD uriparser-0.8.3.ebuild 971 BLAKE2B 2cb27a9c6dde3711633eb2fe8bc4b2e7c0fe0a0b5925caf35bd25240637bbd734ba00a09c93a06b3318dbfb4dc85042ee712d76b6de2b0e848bab272ab7dde69 SHA512 e2736b924941f39a6b8d4810c550d4ae89d6b869cc643c3499916ac7bac4f1e5e6e76110b856498f0e4e09793d8851e71c3bd2df7b2af97c0f6cf29c51079457
EBUILD uriparser-0.8.4.ebuild 976 BLAKE2B b408b3abb8eca1b16822b7385a124e01b4021a7434037f6c03dbb2e49ed296ab2830f63d1fc1479f0799fe1562bc5fac386cb813042518f24fc11792bf950af1 SHA512 d356896c3040b0dd6e5935183ab0f26c996aacdae1725904800c49d4a23d6acbebd9d7919d07cf15f9edad7dde46526acc0ae19bbfb919d1bb230fb4a6a6eb99
MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.7.9.ebuild b/dev-libs/uriparser/uriparser-0.7.9.ebuild
deleted file mode 100644
index 64193ffa3c9f..000000000000
--- a/dev-libs/uriparser/uriparser-0.7.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="http://uriparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt4 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt4? ( dev-qt/qthelp:4 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --disable-dependency-tracking \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog THANKS doc/*.txt || die
-
- if use doc && use qt4; then
- insinto /usr/share/doc/${PF}/
- doins doc/*.qch || die # Using doins to avoid dodoc's compression
- fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.1.ebuild b/dev-libs/uriparser/uriparser-0.8.1.ebuild
deleted file mode 100644
index 6dc5fe7e3fd6..000000000000
--- a/dev-libs/uriparser/uriparser-0.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="http://uriparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt4 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt4? ( dev-qt/qthelp:4 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-doc-install.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --disable-dependency-tracking \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog THANKS || die
-
- if use doc && use qt4; then
- insinto /usr/share/doc/${PF}/
- doins doc/*.qch || die # Using doins to avoid dodoc's compression
- fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.2.ebuild b/dev-libs/uriparser/uriparser-0.8.2.ebuild
deleted file mode 100644
index 79890873ba97..000000000000
--- a/dev-libs/uriparser/uriparser-0.8.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="http://uriparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt4 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt4? ( dev-qt/qthelp:4 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --disable-dependency-tracking \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog THANKS || die
-
- if use doc && use qt4; then
- insinto /usr/share/doc/${PF}/
- doins doc/*.qch || die # Using doins to avoid dodoc's compression
- fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.3.ebuild b/dev-libs/uriparser/uriparser-0.8.3.ebuild
deleted file mode 100644
index 0f26dee35fc6..000000000000
--- a/dev-libs/uriparser/uriparser-0.8.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="http://uriparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt4 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt4? ( dev-qt/qthelp:4 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog THANKS
-
- if use doc && use qt4; then
- dodoc doc/*.qch
- docompress -x /usr/share/doc/${PF}/${P}.qch
- fi
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 21:27:26 +0000