diff --git a/Manifest.files.gz b/Manifest.files.gz index 76f4017a1f9d..3d809c058e32 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index fd847feb20ce..2767736d4c46 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest index 615137ed60b7..2373b7cc70bf 100644 --- a/app-admin/kube-bench/Manifest +++ b/app-admin/kube-bench/Manifest @@ -25,3 +25,4 @@ DIST kube-bench-0.0.17.tar.gz 197158 BLAKE2B 458a7ee61cde654359002060ca05ef376c0 DIST kube-bench-0.0.19.tar.gz 197836 BLAKE2B 86fd5d43d45fb2fa98e542a2a2385fecf2ec2a024bede34d5d9a9e33e04967b7dadab34651734361bb5f273eb8da824ca6d73fe46e8944b14ae0ba4c4e64341a SHA512 dfe82bcce482c88effffad772b17874bc2c80423d47f2dc7c02b5c9425b915ec2405d9f97b88b4aff2a54d33b7bfafd3f89c43ee4c32956d27cef4f11833a178 DIST kube-bench-0.0.20.tar.gz 197875 BLAKE2B 8bca6040b62226d01d86edd020166538ee6072cf6ec1ec72d0db38b024ade39ba2378e9bd866b8b7e3878e11dd5ca9ce62ad3c3a36d7d99e124c664acf7961a9 SHA512 1a07d1b7b5a073915e8c161fedc901974889791a939fd58daae267dccbf80dc09bafe133f783c2eb02335535d27d143cfd7b657652ea5b517064b3cded31430d DIST kube-bench-0.0.22.tar.gz 205683 BLAKE2B d405bc0b7af4f588e363f5a4f240d1b8662118e64e92356f841a86501b76bec8ee51ae5fb832819cee3d99f0aefa232676e6602029ab103f3760c5127fe8a845 SHA512 e64aaae83a9469763ac5a044df8cc5e53c7b0dd1bffc27c5fbc48fa0e3e27c8a3be45ebe6d82483757eb4da290c34b003d0db5c9fee25b95fbe44d0ff3e273ad +DIST kube-bench-0.0.23.tar.gz 205894 BLAKE2B 7c10f4f8c6b153d7e3e63cdc4cadb1b403c599e55e56f7f47be91e6c49b68215eb9c67898c6d897b7c7f038cbd404d2af158ca9629bc2d3a4e40dddb9fcdc32e SHA512 946bf313e6762ab11a59c02c03e150686254669c0ec32c36c7b9f6d224d6d011f73d7a6f56b771dbf8857b24aaf5138248b506bb180df6c3375e6c0ad68ffee3 diff --git a/app-admin/kube-bench/kube-bench-0.0.23.ebuild b/app-admin/kube-bench/kube-bench-0.0.23.ebuild new file mode 100644 index 000000000000..456872daf1dd --- /dev/null +++ b/app-admin/kube-bench/kube-bench-0.0.23.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/aquasecurity/kube-bench" + +EGO_VENDOR=( + "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260" + "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1" + "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998" + "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" + "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b" + "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f" + "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78" + "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934" + "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96" + "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022" + "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a" + "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224" + "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db" + "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4" + "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b" + "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b" + "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea" + "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7" + "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys" + "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text" + "gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml" +) + +inherit golang-build golang-vcs-snapshot bash-completion-r1 + +ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_VENDOR_URI}" +KEYWORDS="~amd64" + +DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark" +HOMEPAGE="https://github.com/aquasecurity/kube-bench" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RESTRICT="test" + +src_compile() { + pushd src/${EGO_PN} || die + GOPATH="${S}" go build -o ${PN} . || die + popd || die +} + +src_install() { + dobin src/${EGO_PN}/${PN} + insinto /etc/kube-bench + doins -r src/${EGO_PN}/cfg +} diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild index fe2cba9b115c..93fad0de32f8 100644 --- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else - KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" + KEYWORDS="amd64 arm ~arm64 ~hppa x86" SRC_URI=" https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest index ea091bee8f93..b409a0da3dc9 100644 --- a/app-admin/sshguard/Manifest +++ b/app-admin/sshguard/Manifest @@ -1,3 +1,4 @@ DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119 DIST sshguard-2.2.0.tar.gz 737612 BLAKE2B 8c51a265d5bddc6d4da75e2c6aa84de4c84fd85466f1cb06000c01cf8552d3d3e291532e2a1bce5c6367a93044a63839b9aa584f65dd02838c4959d86220b386 SHA512 4f7bfcd0fe7237609cd393bd6ca235882de252eced03014d9fe713c7cf66a2ecb365c35c24ab62d034abad970fb3e9a07bc854e7e5d194f6c374fac74cdc7e2f DIST sshguard-2.3.0.tar.gz 755702 BLAKE2B 3b2e9bea3cf65c4e9a3ab82b6f5013c167033310d6f9ffe27d1d7dc9380be2214fdfdab4892ab9f6dfaa51b1131698d729257695ddef9debbc0ad06a9f49acfd SHA512 b3df479a752e0263fc444c582dd6c89dfdd4154ab011d23d0973f16f3b3e60f21f01b53e6ed0c4b138f134cd7e3dea5e67b44901f812f3da0d1aac760eeee279 +DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d diff --git a/app-admin/sshguard/sshguard-2.3.1.ebuild b/app-admin/sshguard/sshguard-2.3.1.ebuild new file mode 100644 index 000000000000..3fac136a82f9 --- /dev/null +++ b/app-admin/sshguard/sshguard-2.3.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="protects hosts from brute force attacks against ssh" +HOMEPAGE="https://www.sshguard.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd" + +DEPEND=" + sys-devel/flex +" +RDEPEND=" + virtual/logger +" +DOCS=( + CHANGELOG.rst + CONTRIBUTING.rst + README.rst + examples/net.sshguard.plist + examples/sshguard.service + examples/whitelistfile.example +) +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-conf.patch +) + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + + insinto /etc + newins examples/sshguard.conf.sample sshguard.conf +} diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild new file mode 100644 index 000000000000..407363556f81 --- /dev/null +++ b/app-admin/sshguard/sshguard-99999.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools git-r3 + +DESCRIPTION="protects hosts from brute force attacks against ssh" +HOMEPAGE="https://www.sshguard.net/" +EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="" + +DEPEND=" + sys-devel/flex +" +RDEPEND=" + virtual/logger +" +DOCS=( + CHANGELOG.rst + CONTRIBUTING.rst + README.rst + examples/net.sshguard.plist + examples/sshguard.service + examples/whitelistfile.example +) +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-conf.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + + insinto /etc + newins examples/sshguard.conf.sample sshguard.conf +} diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 9903a16f7b3e..1681c2269e73 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild index c7d3b459c23f..4cc05dcbf322 100644 --- a/app-arch/gzip/gzip-1.9.ebuild +++ b/app-arch/gzip/gzip-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pic static" PATCHES=( diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 4d3b42f1260c..686dbf3e93ba 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1 +1,2 @@ DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8 +DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6 diff --git a/app-arch/tar/files/tar-1.30-CVE-2018-20482.patch b/app-arch/tar/files/tar-1.30-CVE-2018-20482.patch new file mode 100644 index 000000000000..8abab5df6c02 --- /dev/null +++ b/app-arch/tar/files/tar-1.30-CVE-2018-20482.patch @@ -0,0 +1,146 @@ +From c15c42ccd1e2377945fd0414eca1a49294bff454 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 27 Dec 2018 17:48:57 +0200 +Subject: Fix CVE-2018-20482 + +* src/sparse.c (sparse_dump_region): Handle short read condition. +(sparse_extract_region,check_data_region): Fix dumped_size calculation. +Handle short read condition. +(pax_decode_header): Fix dumped_size calculation. + +diff --git a/src/sparse.c b/src/sparse.c +index d41c0ea..f611200 100644 +--- a/src/sparse.c ++++ b/src/sparse.c +@@ -1,6 +1,6 @@ + /* Functions for dealing with sparse files + +- Copyright 2003-2007, 2010, 2013-2017 Free Software Foundation, Inc. ++ Copyright 2003-2007, 2010, 2013-2018 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the +@@ -427,6 +427,30 @@ sparse_dump_region (struct tar_sparse_file *file, size_t i) + bufsize); + return false; + } ++ else if (bytes_read == 0) ++ { ++ char buf[UINTMAX_STRSIZE_BOUND]; ++ struct stat st; ++ size_t n; ++ if (fstat (file->fd, &st) == 0) ++ n = file->stat_info->stat.st_size - st.st_size; ++ else ++ n = file->stat_info->stat.st_size ++ - (file->stat_info->sparse_map[i].offset ++ + file->stat_info->sparse_map[i].numbytes ++ - bytes_left); ++ ++ WARNOPT (WARN_FILE_SHRANK, ++ (0, 0, ++ ngettext ("%s: File shrank by %s byte; padding with zeros", ++ "%s: File shrank by %s bytes; padding with zeros", ++ n), ++ quotearg_colon (file->stat_info->orig_file_name), ++ STRINGIFY_BIGINT (n, buf))); ++ if (! ignore_failed_read_option) ++ set_exit_status (TAREXIT_DIFFERS); ++ return false; ++ } + + memset (blk->buffer + bytes_read, 0, BLOCKSIZE - bytes_read); + bytes_left -= bytes_read; +@@ -464,9 +488,9 @@ sparse_extract_region (struct tar_sparse_file *file, size_t i) + return false; + } + set_next_block_after (blk); ++ file->dumped_size += BLOCKSIZE; + count = blocking_write (file->fd, blk->buffer, wrbytes); + write_size -= count; +- file->dumped_size += count; + mv_size_left (file->stat_info->archive_file_size - file->dumped_size); + file->offset += count; + if (count != wrbytes) +@@ -598,6 +622,12 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end) + rdsize); + return false; + } ++ else if (bytes_read == 0) ++ { ++ report_difference (file->stat_info, _("Size differs")); ++ return false; ++ } ++ + if (!zero_block_p (diff_buffer, bytes_read)) + { + char begbuf[INT_BUFSIZE_BOUND (off_t)]; +@@ -609,6 +639,7 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end) + + beg += bytes_read; + } ++ + return true; + } + +@@ -635,6 +666,7 @@ check_data_region (struct tar_sparse_file *file, size_t i) + return false; + } + set_next_block_after (blk); ++ file->dumped_size += BLOCKSIZE; + bytes_read = safe_read (file->fd, diff_buffer, rdsize); + if (bytes_read == SAFE_READ_ERROR) + { +@@ -645,7 +677,11 @@ check_data_region (struct tar_sparse_file *file, size_t i) + rdsize); + return false; + } +- file->dumped_size += bytes_read; ++ else if (bytes_read == 0) ++ { ++ report_difference (¤t_stat_info, _("Size differs")); ++ return false; ++ } + size_left -= bytes_read; + mv_size_left (file->stat_info->archive_file_size - file->dumped_size); + if (memcmp (blk->buffer, diff_buffer, rdsize)) +@@ -1213,7 +1249,8 @@ pax_decode_header (struct tar_sparse_file *file) + union block *blk; + char *p; + size_t i; +- ++ off_t start; ++ + #define COPY_BUF(b,buf,src) do \ + { \ + char *endp = b->buffer + BLOCKSIZE; \ +@@ -1229,7 +1266,6 @@ pax_decode_header (struct tar_sparse_file *file) + if (src == endp) \ + { \ + set_next_block_after (b); \ +- file->dumped_size += BLOCKSIZE; \ + b = find_next_block (); \ + src = b->buffer; \ + endp = b->buffer + BLOCKSIZE; \ +@@ -1240,8 +1276,8 @@ pax_decode_header (struct tar_sparse_file *file) + dst[-1] = 0; \ + } while (0) + ++ start = current_block_ordinal (); + set_next_block_after (current_header); +- file->dumped_size += BLOCKSIZE; + blk = find_next_block (); + p = blk->buffer; + COPY_BUF (blk,nbuf,p); +@@ -1278,6 +1314,8 @@ pax_decode_header (struct tar_sparse_file *file) + sparse_add_map (file->stat_info, &sp); + } + set_next_block_after (blk); ++ ++ file->dumped_size += BLOCKSIZE * (current_block_ordinal () - start); + } + + return true; +-- +cgit v1.0-41-gc330 + diff --git a/app-arch/tar/tar-1.30-r1.ebuild b/app-arch/tar/tar-1.30-r1.ebuild new file mode 100644 index 000000000000..731db2be72c3 --- /dev/null +++ b/app-arch/tar/tar-1.30-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="Use this to make tarballs :)" +HOMEPAGE="https://www.gnu.org/software/tar/" +SRC_URI="mirror://gnu/tar/${P}.tar.bz2 + mirror://gnu-alpha/tar/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" + +RDEPEND="acl? ( virtual/acl ) + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.10.35 ) + xattr? ( elibc_glibc? ( sys-apps/attr ) )" + +PATCHES=( + "${FILESDIR}"/${P}-fix-test-92.patch + "${FILESDIR}"/${P}-fix-test-117-and-118.patch + "${FILESDIR}"/${P}-CVE-2018-20482.patch #674210 +) + +src_prepare() { + default + + if ! use userland_GNU ; then + sed -i \ + -e 's:/backup\.sh:/gbackup.sh:' \ + scripts/{backup,dump-remind,restore}.in \ + || die "sed non-GNU" + fi +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --bindir="${EPREFIX%/}"/bin + --enable-backup-scripts + --libexecdir="${EPREFIX%/}"/usr/sbin + $(usex userland_GNU "" "--program-prefix=g") + $(use_with acl posix-acls) + $(use_enable nls) + $(use_with selinux) + $(use_with xattr xattrs) + ) + FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" +} + +src_install() { + default + + local p=$(usex userland_GNU "" "g") + if [[ -z ${p} ]] ; then + # a nasty yet required piece of baggage + exeinto /etc + doexe "${FILESDIR}"/rmt + fi + + # autoconf looks for gtar before tar (in configure scripts), hence + # in Prefix it is important that it is there, otherwise, a gtar from + # the host system (FreeBSD, Solaris, Darwin) will be found instead + # of the Prefix provided (GNU) tar + if use prefix ; then + dosym tar /bin/gtar + fi + + mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die + + if use minimal ; then + find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \ + -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ + -delete || die + fi +} diff --git a/app-arch/tar/tar-1.31.ebuild b/app-arch/tar/tar-1.31.ebuild new file mode 100644 index 000000000000..571e4db0d180 --- /dev/null +++ b/app-arch/tar/tar-1.31.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="Use this to make tarballs :)" +HOMEPAGE="https://www.gnu.org/software/tar/" +SRC_URI="mirror://gnu/tar/${P}.tar.bz2 + mirror://gnu-alpha/tar/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" + +RDEPEND="acl? ( virtual/acl ) + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.10.35 ) + xattr? ( elibc_glibc? ( sys-apps/attr ) )" + +src_prepare() { + default + + if ! use userland_GNU ; then + sed -i \ + -e 's:/backup\.sh:/gbackup.sh:' \ + scripts/{backup,dump-remind,restore}.in \ + || die "sed non-GNU" + fi +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --bindir="${EPREFIX}"/bin + --enable-backup-scripts + --libexecdir="${EPREFIX}"/usr/sbin + $(usex userland_GNU "" "--program-prefix=g") + $(use_with acl posix-acls) + $(use_enable nls) + $(use_with selinux) + $(use_with xattr xattrs) + ) + FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" +} + +src_install() { + default + + local p=$(usex userland_GNU "" "g") + if [[ -z ${p} ]] ; then + # a nasty yet required piece of baggage + exeinto /etc + doexe "${FILESDIR}"/rmt + fi + + # autoconf looks for gtar before tar (in configure scripts), hence + # in Prefix it is important that it is there, otherwise, a gtar from + # the host system (FreeBSD, Solaris, Darwin) will be found instead + # of the Prefix provided (GNU) tar + if use prefix ; then + dosym tar /bin/gtar + fi + + mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die + mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die + + if use minimal ; then + find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ + -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ + -delete || die + fi +} diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest index 758e04021568..01df841c87a7 100644 --- a/app-arch/wimlib/Manifest +++ b/app-arch/wimlib/Manifest @@ -1 +1,2 @@ DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9 +DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild new file mode 100644 index 000000000000..9db9ef57d01a --- /dev/null +++ b/app-arch/wimlib/wimlib-1.13.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools pax-utils +if [[ -z ${PV%%*9999} ]]; then + inherit git-r3 + EGIT_REPO_URI="git://wimlib.net/${PN}" +else + inherit vcs-snapshot + MY_PV="${PV/_/-}" + MY_PV="${MY_PV^^}" + SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + RESTRICT="primaryuri" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="The open source Windows Imaging (WIM) library" +HOMEPAGE="https://wimlib.net/" + +LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0" +SLOT="0" +IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm" +REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )" + +PATCHES=( "${FILESDIR}/syslinux-path.patch" ) + +RDEPEND=" + dev-libs/libxml2:2 + ntfs? ( sys-fs/ntfs3g ) + fuse? ( sys-fs/fuse:0 ) + openssl? ( dev-libs/openssl:0 ) + iso? ( + app-arch/cabextract + app-cdr/cdrtools + ) +" +DEPEND=" + ${RDEPEND} + cpu_flags_x86_ssse3? ( + yasm? ( dev-lang/yasm ) + !yasm? ( dev-lang/nasm ) + ) +" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with ntfs ntfs-3g) + $(use_with fuse) + $(use_enable cpu_flags_x86_ssse3 ssse3-sha1) + $(use_with openssl libcrypto) + $(use_enable threads multithreaded-compression) + ) + has test ${FEATURES} && myeconfargs+=( --enable-test-support ) + ac_cv_prog_NASM="$(usex yasm yasm nasm)" \ + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + pax-mark m "${S}"/.libs/wimlib-imagex +} diff --git a/app-arch/xar/files/xar-1.8-openssl-1.1.patch b/app-arch/xar/files/xar-1.8-openssl-1.1.patch new file mode 100644 index 000000000000..f811d99d07e5 --- /dev/null +++ b/app-arch/xar/files/xar-1.8-openssl-1.1.patch @@ -0,0 +1,45 @@ +lib/hash.c: fix compilation with OpenSSL-1.1+ + +EVP_MD_CTX has become an anonymous struct now, so can't allocate size +for it anymore. + +--- a/lib/hash.c 2015-06-09 03:22:07.000000000 +0000 ++++ b/lib/hash.c 2019-01-01 14:37:01.487775958 +0000 +@@ -102,7 +102,7 @@ + #ifdef __APPLE__ + CCDigestRef digest; + #else +- EVP_MD_CTX digest; ++ EVP_MD_CTX *digest; + const EVP_MD *type; + #endif + unsigned int length; +@@ -123,7 +123,8 @@ + #else + OpenSSL_add_all_digests(); + HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name); +- EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type); ++ HASH_CTX(hash)->digest = EVP_MD_CTX_create(); ++ EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type); + #endif + + HASH_CTX(hash)->digest_name = strdup(digest_name); +@@ -143,7 +143,7 @@ + #ifdef __APPLE__ + CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #else +- EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte); ++ EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #endif + } + +@@ -160,7 +160,8 @@ + CCDigestFinal(HASH_CTX(hash)->digest, buffer); + CCDigestDestroy(HASH_CTX(hash)->digest); + #else +- EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); ++ EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); ++ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest); + #endif + + *nbyte = HASH_CTX(hash)->length; diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild new file mode 100644 index 000000000000..b8acc75f2315 --- /dev/null +++ b/app-arch/xar/xar-1.8-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic multilib-minimal ltprune + +APPLE_PV=400 +DESCRIPTION="An easily extensible archive format" +HOMEPAGE="https://opensource.apple.com/source/xar/" +SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="libressl kernel_Darwin" + +DEPEND=" + !kernel_Darwin? ( + !kernel_SunOS? ( virtual/acl ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + app-arch/bzip2[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + dev-libs/libxml2[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-ext2.patch + "${FILESDIR}"/${PN}-1.8-safe_dirname.patch + "${FILESDIR}"/${PN}-1.8-arm-ppc.patch + "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch +) + +S=${WORKDIR}/${PN}-${APPLE_PV}/${PN} + +multilib_src_configure() { + use kernel_Darwin || append-libs $(pkg-config --libs openssl) + ECONF_SOURCE=${S} \ + econf \ + --disable-static + # botched check, fix it up + if use kernel_SunOS ; then + sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die + fi +} + +multilib_src_install() { + default + prune_libtool_files +} diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest index b508bad0f5e4..60092e56e2a1 100644 --- a/app-arch/xarchiver/Manifest +++ b/app-arch/xarchiver/Manifest @@ -1 +1,2 @@ DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849 +DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498 diff --git a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild new file mode 100644 index 000000000000..12127f58d602 --- /dev/null +++ b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils xdg-utils + +DESCRIPTION="A GTK+ archive manager that can be used with Thunar" +HOMEPAGE="https://github.com/ib/xarchiver" +SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="doc" + +# older pigz versions have incompatible command-line processing +# https://bugs.gentoo.org/661464 +RDEPEND=">=dev-libs/glib-2:= + x11-libs/gtk+:3= + !! ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="+cron" DEPEND="cron? ( virtual/cron )" diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild index 423fb4af7e91..3da3c77fb124 100644 --- a/app-crypt/gpgme/gpgme-1.11.1.ebuild +++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="1/11" # subslot = soname major version -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="common-lisp static-libs cxx python qt5" COMMON_DEPEND=">=app-crypt/gnupg-2 diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest new file mode 100644 index 000000000000..27aed74de43c --- /dev/null +++ b/app-crypt/nitrocli/Manifest @@ -0,0 +1,6 @@ +DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3 +DIST hid-0.4.1.crate 4121 BLAKE2B 8af6af754c129f3eeaaa35e3b03361fd2a658cdee017701573e79ed40e86900e137ae6a10c844f90ce8c29ecb577d892a8a9b065520eb360734c9bf52bcae6ce SHA512 5529be48d9c0cfb7bdafee029a45fe471cd8996cabe7d584615ccbfea244700a1cf7d78cdaaf8f36ac3d6ddca466d36569fb12e1c1eaaa45091899e57a1d21ce +DIST hidapi-sys-0.1.4.crate 2391 BLAKE2B 5d8309bad190bdba91aee84239bb0965fdc0093a16a835b99ddfc13633dff6568c66f13c917d9e20cd4e1e453b3dd46ff071f729aba3ea1d99de8388997b193e SHA512 4e2c0a7ee48cb7c7c8bdaaf7c3fd22f58f8995ea2b14caab0cb03efef64711fbe35b435c9f4132e35fb02ea27ee77788be11b3c459f5a290e7297f4d0f9426ac +DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381 +DIST nitrocli-0.1.3.crate 23497 BLAKE2B a61cbf26ae5503a77c534efcfffadcd56a1ea15dc34fcfff50765fcee1c22b64f54b76d9cf23ce9ec58d37132be13e313e643379f1330e9d43b2e7492fa627db SHA512 43880b6cb9bb152a1179d02b4290ff6c4dbbdae3c5cb46c0c5cdc382d2a5d8322de97d94b1842b6e93bba97bc3d451bc8946da6d6c0b66fb7d9ed8936df2c263 +DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d diff --git a/app-crypt/nitrocli/metadata.xml b/app-crypt/nitrocli/metadata.xml new file mode 100644 index 000000000000..d84c39390b85 --- /dev/null +++ b/app-crypt/nitrocli/metadata.xml @@ -0,0 +1,20 @@ + + + + + deso@posteo.net + Daniel Müller + + + proxy-maint@gentoo.org + Proxy Maintainers + + + nitrocli is a command line application that interacts with Nitrokey + Pro and Storage devices (see https://www.nitrokey.com/). + + + d-e-s-o/nitrocli + https://github.com/d-e-s-o/nitrocli/issues + + diff --git a/app-crypt/nitrocli/nitrocli-0.1.3.ebuild b/app-crypt/nitrocli/nitrocli-0.1.3.ebuild new file mode 100644 index 000000000000..1424608aca74 --- /dev/null +++ b/app-crypt/nitrocli/nitrocli-0.1.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" +cc-1.0.25 +hid-0.4.1 +hidapi-sys-0.1.4 +libc-0.2.45 +nitrocli-0.1.3 +pkg-config-0.3.14 +" + +inherit cargo + +DESCRIPTION="A command line tool for interacting with the Nitrokey Storage" +HOMEPAGE="https://github.com/d-e-s-o/nitrocli" +SRC_URI="$(cargo_crate_uris ${CRATES})" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +BDEPEND=" + >=dev-lang/rust-1.31.0 +" +DEPEND=" + dev-libs/hidapi +" +# We require gnupg for /usr/bin/gpg-connect-agent. +RDEPEND=" + ${DEPEND} + app-crypt/gnupg +" + +# Requires a Nitrokey in pristine configuration. +RESTRICT="test" +QA_FLAGS_IGNORED="/usr/bin/nitrocli" + +src_install() { + cargo install -j $(makeopts_jobs) --path=. --root="${D}/usr" $(usex debug --debug "") \ + || die "cargo install failed" + rm "${D}/usr/.crates.toml" || die "failed to remove .crates.toml" + + einstalldocs + doman "${S}/doc/nitrocli.1" +} diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest index 734f67be4291..b643a1ca57e6 100644 --- a/app-crypt/openpgp-keys-gentoo-release/Manifest +++ b/app-crypt/openpgp-keys-gentoo-release/Manifest @@ -1,2 +1,3 @@ DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894 +DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553 diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild new file mode 100644 index 000000000000..b9a927fd8e1e --- /dev/null +++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)" +HOMEPAGE="https://www.gentoo.org/downloads/signatures/" +SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz + test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="test" + +DEPEND="test? ( app-crypt/gnupg )" + +S=${WORKDIR} + +src_test() { + local old_umask=$(umask) + umask 077 + + local -x GNUPGHOME=${T}/.gnupg + mkdir "${GNUPGHOME}" || die + einfo "Importing keys ..." + gpg --import "gentoo-release.asc.${PV}" || die "Key import failed" + + local f + for f in gentoo-release-test-sigs*/*.asc; do + einfo "Testing ${f##*/} ..." + gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}" + done + + umask "${old_umask}" +} + +src_install() { + insinto /usr/share/openpgp-keys + newins "gentoo-release.asc.${PV}" gentoo-release.asc +} diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch new file mode 100644 index 000000000000..7c26d6e14f8c --- /dev/null +++ b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch @@ -0,0 +1,81 @@ +From a3447989483e09638e6ebeab7eabe6273aa5f3db Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Fri, 4 Jan 2019 10:33:15 +0200 +Subject: [PATCH] build: fixup libressl support and add libressl-2.7 + +Signed-off-by: Alon Bar-Lev +Backport: 5d4cc4ee +--- + lib/conversion.c | 6 +++++- + lib/tpm_kdfa.c | 10 +++++++--- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/lib/conversion.c b/lib/conversion.c +index ce0f5b3..f55af6f 100644 +--- a/lib/conversion.c ++++ b/lib/conversion.c +@@ -45,6 +45,10 @@ + #include "tpm2_alg_util.h" + #include "tpm2_util.h" + ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */ ++#define LIB_TPM2_OPENSSL_OPENSSL_PRE11 ++#endif ++ + static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, const char *path); + + pubkey_format tpm2_parse_pubkey_format(const char *label) { +@@ -134,7 +138,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, c + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */ ++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) + ssl_rsa_key->e = e; + ssl_rsa_key->n = n; + #else +diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c +index 3d1ed50..fc03af8 100644 +--- a/lib/tpm_kdfa.c ++++ b/lib/tpm_kdfa.c +@@ -34,6 +34,10 @@ + #include "log.h" + #include "tpm2_util.h" + ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */ ++#define LIB_TPM2_OPENSSL_OPENSSL_PRE11 ++#endif ++ + static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) { + + switch(algorithm) { +@@ -54,7 +58,7 @@ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) { + static HMAC_CTX *hmac_alloc() + { + HMAC_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */ ++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) + ctx = malloc(sizeof(*ctx)); + #else + ctx = HMAC_CTX_new(); +@@ -62,7 +66,7 @@ static HMAC_CTX *hmac_alloc() + if (!ctx) + return NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) + HMAC_CTX_init(ctx); + #endif + +@@ -71,7 +75,7 @@ static HMAC_CTX *hmac_alloc() + + static void hmac_del(HMAC_CTX *ctx) + { +-#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11) + HMAC_CTX_cleanup(ctx); + free(ctx); + #else +-- +2.19.2 + diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild index a23c0b4d9a6a..df27445aa2b5 100644 --- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild +++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,10 @@ DEPEND="${RDEPEND} test? ( dev-util/cmocka )" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${P}-libressl.patch" +) + src_configure() { econf \ --disable-hardening \ diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz index a28ad5ad06b5..4da2310c9295 100644 Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest index 69d24ab4ddb9..7164287325e4 100644 --- a/app-doc/kicad-doc/Manifest +++ b/app-doc/kicad-doc/Manifest @@ -1,2 +1,3 @@ DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a DIST kicad-doc-5.0.0.tar.gz 68834628 BLAKE2B af6cf42fbabbf3dcd1a00b1bf94633d1cc09a5c6457bd20631f4049a0c7051b74e33cb62911e3df7cc8cfa6c50738276c17ba834923295538d88d9898cf24f73 SHA512 0fb266ada47303af41f3f5438894d66800644252bee898467522a7e6e86c372c7701768c34ac2260f0e6d76af669bf4bab33c41598037d6005ecc4ed6d31b419 +DIST kicad-doc-5.0.1.tar.gz 68998124 BLAKE2B 89c89f76ea17fd95dc8657b415675f5665a4d4bcb8c29eb5bf43f3216c59f38f38904d2d30242ebf3c4bb02197d6e04557af6b7b03b17c13ed9d051c7ed0c134 SHA512 f500be02417bbe3105ece434ca594c7a8cfe3d937a9a835b49b238569f40a8e8cc360d3970d38262b1ae0b702203de942feeae8c48cd2068aec90bf81e3e5a88 diff --git a/app-doc/kicad-doc/kicad-doc-5.0.1.ebuild b/app-doc/kicad-doc/kicad-doc-5.0.1.ebuild new file mode 100644 index 000000000000..1924e8c1b4a5 --- /dev/null +++ b/app-doc/kicad-doc/kicad-doc-5.0.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Electronic Schematic and PCB design tools manuals" +HOMEPAGE="http://www.kicad-pcb.org/" +SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="html +pdf" +LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl" +IUSE+=${LANG_USE} +REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )" +unset LANG_USE + +DEPEND=" + >=app-text/asciidoc-8.6.9 + >=app-text/dblatex-0.3.10 + >=app-text/po4a-0.45 + >=sys-devel/gettext-0.18 + dev-perl/Unicode-LineBreak + dev-util/source-highlight + l10n_ca? ( dev-texlive/texlive-langspanish ) + l10n_de? ( dev-texlive/texlive-langgerman ) + l10n_en? ( dev-texlive/texlive-langenglish ) + l10n_es? ( dev-texlive/texlive-langspanish ) + l10n_fr? ( dev-texlive/texlive-langfrench ) + l10n_it? ( dev-texlive/texlive-langitalian ) + l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) + l10n_pl? ( dev-texlive/texlive-langpolish )" +RDEPEND="" + +src_configure() { + local mycmakeargs=( + -DBUILD_FORMATS="$(usev html);$(usev pdf)" + -DSINGLE_LANGUAGE="${L10N}" + -DKICAD_DOC_PATH="/usr/share/doc/${P}/help" + ) + cmake-utils_src_configure +} diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 5f2415661dae..4421e934e811 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest index 144949df2fb4..54c311b4dfe8 100644 --- a/app-emulation/cri-o/Manifest +++ b/app-emulation/cri-o/Manifest @@ -1,2 +1,3 @@ DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b SHA512 dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894 +DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a SHA512 52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283 diff --git a/app-emulation/cri-o/cri-o-1.13.0.ebuild b/app-emulation/cri-o/cri-o-1.13.0.ebuild new file mode 100644 index 000000000000..32f4f4374306 --- /dev/null +++ b/app-emulation/cri-o/cri-o-1.13.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_COMMIT="e8a2525c2e7f5ab057d5a2b5f1950be5643d8053" +EGO_PN="github.com/kubernetes-sigs/${PN}" + +inherit golang-vcs-snapshot systemd + +DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface" +HOMEPAGE="http://cri-o.io/" +SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="btrfs +device-mapper ostree seccomp selinux" + +COMMON_DEPEND=" + app-crypt/gpgme:= + app-emulation/runc + dev-libs/glib:= + dev-libs/libassuan:= + dev-libs/libgpg-error:= + net-firewall/conntrack-tools + net-firewall/iptables + net-misc/cni-plugins + net-misc/socat + sys-apps/iproute2 + btrfs? ( sys-fs/btrfs-progs ) + device-mapper? ( sys-fs/lvm2:= ) + ostree? ( dev-util/ostree ) + seccomp? ( sys-libs/libseccomp:= ) + selinux? ( sys-libs/libselinux:= )" +DEPEND=" + ${COMMON_DEPEND} + dev-go/go-md2man" +RDEPEND="${COMMON_DEPEND}" +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + + sed -e '/^GIT_.*/d' \ + -e 's/$(GO) build/$(GO) build -v -work -x/' \ + -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \ + -i Makefile || die + + sed -e 's:/usr/local/bin:/usr/bin:' \ + -i contrib/systemd/* || die +} + +src_compile() { + [[ -f hack/btrfs_installed_tag.sh ]] || die + use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ + hack/btrfs_installed_tag.sh || die; } + + [[ -f hack/libdm_installed.sh ]] || die + use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \ + hack/libdm_installed.sh || die; } + + [[ -f hack/ostree_tag.sh ]] || die + use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \ + hack/ostree_tag.sh || die; } + + [[ -f hack/seccomp_tag.sh ]] || die + use seccomp || { echo -e "#!/bin/sh\ntrue" > \ + hack/seccomp_tag.sh || die; } + + [[ -f hack/selinux_tag.sh ]] || die + use selinux || { echo -e "#!/bin/sh\ntrue" > \ + hack/selinux_tag.sh || die; } + + mkdir -p bin || die + GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \ + emake binaries docs +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man + + keepdir /etc/crio + insinto /etc/crio + use seccomp && doins seccomp.json + + "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die + doins "${T}/crio.conf.example" + + newinitd "${FILESDIR}/crio.initd" crio + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + + # Suppress crio log error messages triggered if these don't exist. + keepdir /etc/containers/oci/hooks.d + keepdir /usr/share/containers/oci/hooks.d + + # Suppress crio "Missing CNI default network" log message. + keepdir /etc/cni/net.d + insinto /etc/cni/net.d + doins contrib/cni/99-loopback.conf + + systemd_dounit contrib/systemd/* +} diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml index a18ec9b7d291..e48b961a7b5a 100644 --- a/app-emulation/cri-o/metadata.xml +++ b/app-emulation/cri-o/metadata.xml @@ -26,6 +26,6 @@ - kubernetes-incubator/cri-o + kubernetes-sigs/cri-o diff --git a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild index 8c47ef3bf8df..c0dbda3904fc 100644 --- a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild +++ b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="+introspection nls +vala" REQUIRED_USE="vala? ( introspection )" diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild index 1a8756f5974d..fb60857d3dca 100644 --- a/app-emulation/libvirt/libvirt-4.9.0.ebuild +++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" - KEYWORDS="x86" + KEYWORDS="amd64 x86" SLOT="0" else # Versions with 4 numbers are stable updates: @@ -20,7 +20,7 @@ else else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" fi - KEYWORDS="~amd64 ~arm64 x86" + KEYWORDS="amd64 ~arm64 x86" SLOT="0/${PV}" fi diff --git a/app-emulation/lxc-templates/Manifest b/app-emulation/lxc-templates/Manifest index d5ddd3e6b0e9..94c37e69f3d8 100644 --- a/app-emulation/lxc-templates/Manifest +++ b/app-emulation/lxc-templates/Manifest @@ -1,3 +1,2 @@ DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe SHA512 cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290 -DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34 SHA512 1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0 SHA512 3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632 diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild deleted file mode 100644 index 92e3e2aa239a..000000000000 --- a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Old style template scripts for LXC" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" - -LICENSE="LGPL-3" -SLOT="0" - -RDEPEND=" - >=app-emulation/lxc-3.0" - -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" ) -DOCS=() - -src_prepare() { - default - eautoreconf -} diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild index 4a4dcd5d0e2a..c52d602d5218 100644 --- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild +++ b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC" HOMEPAGE="https://linuxcontainers.org/" SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" LICENSE="LGPL-3" SLOT="0" diff --git a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild index b99319a5ac52..944a821c3da6 100644 --- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild +++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2" diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild index 092c665883fc..871816079601 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -181,7 +181,7 @@ src_install() { # This ebuild / package supports only py2.7. When py3 comes is unknown. # The compile phase makes VBoxPython2_7.so. # py3 support would presumably require a binary pre-compiled by py3. - use python && doins VBoxPython.so VBoxPython2_7.so + use python && doins VBoxPython.so rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \ vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \ diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz index b91d23961bd4..d1ff595115cf 100644 Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild index bbb5d6bd1fc4..98ab02c04788 100644 --- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild +++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/" SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND="app-admin/eselect" diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz index fb68aead4d77..9f992c822e2e 100644 Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ diff --git a/app-forensics/afl/Manifest b/app-forensics/afl/Manifest index 8104338bd1da..57a0845d077f 100644 --- a/app-forensics/afl/Manifest +++ b/app-forensics/afl/Manifest @@ -1,5 +1 @@ -DIST afl-2.35b.tgz 829515 BLAKE2B 5f03d00b21ec8e2169b78757c9be7ca57d35a66c42c169c4a14a554f8ecb9cdacd0bbb99da63e7007731377dd6e815e7ea886ac8b9623cd1be80976ffc51bdaf SHA512 77f286d0008055770812b7429a671caed54adb2355cd88e1cbdd13f9e739763f46ed6f3e25ddfbe7aa2679e0a71c9b1af9767d1c367df1778338fcf260bc38c5 -DIST afl-2.39b.tgz 830897 BLAKE2B cc03e3864b75f6bae232bafb3fc66c80be18b00e05982c1124ce7de7e8df9c54a66273985472507e64a927485ba8121ded565fe4021350a2e8caab7a4c9a3178 SHA512 0df37fc8dea65d4130bc0fc8aaa23525bde4832c7202efb78ebe740d661546adee575b48fb94d851ef26293ca28a6ff818ab1dfd643c8e688aceb520e11229d0 -DIST afl-2.46b.tgz 834265 BLAKE2B d292d4c1686c123af7ddee57d9d44d4d8618a49f57985493ed0017fdda88d95cca4b270c139416f95c21476c9aeea3bcbde0be737fcc1f2c38ef0b17379f2b46 SHA512 01e150f05a023277f6fbf165f1ee0799f9a330efae562d67725cf87b456f4104e086162796634fcfdd7c68aa33a38ef7df9ac5931f8893c14364d270b864d059 -DIST afl-2.51b.tgz 835611 BLAKE2B 6fb4fb60e2fd1d1a18caee84568bee98c4224b54bc55454c53d3c3b753274d183816c8fe229be84303722c7fc31e29bc244a149718ae7507f127e994c5b6e663 SHA512 fd67cf44b7336175041c2efa42b122e91f887f4a293618a59ea1e145ef47b9c0fab9fc274e4b94499c523bec950ff5a704050c3f4260e890ad97774c365a358c DIST afl-2.52b.tgz 835907 BLAKE2B 6df8b8f97a0b1ccb22466492bf15f054e7a05f77f2827c6555572fd610cbed24c903ae188e2242ba6ffec302e154e319adb627626a7927f17ffa5ab00cef604f SHA512 30d4526440cff109ef2a014278f52a04b1b33560b6ab7d7f59e1516655858ffb36dac81963d2d8f214984776742ca9a7942c27c8fb61f7eb70b5b35cd029008f diff --git a/app-forensics/afl/afl-2.35b.ebuild b/app-forensics/afl/afl-2.35b.ebuild deleted file mode 100644 index cbd560185fa0..000000000000 --- a/app-forensics/afl/afl-2.35b.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs flag-o-matic - -DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer" -HOMEPAGE="http://lcamtuf.coredump.cx/afl/" -SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -DEPEND="sys-devel/gcc:* - sys-devel/clang:*" -RDEPEND="${DEPEND}" -QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf" - -src_compile() { - emake CC="$(tc-getCC)" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" - CC="clang" CXX="clang++" strip-unsupported-flags - cd llvm_mode - emake \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" \ - install -} diff --git a/app-forensics/afl/afl-2.39b.ebuild b/app-forensics/afl/afl-2.39b.ebuild deleted file mode 100644 index cbd560185fa0..000000000000 --- a/app-forensics/afl/afl-2.39b.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs flag-o-matic - -DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer" -HOMEPAGE="http://lcamtuf.coredump.cx/afl/" -SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -DEPEND="sys-devel/gcc:* - sys-devel/clang:*" -RDEPEND="${DEPEND}" -QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf" - -src_compile() { - emake CC="$(tc-getCC)" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" - CC="clang" CXX="clang++" strip-unsupported-flags - cd llvm_mode - emake \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" \ - install -} diff --git a/app-forensics/afl/afl-2.46b.ebuild b/app-forensics/afl/afl-2.46b.ebuild deleted file mode 100644 index f6578457d15a..000000000000 --- a/app-forensics/afl/afl-2.46b.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib toolchain-funcs flag-o-matic - -DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer" -HOMEPAGE="http://lcamtuf.coredump.cx/afl/" -SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -DEPEND="sys-devel/gcc:* - sys-devel/clang:*" -RDEPEND="${DEPEND}" -QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf" - -src_compile() { - emake CC="$(tc-getCC)" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" - CC="clang" CXX="clang++" strip-unsupported-flags - cd llvm_mode || die - emake \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" \ - install -} diff --git a/app-forensics/afl/afl-2.51b.ebuild b/app-forensics/afl/afl-2.51b.ebuild deleted file mode 100644 index 4da2fbf2e0de..000000000000 --- a/app-forensics/afl/afl-2.51b.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 multilib toolchain-funcs flag-o-matic - -DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer" -HOMEPAGE="http://lcamtuf.coredump.cx/afl/" -SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -DEPEND="sys-devel/gcc:* - sys-devel/clang:*" -RDEPEND="${DEPEND}" -QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf" - -src_compile() { - emake CC="$(tc-getCC)" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" - CC="clang" CXX="clang++" strip-unsupported-flags - cd llvm_mode || die - emake \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="/usr" \ - HELPER_PATH="/usr/$(get_libdir)/afl" \ - DOC_PATH="/usr/share/doc/${PF}" \ - install -} diff --git a/app-forensics/afl/afl-2.52b.ebuild b/app-forensics/afl/afl-2.52b.ebuild index 4da2fbf2e0de..9c58122f99dd 100644 --- a/app-forensics/afl/afl-2.52b.ebuild +++ b/app-forensics/afl/afl-2.52b.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit multilib toolchain-funcs flag-o-matic @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" DEPEND="sys-devel/gcc:* - sys-devel/clang:*" + sys-devel/clang:=" RDEPEND="${DEPEND}" QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf" diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 5e0e0d2fbc72..1eaaa4257762 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest index 8b5eb7828330..af4966e9a0c1 100644 --- a/app-misc/ckermit/Manifest +++ b/app-misc/ckermit/Manifest @@ -1 +1,2 @@ DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad +DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa diff --git a/app-misc/ckermit/ckermit-9.0.302.ebuild b/app-misc/ckermit/ckermit-9.0.302.ebuild new file mode 100644 index 000000000000..8c7e12e0f401 --- /dev/null +++ b/app-misc/ckermit/ckermit-9.0.302.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic toolchain-funcs + +# Columbia University only uses the third component, e.g. cku211.tar.gz for +# what we would call 8.0.211. +MY_P="cku$(ver_cut 3)" + +DESCRIPTION="combined serial and network communication software package" +SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz" +HOMEPAGE="http://www.kermitproject.org/" + +LICENSE="Kermit" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="ncurses" + +DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )" +RDEPEND="${DEPEND} + net-dialup/lrzsz" + +S=${WORKDIR} + +PATCHES=( + "${FILESDIR}"/${P}-cleanup.patch + "${FILESDIR}"/${PN}-8.0.211-build-wart.patch +) + +src_prepare() { + default + + tc-export_build_env BUILD_CC + sed -i -r \ + -e 's:"(CC2?) = gcc":"\1=$(CC)":g' \ + -e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \ + makefile || die +} + +src_compile() { + # we don't enable any of the telnet/ftp authentication stuff + # since there are other packages which do these things better + # USE="kerberos pam shadow ssl zlib" + append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP + + if use ncurses; then + append-cppflags "-DCK_NCURSES" + append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)" + append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)" + fi + + append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840 + append-cppflags -DHAVE_CRYPT_H -DHAVE_OPENPTY + append-cppflags -DNOARROWKEYS # bug #669332 + emake \ + CC="$(tc-getCC)" \ + KFLAGS="${CPPFLAGS}" \ + LIBS="-lcrypt -lresolv -lutil ${LIBS}" \ + LNKFLAGS="${LDFLAGS}" \ + linuxa +} + +src_install() { + emake DESTDIR="${ED}" prefix=/usr manroot=/usr/share install + dodoc *.txt + + # make the correct symlink + rm "${ED}"/usr/bin/kermit-sshsub || die + dosym kermit /usr/bin/kermit-sshsub + + # the ckermit.ini script is calling the wrong kermit binary -- + # the one from ${D} + sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini +} diff --git a/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch new file mode 100644 index 000000000000..c645e75da835 --- /dev/null +++ b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch @@ -0,0 +1,94 @@ +Various clean-ups and fix makefile dir creation. + +--- cku302/ckcmai.c ++++ cku302/ckcmai.c +@@ -561,6 +561,8 @@ + #include "ckntap.h" + #endif /* NT */ + ++#include ++ + #ifndef NOSERVER + /* Text message definitions.. each should be 256 chars long, or less. */ + #ifdef MINIX +--- cku302/ckuus5.c ++++ cku302/ckuus5.c +@@ -7853,7 +7853,7 @@ + printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)"); + printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)"); + printf(" --cdmessage:%d\n",srvcdmsg); +- printf(" --helpfile:%d\n",helpfile); ++ printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)"); + if (inserver) { + printf("\n"); + break; +--- cku302/ckuusx.c ++++ cku302/ckuusx.c +@@ -57,7 +57,6 @@ + #include + #endif /* NOHTERMCAP */ + #endif /* BSD44 */ +-#else /* !BSD44 */ + #ifdef linux + #include + #endif /* linux */ +--- cku302/makefile ++++ cku302/makefile +@@ -1047,7 +1047,7 @@ + else\ + echo "Creating $(DESTDIR)...";\ + DESTDIR=`echo $(DESTDIR) | sed 's!/*$$!!'`;\ +- mkdir $$DESTDIR || exit 1;\ ++ mkdir -p $$DESTDIR || exit 1;\ + fi;\ + chmod 755 $(DESTDIR) || exit 1;\ + fi;\ +@@ -1066,7 +1066,7 @@ + echo "$(DESTDIR)$(BINDIR) exists...";\ + else\ + echo "Creating $(DESTDIR)$(BINDIR)/...";\ +- mkdir $(DESTDIR)$(BINDIR) || exit 1;\ ++ mkdir -p $(DESTDIR)$(BINDIR) || exit 1;\ + chmod 755 $(DESTDIR)$(BINDIR);\ + fi;\ + rm -f $(DESTDIR)$(BINDIR)/kermit;\ +@@ -1104,9 +1104,9 @@ + if test -d $(DESTDIR)$(MANDIR); then\ + echo "$(DESTDIR)$(MANDIR) exists...";\ + else\ +- echo "Creating $(MANDIR)...";\ +- mkdir $(MANDIR) || exit 1;\ +- chmod 755 $(MANDIR) || exit 1;\ ++ echo "Creating $(DESTDIR)$(MANDIR)...";\ ++ mkdir -p $(DESTDIR)$(MANDIR) || exit 1;\ ++ chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\ + fi;\ + rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\ + cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\ +@@ -1125,7 +1125,7 @@ + echo "$(CERTDIR) exists...";\ + else\ + echo "Creating $(CERTDIR)...";\ +- mkdir $(CERTDIR) || exit 1;\ ++ mkdir -p $(CERTDIR) || exit 1;\ + chmod 755 $(CERTDIR) || exit 1;\ + fi;\ + echo "Installing certificates file...";\ +@@ -1146,7 +1146,7 @@ + echo "$(DESTDIR)$(SRCDIR) exists...";\ + else\ + echo "Creating $(DESTDIR)$(SRCDIR)/...";\ +- mkdir $(DESTDIR)$(SRCDIR) || exit 1;\ ++ mkdir -p $(DESTDIR)$(SRCDIR) || exit 1;\ + chmod 755 $(DESTDIR)$(SRCDIR);\ + fi;\ + echo "Copying source files to $(DESTDIR)$(SRCDIR)...";\ +@@ -1168,7 +1168,7 @@ + echo "$(DESTDIR)$(INFODIR) exists...";\ + else\ + echo "Creating $(DESTDIR)$(INFODIR)/...";\ +- mkdir $(DESTDIR)$(INFODIR) || exit 1;\ ++ mkdir -p $(DESTDIR)$(INFODIR) || exit 1;\ + chmod 755 $(DESTDIR)$(INFODIR);\ + fi;\ + echo "Copying text files to $(DESTDIR)$(INFODIR)...";\ diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 9967ef414809..1424ab6aa800 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,2 +1,3 @@ DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138 DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf +DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild new file mode 100644 index 000000000000..d6f2ab5c5677 --- /dev/null +++ b/app-misc/mc/mc-4.8.22.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +MY_P=${P/_/-} + +DESCRIPTION="GNU Midnight Commander is a text based file manager" +HOMEPAGE="https://www.midnight-commander.org" +SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" + +REQUIRED_USE="spell? ( edit )" + +RDEPEND=">=dev-libs/glib-2.26.0:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) + slang? ( >=sys-libs/slang-2 ) + !slang? ( sys-libs/ncurses:0=[unicode?] ) + spell? ( app-text/aspell ) + X? ( x11-libs/libX11 + x11-libs/libICE + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-libs/check ) + " + +S=${WORKDIR}/${MY_P} + +pkg_pretend() { + if use slang && use unicode ; then + ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." + fi +} + +src_configure() { + [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" + + local myeconfargs=( + --disable-dependency-tracking + --disable-silent-rules + --enable-charset + --enable-vfs + --with-homedir=$(usex xdg 'XDG' '.mc') + --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") + $(use_enable kernel_linux vfs-undelfs) + $(use_enable mclib) + $(use_enable nls) + $(use_enable samba vfs-smb) + $(use_enable sftp vfs-sftp) + $(use_enable spell aspell) + $(use_enable test tests) + $(use_with gpm gpm-mouse) + $(use_with X x) + $(use_with edit internal-edit) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS README NEWS + + # fix bug #334383 + if use kernel_linux && [[ ${EUID} == 0 ]] ; then + fowners root:tty /usr/libexec/mc/cons.saver + fperms g+s /usr/libexec/mc/cons.saver + fi + + if ! use xdg ; then + sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ + -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die + fi +} + +pkg_postinst() { + elog "To enable exiting to latest working directory," + elog "put this into your ~/.bashrc:" + elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" +} diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild index 3af128d35dc4..722ae657e0d8 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git" @@ -68,7 +68,7 @@ src_configure() { --enable-charset --enable-vfs --with-homedir=$(usex xdg 'XDG' '.mc') - --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')") + --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") $(use_enable kernel_linux vfs-undelfs) $(use_enable mclib) $(use_enable nls) diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild index 10d20cfd5fc0..b47e54a11ef1 100644 --- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml" REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )" diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index 12a41209c6c3..ea2ac17a4221 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild new file mode 100644 index 000000000000..f126c2aad96d --- /dev/null +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CHECKREQS_DISK_BUILD="4G" +KDE_DOC_DIR="xxx" # contains no language subdirs +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit check-reqs kde5 + +DESCRIPTION="KDE Office Suite" +HOMEPAGE="https://www.calligra.org/" +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +CAL_FTS=( karbon sheets stage words ) + +IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf + phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" + +# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) +# Required for the matlab/octave formula tool +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kross) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtscript) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + sys-libs/zlib + virtual/libiconv + activities? ( $(add_frameworks_dep kactivities) ) + crypt? ( app-crypt/qca:2[qt5(+)] ) + fontconfig? ( media-libs/fontconfig ) + gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) + gsl? ( sci-libs/gsl ) + import-filter? ( + $(add_frameworks_dep khtml) + app-text/libetonyek + app-text/libodfgen + app-text/libwpd:* + app-text/libwpg:* + >=app-text/libwps-0.4 + dev-libs/librevenge + media-libs/libvisio + ) + lcms? ( + media-libs/ilmbase:= + media-libs/lcms:2 + ) + openexr? ( media-libs/openexr ) + pdf? ( >=app-text/poppler-0.64:=[qt5] ) + phonon? ( media-libs/phonon[qt5(+)] ) + pim? ( $(add_kdeapps_dep kcalcore) ) + spacenav? ( dev-libs/libspnav ) + truetype? ( media-libs/freetype:2 ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) + calligra_features_sheets? ( dev-cpp/eigen:3 ) + calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) ) + calligra_features_words? ( + dev-libs/libxslt + okular? ( $(add_kdeapps_dep okular) ) + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + sys-devel/gettext + x11-misc/shared-mime-info + test? ( $(add_frameworks_dep threadweaver) ) +" +RDEPEND="${COMMON_DEPEND} + calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) + !app-office/calligra:4 + !app-office/calligra-l10n:4 +" +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${P}-no-arch-detection.patch + "${FILESDIR}"/${P}-doc.patch + "${FILESDIR}"/${P}-qt-5.11.patch + "${FILESDIR}"/${P}-stage-qt-5.11.patch + "${FILESDIR}"/${P}-poppler-0.69.patch + "${FILESDIR}"/${P}-poppler-0.71.patch + "${FILESDIR}"/${P}-no-webkit.patch +) + +pkg_pretend() { + check-reqs_pkg_pretend +} + +pkg_setup() { + kde5_pkg_setup + check-reqs_pkg_setup +} + +src_prepare() { + kde5_src_prepare + + if ! use test; then + sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ + -i libs/pigment/CMakeLists.txt || die + fi + + # Unconditionally disable deprecated deps (required by QtQuick1) + punt_bogus_dep Qt5 Declarative + punt_bogus_dep Qt5 OpenGL + + # Hack around the excessive use of CMake macros + if use okular && ! use calligra_features_words; then + sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ + extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" + fi + + if use okular && ! use calligra_features_stage; then + sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ + extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" + fi +} + +src_configure() { + local cal_ft myproducts + + # applications + for cal_ft in ${CAL_FTS[@]}; do + use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) + done + + use lcms && myproducts+=( PLUGIN_COLORENGINES ) + use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) + + local mycmakeargs=( + -DPACKAGERS_BUILD=OFF + -DRELEASE_BUILD=ON + -DWITH_Iconv=ON + -DPRODUCTSET="${myproducts[*]}" + $(cmake-utils_use_find_package activities KF5Activities) + -DWITH_Qca-qt5=$(usex crypt) + -DWITH_Fontconfig=$(usex fontconfig) + $(cmake-utils_use_find_package gemini Libgit2) + $(cmake-utils_use_find_package gemini Qt5QuickWidgets) + -DWITH_GSL=$(usex gsl) + -DWITH_LibEtonyek=$(usex import-filter) + -DWITH_LibOdfGen=$(usex import-filter) + -DWITH_LibRevenge=$(usex import-filter) + -DWITH_LibVisio=$(usex import-filter) + -DWITH_LibWpd=$(usex import-filter) + -DWITH_LibWpg=$(usex import-filter) + -DWITH_LibWps=$(usex import-filter) + $(cmake-utils_use_find_package phonon Phonon4Qt5) + $(cmake-utils_use_find_package pim KF5CalendarCore) + -DWITH_LCMS2=$(usex lcms) + -DWITH_Okular5=$(usex okular) + -DWITH_OpenEXR=$(usex openexr) + -DWITH_Poppler=$(usex pdf) + -DWITH_Eigen3=$(usex calligra_features_sheets) + -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) + -ENABLE_CSTESTER_TESTING=$(usex test) + -DWITH_Freetype=$(usex truetype) + ) + + kde5_src_configure +} diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch new file mode 100644 index 000000000000..f126e2e51386 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch @@ -0,0 +1,70 @@ +From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001 +From: Dag Andersen +Date: Mon, 22 Oct 2018 09:41:53 +0200 +Subject: Stage does not use WebKit, so remove + +--- + CMakeLists.txt | 21 +-------------------- + stage/part/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 21 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b148c0..1e29140 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET + Quick + QuickWidgets + Sql +- WebKit +-# WebKitWidgets +-) +-message("**********************************************************************************************************************") +-message("**********************************************************************************************************************") +-message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.") +-message("**********************************************************************************************************************") +-message("**********************************************************************************************************************") ++) + + # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call + # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: +@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES + PURPOSE "Required for Braindump's Web shape" + TYPE OPTIONAL + ) +-set_package_properties(Qt5WebKitWidget PROPERTIES +- PURPOSE "Required for Stage" +- TYPE RECOMMENDED +-) +- +-if(Qt5WebKit_FOUND) +- add_definitions( -DCAN_USE_QTWEBKIT ) +-endif() + + set(HAVE_OPENGL ${Qt5OpenGL_FOUND}) + +@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF + Soprano_FOUND "Soprano not found" + ) + +-# calligra_drop_product_on_bad_condition( PART_STAGE +-# Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found" +-# ) +- + calligra_drop_product_on_bad_condition( PART_SHEETS + EIGEN3_FOUND "Eigen devel not found" + ) +diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt +index d6000a1..9bdc840 100644 +--- a/stage/part/CMakeLists.txt ++++ b/stage/part/CMakeLists.txt +@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate + KF5::IconThemes + KF5::Completion + Qt5::Svg +-# Qt5::WebKitWidgets + ) + if(HAVE_OPENGL) + target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL) +-- +cgit v1.1 diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch new file mode 100644 index 000000000000..c82fbd242b8a --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch @@ -0,0 +1,83 @@ +From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Wed, 24 Oct 2018 08:28:00 +0200 +Subject: Fix build with poppler>=0.69 + +Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's + +Differential Revision: https://phabricator.kde.org/D16388 +--- + filters/karbon/pdf/PdfImport.cpp | 3 --- + filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- + filters/karbon/pdf/SvgOutputDev.h | 2 +- + 3 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index c3e96b0..48b08df 100644 +--- a/filters/karbon/pdf/PdfImport.cpp ++++ b/filters/karbon/pdf/PdfImport.cpp +@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + delete globalParams; + globalParams = 0; + +- // check for memory leaks +- Object::memCheck(stderr); +- + return KoFilter::OK; + } + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 931917a..7901317 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) + .arg(matrix.dx()) .arg(matrix.dy()); + } + +-QString SvgOutputDev::convertMatrix(double * matrix) ++QString SvgOutputDev::convertMatrix(const double * matrix) + { + return QString("matrix(%1 %2 %3 %4 %5 %6)") + .arg(matrix[0]).arg(matrix[1]) +@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + + QString str; + +- char * p = s->getCString(); ++ const char * p = s->getCString(); + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + double x = state->getCurX(); + double y = state->getCurY(); + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + + QMatrix mirror; +@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + return; + } + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix m; + m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); + +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 85fe55d..2a44908 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -84,7 +84,7 @@ public: + private: + QString convertPath(GfxPath *path); + QString convertMatrix(const QMatrix &matrix); +- QString convertMatrix(double * matrix); ++ QString convertMatrix(const double * matrix); + QString printFill(); + QString printStroke(); + +-- +cgit v1.1 diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch new file mode 100644 index 000000000000..6b50e3a42ed0 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch @@ -0,0 +1,202 @@ +From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Thu, 25 Oct 2018 23:04:39 +0200 +Subject: Mark the functions as override + +So when poppler API breaks (as it often does) it stops compiling and +someone has to fix it + +From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Thu, 25 Oct 2018 23:06:34 +0200 +Subject: GBool -> bool + +It was just a typedef in poppler and it'll die in next versions + +From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Fri, 2 Nov 2018 21:23:13 +0100 +Subject: Fix build with poppler 0.71 + +Port away from removed API + +diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -39,7 +39,7 @@ + { + public: + Private(const QString &fname) +- : svgFile(fname), defs(0), body(0), state(gTrue) ++ : svgFile(fname), defs(0), body(0), state(true) + , brush(Qt::SolidPattern) {} + + ~Private() { +@@ -52,7 +52,7 @@ + QString defsData; + QTextStream * defs; + QTextStream * body; +- GBool state; ++ bool state; + QSizeF pageSize; + QPen pen; + QBrush brush; +@@ -62,7 +62,7 @@ + : d(new Private(fileName)) + { + if (! d->svgFile.open(QIODevice::WriteOnly)) { +- d->state = gFalse; ++ d->state = false; + return; + } + +@@ -75,24 +75,24 @@ + delete d; + } + +-GBool SvgOutputDev::isOk() ++bool SvgOutputDev::isOk() + { + return d->state; + } + +-GBool SvgOutputDev::upsideDown() ++bool SvgOutputDev::upsideDown() + { +- return gTrue; ++ return true; + } + +-GBool SvgOutputDev::useDrawChar() ++bool SvgOutputDev::useDrawChar() + { +- return gFalse; ++ return false; + } + +-GBool SvgOutputDev::interpretType3Chars() ++bool SvgOutputDev::interpretType3Chars() + { +- return gFalse; ++ return false; + } + + void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) +@@ -387,7 +387,7 @@ + return stroke; + } + +-void SvgOutputDev::drawString(GfxState * state, GooString * s) ++void SvgOutputDev::drawString(GfxState * state, const GooString * s) + { + int render = state->getRender(); + // check for invisible text -- this is used by Acrobat Capture +@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + + void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool /*inlineImg*/) ++ bool /*interpolate*/, int *maskColors, bool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); +@@ -550,7 +549,0 @@ +-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, +- int width, int height, GfxImageColorMap *colorMap, +- GBool /*interpolate*/, int *maskColors, GBool inlineImg) +-{ +- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); +-} +- + +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -20,11 +20,6 @@ + #ifndef SVGOUTPUTDEV_H + #define SVGOUTPUTDEV_H + +-// Don't show this warning: it's an issue in poppler +-#ifdef __GNUC__ +-#pragma GCC diagnostic ignored "-Wunused-parameter" +-#endif +- + #include + #include + +@@ -44,40 +44,37 @@ + explicit SvgOutputDev(const QString &fileName); + virtual ~SvgOutputDev(); + +- GBool isOk(); ++ bool isOk(); + +- virtual GBool upsideDown(); +- virtual GBool useDrawChar(); +- virtual GBool interpretType3Chars(); +- virtual void startPage(int pageNum, GfxState *state, XRef *xref); +- virtual void endPage(); ++ bool upsideDown() override; ++ bool useDrawChar() override; ++ bool interpretType3Chars() override; ++ void startPage(int pageNum, GfxState *state, XRef *xref) override; ++ void endPage() override; + + // path painting +- virtual void stroke(GfxState * state); +- virtual void fill(GfxState * state); +- virtual void eoFill(GfxState *state); ++ void stroke(GfxState * state) override; ++ void fill(GfxState * state) override; ++ void eoFill(GfxState *state) override; + + // text +- virtual void drawString(GfxState * state, GooString * s); ++ void drawString(GfxState * state, const GooString * s) override; + + // images +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, ++ void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool inlineImg); +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, +- int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg); ++ bool interpolate, int *maskColors, bool inlineImg) override; + + // styles +- virtual void updateAll(GfxState *state); +- virtual void updateFillColor(GfxState *state); +- virtual void updateStrokeColor(GfxState *state); +- virtual void updateFillOpacity(GfxState *state); +- virtual void updateStrokeOpacity(GfxState *state); +- virtual void updateLineJoin(GfxState *state); +- virtual void updateLineCap(GfxState *state); +- virtual void updateMiterLimit(GfxState *state); +- virtual void updateLineWidth(GfxState *state); ++ void updateAll(GfxState *state) override; ++ void updateFillColor(GfxState *state) override; ++ void updateStrokeColor(GfxState *state) override; ++ void updateFillOpacity(GfxState *state) override; ++ void updateStrokeOpacity(GfxState *state) override; ++ void updateLineJoin(GfxState *state) override; ++ void updateLineCap(GfxState *state) override; ++ void updateMiterLimit(GfxState *state) override; ++ void updateLineWidth(GfxState *state) override; + + /// Dumps content to svg file + void dumpContent(); +--- a/filters/karbon/pdf/PdfImport.cpp ++++ b/filters/karbon/pdf/PdfImport.cpp +@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); + if (dev->isOk()) { + int rotate = 0; +- GBool useMediaBox = gTrue; +- GBool crop = gFalse; +- GBool printing = gFalse; ++ bool useMediaBox = true; ++ bool crop = false; ++ bool printing = false; + pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); + dev->dumpContent(); + } diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest new file mode 100644 index 000000000000..7ff08e554656 --- /dev/null +++ b/app-office/calligraplan/Manifest @@ -0,0 +1 @@ +DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild b/app-office/calligraplan/calligraplan-3.1.0.ebuild new file mode 100644 index 000000000000..1ee634ee1769 --- /dev/null +++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Project management application" +HOMEPAGE="https://www.calligra.org/" +SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="activities +holidays kwallet pim X" + +# FIXME: Disabled by upstream for good reason +# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) +# $(add_kdeapps_dep akonadi) +# $(add_kdeapps_dep akonadi-contacts) +# Currently upstream-disabled in plan +# =dev-libs/kproperty-3.0*:5 +# =dev-libs/kreport-3.0*:5 +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + dev-libs/kdiagram:5 + sys-libs/zlib + activities? ( $(add_frameworks_dep kactivities) ) + holidays? ( $(add_frameworks_dep kholidays) ) + kwallet? ( + $(add_frameworks_dep kwallet) + app-crypt/qca:2[qt5(+)] + ) + pim? ( + $(add_kdeapps_dep kcalcore) + $(add_kdeapps_dep kcontacts) + ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND} + !app-office/calligra[calligra_features_plan(-)] + !app-office/calligra-l10n:4 + $(add_qt_dep qtsvg) +" + +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${P}-qt-5.11.patch + "${FILESDIR}"/${P}-qca.patch +) + +src_prepare() { + kde5_src_prepare + # Unconditionally disable deprecated deps + punt_bogus_dep Qt5 OpenGL + # FIXME: disable bogus deps + punt_bogus_dep KF5 KCMUtils + punt_bogus_dep Qt5 Network + punt_bogus_dep Qt5 Svg +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package activities KF5Activities) + $(cmake-utils_use_find_package holidays KF5Holidays) + $(cmake-utils_use_find_package pim KF5CalendarCore) + $(cmake-utils_use_find_package pim KF5Contacts) + $(cmake-utils_use_find_package kwallet Qca-qt5) + $(cmake-utils_use_find_package kwallet KF5Wallet) + ) + # Qt5DBus can't be disabled because of KF5DBusAddons dependency + + kde5_src_configure +} diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch new file mode 100644 index 000000000000..213cc9935bea --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch @@ -0,0 +1,127 @@ +From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 1 Jan 2019 19:19:19 +0100 +Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is + optional + +--- + CMakeLists.txt | 18 +++++++++++++++++- + src/libs/store/CMakeLists.txt | 15 +++++++-------- + 2 files changed, 24 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eed9d3c..3cb4b63 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + Parts + # Sonnet + TextWidgets +- Wallet + WidgetsAddons + WindowSystem + XmlGui +@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES + TYPE REQUIRED + ) + ++## ++## Test for QCA2 ++## ++macro_optional_find_package(Qca-qt5 2.1.0 QUIET) ++set_package_properties(Qca-qt5 PROPERTIES ++ DESCRIPTION "Qt Cryptographic Architecture" ++ URL "https:/download.kde.org/stable/qca-qt5" ++ PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support" ++ TYPE OPTIONAL ++) ++ ++find_package(KF5Wallet ${REQUIRED_KF5_VERSION}) ++ ++if(Qca-qt5_FOUND AND KF5Wallet_FOUND) ++ add_definitions( -DQCA2 ) ++endif() ++ + find_package(Perl REQUIRED) + find_package(ZLIB REQUIRED) + +diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt +index 2c96fa7..f998264 100644 +--- a/src/libs/store/CMakeLists.txt ++++ b/src/libs/store/CMakeLists.txt +@@ -4,14 +4,8 @@ endif() + + ########### libkostore ############### + +-if( Qca-qt5_FOUND ) +- add_definitions( -DQCA2 ) +-endif() +- + set(kostore_LIB_SRCS + KoDirectoryStore.cpp +- KoEncryptedStore.cpp +- KoEncryptionChecker.cpp + KoLZF.cpp + KoStore.cpp + KoStoreDevice.cpp +@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS + StoreDebug.cpp + KoNetAccess.cpp # temporary while porting + ) ++if( Qca-qt5_FOUND ) ++ set(kostore_LIB_SRCS ${kostore_LIB_SRCS} ++ KoEncryptedStore.cpp ++ KoEncryptionChecker.cpp ++ ) ++endif() + + add_library(planstore SHARED ${kostore_LIB_SRCS}) + generate_export_header(planstore BASE_NAME kostore) +@@ -35,12 +35,11 @@ target_link_libraries(planstore + PRIVATE + Qt5::Gui + KF5::Archive +- KF5::Wallet + KF5::KIOWidgets + KF5::I18n + ) + if( Qca-qt5_FOUND ) +- target_link_libraries(planstore PRIVATE qca-qt5) ++ target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet) + endif() + + set_target_properties(planstore PROPERTIES +diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp +index 1615a61..55e2c32 100644 +--- a/src/libs/widgets/KoDocumentInfoDlg.cpp ++++ b/src/libs/widgets/KoDocumentInfoDlg.cpp +@@ -26,7 +26,9 @@ + #include "KoDocumentInfo.h" + #include "KoDocumentBase.h" + #include "KoGlobal.h" ++#ifdef QCA2 + #include ++#endif + #include "KoPageWidgetItem.h" + //#include + #include +@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo) + d->aboutUi = new Ui::KoDocumentInfoAboutWidget(); + QWidget *infodlg = new QWidget(); + d->aboutUi->setupUi(infodlg); ++#ifdef QCA2 + if (!KoEncryptionChecker::isEncryptionSupported()) { ++#endif + d->aboutUi->lblEncryptedDesc->setVisible(false); + d->aboutUi->lblEncrypted->setVisible(false); + d->aboutUi->pbEncrypt->setVisible(false); + d->aboutUi->lblEncryptedPic->setVisible(false); ++#ifdef QCA2 + } ++#endif + d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages()); + d->aboutUi->cbLanguage->setCurrentIndex(-1); + +-- +2.20.1 + diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch new file mode 100644 index 000000000000..584d14e447e7 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch @@ -0,0 +1,124 @@ +From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 18 Mar 2018 11:56:57 +0100 +Subject: [PATCH] Fix build with Qt 5.11 (missing headers) + +Reviewers: #calligra:_3.0 + +Tags: #calligra:_3.0 + +Differential Revision: https://phabricator.kde.org/D11454 +--- + src/kptview.h | 1 + + src/kptviewlist.cpp | 1 + + src/libs/ui/kptaccountseditor.cpp | 1 + + src/libs/ui/kptdocumentspanel.h | 1 + + src/libs/ui/kptitemviewsettup.cpp | 2 +- + src/libs/ui/kpttaskeditor.cpp | 1 + + src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + + src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ + 15 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/src/kptview.h b/src/kptview.h +index 44d11935e71..a98e55342db 100644 +--- a/src/kptview.h ++++ b/src/kptview.h +@@ -28,6 +28,7 @@ + #include "kptcontext.h" + #include "kptviewbase.h" + ++#include + #include + #include + +diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp +index f34e702e055..0e6db7b2ffe 100644 +--- a/src/kptviewlist.cpp ++++ b/src/kptviewlist.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp +index 7991fafd779..54e3a87c94f 100644 +--- a/src/libs/ui/kptaccountseditor.cpp ++++ b/src/libs/ui/kptaccountseditor.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h +index 00ea3af80b2..491cb1ebb86 100644 +--- a/src/libs/ui/kptdocumentspanel.h ++++ b/src/libs/ui/kptdocumentspanel.h +@@ -26,6 +26,7 @@ + + #include "kptdocuments.h" + ++#include + #include + #include + +diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp +index d1c3b1fc157..7c97a070b9a 100644 +--- a/src/libs/ui/kptitemviewsettup.cpp ++++ b/src/libs/ui/kptitemviewsettup.cpp +@@ -25,9 +25,9 @@ + + #include "KoPageLayoutWidget.h" + ++#include + #include + +- + namespace KPlato + { + +diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp +index 21546118d33..91db5acbb18 100644 +--- a/src/libs/ui/kpttaskeditor.cpp ++++ b/src/libs/ui/kpttaskeditor.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +index 344ebc2b599..9146f06ab8c 100644 +--- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp ++++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +@@ -31,6 +31,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp +index c9e17b748a9..b67e9848807 100644 +--- a/src/libs/widgets/KoPageLayoutWidget.cpp ++++ b/src/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +-- +2.16.2 + diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml new file mode 100644 index 000000000000..a7529db60e61 --- /dev/null +++ b/app-office/calligraplan/metadata.xml @@ -0,0 +1,18 @@ + + + + + kde@gentoo.org + Gentoo KDE Project + + + office@gentoo.org + Gentoo Office project + + + Enable kactivities support + Enable kde-frameworks/kholidays integration + Enable access to encrypted OpenDocument files with kde-frameworks/kwallet storage + Enable support for KDE PIM resources integration + + diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild index 9db8af43438e..40e51ebfe3d9 100644 --- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild +++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,7 +46,7 @@ SRC_URI=" IUSE="gnome java kde" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 ~x86" RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]" diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild index 1e4586411304..8b0b291d6158 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -51,7 +51,7 @@ SRC_URI=" IUSE="gnome java kde" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 ~x86" BIN_COMMON_DEPEND=" app-text/hunspell:0/1.6 diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild index a11a956daf3d..a22cefd56729 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="offlinehelp" # diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild index 29174b9eb1cd..01dfdc4ae48c 100644 --- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip diff --git a/app-office/moneyguru/Manifest b/app-office/moneyguru/Manifest new file mode 100644 index 000000000000..c6fd4179caa3 --- /dev/null +++ b/app-office/moneyguru/Manifest @@ -0,0 +1 @@ +DIST moneyguru-2.13.1.tar.gz 1665892 BLAKE2B 969286130c5336f4c41ccf0ee3cbfe55a13560f753e137ff5370184c5aff3e038995c79ad48620a5653552406ea6fb56d356a209cd36774751db4f8e3777354c SHA512 9544a2fe17d0c1d4a6f1ee6c52c79e66ca76da6a6ac35067f1961fe2b44a8efe20173ee5932a91adeeebcb0a522b544df11ad388cb4c453a0641060d75f2a17c diff --git a/app-office/moneyguru/metadata.xml b/app-office/moneyguru/metadata.xml new file mode 100644 index 000000000000..951b70bfa8e2 --- /dev/null +++ b/app-office/moneyguru/metadata.xml @@ -0,0 +1,11 @@ + + + + + vdurpas@gentoo.org + Virgil Dupras + + + hsoft/moneyguru + + diff --git a/app-office/moneyguru/moneyguru-2.13.1.ebuild b/app-office/moneyguru/moneyguru-2.13.1.ebuild new file mode 100644 index 000000000000..ffe8516e22b5 --- /dev/null +++ b/app-office/moneyguru/moneyguru-2.13.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit python-single-r1 + +DESCRIPTION="Future-aware personal finances management" +HOMEPAGE="https://hardcoded.net/moneyguru" +SRC_URI="https://download.hardcoded.net/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND="${PYTHON_DEPS} + dev-db/sqlite:3 + dev-libs/glib:2 + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,printsupport] + dev-qt/qttranslations" +DEPEND="${RDEPEND} + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-util/cunit + )" + +_emake() { + emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \ + SHEBANG="${PYTHON}" \ + DESTDIR="${ED}" \ + PREFIX=/usr \ + $@ +} + +src_compile() { + _emake +} + +src_install() { + _emake install +} + +src_test() { + emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests + pytest -vv core || die "Tests failed with ${EPYTHON}" +} diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest index de586539406d..7a6f1a1271fc 100644 --- a/app-office/texstudio/Manifest +++ b/app-office/texstudio/Manifest @@ -1,5 +1,6 @@ DIST texstudio-2.11.2.tar.gz 24143941 BLAKE2B 2c17b70cd497338ee9c7cd7fda0bdcb8775c3b487ae940fb0e755c8621d45a45a4381b064c0e18b9c134560e9a322d9c321453b01c3b05991d7d37467ea90f01 SHA512 774cea12339b19c7d33d034e75386415b89c59de1e149f3973bd0cf789a28c4cb1cdb026a897228303071dc05f985d4798924c6b253e964d6bdced877ab9f1e7 DIST texstudio-2.12.10.tar.gz 26770850 BLAKE2B 7dba024c34f6cf53ff8cfa21eedb53bbf7fb5aba0b00d1c7983240a46c46360bf6fdd783ec539019a9d385dd6862fc3bb9a0198c234c9546798835e1621d11ff SHA512 c3d1e14df8efe3f37dd71e5d0148f57f117c666b9487712fca5a7bd967eca4f7951c970bc5bffab14daef4fb8497af33edf2fce23cc9ae4cf598d905d9312ef0 +DIST texstudio-2.12.14.tar.gz 34206353 BLAKE2B 667d316fce36ca17b6d9f05deaf28794e5b85265da7e48673870848d029de19c7635656ebce2841a77ad9c057e7a3e301b66635ffab3e360cce085a7c065241c SHA512 fe2fe641a455425f87e28f3058f63df103823a97990365e3a3d67d14c4959a6e59db9205ce100f4ebbdb7c8a5c914b0514333b9b9537dd48053bf166e4326984 DIST texstudio-2.12.2.tar.gz 26311798 BLAKE2B 1eb3add771a28918f39c69bb167eee31456ab87afcff0f4ae66ccd73d96fdfba5cbfbc57666908f7e7ffb5c69fd2d5aebf342338b9e3a56d3c31fb774f9cd1a7 SHA512 255b211fe715ffc91706ab20877ffaa4b8e0710d3e6f381e7a6b8eed19bb889d89d0913756839c1f0c427029c0da9713b78bd1e21769ccc46cf976b65c91c6f6 DIST texstudio-2.12.4.tar.gz 26401510 BLAKE2B 53f1aca4f28154c5ae0f941e074e2da6d727dedf6b5604b301efccd95eea256a6cb91bf887985d81c65964c0e407cd1a8c2037a3bd73559aa115bec3954df744 SHA512 6e1d114ae87c854231399004504e460d078b9bf26ceb25c7fc592b79d3234f9880f8c021c3ddb2ef26a883dbddc2b94f98f368c976aa16973d3c1a6823a4150d DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3f8f1869cb667897bbdb48b99626089bf14a5e321c57ca5c9196d1cf2ce0beaad322b04d90f8a0b62189ff7c5be0d33 SHA512 16e846137b529f89f10dba3f847afe5a875ce1bc4029d002f76a1bcde491dd44756b27e38b4c5c159fcdb12b025759c8a0ebbbb8d8bd296e954b53032434170a diff --git a/app-office/texstudio/texstudio-2.12.14.ebuild b/app-office/texstudio/texstudio-2.12.14.ebuild new file mode 100644 index 000000000000..53b1b3cbdb45 --- /dev/null +++ b/app-office/texstudio/texstudio-2.12.14.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2-utils prefix qmake-utils xdg-utils + +DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)" +HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio" +SRC_URI="https://github.com/texstudio-org/texstudio/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="video" + +COMMON_DEPEND=" + app-text/hunspell:= + app-text/poppler[qt5] + >=dev-libs/quazip-0.7.2[qt5(+)] + dev-qt/designer:5 + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsingleapplication[qt5(+),X] + dev-qt/qtsvg:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXext + video? ( media-libs/phonon[qt5(+)] )" +RDEPEND="${COMMON_DEPEND} + app-text/ghostscript-gpl + app-text/psutils + media-libs/netpbm + virtual/latex-base" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +src_prepare() { + default + # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die + + if use video; then + sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die + fi + + sed \ + -e '/qtsingleapplication.pri/d' \ + -i ${PN}.pro || die + + cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die + eprefixify ${PN}.pri +} + +src_configure() { + eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1 +} + +src_install() { + local i + for i in 16x16 22x22 32x32 48x48 64x64 128x128; do + newicon -s ${i} utilities/${PN}${i}.png ${PN}.png + done + emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index 7a8ebbb74d6f..be15b6a774aa 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild index 07ef00adc305..d74c06b856ad 100644 --- a/app-portage/eix/eix-0.33.5.ebuild +++ b/app-portage/eix/eix-0.33.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc nls sqlite" BOTHDEPEND="nls? ( virtual/libintl ) diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 0d8918995c08..bb1bc1cf6d34 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild index 13c8825da288..4f7f255a1b52 100644 --- a/app-text/dvipng/dvipng-1.15-r1.ebuild +++ b/app-text/dvipng/dvipng-1.15-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-3+ Texinfo-manual" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="truetype test" RDEPEND=" diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild deleted file mode 100644 index 6b0df705d059..000000000000 --- a/app-text/dvipng/dvipng-1.15.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 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Translate DVI files into PNG or GIF graphics" -HOMEPAGE="http://dvipng.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3+ Texinfo-manual" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="truetype test" - -RDEPEND=" - dev-libs/kpathsea:= - media-libs/gd:2=[jpeg,png] - media-libs/libpng:0= - virtual/latex-base - sys-libs/zlib - truetype? ( >=media-libs/freetype-2.1.5 )" -DEPEND="${RDEPEND} - virtual/texi2dvi - virtual/pkgconfig - test? ( dev-texlive/texlive-fontsrecommended )" - -DOCS="ChangeLog README RELEASE" - -src_configure() { - has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" - if ! use truetype; then - sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed" - fi - - export VARTEXFONTS="${T}/fonts" - econf -} diff --git a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild index df23cdf0b8ea..9de0bdfd42e8 100644 --- a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild +++ b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="" src_configure() { diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild index 03f14c4c7029..97d1e321d633 100644 --- a/app-text/libodfgen/libodfgen-0.1.7.ebuild +++ b/app-text/libodfgen/libodfgen-0.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit autotools git-r3 else SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Library to generate ODF documents from libwpd and libwpg" diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild index 9eaec634d344..2089421ff8ea 100644 --- a/app-text/poppler/poppler-0.68.0.ebuild +++ b/app-text/poppler/poppler-0.68.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then SLOT="0/9999" else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0/79" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild index a4177b96e52a..82d08af27342 100644 --- a/app-text/unrtf/unrtf-0.21.10.ebuild +++ b/app-text/unrtf/unrtf-0.21.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz index c180c5604f8f..f49ca23ffff1 100644 Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest index 3399dc09f933..1b976f5d7a2c 100644 --- a/dev-ada/gps/Manifest +++ b/dev-ada/gps/Manifest @@ -1,5 +1,5 @@ DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470 -DIST gpsLib.tar.gz 11017404 BLAKE2B b84219322950d5c3a7b202e4b5e423fcb95c528d4e0810f25674e8cfd0e9ca91a155fff500e4d25959cdba42492794fba8cb725e6955bcea8908a8043a387ca1 SHA512 e852285c8b67e5787396dfaa95feaff31e73bd4cd3a731e20c6970c2ade3ef6290ef98d9a6b7553d4daf6f2ae722ca5ff74add3fd4285ce259a1443e6b06a5a1 +DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5 diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018-r1.ebuild similarity index 73% rename from dev-ada/gps/gps-2018.ebuild rename to dev-ada/gps/gps-2018-r1.ebuild index 290f5bf27219..b8cd9b2a7584 100644 --- a/dev-ada/gps/gps-2018.ebuild +++ b/dev-ada/gps/gps-2018-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 autotools desktop llvm +inherit python-single-r1 autotools desktop llvm multilib MYP=${PN}-gpl-${PV}-src @@ -13,7 +13,8 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> ${MYP}.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz - https://dev.gentoo.org/~tupone/distfiles/gpsLib.tar.gz" + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> + gtk+-3.14.15-src.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -75,8 +76,13 @@ src_prepare() { || die mv "${WORKDIR}"/libadalang-tools-src laltools echo "#!/bin/bash" > gps.sh - echo "export LD_LIBRARY_PATH=/opt/lib/gps" >> gps.sh + echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh + cd ../gtk+-3.14.15-src + sed -i \ + -e "/^libadd/s:=.*$:= \\\:" \ + -e "/^deps/s:=.*$:= \\\:" \ + ../gtk+-3.14.15-src/gtk/Makefile.in } src_configure() { @@ -84,6 +90,8 @@ src_configure() { GNATMAKE=/usr/bin/${GNATMAKE} \ GNATDRV=/usr/bin/${GNATDRV} \ --with-clang=$(llvm-config --libdir) + cd ../gtk+-3.14.15-src + econf --disable-cups } src_compile() { @@ -92,13 +100,19 @@ src_compile() { Build=Production gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \ -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die + cd ../gtk+-3.14.15-src + emake -C gtk/inspector + emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h + emake -C gtk libgtk-3.la } src_install() { default make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;" - insinto /opt/lib - doins -r ../lib/gps mv "${D}"/usr/bin/gps{,_exe} - newbin gps.sh gps + newbin gps.sh gps + cd ../gtk+-3.14.15-src + emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES + rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die + dosym "${D}"/usr/$(get_libdir)/libgtk-3.so.0.* /usr/$(get_libdir)/gps/libgtk-3.so.0 } diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index 733b74765447..793d1b8f7c95 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest index c8bbf06fc8c3..72791e8e4f4f 100644 --- a/dev-cpp/glibmm/Manifest +++ b/dev-cpp/glibmm/Manifest @@ -1,5 +1,2 @@ -DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb -DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda -DIST glibmm-2.54.1.tar.xz 6837384 BLAKE2B 98e4acb5b80786a27195bea43cc425a45219078ef839e97c60c9e3f52b3a0b3c928e19469d679529b5091d8ac1953d4f315ea75618c3fcc8f33d15f6565b5783 SHA512 94f2a4d6972684e25e38ff2e6bcfc1e9c5e4d096856d3419320c14166e27e26b1ad69be434337e9b70c23842989988113521aae7a800ef2f29e81f1ae6c25a13 DIST glibmm-2.56.0.tar.xz 6859520 BLAKE2B 8d7f0120de211002d587e6ec0d3750dcdce60abae6506395b318be876d5ed680b1451920063f06d6d9655137d50482a9ba936caa0f6da127bb3855e43b4d877f SHA512 65e577009019e30e340ae5fe6e4c854e5a75551b2eb83ad85403d73eb4e77879783162d4c3c354bc37be0be842f0ddffc1977021a5e0c32985fb596d86929c08 DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735 diff --git a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch deleted file mode 100644 index 2da4a5621992..000000000000 --- a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt -Date: Wed, 20 Dec 2017 20:00:32 +0100 -Subject: [PATCH] Glib::Threads::Private: Fix gobj() - -Bug 791711 ---- - glib/src/threads.hg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/src/threads.hg b/glib/src/threads.hg -index 86d7a17b..c82a6130 100644 ---- a/glib/src/threads.hg -+++ b/glib/src/threads.hg -@@ -628,7 +628,7 @@ public: - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; ---- a/glib/glibmm/threads.h 2017-09-04 15:27:31.000000000 +0200 -+++ b/glib/glibmm/threads.h 2018-05-05 10:53:44.339288554 +0200 -@@ -657,7 +657,7 @@ - */ - inline void replace(T* data); - -- GPrivate* gobj() { return gobject_; } -+ GPrivate* gobj() { return &gobject_; } - - private: - GPrivate gobject_; diff --git a/dev-cpp/glibmm/glibmm-2.50.1.ebuild b/dev-cpp/glibmm/glibmm-2.50.1.ebuild deleted file mode 100644 index a111edbd8924..000000000000 --- a/dev-cpp/glibmm/glibmm-2.50.1.ebuild +++ /dev/null @@ -1,65 +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="C++ interface for glib2" -HOMEPAGE="https://www.gtkmm.org" - -LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc debug test" - -RDEPEND=" - >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -# dev-cpp/mm-common needed for eautoreconf - -src_prepare() { - if ! use test; then - # don't waste time building tests - sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 1 failed" - fi - - # don't build examples - we want to install example sources, not binaries - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 2 failed" - - gnome2_src_prepare -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" gnome2_src_configure \ - $(use_enable debug debug-refcounting) \ - $(multilib_native_use_enable doc documentation) \ - --enable-deprecated-api -} - -multilib_src_test() { - cd tests - default - - for i in */test; do - ${i} || die "Running tests failed at ${i}" - done -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - einstalldocs - - find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null - find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null - dodoc -r examples -} diff --git a/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild deleted file mode 100644 index 2a4e3739f629..000000000000 --- a/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 multilib-minimal - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://www.gtkmm.org" - -LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc debug test" - -RDEPEND=" - >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -# dev-cpp/mm-common needed for eautoreconf - -PATCHES=( - # Fix build with GCC-8 - # https://bugs.gentoo.org/654776 - "${FILESDIR}"/${PN}-fix-threads-gobject.patch -) - -src_prepare() { - if ! use test; then - # don't waste time building tests - sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 1 failed" - fi - - # don't build examples - we want to install example sources, not binaries - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 2 failed" - - gnome2_src_prepare -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" gnome2_src_configure \ - $(use_enable debug debug-refcounting) \ - $(multilib_native_use_enable doc documentation) \ - --enable-deprecated-api -} - -multilib_src_test() { - cd tests - default - - for i in */test; do - ${i} || die "Running tests failed at ${i}" - done -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - einstalldocs - - find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null - find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null - dodoc -r examples -} diff --git a/dev-cpp/glibmm/glibmm-2.54.1.ebuild b/dev-cpp/glibmm/glibmm-2.54.1.ebuild deleted file mode 100644 index 04705cc0aa29..000000000000 --- a/dev-cpp/glibmm/glibmm-2.54.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 multilib-minimal - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://www.gtkmm.org" - -LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc debug test" - -RDEPEND=" - >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -# dev-cpp/mm-common needed for eautoreconf - -PATCHES=( - # Fix build with GCC-8 - # https://bugs.gentoo.org/654776 - "${FILESDIR}"/${PN}-fix-threads-gobject.patch -) - -src_prepare() { - if ! use test; then - # don't waste time building tests - sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 1 failed" - fi - - # don't build examples - we want to install example sources, not binaries - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ - -i Makefile.am Makefile.in || die "sed 2 failed" - - gnome2_src_prepare -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" gnome2_src_configure \ - $(use_enable debug debug-refcounting) \ - $(multilib_native_use_enable doc documentation) \ - --enable-deprecated-api -} - -multilib_src_test() { - cd tests - default - - for i in */test; do - ${i} || die "Running tests failed at ${i}" - done -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - einstalldocs - - find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null - find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null - dodoc -r examples -} diff --git a/dev-cpp/glibmm/glibmm-2.56.0.ebuild b/dev-cpp/glibmm/glibmm-2.56.0.ebuild index 13e1f59bb723..20a072129508 100644 --- a/dev-cpp/glibmm/glibmm-2.56.0.ebuild +++ b/dev-cpp/glibmm/glibmm-2.56.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="doc debug test" RDEPEND=" diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 201800c02a59..7bbe249d6d95 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/sqlite/sqlite-3.25.3.ebuild b/dev-db/sqlite/sqlite-3.25.3.ebuild index e77904944e43..4422bbfe5d01 100644 --- a/dev-db/sqlite/sqlite-3.25.3.ebuild +++ b/dev-db/sqlite/sqlite-3.25.3.ebuild @@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) LICENSE="public-domain" SLOT="3" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" RESTRICT="!test? ( test )" diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz index bd7828d5730e..126276bf9957 100644 Binary files a/dev-go/Manifest.gz and b/dev-go/Manifest.gz differ diff --git a/dev-go/go-md2man/Manifest b/dev-go/go-md2man/Manifest index ae8675a3a32f..f12a1a05acea 100644 --- a/dev-go/go-md2man/Manifest +++ b/dev-go/go-md2man/Manifest @@ -1,2 +1,3 @@ DIST go-md2man-1.0.3.tar.gz 3279 BLAKE2B 0b693569ad7ff609508dd28b11bacdc0eb08ee0fd2b2a23dad5e26a670e1fc0fcc2321ee099114dc144fb8671dfcd7ed072e7feb17bb96e17c2f9ff0e748ddac SHA512 855809f068daae2becb31d4b182b0953a9a11428cf89d488e2148256c6f4292bf24d42bd1c5bc96ba2c1c18a8201e859629f2515f750de390e4325cc320ac7b8 DIST go-md2man-1.0.6.tar.gz 40240 BLAKE2B 183a96b661419861fcca27e34fcd107070839087d61d3c36f3da3b3aa644678d4eeb6fa31ae3a07eb41dbd750ed43fa29b5518db9a56290530795f6b3cc16873 SHA512 73abf08470c7ba3c5e5f0212a19f37ae98a8582605d2493bb21b2e5c07fafa8fb711f05665e153863d195749a0870e674e203f377ec7bb8425b9d497fa9864d1 +DIST go-md2man-1.0.8.tar.gz 79284 BLAKE2B c6bf5c1507f0e7e6393c08592bf56e6423157f265a2f26b10f262c00b15c855e99c022d9e4b465247997b0c9d667ed71c727d03735af6214ec20ca30583235aa SHA512 4c52e01c9b07582b5d55d1e94935378a676bd284a3e8230a8a191d4678b1b6ae92b704a249117c542832170069a70c649e58a1752fb2973709259b5bc108db91 diff --git a/dev-go/go-md2man/go-md2man-1.0.8.ebuild b/dev-go/go-md2man/go-md2man-1.0.8.ebuild new file mode 100644 index 000000000000..c3767538421b --- /dev/null +++ b/dev-go/go-md2man/go-md2man-1.0.8.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +EGO_PN=github.com/cpuguy83/go-md2man + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs +else + KEYWORDS="~amd64 ~arm ~arm64" + EGIT_COMMIT=v${PV} + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + inherit golang-vcs-snapshot +fi +inherit golang-build + +DESCRIPTION="A utility to convert markdown to man pages" +HOMEPAGE="https://github.com/cpuguy83/go-md2man" +LICENSE="MIT" +SLOT="0" +IUSE="" + +src_install() { + "${S}"/go-md2man -in src/${EGO_PN}/go-md2man.1.md -out go-md2man.1 + dobin go-md2man + doman go-md2man.1 +} diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 7e2ae7ee839f..7ce42dd2675f 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest index 60b6c77f4b8b..627679b2b8df 100644 --- a/dev-lang/nim/Manifest +++ b/dev-lang/nim/Manifest @@ -1,5 +1,2 @@ -DIST nim-0.16.0.tar.xz 2907076 BLAKE2B 5f14bb2634da32deb810381edf817e3885382ffce0a35db0ae3faca818bb0f5646b1619609e971fbe93ef383f3c4060029bf51a12ef0b4df75ebf0dde12753b5 SHA512 6be1c00328b7e5bdaa9070e1cd0e3c6e1883c5bc1e44e9c574785f9bce93697f05753f598cf6fdaa6c5a66f08c2ad6f7afb8f6650fc3b1c8e461eb0cf80baabd -DIST nim-0.17.0.tar.xz 25079320 BLAKE2B d01ade93ff299962aeea3dc9c90f0a8fe87acef8c2ee6d7d521d936c680aded0d8383221b7c11c3b2a8d6c28311c939456f271bbc90c1115acaae2c1987fa908 SHA512 90d709b39746fac5582b9df69d3eb9e3b7a39563a98f7a3002f00716b936e4e0d2be47d8b877878318692e6e2b85c08077dfcc20d9059573a1967402c244894b -DIST nim-0.17.2.tar.xz 4083084 BLAKE2B c1a4134592bb6a57bfaf6174becb409e40075c77042964c639b39fe7b30f094bfc8d404d6e1e4e527a95333a8ee4597477f1052da1af58c3216042bb2f85c826 SHA512 7b4ed1eb1e9067ce72b76b95c43ec74eb38f04611776c174ba6a697254a9253fed61258712fb938f15e662bb3b0d36138194fc8fa89bbcb4d22888263e5e2880 -DIST nim-0.18.0.tar.xz 4412632 BLAKE2B f7286542daa4c3502f4edeb9d93e6a69169228a50248f1c5c02421cb8e70c0ab99bc84cc91b35a6227a4974345423eeb3b5ffecdb18e321b0a82eb8fd0879a16 SHA512 8f59cb4a8d44949cdd1154fb44df548005329da8255becf2f54083ce58323ff8d6cf7b2fdd86d4b1f446bd9f977e8eaf4b13c7ca6723da8a10c7b671954de772 DIST nim-0.19.0.tar.xz 3321644 BLAKE2B e1de3b8a4c756315bcd110ddc62c03eb1a379403d8c102eb4d6d131cccabe3dccdfdac33d46037fd8b3b241d727acb42f5cb0b616a4079830ea3abf63089f90a SHA512 f7f3c8e0e9a6509b6404e21da4693ceb279112dd7a7c39edc7e717f21554442914c9cf7d811bb4034ff244e34d77dabf6e09b5e3e77c37314adf99cc0c3b2311 +DIST nim-0.19.2.tar.xz 21176300 BLAKE2B 85250ca174c2ef6ee77e8c1a2b35316bb9b21e591438d7d3bf560c0d38f1ba64c811ef99c0c3147acceddd6d27fcd5ff2dfccf65cb92218484649f1029e0dd1b SHA512 fc7ab034dcdf3cb5f1cc379595ee9ae6da7c6256eef4b294e3bf31ff559efd48598a9974ca9a0f41d899f01af6a916feb9c5eb7f888f637287ce357722d41421 diff --git a/dev-lang/nim/nim-0.16.0.ebuild b/dev-lang/nim/nim-0.16.0.ebuild deleted file mode 100644 index 6f4bf09dcfa8..000000000000 --- a/dev-lang/nim/nim-0.16.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN=Nim -MY_P=${MY_PN}-${PV} - -DESCRIPTION="compiled, garbage-collected systems programming language" -HOMEPAGE="https://nim-lang.org/" -SRC_URI="https://nim-lang.org/download/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc +readline test" - -DEPEND=" - readline? ( sys-libs/readline:0= ) -" -RDEPEND="${DEPEND}" - -nim_use_enable() { - [[ -z $2 ]] && die "usage: nim_use_enable " - use $1 && echo "-d:$2" -} - -src_compile() { - ./build.sh || die "build.sh failed" - - ./bin/nim c koch || die "csources nim failed" - ./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed" - - if use doc; then - PATH="./bin:$PATH" ./koch web || die "koch web failed" - fi -} - -src_test() { - PATH="./bin:$PATH" ./koch test || die "test suite failed" -} - -src_install() { - ./koch install "${D}/usr" || die "koch install failed" - rm -r "${D}/usr/nim/doc" || die "failed to remove 'doc'" - - dodir /usr/bin - dosym ../nim/bin/nim /usr/bin/nim - - if use doc; then - insinto /usr/share/doc/${PF} - dodoc doc/*.html - fi -} diff --git a/dev-lang/nim/nim-0.17.0.ebuild b/dev-lang/nim/nim-0.17.0.ebuild deleted file mode 100644 index be6d8989a30b..000000000000 --- a/dev-lang/nim/nim-0.17.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="compiled, garbage-collected systems programming language" -HOMEPAGE="https://nim-lang.org/" -SRC_URI="https://nim-lang.org/download/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc +readline test" - -DEPEND=" - readline? ( sys-libs/readline:0= ) -" -RDEPEND="${DEPEND}" - -nim_use_enable() { - [[ -z $2 ]] && die "usage: nim_use_enable " - use $1 && echo "-d:$2" -} - -src_compile() { - ./build.sh || die "build.sh failed" - - ./bin/nim c koch || die "csources nim failed" - ./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed" - - if use doc; then - PATH="./bin:$PATH" ./koch web || die "koch web failed" - fi -} - -src_test() { - PATH="./bin:$PATH" ./koch test || die "test suite failed" -} - -src_install() { - ./koch install "${D}/usr" || die "koch install failed" - rm -r "${D}/usr/nim/doc" || die "failed to remove 'doc'" - - dodir /usr/bin - dosym ../nim/bin/nim /usr/bin/nim - - if use doc; then - insinto /usr/share/doc/${PF} - dodoc doc/*.html - fi -} diff --git a/dev-lang/nim/nim-0.17.2-r1.ebuild b/dev-lang/nim/nim-0.17.2-r1.ebuild deleted file mode 100644 index b5b88357cd22..000000000000 --- a/dev-lang/nim/nim-0.17.2-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -DESCRIPTION="compiled, garbage-collected systems programming language" -HOMEPAGE="https://nim-lang.org/" -SRC_URI="https://nim-lang.org/download/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc +readline test" - -DEPEND=" - readline? ( sys-libs/readline:0= ) -" -RDEPEND="${DEPEND}" - -nim_use_enable() { - [[ -z $2 ]] && die "usage: nim_use_enable " - use $1 && echo "-d:$2" -} - -src_compile() { - ./build.sh || die "build.sh failed" - - ./bin/nim c koch || die "csources nim failed" - ./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed" - # build nimble and friends - PATH="./bin:$PATH" ./koch tools || die "koch tools failed" - - if use doc; then - PATH="./bin:$PATH" ./koch web || die "koch web failed" - fi -} - -src_test() { - PATH="./bin:$PATH" ./koch test || die "test suite failed" -} - -src_install() { - PATH="./bin:$PATH" ./koch install "${ED}/usr" || die "koch install failed" - rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'" - - dodir /usr/bin - exeinto /usr/nim/bin - - local bin_exe - for bin_exe in bin/*; do - # './koch install' installs only 'nim' binary - # but not the rest - doexe "${bin_exe}" - dosym ../nim/"${bin_exe}" /usr/"${bin_exe}" - done - - if use doc; then - insinto /usr/share/doc/${PF} - dodoc doc/*.html - fi - - newbashcomp tools/nim.bash-completion ${PN} -} diff --git a/dev-lang/nim/nim-0.17.2.ebuild b/dev-lang/nim/nim-0.17.2.ebuild deleted file mode 100644 index 3942e4e7b582..000000000000 --- a/dev-lang/nim/nim-0.17.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -DESCRIPTION="compiled, garbage-collected systems programming language" -HOMEPAGE="https://nim-lang.org/" -SRC_URI="https://nim-lang.org/download/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc +readline test" - -DEPEND=" - readline? ( sys-libs/readline:0= ) -" -RDEPEND="${DEPEND}" - -nim_use_enable() { - [[ -z $2 ]] && die "usage: nim_use_enable " - use $1 && echo "-d:$2" -} - -src_compile() { - ./build.sh || die "build.sh failed" - - ./bin/nim c koch || die "csources nim failed" - ./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed" - PATH="./bin:$PATH" ./koch tools || die "koch tools failed" - - if use doc; then - PATH="./bin:$PATH" ./koch web || die "koch web failed" - fi -} - -src_test() { - PATH="./bin:$PATH" ./koch test || die "test suite failed" -} - -src_install() { - ./koch install "${ED}/usr" || die "koch install failed" - rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'" - - dodir /usr/bin - local exe - for bin_exe in bin/*; do - dosym ../nim/${bin_exe} /usr/${bin_exe} - done - - if use doc; then - insinto /usr/share/doc/${PF} - dodoc doc/*.html - fi - - newbashcomp tools/nim.bash-completion ${PN} -} diff --git a/dev-lang/nim/nim-0.18.0.ebuild b/dev-lang/nim/nim-0.19.2.ebuild similarity index 72% rename from dev-lang/nim/nim-0.18.0.ebuild rename to dev-lang/nim/nim-0.19.2.ebuild index 53766c3e8a09..2dc958a2a86b 100644 --- a/dev-lang/nim/nim-0.18.0.ebuild +++ b/dev-lang/nim/nim-0.19.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit bash-completion-r1 multiprocessing @@ -24,6 +24,10 @@ DEPEND=" test? ( net-libs/nodejs ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.19.0-paths.patch +) + _run() { echo "$@" "$@" || die "'$*' failed" @@ -35,15 +39,18 @@ nim_use_enable() { } src_compile() { + export XDG_CACHE_HOME=${T}/cache #667182 + _run ./build.sh _run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch _run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline) # build nimble and friends - PATH="./bin:$PATH" _run ./koch tools + # --stable to avoid pulling HEAD nimble + PATH="./bin:$PATH" _run ./koch --stable tools if use doc; then - PATH="./bin:$PATH" _run ./koch web + PATH="./bin:$PATH" _run ./koch doc fi } @@ -52,23 +59,22 @@ src_test() { } src_install() { - PATH="./bin:$PATH" _run ./koch install "${ED}/usr" - rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'" + PATH="./bin:$PATH" _run ./koch install "${ED%/}" + rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'" - dodir /usr/bin - exeinto /usr/nim/bin + exeinto /usr/bin local bin_exe for bin_exe in bin/*; do # './koch install' installs only 'nim' binary # but not the rest + [[ ${bin_exe} == bin/nim ]] && continue doexe "${bin_exe}" - dosym ../nim/"${bin_exe}" /usr/"${bin_exe}" done if use doc; then insinto /usr/share/doc/${PF} - dodoc doc/*.html + dodoc doc/html/*.html fi newbashcomp tools/nim.bash-completion ${PN} diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild index f2fe8d1b2cc9..fdc25eefab6e 100644 --- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9. LICENSE="NPL-1.1" SLOT="52" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="debug minimal +system-icu test" RESTRICT="ia64? ( test )" diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest index 60e3de59ad91..0eba5281bb31 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -2,3 +2,4 @@ DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686 +DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 diff --git a/dev-lang/tk/tk-8.6.9.1.ebuild b/dev-lang/tk/tk-8.6.9.1.ebuild new file mode 100644 index 000000000000..36af12eb46dc --- /dev/null +++ b/dev-lang/tk/tk-8.6.9.1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal prefix toolchain-funcs virtualx + +MY_P="${PN}${PV/_beta/b}" + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug +threads truetype aqua xscreensaver" + +RDEPEND=" + !aqua? ( + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) + xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + ) + ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + !aqua? ( x11-base/xorg-proto )" + +# Not bumped to 8.6 +#RESTRICT=test + +SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})" +S="${SPARENT}"/unix + +PATCHES=( + "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch + "${FILESDIR}"/${PN}-8.5.13-multilib.patch + "${FILESDIR}"/${PN}-8.4.15-aqua.patch + "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971 +) + +src_prepare() { + find \ + "${SPARENT}"/compat/* \ + -delete || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + eprefixify Makefile.in + + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + -i configure.in || die + rm configure || die + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + if tc-is-cross-compiler ; then + export ac_cv_func_strtod=yes + export tcl_cv_strtod_buggy=1 + fi + + local mylibdir=$(get_libdir) + + econf \ + --with-tcl="${EPREFIX}/usr/${mylibdir}" \ + $(use_enable threads) \ + $(use_enable aqua) \ + $(use_enable truetype xft) \ + $(use_enable xscreensaver xss) \ + $(use_enable debug symbols) +} + +multilib_src_test() { + virtx emake test +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + + # normalize $S path, bug #280766 (pkgcore) + local nS="$(cd "${S}"; pwd)" + + # fix the tkConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ + -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ + -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ + -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed \ + -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/*.h + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die + + # install symlink for libraries + dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + if multilib_is_native_abi; then + dosym wish${v1} /usr/bin/wish + dodoc "${SPARENT}"/{ChangeLog*,README,changes} + fi +} diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 3e396952d0a9..eae66eff09a9 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild index ec60c641073a..7e13258d7147 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " # libxml2 required for glib-compile-resources DEPEND="${RDEPEND} diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 2d6baa82c815..5a11cc2bfebd 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -1 +1,2 @@ DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 +DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild new file mode 100644 index 000000000000..707e90d46a20 --- /dev/null +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver + +SASLAUTHD_CONF_VER="2.1.26" + +DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" +HOMEPAGE="https://www.cyrusimap.org/sasl/" +#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" +SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD-with-attribution" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" + +CDEPEND=" + net-mail/mailbase + authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) + berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) + gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) + mysql? ( virtual/mysql ) + pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + ) + java? ( >=virtual/jdk-1.6:= )" + +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-sasl )" + +DEPEND="${CDEPEND}" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/sasl/md5global.h +) + +PATCHES=( + "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch" + "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch" + "${FILESDIR}/${PN}-2.1.27-as_needed.patch" + "${FILESDIR}/${PN}-2.1.25-auxprop.patch" + "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch" + "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch" + "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch" +) + +pkg_setup() { + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # Get rid of the -R switch (runpath_switch for Sun) + # >=gcc-4.6 errors out with unknown option + sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \ + configure.ac || die + + # Use plugindir for sasldir + sed -i '/^sasldir =/s:=.*:= $(plugindir):' \ + "${S}"/plugins/Makefile.{am,in} || die "sed failed" + + # #486740 #468556 + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \ + -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + if [[ ${CHOST} == *-solaris* ]] ; then + # getpassphrase is defined in /usr/include/stdlib.h + append-cppflags -DHAVE_GETPASSPHRASE + else + # this horrendously breaks things on Solaris + append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # Java support. + multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}" + + local myeconfargs=( + --enable-login + --enable-ntlm + --enable-auth-sasldb + --disable-cmulocal + --disable-krb4 + --disable-macos-framework + --enable-otp + --without-sqlite + --with-saslauthd="${EPREFIX}"/run/saslauthd + --with-pwcheck="${EPREFIX}"/run/saslauthd + --with-configdir="${EPREFIX}"/etc/sasl2 + --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2 + --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2 + --with-sphinx-build=no + $(use_with ssl openssl) + $(use_with pam) + $(use_with openldap ldap) + $(use_enable ldapdb) + $(multilib_native_use_enable sample) + $(use_enable kerberos gssapi) + $(multilib_native_use_enable java) + $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) + $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) + $(use_enable srp) + $(use_enable static-libs static) + + # Add authdaemond support (bug #56523). + $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '') + + # Fix for bug #59634. + $(usex ssl '' --without-des) + + # Use /dev/urandom instead of /dev/random (bug #46038). + $(usex urandom --with-devrandom=/dev/urandom '') + ) + + if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then + myeconfargs+=( --enable-sql ) + else + myeconfargs+=( --disable-sql ) + fi + + # Default to GDBM if both 'gdbm' and 'berkdb' are present. + if use gdbm ; then + einfo "Building with GNU DB as database backend for your SASLdb" + myeconfargs+=( --with-dblib=gdbm ) + elif use berkdb ; then + einfo "Building with BerkeleyDB as database backend for your SASLdb" + myeconfargs+=( + --with-dblib=berkeley + --with-bdb-incdir="$(db_includedir)" + ) + else + einfo "Building without SASLdb support" + myeconfargs+=( --with-dblib=none ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake + + # Default location for java classes breaks OpenOffice (bug #60769). + # Thanks to axxo@gentoo.org for the solution. + if multilib_is_native_abi && use java ; then + jar -cvf ${PN}.jar -C java $(find java -name "*.class") + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi; then + if use sample ; then + docinto sample + dodoc "${S}"/sample/*.c + exeinto /usr/share/doc/${P}/sample + doexe sample/client sample/server + fi + + # Default location for java classes breaks OpenOffice (bug #60769). + if use java; then + java-pkg_dojar ${PN}.jar + java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)" + # hackish, don't wanna dig through makefile + rm -rf "${ED}/usr/$(get_libdir)/java" || die + docinto "java" + dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/* + dodir "/usr/share/doc/${PF}/java/Test" + insinto "/usr/share/doc/${PF}/java/Test" + doins "${S}"/java/Test/*.java + fi + + dosbin saslauthd/testsaslauthd + fi +} + +multilib_src_install_all() { + doman man/* + + keepdir /etc/sasl2 + + # Reset docinto to default value (#674296) + docinto + dodoc AUTHORS ChangeLog doc/legacy/TODO + newdoc pwcheck/README README.pwcheck + + newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes + edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes + + docinto html + dodoc doc/html/*.html + + newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd + + newinitd "${FILESDIR}/pwcheck.rc6" pwcheck + systemd_dounit "${FILESDIR}/pwcheck.service" + + newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd + newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd + systemd_dounit "${FILESDIR}/saslauthd.service" + systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" + + # The get_modname bit is important: do not remove the .la files on + # platforms where the lib isn't called .so for cyrus searches the .la to + # figure out what the name is supposed to be instead + if ! use static-libs && [[ $(get_modname) == .so ]] ; then + find "${ED}" -name "*.la" -delete || die + fi +} + +pkg_postinst () { + # Generate an empty sasldb2 with correct permissions. + if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then + einfo "Generating an empty sasldb2 with correct permissions ..." + echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \ + || die "Failed to generate sasldb2" + "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \ + || die "Failed to delete temp user" + chown root:mail "${EROOT}/etc/sasl2/sasldb2" \ + || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2" + chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \ + || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2" + fi + + if use authdaemond ; then + elog "You need to add a user running a service using Courier's" + elog "authdaemon to the 'mail' group. For example, do:" + elog " gpasswd -a postfix mail" + elog "to add the 'postfix' user to the 'mail' group." + fi + + elog "pwcheck and saslauthd home directories have moved to:" + elog " /run/saslauthd, using tmpfiles.d" +} diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch new file mode 100644 index 000000000000..7cd9e151fbb7 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch @@ -0,0 +1,25 @@ +Author: Matthias Klose +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- cyrus-sasl-2.1.27/saslauthd/Makefile.am ++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am +@@ -25,7 +25,7 @@ + saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL) + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS) ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS) + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- cyrus-sasl-2.1.27/sasldb/Makefile.am ++++ cyrus-sasl-2.1.27/sasldb/Makefile.am +@@ -54,6 +54,6 @@ + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + libsasldb_la_LDFLAGS = -no-undefined diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch new file mode 100644 index 000000000000..2ce971efc5b5 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch @@ -0,0 +1,31 @@ +--- cyrus-sasl-2.1.27/configure.ac ++++ cyrus-sasl-2.1.27/configure.ac +@@ -44,6 +44,8 @@ + + AC_PREREQ(2.63) + ++AC_CONFIG_MACRO_DIR([config]) ++ + dnl + dnl REMINDER: When changing the version number here, please also update + dnl the values in win32/include/config.h and include/sasl.h as well. +--- cyrus-sasl-2.1.27/Makefile.am ++++ cyrus-sasl-2.1.27/Makefile.am +@@ -44,6 +44,8 @@ + # + ################################################################ + ++ACLOCAL_AMFLAGS = -I config ++ + if SASLAUTHD + SAD = saslauthd + else +--- cyrus-sasl-2.1.27/saslauthd/Makefile.am ++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am +@@ -1,4 +1,6 @@ + AUTOMAKE_OPTIONS = 1.7 ++ACLOCAL_AMFLAGS = -I ../config ++ + sbin_PROGRAMS = saslauthd testsaslauthd + EXTRA_PROGRAMS = saslcache + diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch new file mode 100644 index 000000000000..c331039e2f16 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch @@ -0,0 +1,17 @@ +Author: Fabian Fagerholm +Description: This patch makes sure the non-PIC version of libsasldb.a, which +is created out of non-PIC objects, is not going to overwrite the PIC version, +which is created out of PIC objects. The PIC version is placed in .libs, and +the non-PIC version in the current directory. This ensures that both non-PIC +and PIC versions are available in the correct locations. +--- cyrus-sasl-2.1.27/lib/Makefile.am ++++ cyrus-sasl-2.1.27/lib/Makefile.am +@@ -98,7 +98,7 @@ + + libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) + @echo adding static plugins and dependencies +- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) ++ $(AR) cru $@ $(SASL_STATIC_OBJS) + @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ + if test ! -f $$i; then continue; fi; . $$i; \ + for j in $$dependency_libs foo; do \ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch new file mode 100644 index 000000000000..bdd02f779660 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py ++++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py +@@ -23,7 +23,7 @@ + from sphinx import addnodes + from sphinx.locale import admonitionlabels, _ + from sphinx.util.osutil import ustrftime +-from sphinx.util.compat import docutils_version ++#from sphinx.util.compat import docutils_version + + class CyrusManualPageWriter(ManualPageWriter): + diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch new file mode 100644 index 000000000000..c585cb158e15 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch @@ -0,0 +1,16 @@ +Gentoo bug #389349 +--- cyrus-sasl-2.1.27/m4/sasl2.m4 ++++ cyrus-sasl-2.1.27/m4/sasl2.m4 +@@ -220,7 +220,11 @@ + [AC_WARN([Cybersafe define not found])]) + + elif test "$ac_cv_header_gssapi_h" = "yes"; then +- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, ++ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h, ++ [#include ++ #ifdef GSS_C_NT_HOSTBASED_SERVICE ++ hostbased_service_gss_nt_yes ++ #endif], + [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, + [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])]) + elif test "$ac_cv_header_gssapi_gssapi_h"; then diff --git a/dev-libs/efl/efl-1.21.1-r2.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild similarity index 99% rename from dev-libs/efl/efl-1.21.1-r2.ebuild rename to dev-libs/efl/efl-1.21.1-r3.ebuild index 609c8e0bae66..d7f5142c1b88 100644 --- a/dev-libs/efl/efl-1.21.1-r2.ebuild +++ b/dev-libs/efl/efl-1.21.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif REQUIRED_USE=" ?? ( opengl egl ) ?? ( opengl gles ) - egl ( gles ) + egl? ( gles ) fbcon? ( !tslib ) gles? ( || ( X wayland ) diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest index f1310f7d8257..1db740c28757 100644 --- a/dev-libs/gdl/Manifest +++ b/dev-libs/gdl/Manifest @@ -1,2 +1 @@ -DIST gdl-3.22.0.tar.xz 529072 BLAKE2B 7215c53051dc3ec467c97615fa7e8059bf6c610cd166bea28ba256bf26b4de75fc63ab1e627acdeb8228257844ae1b47bb5d88cef24c7efcbd5bfbe508928eae SHA512 408fd75627497c658b65e9cd39b8779ad0db2fdc1f780e369237fbdd3f0ccc035cd86456ff72e1581c524f1d35673d3b31ebb074290babf025596d08d823833d DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471 diff --git a/dev-libs/gdl/gdl-3.22.0.ebuild b/dev-libs/gdl/gdl-3.22.0.ebuild deleted file mode 100644 index 9659716660ac..000000000000 --- a/dev-libs/gdl/gdl-3.22.0.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="GNOME docking library" -HOMEPAGE="https://git.gnome.org/browse/gdl" - -LICENSE="LGPL-2.1+" -SLOT="3/5" # subslot = libgdl-3 soname version -IUSE="+introspection" -KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" - -RDEPEND=" - dev-libs/glib:2 - >=x11-libs/gtk+-3.0.0:3[introspection?] - >=dev-libs/libxml2-2.4:2 - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.4 - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure $(use_enable introspection) -} diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild index 5d411e0cfe9f..efeb11f9b85f 100644 --- a/dev-libs/gdl/gdl-3.28.0.ebuild +++ b/dev-libs/gdl/gdl-3.28.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl" LICENSE="LGPL-2.1+" SLOT="3/5" # subslot = libgdl-3 soname version IUSE="+introspection" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" RDEPEND=" dev-libs/glib:2 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index da752322e9e8..81581ccb1f01 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,4 +1,3 @@ -DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild deleted file mode 100644 index 9ccdbdf98d32..000000000000 --- a/dev-libs/glib/glib-2.56.2.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) -GNOME2_EAUTORECONF=yes - -inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ - multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx - -# Until bug #537330 glib is a reverse dependency of pkgconfig and, then -# adding new dependencies end up making stage3 to grow. Every addition needs -# then to be think very closely. - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="https://www.gtk.org/" -SRC_URI="${SRC_URI} - https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf - -LICENSE="LGPL-2.1+" -SLOT="2" -IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -# Added util-linux multilib dependency to have libmount support (which -# is always turned on on linux systems, unless explicitly disabled, but -# this ebuild does not do that anyway) (bug #599586) - -RDEPEND=" - !=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) - utils? ( - >=dev-util/gdbus-codegen-${PV} - virtual/libelf:0= - ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-libs/libxslt-1.0 - >=sys-devel/gettext-0.11 - >=dev-util/gtk-doc-am-1.20 - systemtap? ( >=dev-util/systemtap-1.3 ) - ${PYTHON_DEPS} - test? ( - sys-devel/gdb - >=dev-util/gdbus-codegen-${PV} - >=sys-apps/dbus-1.2.14 ) - !& /dev/null; then - if has_version sys-apps/dbus; then - export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" - export DBUS1_LIBS="-ldbus-1" - fi - export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" - export LIBFFI_LIBS="-lffi" - export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass - export PCRE_LIBS="-lpcre" - fi - - # These configure tests don't work when cross-compiling. - if tc-is-cross-compiler ; then - # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - case ${CHOST} in - hppa*|metag*) export glib_cv_stack_grows=yes ;; - *) export glib_cv_stack_grows=no ;; - esac - # https://bugzilla.gnome.org/show_bug.cgi?id=756474 - export glib_cv_uscore=no - # https://bugzilla.gnome.org/show_bug.cgi?id=756475 - export ac_cv_func_posix_get{pwuid,grgid}_r=yes - fi - - local myconf - - case "${CHOST}" in - *-mingw*) myconf="${myconf} --with-threads=win32" ;; - *) myconf="${myconf} --with-threads=posix" ;; - esac - - # libelf used only by the gresource bin - ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable xattr) \ - $(use_enable fam) \ - $(use_enable kernel_linux libmount) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_enable systemtap dtrace) \ - $(use_enable systemtap systemtap) \ - $(multilib_native_use_enable utils libelf) \ - --with-python=${EPYTHON} \ - --disable-compile-warnings \ - --enable-man \ - --with-pcre=system \ - --with-xml-catalog="${EPREFIX}/etc/xml/catalog" - - if multilib_is_native_abi; then - local d - for d in glib gio gobject; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - export XDG_CONFIG_DIRS=/etc/xdg - export XDG_DATA_DIRS=/usr/local/share:/usr/share - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" - export LC_TIME=C # bug #411967 - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - - # Hardened: gdb needs this, bug #338891 - if host-is-pax ; then - pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ - || die "Hardened adjustment failed" - fi - - # Need X for dbus-launch session X11 initialization - virtx emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - einstalldocs - - # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson - rm "${ED}usr/bin/glib-genmarshal" || die - rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die - rm "${ED}usr/bin/glib-mkenums" || die - rm "${ED}usr/share/man/man1/glib-mkenums.1" || die - rm "${ED}usr/bin/gtester-report" || die - rm "${ED}usr/share/man/man1/gtester-report.1" || die - - # Do not install charset.alias even if generated, leave it to libiconv - rm -f "${ED}/usr/$(get_libdir)/charset.alias" - - # Don't install gdb python macros, bug 291328 - rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" - - # Completely useless with or without USE static-libs, people need to use pkg-config - find "${ED}" -name '*.la' -delete || die -} - -pkg_preinst() { - gnome2_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - # force (re)generation of gschemas.compiled - GNOME2_ECLASS_GLIB_SCHEMAS="force" - - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled - fi -} diff --git a/dev-libs/glib/glib-2.56.4.ebuild b/dev-libs/glib/glib-2.56.4.ebuild index 94964f583362..9cccbd6aa5be 100644 --- a/dev-libs/glib/glib-2.56.4.ebuild +++ b/dev-libs/glib/glib-2.56.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+" SLOT="2" IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" # Added util-linux multilib dependency to have libmount support (which # is always turned on on linux systems, unless explicitly disabled, but diff --git a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild similarity index 90% rename from dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild rename to dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild index 10f11b05bddb..9bcff53af420 100644 --- a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild +++ b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ IUSE="test" RESTRICT="!test? ( test )" SLOT="0/${PV}" -COMMON_DEPEND=">=dev-libs/openssl-1.1:0=" +COMMON_DEPEND=">=dev-libs/openssl-1.1.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig test? ( diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild index 60425b979899..1d7a11fbc17e 100644 --- a/dev-libs/gost-engine/gost-engine-9999.ebuild +++ b/dev-libs/gost-engine/gost-engine-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ IUSE="test" RESTRICT="!test? ( test )" SLOT="0/${PV}" -COMMON_DEPEND=">=dev-libs/openssl-1.1:0=" +COMMON_DEPEND=">=dev-libs/openssl-1.1.1:0=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig test? ( diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild b/dev-libs/grok/grok-0.9.2-r2.ebuild index 72d46636f25f..0e18ee718f15 100644 --- a/dev-libs/grok/grok-0.9.2-r2.ebuild +++ b/dev-libs/grok/grok-0.9.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa x86" +KEYWORDS="amd64 arm ~arm64 hppa x86" IUSE="" diff --git a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild index a57e7bd99f09..c4a480ad1f88 100644 --- a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild +++ b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc ~x86" IUSE="debug static-libs" RDEPEND=" diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild index e069f52e1b33..a7c4550e286b 100644 --- a/dev-libs/icu/icu-63.1-r1.ebuild +++ b/dev-libs/icu/icu-63.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="debug doc examples static-libs" DEPEND=" diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild index 595c96d72f9c..af137bfde7b8 100644 --- a/dev-libs/jansson/jansson-2.11.ebuild +++ b/dev-libs/jansson/jansson-2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd" IUSE="doc static-libs" DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest index 96f22701ff6e..4f2a7a62cceb 100644 --- a/dev-libs/libarcus/Manifest +++ b/dev-libs/libarcus/Manifest @@ -1,3 +1,2 @@ -DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9 DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d -DIST libarcus-3.5.1.tar.gz 28935 BLAKE2B ae850a0923e45446f248fb9944cd795cfa07e05ae4a1c0c91089fd60711603cb1c7b6c3ec81e71496e1a5a2752abb215cbcf725be65a0f8ca92dd0c9d24ed3f1 SHA512 a3cf8599aee83aa080d23849c2c9760e1342fd738db58f4e4bb974a9c3f3dfa34dab1fead6292aa6e27ad9a659fda7b92f031c141039bc3118df8f97cc4b8712 +DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430 diff --git a/dev-libs/libarcus/libarcus-3.3.0.ebuild b/dev-libs/libarcus/libarcus-3.3.0.ebuild deleted file mode 100644 index d0e49ef66b98..000000000000 --- a/dev-libs/libarcus/libarcus-3.3.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) - -inherit cmake-utils python-single-r1 - -MY_PN="libArcus" - -DESCRIPTION="This library facilitates communication between Cura and its backend" -HOMEPAGE="https://github.com/Ultimaker/libArcus" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="examples python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-python/sip[${PYTHON_USEDEP}] - dev-libs/protobuf - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_EXAMPLES=$(usex examples ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure -} diff --git a/dev-libs/libarcus/libarcus-3.5.1.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild similarity index 100% rename from dev-libs/libarcus/libarcus-3.5.1.ebuild rename to dev-libs/libarcus/libarcus-3.6.0.ebuild diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild index 37b882db5432..2a24133ba42b 100644 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild +++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz" # clause "or later" so we use LGPL-2.1 without + LICENSE="GPL-3+ GPL-2+ LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="+cxx static-libs test" RDEPEND="app-eselect/eselect-cdparanoia diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest index 8f7754a6131a..afc82f2aa411 100644 --- a/dev-libs/libcec/Manifest +++ b/dev-libs/libcec/Manifest @@ -1,2 +1,2 @@ -DIST libcec-3.1.0.tar.gz 1097121 BLAKE2B f216c03c26fd51366282d649d18ca969f362438a2803a7a15dc2aa1ec7caeb4e2a9f02b74e569da4d4c6aa24427ec5bd1870a230dc9c0bc575938c3929a7772b SHA512 e06f65d85ee268ec23380186d11e53f3e477bf25b955c9314cc13555eedeffee902dc8a0f3005248250c584760ab68c461b087b305dc4ef463da628ee1ab433b DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb +DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116 diff --git a/dev-libs/libcec/libcec-3.1.0-r1.ebuild b/dev-libs/libcec/libcec-3.1.0-r1.ebuild deleted file mode 100644 index 46b752cba094..000000000000 --- a/dev-libs/libcec/libcec-3.1.0-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit cmake-utils linux-info python-single-r1 toolchain-funcs - -DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" -HOMEPAGE="http://libcec.pulse-eight.com" -SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="cubox exynos python raspberry-pi +xrandr" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="virtual/udev - >=dev-libs/libplatform-2.0.0 - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - xrandr? ( x11-libs/libXrandr ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - virtual/pkgconfig" - -CONFIG_CHECK="~USB_ACM" - -S="${WORKDIR}/${PN}-${P}" - -pkg_pretend() { - linux-info_pkg_setup -} - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # Do not hardcode the python libpath #577612 - sed -i \ - -e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \ - src/libcec/cmake/CheckPlatformSupport.cmake || die - - use python || cmake_comment_add_subdirectory "src/pyCecClient" -} - -src_configure() { - local mycmakeargs=( - -DSKIP_PYTHON_WRAPPER=$(usex python) - -DHAVE_EXYNOS_API=$(usex exynos) - -DHAVE_TDA955X_API=$(usex cubox) - -DHAVE_RPI_API=$(usex raspberry-pi) - ) - use python && mycmakeargs+=( - -DPYTHON_SITEDIR="$(python_get_sitedir)" - ) - - # raspberrypi-userland itself does not provide .pc file so using - # bcm_host.pc instead - use raspberry-pi && mycmakeargs+=( - -DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \ - -DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - elog "You will need to ensure the user running your CEC client has" - elog "read/write access to the device. You can ensure this by adding" - elog "them to the uucp group" -} diff --git a/dev-libs/libcec/libcec-4.0.2-r1.ebuild b/dev-libs/libcec/libcec-4.0.2-r1.ebuild deleted file mode 100644 index f52629d16720..000000000000 --- a/dev-libs/libcec/libcec-4.0.2-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -MY_PV=${PV/_p/-} -MY_P=${PN}-${MY_PV} - -inherit cmake-utils linux-info python-single-r1 toolchain-funcs - -DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor" -HOMEPAGE="http://libcec.pulse-eight.com" -SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cubox exynos python raspberry-pi +xrandr" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="virtual/udev - >=dev-libs/libplatform-2.0.0 - sys-libs/ncurses:= - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - xrandr? ( x11-libs/libXrandr ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - virtual/pkgconfig" - -CONFIG_CHECK="~USB_ACM" - -S="${WORKDIR}/${PN}-${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-no-tinfo.patch" ) - -pkg_pretend() { - linux-info_pkg_setup -} - -pkg_setup() { - linux-info_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # Do not hardcode the python libpath #577612 - sed -i \ - -e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \ - src/libcec/cmake/CheckPlatformSupport.cmake || die - - use python || cmake_comment_add_subdirectory "src/pyCecClient" -} - -src_configure() { - local mycmakeargs=( - -DSKIP_PYTHON_WRAPPER=$(usex !python) - -DHAVE_EXYNOS_API=$(usex exynos) - -DHAVE_TDA995X_API=$(usex cubox) - -DHAVE_RPI_API=$(usex raspberry-pi) - ) - use python && mycmakeargs+=( - -DPYTHON_SITEDIR="$(python_get_sitedir)" - ) - - # raspberrypi-userland itself does not provide .pc file so using - # bcm_host.pc instead - use raspberry-pi && mycmakeargs+=( - -DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \ - -DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - elog "You will need to ensure the user running your CEC client has" - elog "read/write access to the device. You can ensure this by adding" - elog "them to the uucp group" -} diff --git a/dev-libs/libcec/libcec-4.0.2.ebuild b/dev-libs/libcec/libcec-4.0.4.ebuild similarity index 94% rename from dev-libs/libcec/libcec-4.0.2.ebuild rename to dev-libs/libcec/libcec-4.0.4.ebuild index 6c8fc121c6aa..38c70e8e9200 100644 --- a/dev-libs/libcec/libcec-4.0.2.ebuild +++ b/dev-libs/libcec/libcec-4.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) MY_PV=${PV/_p/-} MY_P=${PN}-${MY_PV} @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="cubox exynos python raspberry-pi +xrandr" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index a4301a5acce2..6c2563903010 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm ~ppc ~ppc64 x86" -IUSE="+daemon elibc_musl pam static-libs +tools" +IUSE="+daemon elibc_musl pam static-libs test +tools" RDEPEND="pam? ( virtual/pam )" @@ -51,6 +51,11 @@ src_prepare() { -i src/pam/Makefile.am || die "sed failed" sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed" + # If we're not running tests, don't bother building them. + if ! use test; then + sed -i '/^SUBDIRS/s:tests::' Makefile.am || die + fi + eautoreconf } diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest index 9034c658bc3f..b09aa2727453 100644 --- a/dev-libs/libcharon/Manifest +++ b/dev-libs/libcharon/Manifest @@ -1,3 +1,2 @@ -DIST libcharon-3.3.0.tar.gz 141001 BLAKE2B 80d880ac274a53dc6673d9993ef8474091a036e6faac8fa44df3ace0f4b2fcf0102229b0f407acf9f7df7c56fb08a60c7ac3b7078e5e5daf86e1f0fe3fa453fa SHA512 92e7a33c77d05224f0b07c92f105d66010e727f67ec51e6dc314c001953e14047a7d59e2e0887950dcd38d25595df5186161ff1c0272a1193bcd8ccd64b0033b DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3 -DIST libcharon-3.5.1.tar.gz 143496 BLAKE2B bffbe111b6d671d4c2b636e3f708555ba98acafb0d0475c07e0658bca7a557a678097a0daa600dd59f71628802a5c2b995683a25965da200681373b9184e9a1f SHA512 d8cf3b95e09fe9f046e7b2c3a2163f8d125e25c2b5c13c286fd8144bda865457bd730a01f8ac83b3b4eb68ff4b7d1a59e030e99f92f5bea612845380c71ff772 +DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4 diff --git a/dev-libs/libcharon/libcharon-3.3.0.ebuild b/dev-libs/libcharon/libcharon-3.3.0.ebuild deleted file mode 100644 index c2de02822b82..000000000000 --- a/dev-libs/libcharon/libcharon-3.3.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -inherit cmake-utils python-single-r1 - -MY_PN="libCharon" - -DESCRIPTION="This library facilitates communication between Cura and its backend" -HOMEPAGE="https://github.com/Ultimaker/libCharon" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-libs/libcharon/libcharon-3.5.1.ebuild b/dev-libs/libcharon/libcharon-3.6.0.ebuild similarity index 100% rename from dev-libs/libcharon/libcharon-3.5.1.ebuild rename to dev-libs/libcharon/libcharon-3.6.0.ebuild diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild index a93a82468cd3..1d625e762d5b 100644 --- a/dev-libs/libestr/libestr-0.1.11.ebuild +++ b/dev-libs/libestr/libestr-0.1.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="http://libestr.adiscon.com/files/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 hppa x86" +KEYWORDS="amd64 arm ~arm64 hppa x86" IUSE="debug static-libs test" DEPEND="" diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild index 64174c3d34c4..52b3e6aa5550 100644 --- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild +++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 hppa x86 ~amd64-linux" + KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux" fi LICENSE="LGPL-2.1 Apache-2.0" diff --git a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild index d56225a7b926..3e90b50ba9b1 100644 --- a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild +++ b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86" + KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86" fi LICENSE="BSD-2" diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild index 188faec8adc6..b764146b9aad 100644 --- a/dev-libs/librelp/librelp-1.3.0.ebuild +++ b/dev-libs/librelp/librelp-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )" # subslot = soname version SLOT="0/0.4.0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~sparc x86" IUSE="debug doc +ssl +gnutls libressl openssl static-libs test" REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) gnutls? ( ssl ) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 88e825a6433a..e0e19f269611 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,3 +1,2 @@ -DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35 -DIST libsavitar-3.5.1.tar.gz 92456 BLAKE2B 6b7b533af744d3e9c59aae2338cb050cc44240969f07184d311fc1778487e230459cee4684d863a582c52ced34aa5e42bc6b7816ad5d8560f107ae6373f2aebb SHA512 740c3df1a0ae5bc406d1ac555d5952f9d1d49089d8b0eda9c4fafdf3c902f44b7a137906aa5a00ef0ea46d9f76409baf62a26c269d8401abcc642d36a2f7b524 +DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f diff --git a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild deleted file mode 100644 index 4b686c7e432d..000000000000 --- a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_5,3_6} ) -inherit cmake-utils python-single-r1 - -MY_PN="libSavitar" - -DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings" -HOMEPAGE="https://github.com/Ultimaker/libSavitar" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="+python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${P}-remove-packaged-pugixml.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure -} diff --git a/dev-libs/libsavitar/libsavitar-3.5.1.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild similarity index 100% rename from dev-libs/libsavitar/libsavitar-3.5.1.ebuild rename to dev-libs/libsavitar/libsavitar-3.6.0.ebuild diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch new file mode 100644 index 000000000000..6062f63df9ea --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch @@ -0,0 +1,65 @@ +https://bugs.gentoo.org/618110 +https://bugzilla.gnome.org/show_bug.cgi?id=775200 +https://gitlab.gnome.org/GNOME/libxml2/issues/26 + +From 123234f2cfcd9e9b9f83047eee1dc17b4c3f4407 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 11 Sep 2018 14:52:07 +0200 +Subject: [PATCH] Free input buffer in xmlHaltParser + +This avoids miscalculation of available bytes. + +Thanks to Yunho Kim for the report. + +Closes: #26 +--- + parser.c | 5 +++++ + result/errors/759573.xml.err | 17 +++++++---------- + 2 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/parser.c b/parser.c +index ca9fde2c8758..5813a6643e15 100644 +--- a/parser.c ++++ b/parser.c +@@ -12462,7 +12462,12 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) { + ctxt->input->free((xmlChar *) ctxt->input->base); + ctxt->input->free = NULL; + } ++ if (ctxt->input->buf != NULL) { ++ xmlFreeParserInputBuffer(ctxt->input->buf); ++ ctxt->input->buf = NULL; ++ } + ctxt->input->cur = BAD_CAST""; ++ ctxt->input->length = 0; + ctxt->input->base = ctxt->input->cur; + ctxt->input->end = ctxt->input->cur; + } +diff --git a/result/errors/759573.xml.err b/result/errors/759573.xml.err +index 554039f65b91..38ef5c40b8e3 100644 +--- a/result/errors/759573.xml.err ++++ b/result/errors/759573.xml.err +@@ -21,14 +21,11 @@ Entity: line 1: + ^ + ./test/errors/759573.xml:1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration + +- +Date: Mon, 30 Jul 2018 12:54:38 +0200 +Subject: [PATCH] Fix nullptr deref with XPath logic ops + +If the XPath stack is corrupted, for example by a misbehaving extension +function, the "and" and "or" XPath operators could dereference NULL +pointers. Check that the XPath stack isn't empty and optimize the +logic operators slightly. + +Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/5 + +Also see +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901817 +https://bugzilla.redhat.com/show_bug.cgi?id=1595985 + +This is CVE-2018-14404. + +Thanks to Guy Inbar for the report. +--- + xpath.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/xpath.c b/xpath.c +index 3fae0bf4e0a0..5e3bb9ff6401 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -13234,9 +13234,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + return(0); + } + xmlXPathBooleanFunction(ctxt, 1); +- arg1 = valuePop(ctxt); +- arg1->boolval &= arg2->boolval; +- valuePush(ctxt, arg1); ++ if (ctxt->value != NULL) ++ ctxt->value->boolval &= arg2->boolval; + xmlXPathReleaseObject(ctxt->context, arg2); + return (total); + case XPATH_OP_OR: +@@ -13252,9 +13251,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + return(0); + } + xmlXPathBooleanFunction(ctxt, 1); +- arg1 = valuePop(ctxt); +- arg1->boolval |= arg2->boolval; +- valuePush(ctxt, arg1); ++ if (ctxt->value != NULL) ++ ctxt->value->boolval |= arg2->boolval; + xmlXPathReleaseObject(ctxt->context, arg2); + return (total); + case XPATH_OP_EQUAL: +-- +2.19.1 + diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch new file mode 100644 index 000000000000..0d289352d2f9 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch @@ -0,0 +1,50 @@ +From 2240fbf5912054af025fb6e01e26375100275e74 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Mon, 30 Jul 2018 13:14:11 +0200 +Subject: [PATCH] Fix infinite loop in LZMA decompression +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Check the liblzma error code more thoroughly to avoid infinite loops. + +Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/13 +Closes: https://bugzilla.gnome.org/show_bug.cgi?id=794914 + +This is CVE-2018-9251 and CVE-2018-14567. + +Thanks to Dongliang Mu and Simon Wörner for the reports. +--- + xzlib.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/xzlib.c b/xzlib.c +index a839169ef2ec..0ba88cfa849d 100644 +--- a/xzlib.c ++++ b/xzlib.c +@@ -562,6 +562,10 @@ xz_decomp(xz_statep state) + "internal error: inflate stream corrupt"); + return -1; + } ++ /* ++ * FIXME: Remapping a couple of error codes and falling through ++ * to the LZMA error handling looks fragile. ++ */ + if (ret == Z_MEM_ERROR) + ret = LZMA_MEM_ERROR; + if (ret == Z_DATA_ERROR) +@@ -587,6 +591,11 @@ xz_decomp(xz_statep state) + xz_error(state, LZMA_PROG_ERROR, "compression error"); + return -1; + } ++ if ((state->how != GZIP) && ++ (ret != LZMA_OK) && (ret != LZMA_STREAM_END)) { ++ xz_error(state, ret, "lzma error"); ++ return -1; ++ } + } while (strm->avail_out && ret != LZMA_STREAM_END); + + /* update available output and crc check value */ +-- +2.19.1 + diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch new file mode 100644 index 000000000000..fcc441d05de2 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch @@ -0,0 +1,40 @@ +https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 + +From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 3 Jan 2019 05:44:03 -0500 +Subject: [PATCH] fix reader5.py test when building out of tree + +When building out of tree, the relative path this test uses doesn't +work. Resolve the path relative to the test script itself instead. + +Url: https://bugs.gentoo.org/565576 +--- + python/tests/reader5.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/python/tests/reader5.py b/python/tests/reader5.py +index 82d0daea474a..da5355ffc4c6 100755 +--- a/python/tests/reader5.py ++++ b/python/tests/reader5.py +@@ -4,6 +4,7 @@ + # this extract the Dragon bibliography entries from the XML specification + # + import libxml2 ++import os + import sys + + # Memory debug specific +@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. + Compilers: Principles, Techniques, and Tools. + Reading: Addison-Wesley, 1986, rpt. corr. 1988.""" + +-f = open('../../test/valid/REC-xml-19980210.xml', 'rb') ++basedir = os.path.dirname(os.path.realpath(__file__)) ++f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') + input = libxml2.inputBuffer(f) + reader = input.newTextReader("REC") + res="" +-- +2.19.1 + diff --git a/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild new file mode 100644 index 000000000000..86521ab289ae --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) +PYTHON_REQ_USE="xml" + +inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal + +DESCRIPTION="XML C parser and toolkit" +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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug examples icu ipv6 lzma python readline static-libs test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20080827.tar.gz" + +SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" + +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig + hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) +" + +S="${WORKDIR}/${PN}-${PV%_rc*}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +src_unpack() { + # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${P/_rc/-rc}.tar.gz + cd "${S}" || die + + if use test; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) + + # Patches needed for prefix support + eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch + + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c + + # Fix build for Windows platform + # https://bugzilla.gnome.org/show_bug.cgi?id=760456 + # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch + + # Fix python detection, bug #567066 + # https://bugzilla.gnome.org/show_bug.cgi?id=760458 + eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch + + # Fix python tests when building out of tree #565576 + eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch + + # CVE-2017-8872 #618110 + # https://bugzilla.gnome.org/show_bug.cgi?id=775200 + eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2017-8872.patch + + # CVE-2018-14567 + # https://bugzilla.gnome.org/show_bug.cgi?id=794914 + eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2018-14567.patch + + # CVE-2018-14404 + # https://gitlab.gnome.org/GNOME/libxml2/issues/5 + eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2018-14404.patch + + if [[ ${CHOST} == *-darwin* ]] ; then + # Avoid final linking arguments for python modules + sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die + # gcc-apple doesn't grok -Wno-array-bounds + sed -i -e 's/-Wno-array-bounds//' configure.ac || die + fi + + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + # We now need to run eautoreconf at the end to prevent maintainer mode. +# elibtoolize +# epunt_cxx # if we don't eautoreconf + + eautoreconf +} + +multilib_src_configure() { + # filter seemingly problematic CFLAGS (#26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + # USE zlib support breaks gnome2 + # (libgnomeprint for instance fails to compile with + # fresh install, and existing) - (22 Dec 2002). + + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + + # --with-mem-debug causes unusual segmentation faults (bug #105120). + + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-subdir=${PF}/html \ + $(use_with debug run-debug) \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable ipv6) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + libxml2_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130 + } + + libxml2_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxml2_py_configure + fi +} + +multilib_src_compile() { + default + if multilib_is_native_abi && use python; then + local native_builddir=${BUILD_DIR} + python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all + fi +} + +multilib_src_test() { + emake check + multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install + + if multilib_is_native_abi && use python; then + python_foreach_impl libxml2_py_emake \ + DESTDIR="${D}" \ + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ + exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ + install + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + # on windows, xmllint is installed by interix libxml2 in parent prefix. + # this is the version to use. the native winnt version does not support + # symlinks, which makes repoman fail if the portage tree is linked in + # from another location (which is my default). -- mduft + if [[ ${CHOST} == *-winnt* ]]; then + rm -rf "${ED}"/usr/bin/xmllint + rm -rf "${ED}"/usr/bin/xmlcatalog + fi + + rm -rf "${ED}"/usr/share/doc/${P} + einstalldocs + + if ! use examples; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples + fi + + prune_libtool_files --modules +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ "${ROOT}" != "/" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}etc/xml/catalog" + + # we dont want to clobber an existing catalog though, + # only ensure that one is there + # + if [[ ! -e ${CATALOG} ]]; then + [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}/python" > /dev/null || die + emake "$@" + popd > /dev/null +} diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild index 1917e19e6284..fbb37285cb7f 100644 --- a/dev-libs/libxml2/libxml2-2.9.8.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild @@ -81,6 +81,9 @@ src_prepare() { # https://bugzilla.gnome.org/show_bug.cgi?id=760458 eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch + # Fix python tests when building out of tree #565576 + eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch + if [[ ${CHOST} == *-darwin* ]] ; then # Avoid final linking arguments for python modules sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest index 5a1a3bc4066f..896d8e262036 100644 --- a/dev-libs/libxmlb/Manifest +++ b/dev-libs/libxmlb/Manifest @@ -1,2 +1,2 @@ -DIST libxmlb-0.1.4.tar.gz 82036 BLAKE2B 26adc2a33e0e63c6340127cb25dffa62d88d1c1ea6c760fcd54189ecd899f4d27547194e3e6ebc9d638dcba384fb2435e832915d5e75018f9f03ca7dbecdd878 SHA512 58b5f51fe0d6c6bc9f8e960f26ef79f3fb437f6802505d4e216e6bb32f95bd134f3230056dbc922bd5cf734ce1ef2278a2931653c1653cfca9baf6ddcdf38b78 DIST libxmlb-0.1.5.tar.gz 82894 BLAKE2B 37918d06938ff2a33efbcca712c1424767e88e0a0471a6458f41d97a5004fc3c93be67e3a47f031186fe157ccc610de5101e254dca8a0e9fb2d908c4f466e418 SHA512 c396ff647b6c0d86c8a1cfa5926699c0d16e0d62ae29afc542bcf4a148d7c1daa9239636222dae04c1236553d09257c7440ac383efb8912bfa9ccd761f3b59bb +DIST libxmlb-0.1.6.tar.gz 83399 BLAKE2B d4c1bb0d95863107bf71225317beb99cabf04e650087e08da10a14cdca2925566fad022123a86966cc8499fa30c89e47fbf7c521bb89b1d74d8636b0ae82926d SHA512 da9e36e97fa4335f21eefa74147676105924a760464647322a3f0a29ac13c815d692eac81b0ae5d47340eeb654989a7ddd2b83f686e5f222a48f749786a047bd diff --git a/dev-libs/libxmlb/libxmlb-0.1.4.ebuild b/dev-libs/libxmlb/libxmlb-0.1.6.ebuild similarity index 91% rename from dev-libs/libxmlb/libxmlb-0.1.4.ebuild rename to dev-libs/libxmlb/libxmlb-0.1.6.ebuild index 5567d3bd9d55..b56b6d247192 100644 --- a/dev-libs/libxmlb/libxmlb-0.1.4.ebuild +++ b/dev-libs/libxmlb/libxmlb-0.1.6.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -MESON_AUTO_DEPEND="no" inherit meson DESCRIPTION="Library to help create and query binary XML blobs" @@ -29,7 +28,6 @@ DEPEND=" BDEPEND=" >=dev-util/meson-0.47.0 - dev-util/ninja virtual/pkgconfig " diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch new file mode 100644 index 000000000000..8014be130ab7 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch @@ -0,0 +1,27 @@ +From 3be71a31a1dda204bb95462a92cf7f247e64b939 Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Sun, 16 Dec 2018 12:43:59 +0100 +Subject: [PATCH] Fix a minor nit in the hkdflabel size + +Reviewed-by: Paul Dale +Reviewed-by: Matt Caswell +(Merged from https://github.com/openssl/openssl/pull/7913) + +(cherry picked from commit 0b4233f5a4a181a6dcb7c511cd2663e500e659a4) +--- + ssl/tls13_enc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c +index c3021d18aa9..e36b7d3a066 100644 +--- a/ssl/tls13_enc.c ++++ b/ssl/tls13_enc.c +@@ -41,7 +41,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret, + * + bytes for the hash itself + */ + unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) + +- + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN ++ + (sizeof(label_prefix) - 1) + TLS13_MAX_LABEL_LEN + + 1 + EVP_MAX_MD_SIZE]; + WPACKET pkt; + diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch new file mode 100644 index 000000000000..8f249e22a1d2 --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch @@ -0,0 +1,97 @@ +From c25ae0fff78cb3cb784ef79167329d5cd55b62de Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Thu, 27 Dec 2018 22:18:21 +0100 +Subject: [PATCH] Fix cert with rsa instead of rsaEncryption as public key + algorithm + +Reviewed-by: Kurt Roeckx +(Merged from https://github.com/openssl/openssl/pull/7962) + +(cherry picked from commit 1f483a69bce11c940309edc437eee6e32294d5f2) +--- + crypto/rsa/rsa_ameth.c | 9 ++++++--- + test/certs/root-cert-rsa2.pem | 18 ++++++++++++++++++ + test/recipes/25-test_verify.t | 4 +++- + 3 files changed, 27 insertions(+), 4 deletions(-) + create mode 100644 test/certs/root-cert-rsa2.pem + +diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c +index a6595aec054..75debb3e0a9 100644 +--- a/crypto/rsa/rsa_ameth.c ++++ b/crypto/rsa/rsa_ameth.c +@@ -34,7 +34,7 @@ static int rsa_param_encode(const EVP_PKEY *pkey, + + *pstr = NULL; + /* If RSA it's just NULL type */ +- if (pkey->ameth->pkey_id == EVP_PKEY_RSA) { ++ if (pkey->ameth->pkey_id != EVP_PKEY_RSA_PSS) { + *pstrtype = V_ASN1_NULL; + return 1; + } +@@ -58,7 +58,7 @@ static int rsa_param_decode(RSA *rsa, const X509_ALGOR *alg) + int algptype; + + X509_ALGOR_get0(&algoid, &algptype, &algp, alg); +- if (OBJ_obj2nid(algoid) == EVP_PKEY_RSA) ++ if (OBJ_obj2nid(algoid) != EVP_PKEY_RSA_PSS) + return 1; + if (algptype == V_ASN1_UNDEF) + return 1; +@@ -109,7 +109,10 @@ static int rsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) + RSA_free(rsa); + return 0; + } +- EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, rsa); ++ if (!EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, rsa)) { ++ RSA_free(rsa); ++ return 0; ++ } + return 1; + } + +diff --git a/test/certs/root-cert-rsa2.pem b/test/certs/root-cert-rsa2.pem +new file mode 100644 +index 00000000000..b817fdf3e5d +--- /dev/null ++++ b/test/certs/root-cert-rsa2.pem +@@ -0,0 +1,18 @@ ++-----BEGIN CERTIFICATE----- ++MIIC7DCCAdSgAwIBAgIBATANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290 ++IENBMCAXDTE2MDExNTA4MTk0OVoYDzIxMTYwMTE2MDgxOTQ5WjASMRAwDgYDVQQD ++DAdSb290IENBMIIBHTAIBgRVCAEBBQADggEPADCCAQoCggEBAOHmAPUGvKBGOHkP ++Px5xGRNtAt8rm3Zr/KywIe3WkQhCO6VjNexSW6CiSsXWAJQDl1o9uWco0n3jIVyk ++7cY8jY6E0Z1Uwz3ZdKKWdmdx+cYaUHez/XjuW+DjjIkjwpoi7D7UN54HzcArVREX ++OjRCHGkNOhiw7RWUXsb9nofGHOeUGpLAXwXBc0PlA94JkckkztiOi34u4DFI0YYq ++alUmeugLNk6XseCkydpcaUsDgAhWg6Mfsiq4wUz+xbFN1MABqu2+ziW97mmt9gfN ++biuhiVT1aOuYCe3JYGbLM2JKA7Bo1g6rX8E1VX79Ru6669y2oqPthX9337VoIkN+ ++ZiQjr8UCAwEAAaNQME4wHQYDVR0OBBYEFI71Ja8em2uEPXyAmslTnE1y96NSMB8G ++A1UdIwQYMBaAFI71Ja8em2uEPXyAmslTnE1y96NSMAwGA1UdEwQFMAMBAf8wDQYJ ++KoZIhvcNAQELBQADggEBAJ0OIdog3uQ1pmsjv1Qtf1w4If1geOn5uK0EOj2wYBHt ++NxlFn7l8d9+51QMZFO+RlQJ0s3Webyo1ReuaL2dMn2LGJhWMoSBAwrMALAENU3lv ++8jioRbfO2OamsdpJpKxQUyUJYudNe+BoKNX/ry3rxezmsFsRr9nDMiJZpmBCXiMm ++mFFJOJkG0CheexBbMkua4kyStIOwO4rb5bSHszVso/9ucdGHBSC7oRcJXoWSDjBx ++PdQPPBK5g4yqL8Lz26ehgsmhRKL9k32eVyjDKcIzgpmgcPTfTqNbd1KHQJKx4ssb ++7nEpGKHalSo5Oq5L9s9qYrUv37kwBY4OpJFtmGaodoI= ++-----END CERTIFICATE----- +diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t +index 6c3deab7c67..b80a1cde3ed 100644 +--- a/test/recipes/25-test_verify.t ++++ b/test/recipes/25-test_verify.t +@@ -27,7 +27,7 @@ sub verify { + run(app([@args])); + } + +-plan tests => 134; ++plan tests => 135; + + # Canonical success + ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]), +@@ -361,6 +361,8 @@ ok(verify("some-names2", "sslserver", ["many-constraints"], ["many-constraints"] + "Not too many names and constraints to check (2)"); + ok(verify("some-names2", "sslserver", ["many-constraints"], ["many-constraints"], ), + "Not too many names and constraints to check (3)"); ++ok(verify("root-cert-rsa2", "sslserver", ["root-cert-rsa2"], [], "-check_ss_sig"), ++ "Public Key Algorithm rsa instead of rsaEncryption"); + + SKIP: { + skip "Ed25519 is not supported by this OpenSSL build", 1 diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch new file mode 100644 index 000000000000..2db64d83e45c --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch @@ -0,0 +1,420 @@ +From 0fb2815b873304d145ed00283454fc9f3bd35e6b Mon Sep 17 00:00:00 2001 +From: Matt Caswell +Date: Tue, 4 Dec 2018 08:37:04 +0000 +Subject: [PATCH] Fix some SSL_export_keying_material() issues + +Fix some issues in tls13_hkdf_expand() which impact the above function +for TLSv1.3. In particular test that we can use the maximum label length +in TLSv1.3. + +Reviewed-by: Tim Hudson +(Merged from https://github.com/openssl/openssl/pull/7755) +--- + doc/man3/SSL_export_keying_material.pod | 3 +- + ssl/ssl_locl.h | 2 +- + ssl/statem/extensions.c | 2 +- + ssl/statem/statem_clnt.c | 2 +- + ssl/statem/statem_srvr.c | 2 +- + ssl/tls13_enc.c | 73 +++++++++++++++++-------- + test/sslapitest.c | 48 ++++++++++++---- + test/tls13secretstest.c | 2 +- + 8 files changed, 92 insertions(+), 42 deletions(-) + +diff --git a/doc/man3/SSL_export_keying_material.pod b/doc/man3/SSL_export_keying_material.pod +index abebf911fc3..4c81a60ffbb 100644 +--- a/doc/man3/SSL_export_keying_material.pod ++++ b/doc/man3/SSL_export_keying_material.pod +@@ -59,7 +59,8 @@ B