diff --git a/Manifest.files.gz b/Manifest.files.gz
index d79400ada30d..0619512c4702 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 2f70cba58728..e2fc8da882af 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index cf0229ce0bf6..3207814a7f06 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd"
IUSE="unicode"
RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
new file mode 100644
index 000000000000..6b7b5b484792
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
@@ -0,0 +1,18 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-17 19:36:56.000000000 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-19 10:52:35.841614932 -0500
+@@ -144,15 +144,6 @@
+ handler.uri2indirection("GET", uri_escaped, params)
+ end
+
+- it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
+- expect(handler).to receive(:check_authorization).with(anything,
+- anything,
+- excluding(:environment))
+- expect(lambda { handler.uri2indirection("GET",
+- "#{master_url_prefix}/node/bar",
+- {:environment => 'bogus'}) }).to raise_error(not_found_error)
+- end
+-
+ it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+ expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+
diff --git a/app-admin/puppet/puppet-6.4.1.ebuild b/app-admin/puppet/puppet-6.4.1.ebuild
index 1d12aee25d2c..0fa5d7101201 100644
--- a/app-admin/puppet/puppet-6.4.1.ebuild
+++ b/app-admin/puppet/puppet-6.4.1.ebuild
@@ -67,7 +67,7 @@ all_ruby_prepare() {
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
+ epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
# fix systemd path
epatch "${FILESDIR}/puppet-systemd.patch"
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 6c0decbd30f1..a57f9643ac8f 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -1,4 +1,4 @@
DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
-DIST supervisor-4.0.0.tar.gz 432825 BLAKE2B 2eca01119f6bfd6bea728ea297424e6e08cc94cc8da78e53fc431013b83b5620a8c88f1a6ef0fcf5f57df46ad43f04215425bede83c02479731795b326dd27c4 SHA512 cca945179aaa16cd7042160b44a2d80e4a6aa388dcabd1572c6ed8610dc6af06cb446a18a5f8fa868a891482032380bf176c1331d9d09702d59fbf8b01651577
DIST supervisor-4.0.1.tar.gz 433742 BLAKE2B dc0683566c9b052c6a832e09eb6eba76890f07f5b67a1c129343ed3de31e5dc88777cfcb1b3c06a6a687160c172c3d83227765678c9c54239fbe57eb9b5ebd0a SHA512 e2e0e92ef1dba74ea4e3e70c2bd56b8a497d22db8123411f4f2019b45626606e90030577ae79aa8b81103c2f337c76d7516f94bb01e97172e2e541ec44d0f1b9
+DIST supervisor-4.0.2.tar.gz 434408 BLAKE2B 567e680c4b350e94c10be28ab25a16392a10f904fbc453c4d59132bb9e284b47e723834d5a34d803f4e54d5d17ce84b3e7e275d7f884c4d0e3ee05d50470008a SHA512 662bc1052276c2f54e0eeae820f9ae53e7f37150db21f0547be74b90455e213c9ca2b21e07079f1bd1740fae6e3d664edd3d27d57a0128828fc1a9c3627b3189
diff --git a/app-admin/supervisor/supervisor-4.0.0.ebuild b/app-admin/supervisor/supervisor-4.0.2.ebuild
similarity index 100%
rename from app-admin/supervisor/supervisor-4.0.0.ebuild
rename to app-admin/supervisor/supervisor-4.0.2.ebuild
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 277d85c18fb2..ab9d231ded47 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,4 +1,5 @@
DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
DIST sysstat-12.0.3.tar.xz 603064 BLAKE2B 79666c16d7a18aa058f2b8c5e81a16e11a01ba94c809a924d4be6a37cdd67f8755a0112e7f227ceb35b1a4847348de0e6ec34ef3da62c2ea81fceb1590e292ea SHA512 b6f7d27981898faabf4349eb889a767e655ed797aa3f7fac3bdc99968bdb15ed2a7aa04acda610a014022bdc2aa7e603b1c413e0eb8d734db04675fcaa4561ca
-DIST sysstat-12.1.2.tar.xz 608304 BLAKE2B 18c259f4aa43cfd30e9ba62ad39712fef1b3c80ce79ddd8a5afc939d3cc99d94b994f78cea68fd751f3c12311442256f439a2483a817cc7cd0dcf03c952feba9 SHA512 622f1ed1949a156e4cc2451d246dc449afcf3ffc2414363ef14f8da8e1a307e3a28e5b4fd50813c3f6d810bcf112ed13ecc91edbcd0a8c3c626303f333785b83
+DIST sysstat-12.0.4.tar.gz 711554 BLAKE2B b671e185d70787f5773d6824a9838ddd5d5f537c66ac37895f88b6bbddbb78b4d81efa6f962e3b812d025b361ce388583811d4f199e1ffcfe1ba0f2119b6eb88 SHA512 0a47e2b692ac3317cfd72784f21cc03970d7673727c579d403895df0377d09836a1dc76ee5d99076f2c9347f033059d000d982f33ef915130c3a89afdd6dad96
DIST sysstat-12.1.3.tar.xz 553880 BLAKE2B cc520d294fbd38385b2f248721a33b0dd7d7beca422dcd3cc00a2a010b98850d65ceb03e8949b12426c5dc3726cb06f0d63ae30d2792808814b5c5e6912d1a14 SHA512 f264efe377b61d5f62b1ad2c14115bd22ada3a25f726bb362c3cb1a6d45f370642783d547339dc118bf34c6f3d015bba19e88043b0753f8ec6c314778456b726
+DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
diff --git a/app-admin/sysstat/sysstat-12.0.3.ebuild b/app-admin/sysstat/sysstat-12.0.3.ebuild
index d5b74497593a..45e90330a0f9 100644
--- a/app-admin/sysstat/sysstat-12.0.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/sysstat/sysstat-12.1.2.ebuild b/app-admin/sysstat/sysstat-12.0.4.ebuild
similarity index 90%
rename from app-admin/sysstat/sysstat-12.1.2.ebuild
rename to app-admin/sysstat/sysstat-12.0.4.ebuild
index d5b74497593a..b9ca3b9892bd 100644
--- a/app-admin/sysstat/sysstat-12.1.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/sysstat/sysstat-12.1.4.ebuild b/app-admin/sysstat/sysstat-12.1.4.ebuild
new file mode 100644
index 000000000000..b9ca3b9892bd
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors:= )
+"
+DEPEND="
+ ${CDEPEND}
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch
+ "${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+ if use nls; then
+ strip-linguas -i nls/
+ local lingua pofile
+ for pofile in nls/*.po; do
+ lingua=${pofile/nls\/}
+ lingua=${lingua/.po}
+ if ! has ${lingua} ${LINGUAS}; then
+ rm "nls/${lingua}.po" || die
+ fi
+ done
+ fi
+
+ default
+}
+
+src_configure() {
+ tc-export AR
+ use static && append-ldflags -static
+
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=${SYSSTAT_FAKE_RC_DIR} \
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls) \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc -r contrib/
+
+ rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index 48cc05c134e9..af26ebf2df13 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -1,4 +1,3 @@
DIST systemrescuecd-6.0.0.iso 931135488 BLAKE2B 82879883780ff11a35f2fe635a5ee1a268de590bac79326ac2c49c960cd18755b3c10548d65eb5fb7ce5749c00f5040bb10c5ad5b196e48033fb70e3ff466026 SHA512 9bd8c06338357882fd8e3f17ddfb918e1f69e25fff6460957f9c50d496ccc3d4501e39b4596e3f387e4f7a481c9b33d18ba18fb49d74f6d916a7c5997b24c03a
-DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
-DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
+DIST systemrescuecd-6.0.3.iso 881852416 BLAKE2B ab1064237902542845e11869f7076a829e9593d29b8d106f0309c61a1371173cd5b3ef3fa3b84910cc81bcec485d27c8e297f269820aa96b0043df7c441121a2 SHA512 21b77e38999f56457a4c0a096eb58b2e74a8b376af33290b2e75995762e12a977435e8a9ed2ad9448799c3246d85f3bddfcafea020a1336b14f4f81644e06bb9
DIST systemrescuecd-x86-5.3.2.iso 585920512 BLAKE2B e68bb4e765359ac0e8124c9cb6090ed2ec9340a09e3ebafbcaa4acc175f8afe3985a57f193cd4be4192dfb23a6042a68328a29bbfb962f73fbe010c32d66e020 SHA512 c9da6a63556836bd38f7072b49a5408f2f9e5fa310dbae3f229c9b7af4fe6e073cdfc95b942bc1a6d9c42d41527fc54e8c6c15379082bc3ee0f025da80b01e5a
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
deleted file mode 100644
index 8fa41fc9f79e..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1 FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( BSD GPL-3 HIDAPI ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
- insinto "/usr/share/${PN%-*}"
- doins "${DISTDIR}/${P}.iso"
-
- if use isohybrid; then
- set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
- echo "${@}"
- "${@}" || die "${*} failed"
- fi
-}
-
-pkg_postinst() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # no version newer than ours? we're the newest!
- if ! has_version ">${CATEGORY}/${PF}"; then
- ln -f -s -v "${P}.iso" "${f}" || die
- fi
-}
-
-pkg_postrm() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # if there is no version newer than ours installed
- if ! has_version ">${CATEGORY}/${PF}"; then
- # and we are truly and completely uninstalled...
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- # then find an older version to set the symlink to
- local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
- if [[ ${newest_version} ]]; then
- # update the symlink
- ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
- else
- # last version removed? clean up the symlink
- rm -v "${f}" || die
- # and the parent directory
- rmdir "${f%/*}" || die
- fi
- fi
- fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
deleted file mode 100644
index 3e37971f63a7..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1 FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR UoI-NCSA vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( BSD GPL-3 HIDAPI ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
- insinto "/usr/share/${PN%-*}"
- doins "${DISTDIR}/${P}.iso"
-
- if use isohybrid; then
- set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
- echo "${@}"
- "${@}" || die "${*} failed"
- fi
-}
-
-pkg_postinst() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # no version newer than ours? we're the newest!
- if ! has_version ">${CATEGORY}/${PF}"; then
- ln -f -s -v "${P}.iso" "${f}" || die
- fi
-}
-
-pkg_postrm() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # if there is no version newer than ours installed
- if ! has_version ">${CATEGORY}/${PF}"; then
- # and we are truly and completely uninstalled...
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- # then find an older version to set the symlink to
- local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
- if [[ ${newest_version} ]]; then
- # update the symlink
- ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
- else
- # last version removed? clean up the symlink
- rm -v "${f}" || die
- # and the parent directory
- rmdir "${f%/*}" || die
- fi
- fi
- fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild
new file mode 100644
index 000000000000..7cfd100cadf5
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/-x86/}
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, amd64 variant"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI="https://osdn.net/projects/systemrescuecd/storage/releases/${PV}/${MY_P}.iso"
+
+LICENSE="Apache-1.0 Apache-2.0 Artistic Artistic-2 BEER-WARE BSD BSD-2 BSD-4 CC0-1.0 CC-BY-SA-3.0 FDL-1.3+ GPL-2 GPL-2+ GPL-3+ icu ISC JasPer2.0 LGPL-2+ LGPL-2.1+ LGPL-3+ linux-firmware MaxMind2 MIT MPL-1.1 MPL-2.0 no-source-code OFL Old-MIT OPENLDAP openssl PSF-2 public-domain Sleepycat unRAR UoI-NCSA vim ZLIB"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+RESTRICT="bindist mirror"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+ ewarn "Please note that starting with version 6.0.0, upstream has switched"
+ ewarn "to Arch Linux as base of their distribution, and running on 32-bit"
+ ewarn "systems is no longer supported."
+}
+
+src_unpack() { :; }
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${MY_P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED%/}/usr/share/${PN%-*}/${MY_P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${MY_P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 45f70f8d6bfc..78344fb9c290 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/unrar/unrar-5.7.4.ebuild b/app-arch/unrar/unrar-5.7.4.ebuild
index 5f9fd5ccc82f..87339265603f 100644
--- a/app-arch/unrar/unrar-5.7.4.ebuild
+++ b/app-arch/unrar/unrar-5.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~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=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b09530d84260..70a798340e50 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bacula/bacula-5.2.13-r7.ebuild b/app-backup/bacula/bacula-5.2.13-r7.ebuild
index 5c90175fbb99..5f8d6be96216 100644
--- a/app-backup/bacula/bacula-5.2.13-r7.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r7.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="5"
@@ -12,7 +12,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.0.6-r4.ebuild b/app-backup/bacula/bacula-9.0.6-r4.ebuild
index bda740bbcd9b..f67ebadf7141 100644
--- a/app-backup/bacula/bacula-9.0.6-r4.ebuild
+++ b/app-backup/bacula/bacula-9.0.6-r4.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 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index d37bd4142af2..0ea0135150c8 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-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"
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.2.1.ebuild b/app-backup/bacula/bacula-9.2.1.ebuild
index d29d80133393..7078d302e01e 100644
--- a/app-backup/bacula/bacula-9.2.1.ebuild
+++ b/app-backup/bacula/bacula-9.2.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=6
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.2.2-r1.ebuild b/app-backup/bacula/bacula-9.2.2-r1.ebuild
index 584865827b12..eedf7f28d1be 100644
--- a/app-backup/bacula/bacula-9.2.2-r1.ebuild
+++ b/app-backup/bacula/bacula-9.2.2-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
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.2.2.ebuild b/app-backup/bacula/bacula-9.2.2.ebuild
index 4d4577e24ba1..df22d058de95 100644
--- a/app-backup/bacula/bacula-9.2.2.ebuild
+++ b/app-backup/bacula/bacula-9.2.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
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.4.1-r1.ebuild b/app-backup/bacula/bacula-9.4.1-r1.ebuild
index e777f2a550f2..7cd85d81e5c7 100644
--- a/app-backup/bacula/bacula-9.4.1-r1.ebuild
+++ b/app-backup/bacula/bacula-9.4.1-r1.ebuild
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.4.1.ebuild b/app-backup/bacula/bacula-9.4.1.ebuild
index c65e3c14a6f5..470df2887e2c 100644
--- a/app-backup/bacula/bacula-9.4.1.ebuild
+++ b/app-backup/bacula/bacula-9.4.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=6
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-backup/bacula/bacula-9.4.2.ebuild b/app-backup/bacula/bacula-9.4.2.ebuild
index b342f18eb77c..0ec8c9e23520 100644
--- a/app-backup/bacula/bacula-9.4.2.ebuild
+++ b/app-backup/bacula/bacula-9.4.2.ebuild
@@ -9,7 +9,7 @@ MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
+HOMEPAGE="https://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b5f1c4ff73e0..5ee56a73d823 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/acme-0.33.1-r1.ebuild b/app-crypt/acme/acme-0.33.1-r1.ebuild
new file mode 100644
index 000000000000..bfa507fa149c
--- /dev/null
+++ b/app-crypt/acme/acme-0.33.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/tox[${PYTHON_USEDEP}]
+ )
+ >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+ if use doc ; then
+ cd docs || die
+ sphinx-build -b html -d _build/doctrees . _build/html
+ fi
+}
+
+python_test() {
+ nosetests -w ${PN} || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 9df5e0dbdae0..bfa507fa149c 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -21,10 +21,11 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="test"
+IUSE="doc test"
RDEPEND="
- >=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
@@ -35,14 +36,33 @@ RDEPEND="
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
"
DEPEND="
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
test? (
${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/tox[${PYTHON_USEDEP}]
)
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+ if use doc ; then
+ cd docs || die
+ sphinx-build -b html -d _build/doctrees . _build/html
+ fi
+}
+
python_test() {
nosetests -w ${PN} || die
}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/metadata.xml b/app-crypt/acme/metadata.xml
index d18839cc8dac..d0f0d1620b50 100644
--- a/app-crypt/acme/metadata.xml
+++ b/app-crypt/acme/metadata.xml
@@ -6,6 +6,7 @@
Matthew Thode
+ acme
letsencrypt/letsencrypt
diff --git a/app-crypt/acmebot/Manifest b/app-crypt/acmebot/Manifest
new file mode 100644
index 000000000000..4b55640b4b68
--- /dev/null
+++ b/app-crypt/acmebot/Manifest
@@ -0,0 +1 @@
+DIST acmebot-2.3.0.tar.gz 64841 BLAKE2B 92bfb9a58722b9955fe908e2fcb1a3ee593bf87e3fdf3dc9564bcbe291b13c553ad426673c337a59344287da64c4ee5cffc734f8dfb60447f96d6234814f0167 SHA512 3951cc7138eb0b83bd802a2e0a221fa985209ba276028606d887b7d2eff84c35db034f4a3d8a6836b3ac149c6dbfa27b1ea47e864f549f8d88b758b40407c4f4
diff --git a/app-crypt/acmebot/acmebot-2.3.0.ebuild b/app-crypt/acmebot/acmebot-2.3.0.ebuild
new file mode 100644
index 000000000000..80bd249ecd73
--- /dev/null
+++ b/app-crypt/acmebot/acmebot-2.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{5,6})
+EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
+[[ $PV == 9999 ]] && _scm=git-r3
+
+inherit ${_scm} python-r1
+
+DESCRIPTION="Certificate manager bot using ACME protocol"
+HOMEPAGE="https://github.com/plinss/acmebot"
+if [[ $PV != 9999 ]]; then
+ SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+ >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+ >=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+ >=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
+ >=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
+ "
+RDEPEND="${CDEPEND}"
+DEPEND=""
+
+src_install() {
+ dobin acmebot
+ python_replicate_script "${ED}"/usr/bin/acmebot
+ insinto /etc/logrotate.d
+ doins logrotate.d/acmebot
+ insinto /etc/acmebot
+ doins acmebot.example.json
+ dodoc README.rst
+}
diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild
new file mode 100644
index 000000000000..80bd249ecd73
--- /dev/null
+++ b/app-crypt/acmebot/acmebot-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{5,6})
+EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
+[[ $PV == 9999 ]] && _scm=git-r3
+
+inherit ${_scm} python-r1
+
+DESCRIPTION="Certificate manager bot using ACME protocol"
+HOMEPAGE="https://github.com/plinss/acmebot"
+if [[ $PV != 9999 ]]; then
+ SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+ >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+ >=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+ >=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
+ >=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
+ "
+RDEPEND="${CDEPEND}"
+DEPEND=""
+
+src_install() {
+ dobin acmebot
+ python_replicate_script "${ED}"/usr/bin/acmebot
+ insinto /etc/logrotate.d
+ doins logrotate.d/acmebot
+ insinto /etc/acmebot
+ doins acmebot.example.json
+ dodoc README.rst
+}
diff --git a/app-crypt/keynote/metadata.xml b/app-crypt/acmebot/metadata.xml
similarity index 64%
rename from app-crypt/keynote/metadata.xml
rename to app-crypt/acmebot/metadata.xml
index 6f49eba8f496..79d462e85571 100644
--- a/app-crypt/keynote/metadata.xml
+++ b/app-crypt/acmebot/metadata.xml
@@ -1,5 +1,7 @@
-
+
+ robbat2@gentoo.org
+
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
index 9e970bdb94c7..324eff7a4d06 100644
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
IUSE="static-libs"
S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
deleted file mode 100644
index 555feb16a0b9..000000000000
--- a/app-crypt/keynote/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST keynote-2.3.tar.gz 141930 BLAKE2B 9cbf18214ca8d39a09be149370b104989470d8040ea307b263451d0d0c74f4658f4620ac16d8f2a5310edca78555e6b8077d67c96941722cd0bc8afa923a2452 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe
diff --git a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
deleted file mode 100644
index cf4b4926f79d..000000000000
--- a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- keynote-2.3.orig/Makefile.in 2010-02-04 09:51:35.757096194 +0100
-+++ keynote-2.3/Makefile.in 2010-02-04 09:52:17.441137132 +0100
-@@ -86,9 +86,11 @@
-
- k.tab.c: keynote.y header.h keynote.h assertion.h config.h
- $(YACC) $(YACCFLAGS) keynote.y
-+k.tab.h: k.tab.c
-
- z.tab.c: keynote-ver.y keynote.h header.h config.h
- $(YACC) $(YACCFLAGS2) keynote-ver.y
-+z.tab.h: z.tab.c
-
- lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
- $(LEX) $(LEXFLAGS) keynote.l
diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
deleted file mode 100644
index f6b1ff28cdb8..000000000000
--- a/app-crypt/keynote/files/keynote-2.3-qa.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Respect CFLAGS, LDFLAGS, and AR.
-
-The better way to fix AR would be to patch configure.in,
-but it is sufficiently old to fail with current autotools.
---- Makefile.in
-+++ Makefile.in
-@@ -27,7 +27,6 @@
- YACC = @YACC@
- SSLEAY = @SSLEAY@
- RM = @RM@
--AR = @AR@
- NROFF = @NROFF@
- TAR = @TAR@
- TRUE = @TRUE@
-@@ -41,10 +40,10 @@
- YACCFLAGS = -d -p kn -b k
- LEXFLAGS2 = -Pkv -s -i
- LEXFLAGS = -Cr -Pkn -s -i
--CFLAGS = -O2 -Wall # -g
- RMFLAGS2 = -rf
- RMFLAGS = -f
- NROFFFLAGS = -mandoc
-+LDFLAGS = @LDFLAGS@
-
- SSLCONF = testsuite/openssl.cnf
- SSLCERT = testsuite/test.cert.pem
-@@ -83,7 +82,7 @@
- $(RANLIB) $(TARGET)
-
- $(TARGET2): $(TARGET) $(OBJS2)
-- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
-
- k.tab.c: keynote.y header.h keynote.h assertion.h config.h
- $(YACC) $(YACCFLAGS) keynote.y
-@@ -131,7 +130,7 @@
- -keyout $(SSLKEY)
-
- test-sample: all $(OBJS3)
-- $(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
-
- test-sig: all $(SSLCERT) $(SSLKEY)
- $(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
deleted file mode 100644
index b4351b69e09b..000000000000
--- a/app-crypt/keynote/keynote-2.3-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The KeyNote Trust-Management System"
-HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
-SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
-
-LICENSE="keynote"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- virtual/yacc"
-
-pkg_setup() {
- tc-export AR CC RANLIB
- # bug #448904
- export ac_cv_path_AR="$(type -p $(tc-getAR))"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-qa.patch
- epatch "${FILESDIR}"/${P}-parallel-build.patch
-}
-
-src_compile() {
- if use ssl; then
- emake
- else
- emake nocrypto
- fi
-}
-
-src_install() {
- dobin keynote
-
- dolib.a libkeynote.a
-
- insinto /usr/include
- doins keynote.h
-
- doman man/keynote.[1345]
- dodoc README HOWTO.add.crypto TODO
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 42303b1c0d38..a31fa77ad3f9 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild
index 2b2d12f280df..18430e835c6b 100644
--- a/app-editors/wily/wily-1.0-r2.ebuild
+++ b/app-editors/wily/wily-1.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="
dev-libs/9libs
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2e89efc211f2..fcbef0c58fbf 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
new file mode 100644
index 000000000000..694c0d62d899
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -0,0 +1 @@
+DIST fs-uae-launcher-2.8.3.tar.gz 8784242 BLAKE2B e54f73efde6563d9e4ab6b4f57cc73bca80d72d0ded4db67edc53dc344685889abf485df067541e8d635595ac5457ec456ded0306310b1ad95a3b3ef07e53bc3 SHA512 4eaa5979fe2e8f2c792d4878e9a9ad0a0433206aac42aa380d97aee21e4ba29a54caced2437b83357c2c4d2fab121bfb821fdb8a883ead971766866b02067a2d
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch
new file mode 100644
index 000000000000..41843d5230f9
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch
@@ -0,0 +1,21 @@
+--- a/fsgs/amiga/roms.py 2017-07-06 16:50:33.351036624 +0200
++++ b/fsgs/amiga/roms.py 2017-07-06 16:52:58.335040977 +0200
+@@ -11,6 +11,8 @@
+ # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[!]
+ # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[o] (patch)
+ "891e9a547772fe0c6c19b610baf8bc4ea7fcb785",
++ # kick13.rom - from Upgrade Commodore Amiga 500 (1989)
++ "90933936cce43ca9bc6bf375662c076b27e3c458",
+ ]
+
+ A500P_KICKSTARTS = [
+@@ -55,6 +57,9 @@
+
+ # Kickstart v3.1 r40.68 (1993)(Commodore)(A4000)[h Cloanto]
+ # "c3c481160866e60d085e436a24db3617ff60b5f9",
++
++ # Kickstart v3.1 r40.10 (15.7.93) from german A4000
++ "3b7f1493b27e212830f989f26ca76c02049f09ca",
+ ]
+
+ CD32_KICKSTARTS = [
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3.ebuild
new file mode 100644
index 000000000000..8a1bab4b4578
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="PyQt5-based launcher for FS-UAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="lha"
+
+RDEPEND="
+ app-emulation/fs-uae
+ dev-python/pyopengl[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},gui]
+ dev-python/six[${PYTHON_USEDEP}]
+ lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
+"
+
+DEPEND="
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-German-ROMs.patch
+)
+
+src_prepare() {
+ default
+
+ # Unbundle some libraries. Keep oyoyo IRC library because upstream
+ # is long dead and it's not worth packaging separately.
+ rm -r {OpenGL,six}/ || die
+ sed -i -r "/OpenGL|six/d" setup.py || die
+}
+
+src_compile() {
+ emake
+}
+
+src_install() {
+ local dir=${EPREFIX}/usr/share/${PN}
+ distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}"
+ dosym ../share/${PN}/${PN} /usr/bin/${PN}
+
+ emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr
+ mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+}
+
+pkg_postinst() {
+ elog "Some important information:"
+ elog
+ ewarn " - Do not use QtCurve, it will crash PyQt5!"
+ elog
+ elog " - By default, FS-UAE creates its directories under Documents/FS-UAE."
+ elog " If your Documents directory is not configured according to the XDG"
+ elog " user diretory spec, ~/FS-UAE will be used as a fallback."
+ elog
+ elog " - You can override this by putting the path to the desired base"
+ elog " directory in a special config file. The config file will be read"
+ elog " from ~/.config/fs-uae/base-dir by both FS-UAE and FS-UAE Launcher"
+ elog " if it exists."
+ elog
+ elog " Alternatively, you can start FS-UAE and/or FS-UAE Launcher with"
+ elog " --base-dir=/path/to/desired/dir"
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/dev-libs/libmcal/metadata.xml b/app-emulation/fs-uae-launcher/metadata.xml
similarity index 50%
rename from dev-libs/libmcal/metadata.xml
rename to app-emulation/fs-uae-launcher/metadata.xml
index f0cf5708f1c8..84e4eb59046e 100644
--- a/dev-libs/libmcal/metadata.xml
+++ b/app-emulation/fs-uae-launcher/metadata.xml
@@ -2,10 +2,13 @@
- robbat2@gentoo.org
- Robin H. Johnson
+ chewi@gentoo.org
+ James Le Cuirot
- libmcal
+ FrodeSolheim/fs-uae-launcher
+
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
new file mode 100644
index 000000000000..7ddd296728c4
--- /dev/null
+++ b/app-emulation/fs-uae/Manifest
@@ -0,0 +1 @@
+DIST fs-uae-2.8.3.tar.gz 5017047 BLAKE2B 3d921446381b56d39410e4d68291c1cb696abd5e1b25105bdcc367c07112e79197d8267cfcb21f3f844cf5ac0a02a19ebec76611f34e747c6d03fefc2858a020 SHA512 1ccab4329a6b678a97f336b963bfaf9ea26bccccba31c90f1b7a8c2a6d3a9f343f9095733be744d4357495c808216d32c08a2bd8ce05bba73017147616d5e8cf
diff --git a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch
new file mode 100644
index 000000000000..660cd2fc9036
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch
@@ -0,0 +1,36 @@
+From 5937f7587de5b96cbab120e99b6ae3a0cd722c53 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Fri, 19 Apr 2019 21:56:58 +0100
+Subject: [PATCH] Only run configure in libmpeg2 when using built-in version
+
+---
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 39958ad..941391a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,7 +200,7 @@ AS_IF([test "x$with_glew" = xyes], [
+ ])
+
+ AC_ARG_WITH(libmpeg2, AS_HELP_STRING(
+- [--without-libmpeg2], [or --with-libmpeg=builtin to use included version]))
++ [--without-libmpeg2], [or --with-libmpeg2=builtin to use included version]))
+ AM_CONDITIONAL([BUILTIN_LIBMPEG2], [test x$with_libmpeg2 = xbuiltin])
+ AS_IF([test "x$with_libmpeg2" != xno], [
+ AS_IF([test "x$with_libmpeg2" = xbuiltin], [
+@@ -776,7 +776,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip],
+
+ AC_DEFINE([FPU_UAE], [1], [Define to 1])
+
+-AC_CONFIG_SUBDIRS([libmpeg2])
++AS_IF([test "x$with_libmpeg2" = xbuiltin], [
++ AC_CONFIG_SUBDIRS([libmpeg2])
++])
+
+ # Write Makefile
+
+--
+2.20.1
+
diff --git a/app-emulation/fs-uae/fs-uae-2.8.3.ebuild b/app-emulation/fs-uae/fs-uae-2.8.3.ebuild
new file mode 100644
index 000000000000..698c12210c57
--- /dev/null
+++ b/app-emulation/fs-uae/fs-uae-2.8.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fmv glew"
+
+RDEPEND="
+ dev-libs/glib:2
+ media-libs/libpng:0=
+ media-libs/libsdl2[opengl]
+ media-libs/openal
+ virtual/opengl
+ x11-libs/libdrm
+ x11-libs/libX11
+ fmv? ( media-libs/libmpeg2 )
+ glew? ( media-libs/glew:0= )
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.8.3-libmpeg2.patch
+)
+
+src_prepare() {
+ default
+ AT_NO_RECURSIVE=1 eautoreconf
+
+ # Ensure bundled libraries are not used. GLee and Udis86 are unused
+ # regardless. Only FLAC headers are bundled and the library is never
+ # used? Lua is bundled but differs from upstream. We keep the
+ # default of disabling the Lua feature anyway as it is unfinished.
+ rm -r glee/ libmpeg2/ libudis86/ || die
+}
+
+src_configure() {
+ # Qt and Udis86 are unused.
+ econf \
+ --enable-a2065 \
+ --enable-action-replay \
+ --enable-aga \
+ --enable-arcadia \
+ --enable-bsdsocket \
+ --enable-caps \
+ --enable-cd32 \
+ --enable-cdtv \
+ --enable-codegen \
+ --enable-dms \
+ --enable-drivesound \
+ --enable-fdi2raw \
+ --enable-gfxboard \
+ --enable-jit \
+ --enable-jit-fpu \
+ --enable-ncr9x \
+ --enable-ncr \
+ --enable-netplay \
+ --enable-parallel-port \
+ --enable-prowizard \
+ --enable-qemu-cpu \
+ --enable-qemu-slirp \
+ --enable-savestate \
+ --enable-scp \
+ --enable-serial-port \
+ --enable-slirp \
+ --enable-softfloat \
+ --enable-uaenative \
+ --enable-uaenet \
+ --enable-uaescsi \
+ --enable-uaeserial \
+ --disable-udis86 \
+ --enable-vpar \
+ --enable-xml-shader \
+ --enable-zip \
+ --with-glad \
+ --without-qt \
+ $(use_with fmv libmpeg2) \
+ $(use_with glew)
+}
+
+src_install() {
+ default
+
+ # Needed for QEMU-UAE.
+ insinto /usr/include/uae
+ doins src/include/uae/{api,attributes,log,ppc,qemu,types}.h
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+
+ elog "Install app-emulation/fs-uae-launcher for a better graphical interface."
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-emulation/fs-uae/metadata.xml b/app-emulation/fs-uae/metadata.xml
new file mode 100644
index 000000000000..e92d93d760f7
--- /dev/null
+++ b/app-emulation/fs-uae/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ chewi@gentoo.org
+ James Le Cuirot
+
+
+ FrodeSolheim/fs-uae
+
+
+
diff --git a/app-emulation/qemu/qemu-3.1.0-r4.ebuild b/app-emulation/qemu/qemu-3.1.0-r4.ebuild
index 3ec0c0b7df87..086555e1bbeb 100644
--- a/app-emulation/qemu/qemu-3.1.0-r4.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0-r4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
# Gentoo specific patchsets:
SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
diff --git a/app-emulation/spice-html5/Manifest b/app-emulation/spice-html5/Manifest
new file mode 100644
index 000000000000..0d427219c727
--- /dev/null
+++ b/app-emulation/spice-html5/Manifest
@@ -0,0 +1 @@
+DIST spice-html5-spice-html5-0.2.1.tar.gz 486871 BLAKE2B 4b44ad772ab5abf13e8d3fe7c651169b340c8978f4163b9b679046efaa554f86d5919d154f16262ea28ddb512ac55ea7b6651ae63f64cf6b69033d8306191dc3 SHA512 c6e17aa465da1a0b882184bb19f2560f43fd3b345fdc00ec71774c7aec37c3453fd87b2448202011e217dda21b602d20dd4d552d49d9a52b64cb91aff092eff7
diff --git a/app-emulation/spice-html5/metadata.xml b/app-emulation/spice-html5/metadata.xml
new file mode 100644
index 000000000000..86afbba5af5e
--- /dev/null
+++ b/app-emulation/spice-html5/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ prometheanfire@gentoo.org
+ Matthew Thode
+
+
+ openstack@gentoo.org
+ Openstack
+
+
+ Spice Javascript client
+
+
diff --git a/app-emulation/spice-html5/spice-html5-0.2.1.ebuild b/app-emulation/spice-html5/spice-html5-0.2.1.ebuild
new file mode 100644
index 000000000000..96b0048f7bd7
--- /dev/null
+++ b/app-emulation/spice-html5/spice-html5-0.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spice Javascript client"
+HOMEPAGE="https://gitlab.freedesktop.org/spice/spice-html5"
+SRC_URI="https://gitlab.freedesktop.org/spice/${PN}/-/archive/${P}/${PN}-${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+# no compiling
+src_compile() {
+ true
+}
+
+src_install() {
+ insinto /usr/share/spice-html5
+ doins -r src apache.conf.sample spice.css spice.html spice_auto.html
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild
index d570db64999b..d5584316c421 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
index 262a996d74e0..59c9a9a87aba 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
LICENSE="GPL-2 PUEL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.6.130049.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.6.130049.ebuild
index d3ff954fe250..0d68ba80c9dc 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.6.130049.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.6.130049.ebuild
@@ -258,9 +258,9 @@ src_install() {
}
pkg_postinst() {
+ xdg_icon_cache_update
xdg_desktop_database_update
-
- gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
@@ -285,5 +285,7 @@ pkg_postinst() {
}
pkg_postrm() {
+ xdg_icon_cache_update
xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
index 12aa179d4984..f31f9f849a01 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
LICENSE="PUEL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror strip"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
index e7b4f774ef65..33e1e37307e5 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
RDEPEND="
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild
index 1944f0a58099..c0ab27d0eef5 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 0c28b5e71973..3a2ea79813a6 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -6,6 +6,7 @@
Lars Wendler
- texstudio
+ texstudio-org/texstudio
diff --git a/app-office/texstudio/texstudio-2.12.16_beta2.ebuild b/app-office/texstudio/texstudio-2.12.16_beta2.ebuild
new file mode 100644
index 000000000000..135aae51fe57
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.12.16_beta2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils prefix qmake-utils xdg-utils
+
+MY_PV="${PV/_/}"
+
+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/${MY_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"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+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 b789dad3b611..34f9c73c3c93 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/gemato-14.0.ebuild b/app-portage/gemato/gemato-14.0.ebuild
index 833afe885248..ecb84bc3788d 100644
--- a/app-portage/gemato/gemato-14.0.ebuild
+++ b/app-portage/gemato/gemato-14.0.ebuild
@@ -18,11 +18,11 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
MODULE_RDEPEND="
- blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+ blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
gpg? ( app-crypt/gnupg )
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
- sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+ sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
RDEPEND="${MODULE_RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-portage/gemato/gemato-14.0m.ebuild b/app-portage/gemato/gemato-14.0m.ebuild
index 435a45db1f2b..318a72bafc86 100644
--- a/app-portage/gemato/gemato-14.0m.ebuild
+++ b/app-portage/gemato/gemato-14.0m.ebuild
@@ -21,11 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
MODULE_RDEPEND="
- blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+ blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
gpg? ( app-crypt/gnupg )
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
- sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+ sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
RDEPEND="${MODULE_RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 4615e46753a8..eadfa2181db3 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -19,11 +19,11 @@ KEYWORDS=""
IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
MODULE_RDEPEND="
- blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+ blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
gpg? ( app-crypt/gnupg )
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
- sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+ sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
RDEPEND="${MODULE_RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-portage/gemato/gemato-9999m.ebuild b/app-portage/gemato/gemato-9999m.ebuild
index b86cc50fd41b..d07e16ce862d 100644
--- a/app-portage/gemato/gemato-9999m.ebuild
+++ b/app-portage/gemato/gemato-9999m.ebuild
@@ -20,11 +20,11 @@ KEYWORDS=""
IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
MODULE_RDEPEND="
- blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+ blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
gpg? ( app-crypt/gnupg )
lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
- sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+ sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
RDEPEND="${MODULE_RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index e562597a082f..0bfe13f13609 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1 +1,2 @@
DIST pram-3.tar.gz 4334 BLAKE2B f06f9cfe938f83702baaa8f8bee06937e8790e533e14ab419251934d0f4300ee75d5377a4f4e0e47a774bd3c25ef31236d7e451b929cfbfe8343d226a311ca2d SHA512 526149523b748b57095ecb3eb23f6808ab57ee1d8dc60e27067931d269ce3465ad8a0e54e8edaa3a1f74fd0a8dd135fe4a92779382ba6e367112016bc254fc98
+DIST pram-4.tar.gz 4406 BLAKE2B c01a8d322f7449398ed0264c9ed4108ac9fc697ef68e5dfc035fb20a53f5c5f9a42e9155937a4b6b6722816779c71dbe4558e7e60e8c19dcf961667996380802 SHA512 00a1f4e0cc07c5b61026e42350212cc55a66b6597082ee677bc905f9bfd0f5692a830c62f15a66a5ba42942449f40b92544f740344ad1d064bebc667c6f730e1
diff --git a/app-portage/pram/metadata.xml b/app-portage/pram/metadata.xml
index af57dcce87b9..6dde7de270a0 100644
--- a/app-portage/pram/metadata.xml
+++ b/app-portage/pram/metadata.xml
@@ -5,6 +5,7 @@
mgorny@gentoo.org
Michał Górny
+
mgorny@gentoo.org
diff --git a/app-portage/pram/pram-3.ebuild b/app-portage/pram/pram-3.ebuild
index d5151395d54a..b62f6ee8e34a 100644
--- a/app-portage/pram/pram-3.ebuild
+++ b/app-portage/pram/pram-3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="dev-vcs/git
diff --git a/app-portage/pram/pram-4.ebuild b/app-portage/pram/pram-4.ebuild
new file mode 100644
index 000000000000..d5151395d54a
--- /dev/null
+++ b/app-portage/pram/pram-4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool to ease merging Pull Requests and git patches"
+HOMEPAGE="https://github.com/mgorny/pram"
+SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-vcs/git
+ net-misc/wget[ssl]
+ virtual/editor
+ !dev-perl/Gentoo-App-Pram"
+
+src_install() {
+ dobin pram
+ doman pram.1
+ einstalldocs
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 707494af728f..35b08c53e865 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 81acc843cdfa..31865ddc7063 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,2 +1,3 @@
DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
+DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
new file mode 100644
index 000000000000..bd7dd809d779
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit autotools python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75
+ dev-libs/libxslt
+ dev-libs/libxml2
+ ${PYTHON_DEPS}
+ graphviz? ( media-gfx/graphviz )
+ highlight? (
+ || (
+ dev-util/source-highlight
+ dev-python/pygments[${PYTHON_USEDEP}]
+ app-text/highlight
+ )
+ )"
+DEPEND="
+ test? (
+ app-text/dvipng
+ dev-texlive/texlive-latex
+ dev-util/source-highlight
+ media-gfx/graphviz
+ media-gfx/imagemagick
+ media-sound/lilypond
+ ${PYTHON_DEPS}
+ )"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
+
+src_prepare() {
+ default
+ # Only needed for prefix - harmless (does nothing) otherwise
+ sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+ "${S}/asciidoc.py" || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_test() {
+ local -x ASCIIDOC_PY=asciidoc.py
+ "${EPYTHON}" tests/test${PN}.py update || die
+ "${EPYTHON}" tests/test${PN}.py run || die
+}
+
+src_install() {
+ default
+ python_fix_shebang "${ED}"/usr/bin/*.py
+
+ readme.gentoo_create_doc
+ dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
+ dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+ # Below results in some files being installed twice in different locations, but they are
+ # in the right place, uncompressed, and there won't be any broken links. See bug #483336
+ if use examples; then
+ # examples/website is full of relative symlinks,
+ # deref them for copying, which dodoc doesn't do
+ cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
deleted file mode 100644
index 34cc2ec88c14..000000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a73071b87a61acf1237da5ad9da59bae9316fb8c Mon Sep 17 00:00:00 2001
-From: Chris Liddell
-Date: Mon, 8 Oct 2018 09:24:22 +0100
-Subject: [PATCH] Bug 699907: Reinstate GTK+ 2.x.x code.
-
-The fix (from March 2018) for deprecated API calls in the GTK+ 3.x.x API
-didn't account for the new, supported methods not being available in
-GTK+ 2.x.x. Handle both cases, as we do elsewhere.
----
- psi/dxmain.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/psi/dxmain.c b/psi/dxmain.c
-index 72c060e..250269a 100644
---- a/psi/dxmain.c
-+++ b/psi/dxmain.c
-@@ -354,17 +354,23 @@ static void window_resize(IMAGE *img)
- #endif
-
- if (!visible) {
-- guint width, height;
- /* We haven't yet shown the window, so set a default size
- * which is smaller than the desktop to allow room for
- * desktop toolbars, and if possible a little larger than
- * the image to allow room for the scroll bars.
- * We don't know the width of the scroll bars, so just guess. */
-+#if !GTK_CHECK_VERSION(3, 0, 0)
-+ gtk_window_set_default_size(GTK_WINDOW(img->window),
-+ min(gdk_screen_width()-96, img->width+24),
-+ min(gdk_screen_height()-96, img->height+24));
-+#else
-+ guint width, height;
- width = gtk_widget_get_allocated_width (img->window) - 96;
- height = gtk_widget_get_allocated_height (img->window) - 96;
- gtk_window_set_default_size(GTK_WINDOW(img->window),
- min(width, img->width+24),
- min(height, img->height+24));
-+#endif
- }
- }
-
---
-2.9.1
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
index d401053463c1..260beb77ff32 100644
--- a/app-text/msort/msort-8.53.ebuild
+++ b/app-text/msort/msort-8.53.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="A program for sorting files in sophisticated ways"
HOMEPAGE="https://billposer.org/Software/msort.html"
SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
IUSE="heap +icu +libuninum"
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 7b4a67ec27e2..f6fcb600816c 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1 +1,2 @@
DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
+DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
diff --git a/app-text/pinfo/pinfo-0.6.10-r6.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
similarity index 53%
rename from app-text/pinfo/pinfo-0.6.10-r6.ebuild
rename to app-text/pinfo/pinfo-0.6.13.ebuild
index 244a97c87c72..7ea70501a526 100644
--- a/app-text/pinfo/pinfo-0.6.10-r6.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+inherit autotools flag-o-matic
DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="http://pinfo.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
+HOMEPAGE="https://github.com/baszoetekouw/pinfo"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -27,34 +27,23 @@ DEPEND="
nls? ( sys-devel/gettext )
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.6.9-as-needed.patch
"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
- "${FILESDIR}"/${PN}-0.6.10-version.patch
- "${FILESDIR}"/${PN}-0.6.10-info-suffix.patch
- "${FILESDIR}"/${PN}-0.6.10-dir-file.patch
- "${FILESDIR}"/${PN}-0.6.10-tinfo.patch
- "${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch
- "${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
- "${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
- "${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
- "${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
)
src_prepare() {
default
-
eautoreconf
-
- append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
}
src_configure() {
+ append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
+
econf \
$(use_with readline) \
$(use_enable nls)
}
src_install() {
- emake DESTDIR="${D}" sysconfdir=/etc install
+ emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install
}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index fadd52ef56c3..926d97cc1b53 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
index 576b9c51d9d0..6e13d098debf 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,8 +14,8 @@ inherit autotools multilib-minimal
MY_P="${PN%-cpp}-${PV}"
DESCRIPTION="The ANTLR 2 C++ Runtime"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="2"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
index 38f0da795403..9c93c56179ec 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -15,8 +15,8 @@ inherit eutils autotools-multilib
MY_P="${PN%-cpp}-${PV}"
DESCRIPTION="The ANTLR 2 C++ Runtime"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="2"
KEYWORDS="amd64 ~arm ppc x86"
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-3.5.2-r1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-3.5.2-r1.ebuild
index 22d8b1075d1f..28b296c9b47e 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-3.5.2-r1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-3.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN%-cpp}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="The ANTLR 3 C++ Runtime"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="3.5"
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-3.5.2.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-3.5.2.ebuild
index de73a6f9bc48..dfc842917676 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-3.5.2.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ MY_PN="${PN%-cpp}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="The ANTLR 3 C++ Runtime"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://github.com/${MY_PN}/${MY_PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="3.5"
diff --git a/dev-cpp/rttr/rttr-0.9.6.ebuild b/dev-cpp/rttr/rttr-0.9.6.ebuild
index d63d19eafdfc..df812c944e7f 100644
--- a/dev-cpp/rttr/rttr-0.9.6.ebuild
+++ b/dev-cpp/rttr/rttr-0.9.6.ebuild
@@ -11,10 +11,10 @@ SRC_URI="https://github.com/rttrorg/${PN}/releases/download/v${PV}/${P}-src.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
-RESTICT="test"
+RESTRICT="test"
PATCHES=(
"${FILESDIR}/${P}-cmake.patch"
diff --git a/dev-cpp/sourcetrail/Manifest b/dev-cpp/sourcetrail/Manifest
index 02dc9406177c..14d514b02ed6 100644
--- a/dev-cpp/sourcetrail/Manifest
+++ b/dev-cpp/sourcetrail/Manifest
@@ -1 +1,2 @@
DIST sourcetrail-2018.3.55.tar.gz 74278615 BLAKE2B e046acfb90cdb495ff28c3dcf4530129cc569a0e9c481f127f656059f80575e4be22e9b63a8b6f00ffdac977ca930ad7a3c4d0e1aa7912af711150afbef03707 SHA512 b8fccc4bae55abf5c5a05418b37c665817c860cc27e314f8ccb69665a63b90ef68485c2395fc899f1112a05def8e95068d7a5c92db399f1d3f7a203a09107767
+DIST sourcetrail-2019.1.11.tar.gz 76120891 BLAKE2B 865c8a510a544705e130e3ec7bc82f1e7ca16d4dee2fa27849dd3530a92a20ef47ed909765ac08c8106ee0e992e3b4a03e79ef7094fb1593c4088b7d8e356423 SHA512 9022873572aef796fcbacf079c37b916d645aacd1479cc79fcddbfd8c561d0004c97202c46812b60d8c539dae3d68bd805da101678ebd1518ce13c3e58009ac9
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
new file mode 100644
index 000000000000..07a989c7d931
--- /dev/null
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.1.11.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg-utils
+
+DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
+HOMEPAGE="https://www.sourcetrail.com/"
+SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
+
+LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples selinux"
+
+DEPEND="dev-util/patchelf"
+
+RDEPEND="
+ =dev-libs/openssl-1.0*:*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libpng:1.2
+ sys-libs/libudev-compat
+ virtual/opengl
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXxf86vm
+ selinux? ( sys-libs/libselinux )
+"
+
+S="${WORKDIR}/Sourcetrail"
+QA_PREBUILT="*"
+
+src_install() {
+ # This removes the rpath entries with $$ORIGIN
+ # since they trigger warnings when merging
+ for f in "Sourcetrail" "sourcetrail_indexer"; do
+ rpath=$(patchelf --print-rpath "${f}" 2>/dev/null)
+ new_rpath=${rpath//\$\$ORIGIN\/lib\/:/}
+ patchelf --set-rpath "${new_rpath}" "${f}" || die
+ done
+
+ # Remove bundled libraries
+ rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \
+ lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \
+ lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \
+ lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \
+ lib/libpng12.so.0 lib/libselinux.so.1
+ insinto /opt/sourcetrail
+ doins -r EULA.txt README data lib plugin
+ if use examples; then
+ doins -r user
+ fi
+ exeinto /opt/sourcetrail
+ doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh
+ into /opt
+ newbin - sourcetrail <<-EOF
+ #! /bin/sh
+ exec /opt/sourcetrail/Sourcetrail.sh "\$@"
+ EOF
+ local size
+ for size in 48 64 128 256 512; do
+ newicon -s ${size} "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \
+ "sourcetrail.png"
+ done
+ sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' "setup/share/applications/sourcetrail.desktop" || die
+ sed -i -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" || die
+ domenu "setup/share/applications/sourcetrail.desktop"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 24cef85331de..2797a1630a72 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index af4c5b2f1347..78a608535582 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -1 +1,2 @@
DIST kdb-3.1.0.tar.xz 543780 BLAKE2B d874765758e245fc939bf88312b064d2dcff3460b2c9e968277e0ce7b8821314273cb3086e821645f9d7605de1a4268e25d11c40f8bf847a8dc98c410bd4d9eb SHA512 f94f1ff87cb5133570f7e9b0ab48202a516eabe1c3f2ed750cd1794800d9b9936bbd62e1479ca6877c293f6473b7f4e2d4a144b928b5bc0f228af327131b43c2
+DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
diff --git a/dev-db/kdb/kdb-3.2.0.ebuild b/dev-db/kdb/kdb-3.2.0.ebuild
new file mode 100644
index 000000000000..a69d6f79b1d2
--- /dev/null
+++ b/dev-db/kdb/kdb-3.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_QTHELP="true"
+KDE_TEST="true"
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit kde5 python-any-r1
+
+DESCRIPTION="Database connectivity and creation framework for various vendors"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="5/4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mysql postgres sqlite"
+
+BDEPEND="${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+"
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/icu:=
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? (
+ $(add_qt_dep qtnetwork)
+ dev-db/postgresql:*
+ )
+ sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ kde5_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DKDB_DEBUG_GUI=$(usex debug)
+ $(cmake-utils_use_find_package mysql MySQL)
+ $(cmake-utils_use_find_package postgres PostgreSQL)
+ $(cmake-utils_use_find_package sqlite Sqlite)
+ )
+
+ kde5_src_configure
+}
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild
index 9fe564a23cd9..63fd079079bc 100644
--- a/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.g
LICENSE="|| ( GPL-2 Artistic )"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
# Package warrants IUSE doc
IUSE=""
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild
index b6f649295f2b..d47037bbe0c4 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
app-arch/lz4:0=
diff --git a/dev-db/sqlite/sqlite-3.27.2.ebuild b/dev-db/sqlite/sqlite-3.27.2.ebuild
index d008a6a8e1b1..a45fde4c5375 100644
--- a/dev-db/sqlite/sqlite-3.27.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.27.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2019/${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-java/Manifest.gz b/dev-java/Manifest.gz
index d76ed406f572..53cde95fde7e 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 09dc38c165a3..c999d7417a30 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.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="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index 10056965f258..de3952a26d09 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.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
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index d8976fb16787..48831af505d1 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -6,9 +6,9 @@ EAPI="5"
inherit eutils java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr3.org/"
-SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
- http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+HOMEPAGE="https://www.antlr3.org/"
+SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
+ https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
LICENSE="BSD"
SLOT="3"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 46c6402f4b20..ffbb7faf52a2 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -6,9 +6,9 @@ EAPI="5"
inherit eutils java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
- http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
+ https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
LICENSE="BSD"
SLOT="3.5"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index a7c4c1ffbb73..38d9b405e655 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -8,9 +8,9 @@ JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr.org/"
+HOMEPAGE="https://www.antlr.org/"
SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
- http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+ https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
LICENSE="BSD"
SLOT="4"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index 3b48b132714c..ed1027b16e89 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -8,9 +8,9 @@ JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr.org/"
+HOMEPAGE="https://www.antlr.org/"
SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
- http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+ https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
LICENSE="BSD"
SLOT="4"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 318d9470f963..6db9d67d1c26 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -4,6 +4,9 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b8
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_9.tar.gz 180384673 BLAKE2B 51cc7f53c371dc140f9cd17c3523251929e384ca73eb34c283b969be1b5c91b1ec15bf72fe08c80b141a96aa0de5dcb0c9631e2f776e123ad5a4059174dfbc1a SHA512 00ecb0fe1e5b4f682841eeda41525dc5a9205e55ec8ccb332aa1dc724499d2df927870c8b70da950384b50a8014bbd70d0025a5ce0ccb90bfc4df028e64613cb
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz 195592867 BLAKE2B 91593fc849e558abf965ecfeadefbeab464e1c4562ec57d0bb6dcb9c17525a7cf37593d8fa2146d4545122a634d22c46764af32a124a0e17621da8b643c2770d SHA512 976874e04df71f747a5a7a78081b5989adfcf783b5642d3a0ca2ab2a98547fbe9495dce57b8eda69240f1850bead7bdd6cd59bf9f53ba70400e0806e0950866d
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u202b08.tar.gz 101497437 BLAKE2B 4fdc659f9cc50fd968cd339cf24780cd0097286fe3004669972b925fa5c8bbd0e6024587f761ef05ec170c4caa6a915f9f748badd021fae6eb669aa613e1c90d SHA512 42991d2203d51492090e92ee4c7600e7b0ab613550d925f52dd7c7c3b796f9bd36e7284d55540b661a5175064d714267cddd786d81aeda358feda3927e3676e3
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz 104336613 BLAKE2B 3bf42af57707a057077969487f66c32289d0dc96639aee553b18812262d517b07a8e80e3351a4b22731569c7d7c1443d8018d05a41a26abf844a1a2950e7c368 SHA512 8e04d22fe03d2ab92e48fbbfe7d6015d9062d8e767d55ca9235e02b39841236d47b8977ae0252d5f4351a4c5fe082d377e2f8978156cf73c0208028a422e5e4c
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz 104368598 BLAKE2B 0c16398c1e962e53316eb9301a8ebb6dc7b37ef812d3b65719c239f392074fcba999fca8442cc52a0b067eb4761b0477e9da243d0d84a2e2ded1d883614d15b3 SHA512 7674f26bbc69535c1d06d7364f515ddd00f1f43f6fb76c806c56cd3b379e03047084fbf6439e375cf57257b8a1fdf94702ba063bf843793b009a76fb449a5cc9
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 7b83622b0d7c..5197cf9973cb 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -1,15 +1,23 @@
-
- java@gentoo.org
- Java
-
- Java™ is the world's leading programming language and platform. The code for Java is open source and available at OpenJDK™. AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
-
+
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+
+
+ java@gentoo.org
+ Java
+
+
+ Java™ is the world's leading programming language and platform.
+ The code for Java is open source and available at OpenJDK™.
+ AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
+
+
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
new file mode 100644
index 000000000000..8cc6752e5ae0
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-libs/glibc-2.2.5:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ doc? ( dev-java/java-sdk-docs:${SLOT} )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr demo/ || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+
+ if use gentoo-vm ; then
+ ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+ ewarn "recognised by the system. This will almost certainly break things."
+ else
+ ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+ ewarn "will not be recognised by the system. For example, simply calling"
+ ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+ ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+ ewarn "absolute location under ${EPREFIX}/opt/${P}."
+ fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild
new file mode 100644
index 000000000000..d214f0e0b459
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+ )"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+ $(abi_uri x64 amd64)
+ $(abi_uri ppc64le ppc64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~ppc64"
+
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-libs/glibc-2.2.5:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ doc? ( dev-java/java-sdk-docs:1.${SLOT} )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}${dest#/}"
+
+ rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+ # this does not exist on arm64 hence -f
+ rm -fv jre/lib/*/libfreetype.so* || die
+
+ if ! use alsa ; then
+ rm -v jre/lib/*/libjsoundalsa.so* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr sample || die
+ fi
+
+ if use headless-awt ; then
+ rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+ {,jre/}bin/policytool bin/appletviewer || die
+ fi
+
+ if ! use source ; then
+ rm -v src.zip || die
+ fi
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+
+ if use gentoo-vm ; then
+ ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+ ewarn "recognised by the system. This will almost certainly break things."
+ else
+ ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+ ewarn "will not be recognised by the system. For example, simply calling"
+ ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+ ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its"
+ ewarn "absolute location under ${EPREFIX}/opt/${P}."
+ fi
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index d9d0ed15a238..25ed89d092a4 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,2 +1,4 @@
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz 41525058 BLAKE2B da456e8415ef45d07968c12082f2351910284b47bac92a952d4962fbc4c63cb2fa006696b6b175e0d1073b1fca76cca61460465d0959afe80d2f5ce9006d9350 SHA512 96b527be34c49e6351bed0d000153c1bc9491cf89f8a7f90190feccd2984cce1e3d18747e108d476c4417f15947d436f20cd34fe88f8126edecf4a789d725b0a
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz 41732132 BLAKE2B 9d3bd543fec6eb6c30eabbbb3ca6073365c5b8900dff9af47cfba5569ecfc33a8e2562ed3f8cf4940b2a7d7c427e48164a94fce1f72c8e98fa7f0fc32d923237 SHA512 b7232a3c75a8c4e67f51bd95c8441026b2bfef29cc779768a5f2d300208dc569d672402e06a2d6c6f512450723bc0631c5a18cde80cbc1ec2028c123607df30f
DIST OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz 40856726 BLAKE2B d9d4599989a0232bcc145aaf58b20dbfcedbe33adb2b3ee65b7e726dea350210f66eb81b321268a29d3234244c517642cfe908531242afb220509666e02c0617 SHA512 f9bb03cd0876f6b3b36d8ba821a14648b5ac2ec6dc6eefb95dc333aae77b55c940153cdd1715b21feaf7d7f2148bf8c272777c8afab911965e514f9792287962
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz 40871242 BLAKE2B 8a6eee7f7465cbccc575e44ab08d6a3d2cedc32954475ea71064a4b6d4379927a795225fed7394922bdaa2a425efb6966d6a0126a55a0fa0e68dc0eeb7a6e935 SHA512 3b0c560cce673fa0e9506c18c4a25b56e26c8ccd7874098f55c37f1a556387b4c2d3ba81ef0368cc666178028eef0fd7beac6307588628c8c8c051381a21366f
diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml
index 1194887e1566..7a807f5dbca1 100644
--- a/dev-java/openjdk-jre-bin/metadata.xml
+++ b/dev-java/openjdk-jre-bin/metadata.xml
@@ -10,7 +10,8 @@
Java
- Java™ is the world's leading programming language and platform. The code for Java is open source and available at OpenJDK™.
+ Java™ is the world's leading programming language and platform.
+ The code for Java is open source and available at OpenJDK™.
AdoptOpenJDK provides prebuilt OpenJDK JRE binaries from a fully open source set of build scripts and infrastructure.
netdata/netdata
diff --git a/net-analyzer/netdata/netdata-1.14.0-r1.ebuild b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..54d150969d3c
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+ mysql? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+ app-misc/jq
+ >=app-shells/bash-4:0
+ || (
+ net-analyzer/openbsd-netcat
+ net-analyzer/netcat
+ )
+ net-analyzer/tcpdump
+ net-analyzer/traceroute
+ net-misc/curl
+ net-misc/wget
+ sys-apps/util-linux
+ virtual/awk
+ caps? ( sys-libs/libcap )
+ cups? ( net-print/cups )
+ compression? ( sys-libs/zlib )
+ ipmi? ( sys-libs/freeipmi )
+ nfacct? (
+ net-firewall/nfacct
+ net-libs/libmnl
+ )
+ nodejs? ( net-libs/nodejs )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ mysql? (
+ || (
+ dev-python/mysqlclient[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ )
+ )
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+ )
+ xen? (
+ app-emulation/xen-tools
+ dev-libs/yajl
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+ 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --with-user=${NETDATA_USER} \
+ $(use_enable cups plugin-cups) \
+ $(use_enable nfacct plugin-nfacct) \
+ $(use_enable ipmi plugin-freeipmi) \
+ $(use_enable xen plugin-xenstat) \
+ $(use_enable cpu_flags_x86_sse2 x86-sse) \
+ $(use_with compression zlib)
+}
+
+src_install() {
+ default
+
+ rm -rf "${D}/var/cache" || die
+
+ # Remove unneeded .keep files
+ find "${ED}" -name ".keep" -delete || die
+
+ fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+ keepdir /var/log/netdata
+ fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+ keepdir /var/lib/netdata
+ keepdir /var/lib/netdata/registry
+
+ fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+ newinitd system/netdata-openrc ${PN}
+ systemd_dounit system/netdata.service
+ insinto /etc/netdata
+ doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.14.0.ebuild b/net-analyzer/netdata/netdata-1.14.0.ebuild
new file mode 100644
index 000000000000..59396a96cc0e
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.14.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+REQUIRED_USE="
+ mysql? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+ app-misc/jq
+ >=app-shells/bash-4:0
+ || (
+ net-analyzer/openbsd-netcat
+ net-analyzer/netcat
+ )
+ net-analyzer/tcpdump
+ net-analyzer/traceroute
+ net-misc/curl
+ net-misc/wget
+ sys-apps/util-linux
+ virtual/awk
+ caps? ( sys-libs/libcap )
+ compression? ( sys-libs/zlib )
+ ipmi? ( sys-libs/freeipmi )
+ nfacct? (
+ net-firewall/nfacct
+ net-libs/libmnl
+ )
+ nodejs? ( net-libs/nodejs )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ mysql? (
+ || (
+ dev-python/mysqlclient[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ )
+ )
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+ 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --with-user=${NETDATA_USER} \
+ $(use_enable nfacct plugin-nfacct) \
+ $(use_enable ipmi plugin-freeipmi) \
+ $(use_enable cpu_flags_x86_sse2 x86-sse) \
+ $(use_with compression zlib)
+}
+
+src_install() {
+ default
+
+ rm -rf "${D}/var/cache" || die
+
+ # Remove unneeded .keep files
+ find "${ED}" -name ".keep" -delete || die
+
+ fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+ keepdir /var/log/netdata
+ fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+ keepdir /var/lib/netdata
+ keepdir /var/lib/netdata/registry
+
+ fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+ newinitd system/netdata-openrc ${PN}
+ systemd_dounit system/netdata.service
+ insinto /etc/netdata
+ doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index c52e2322bd9a..54d150969d3c 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
LICENSE="GPL-3+ MIT BSD"
SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
REQUIRED_USE="
mysql? ( python )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -27,10 +27,10 @@ REQUIRED_USE="
# most unconditional dependencies are for plugins.d/charts.d.plugin:
RDEPEND="
+ app-misc/jq
>=app-shells/bash-4:0
|| (
net-analyzer/openbsd-netcat
- net-analyzer/netcat6
net-analyzer/netcat
)
net-analyzer/tcpdump
@@ -40,6 +40,7 @@ RDEPEND="
sys-apps/util-linux
virtual/awk
caps? ( sys-libs/libcap )
+ cups? ( net-print/cups )
compression? ( sys-libs/zlib )
ipmi? ( sys-libs/freeipmi )
nfacct? (
@@ -58,6 +59,10 @@ RDEPEND="
)
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+ )
+ xen? (
+ app-emulation/xen-tools
+ dev-libs/yajl
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -85,8 +90,10 @@ src_configure() {
econf \
--localstatedir="${EPREFIX}"/var \
--with-user=${NETDATA_USER} \
+ $(use_enable cups plugin-cups) \
$(use_enable nfacct plugin-nfacct) \
$(use_enable ipmi plugin-freeipmi) \
+ $(use_enable xen plugin-xenstat) \
$(use_enable cpu_flags_x86_sse2 x86-sse) \
$(use_with compression zlib)
}
diff --git a/net-analyzer/nodebrain/Manifest b/net-analyzer/nodebrain/Manifest
deleted file mode 100644
index ed0454b00d95..000000000000
--- a/net-analyzer/nodebrain/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nodebrain-0.9.04.tar.gz 2475665 BLAKE2B 04ca839dc862372717530127fc1ec66df2e06bf2bb5b368e5b427d0efc953629b98ef05e3a58ee5e506c1937dcd4e7e676bee32fe841547cbba07063be88e8ef SHA512 a6cbebef09569d2d086954fc06b7a0bbc2828a5041289fdb7b537bd75b354610f3cf28baded5fce9679d89ffea3e245ab59323a00d060e98819d367775fd5226
diff --git a/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch b/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch
deleted file mode 100644
index c34965bfe5e5..000000000000
--- a/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/lib/nbbfi.c
-+++ b/lib/nbbfi.c
-@@ -197,6 +197,7 @@
- *=============================================================================
- */
- #include
-+#include /* isdigit() */
-
- /**************************************************************************
- * Index Routines
---- a/lib/nbkit.c
-+++ b/lib/nbkit.c
-@@ -51,6 +51,7 @@
- #include
- #include
- #include
-+#include /* system() */
-
- static int nbKitUsage(void){
- printf("Usage:\n");
---- a/module/webster/nb_webster.c
-+++ b/module/webster/nb_webster.c
-@@ -78,6 +78,7 @@
- */
- #include "config.h"
- #include
-+#include /* isalnum() */
-
- #if defined(WIN32)
-
diff --git a/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch b/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch
deleted file mode 100644
index 61d98a673375..000000000000
--- a/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/nbhash.c
-+++ b/lib/nbhash.c
-@@ -81,6 +81,7 @@
- */
- #include
- #include
-+#include
-
- struct TYPE *typeHash;
-
diff --git a/net-analyzer/nodebrain/metadata.xml b/net-analyzer/nodebrain/metadata.xml
deleted file mode 100644
index b1e688b96833..000000000000
--- a/net-analyzer/nodebrain/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-
- nodebrain
-
-
diff --git a/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild
deleted file mode 100644
index 8c76a34f5374..000000000000
--- a/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Monitor and do event correlation"
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-CDEPEND="
- dev-libs/libedit
-"
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-apps/texinfo
-"
-RDEPEND="
- ${CDEPEND}
- !sys-boot/netboot
- !www-apps/nanoblogger
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.14-include.patch
- "${FILESDIR}"/${PN}-0.9.04-include.patch
-)
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --include=/usr/include
-}
-
-src_install() {
- default
-
- prune_libtool_files
-
- dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
-}
diff --git a/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
deleted file mode 100644
index 1169e2f71849..000000000000
--- a/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Monitor and do event correlation"
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-CDEPEND="dev-libs/libedit"
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-apps/texinfo
-"
-RDEPEND="
- ${CDEPEND}
- !sys-boot/netboot
- !www-apps/nanoblogger
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8.14-include.patch
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --include=/usr/include
-}
-
-src_install() {
- default
- use static-libs || prune_libtool_files
- dodoc AUTHORS NEWS README THANKS sample/*
- dohtml html/*
-}
diff --git a/net-analyzer/nodebrain/nodebrain-9999.ebuild b/net-analyzer/nodebrain/nodebrain-9999.ebuild
deleted file mode 100644
index 36adf58b091f..000000000000
--- a/net-analyzer/nodebrain/nodebrain-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils git-r3
-
-DESCRIPTION="Monitor and do event correlation"
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/trettevik/nodebrain-nb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-CDEPEND="
- dev-libs/libedit
-"
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-apps/texinfo
-"
-RDEPEND="
- ${CDEPEND}
- !sys-boot/netboot
- !www-apps/nanoblogger
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.14-include.patch
- "${FILESDIR}"/${PN}-0.9.04-include.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --include=/usr/include
-}
-
-src_install() {
- default
-
- prune_libtool_files
-
- dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
-}
diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest
deleted file mode 100644
index 05862a38f1bd..000000000000
--- a/net-analyzer/postal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST postal-0.72.tgz 106720 BLAKE2B 31374e36c0437dd7ebdf5e26ded159d9cfb22d4a97858de058b58ecebd2e31ae18ef9bdda5d61c06c89b1f05a903904ed9cc424918a66ead168be3af6786b994 SHA512 858d5a3ec452e868d6026d631d59260eab83e90c64ce185bf9c6cecd3494c591ba7cb1455f35a5f003acbbe33f4974669e6820750e4d4ce9432d72b350263c99
diff --git a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch b/net-analyzer/postal/files/01_postal-0.70-gcc43.patch
deleted file mode 100644
index fe577603ad3d..000000000000
--- a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rabid.cpp.orig 2008-06-15 14:05:19.776258513 +0200
-+++ rabid.cpp 2008-06-15 14:05:47.927250506 +0200
-@@ -12,6 +12,8 @@
- #include
- #include "postal.h"
- #include "logit.h"
-+#include
-+
- #ifdef USE_GNUTLS
- #include
- #include
diff --git a/net-analyzer/postal/files/02_postal-0.72-nossl.patch b/net-analyzer/postal/files/02_postal-0.72-nossl.patch
deleted file mode 100644
index 238dbdbb783d..000000000000
--- a/net-analyzer/postal/files/02_postal-0.72-nossl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
---- configure.in 2008-04-09 03:08:28.000000000 +0200
-+++ configure.in 2008-04-23 22:37:41.000000000 +0200
-@@ -13,15 +13,28 @@
- else
- stripping="-s"
- fi
-
- AC_ARG_ENABLE(openssl,
-- [ --disable-openssl disables openssl support],
-- DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no)
-+ [ --disable-openssl disable openssl support],
-+ [ if test $enableval = yes; then
-+ DISABLEOPENSSL=no
-+ else
-+ DISABLEOPENSSL=yes
-+ fi ]
-+ ,
-+ [ DISABLEOPENSSL=no ])
-+
- AC_ARG_ENABLE(gnutls,
-- [ --disable-gnutls disables gnutls support],
-- DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no)
-+ [ --disable-gnutls disables gnutls support],
-+ [if test $enableval = yes; then
-+ DISABLEGNUTLS=no
-+ else
-+ DISABLEGNUTLS=yes
-+ fi]
-+ ,
-+ [ DISABLEGNUTLS=no ])
-
- dnl Checks for programs.
- AC_LANG_CPLUSPLUS
- AC_PROG_CC
- AC_PROG_CXX
-@@ -118,17 +131,17 @@
- crypt_ldflags=
- if [[ "$GNUTLS" = "no" ]]; then
- gnutls=""
- else
- gnutls="#define USE_GNUTLS"
-- crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt"
-+ crypt_ldflags=" -lgnutls -lgcrypt"
- fi
- if [[ "$OPENSSL" = "no" ]]; then
- openssl=""
- else
- openssl="#define USE_OPENSSL"
-- crypt_ldflags="$extra_ldflags -lssl -lcrypto"
-+ crypt_ldflags=" -lssl -lcrypto"
- fi
-
- AC_SUBST(large_file)
- large_file=""
-
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
---- Makefile.in 2008-04-10 03:19:34.000000000 +0200
-+++ Makefile.in 2008-04-23 22:37:13.000000000 +0200
-@@ -16,11 +16,11 @@
- INSTALL=@INSTALL@
-
- TESTEXE=ex-test
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
- LFLAGS=-lstdc++ @extra_ldflags@
--CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
-+CRYPTLFLAGS=-lstdc++ @extra_ldflags@ @crypt_ldflags@
-
-
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
-
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o
diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
deleted file mode 100644
index 448af31a8966..000000000000
--- a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
---- postal-0.69.orig/bhm.cpp 2008-04-23 22:39:01.000000000 +0200
-+++ postal-0.69/bhm.cpp 2008-04-24 01:31:54.000000000 +0200
-@@ -7,10 +7,11 @@
- #include
- #include
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
- #include
- #include
-diff -NrU5 postal-0.69.orig/bhmusers.cpp postal-0.69/bhmusers.cpp
---- postal-0.69.orig/bhmusers.cpp 2008-04-10 03:36:27.000000000 +0200
-+++ postal-0.69/bhmusers.cpp 2008-04-24 00:04:07.000000000 +0200
-@@ -1,9 +1,10 @@
- #include "bhmusers.h"
- #include
- #include
- #include "expand.h"
-+#include
-
- BHMUsers::BHMUsers(const char *userListFile)
- {
- char buf[1024];
- FILE *fp = fopen(userListFile, "r");
-diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
---- postal-0.69.orig/bhmusers.h 2006-09-28 17:20:28.000000000 +0200
-+++ postal-0.69/bhmusers.h 2008-04-24 00:14:05.000000000 +0200
-@@ -4,16 +4,21 @@
- using namespace std;
-
- #include
- #include "conf.h"
-
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+#include
-+#include
-+#else
- #ifdef HAVE_EXT_HASH_MAP
- using namespace __gnu_cxx;
- #include
- #else
- #include
- #endif
-+#endif
-
- #include "postal.h"
-
- typedef enum { eNone = 0, eDefer, eReject, eBounce, eGrey } USER_SMTP_ACTION;
-
-@@ -21,10 +26,13 @@
- {
- USER_SMTP_ACTION action;
- int sync_time;
- } BHM_DATA;
-
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+typedef unordered_map > NAME_MAP;
-+#else
- namespace __gnu_cxx
- {
- template<> struct hash< std::string >
- {
- size_t operator() ( const std::string &x ) const
-@@ -33,10 +41,11 @@
- }
- };
- }
-
- typedef hash_map > NAME_MAP;
-+#endif
-
- class BHMUsers
- {
- public:
- BHMUsers(const char *userListFile);
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
---- postal-0.69.orig/configure.in 2008-04-23 22:39:01.000000000 +0200
-+++ postal-0.69/configure.in 2008-04-24 01:20:35.000000000 +0200
-@@ -155,6 +155,98 @@
-
- AC_CHECK_HEADERS(vector ext/hash_map)
-
- dnl Checks for library functions.
-
-+AC_DEFUN([AC_COMPILE_STDCXX_0X], [
-+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-+ ac_cv_cxx_compile_cxx0x_native,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ AC_TRY_COMPILE([
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
-+ AC_LANG_RESTORE
-+ ])
-+
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-+ ac_cv_cxx_compile_cxx0x_cxx,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -std=c++0x"
-+ AC_TRY_COMPILE([
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-+ ac_cv_cxx_compile_cxx0x_gxx,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-+ AC_TRY_COMPILE([
-+ template
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+
-+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
-+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
-+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
-+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-+ fi
-+])
-+
-+AC_COMPILE_STDCXX_0X
-+
-+AC_SUBST(cstd)
-+cstd=
-+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes; then
-+ cstd=-std=c++0x
-+fi
-+
- AC_OUTPUT(Makefile postal.h port.h postal.spec sun/pkginfo)
-+
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
---- postal-0.69.orig/Makefile.in 2008-04-23 22:39:01.000000000 +0200
-+++ postal-0.69/Makefile.in 2008-04-24 00:29:40.000000000 +0200
-@@ -8,12 +8,12 @@
- prefix=@prefix@
- eprefix=@exec_prefix@
- WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wcast-qual -pedantic
- WPLUS=-Woverloaded-virtual -ffor-scope
-
--CXX=@CXX@ $(CFLAGS) -O2 -g $(WFLAGS) $(WPLUS)
--CC=@CC@ $(CFLAGS) -O2 -g $(WFLAGS)
-+CXX=@CXX@ @cstd@ $(CFLAGS) $(WFLAGS) $(WPLUS)
-+CC=@CC@ $(CFLAGS) $(WFLAGS)
-
- INSTALL=@INSTALL@
-
- TESTEXE=ex-test
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
-diff -NrU5 postal-0.69.orig/postal.cpp postal-0.69/postal.cpp
---- postal-0.69.orig/postal.cpp 2007-01-14 05:40:23.000000000 +0100
-+++ postal-0.69/postal.cpp 2008-04-24 01:30:49.000000000 +0200
-@@ -6,10 +6,11 @@
- #include "smtp.h"
- #include
- #include
- #include
- #include
-+#include
- #include "postal.h"
- #include "logit.h"
- #ifdef USE_GNUTLS
- #include
- #include
-diff -NrU5 postal-0.69.orig/smtp.cpp postal-0.69/smtp.cpp
---- postal-0.69.orig/smtp.cpp 2008-04-19 00:01:39.000000000 +0200
-+++ postal-0.69/smtp.cpp 2008-04-24 00:14:49.000000000 +0200
-@@ -7,10 +7,11 @@
- #include
- #include "userlist.h"
- #include "logit.h"
- #include "results.h"
- #include
-+#include
-
- smtpData::smtpData()
- : m_quit("QUIT\r\n")
- , m_randomLetters("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 `~!@#$%^&*()-_=+[]{};:'\"|/?<>,")
- , m_randomLen(strlen(m_randomLetters))
-diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
---- postal-0.69.orig/smtp.h 2008-04-19 00:01:23.000000000 +0200
-+++ postal-0.69/smtp.h 2008-04-24 00:18:03.000000000 +0200
-@@ -4,16 +4,20 @@
- using namespace std;
- #include
- #include
- #include
- #include "conf.h"
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+#include
-+#else
- #ifdef HAVE_EXT_HASH_MAP
- using namespace __gnu_cxx;
- #include
- #else
- #include
- #endif
-+#endif
- #include "tcp.h"
- #include "mutex.h"
-
- class results;
-
-@@ -28,11 +32,15 @@
- {
- return (l1 == l2);
- }
- };
-
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+typedef unordered_map, eqlng> NAME_MAP;
-+#else
- typedef hash_map, eqlng> NAME_MAP;
-+#endif
-
- class smtpData
- {
- public:
- smtpData();
diff --git a/net-analyzer/postal/files/04_postal-0.70-warnings.patch b/net-analyzer/postal/files/04_postal-0.70-warnings.patch
deleted file mode 100644
index 066cf972cdf7..000000000000
--- a/net-analyzer/postal/files/04_postal-0.70-warnings.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
---- postal-0.69.orig/bhm.cpp 2008-04-23 01:47:25.000000000 +0200
-+++ postal-0.69/bhm.cpp 2008-04-23 02:10:17.000000000 +0200
-@@ -67,11 +67,11 @@
- Logit *debug;
- } thread_data;
-
- enum { eFree = 0, eUsed, eFinished };
-
--int check_sender(CPCCHAR addr)
-+int check_sender(CPCCHAR)
- {
- return 0;
- }
-
- int readCommand(base_tcp &t, char *buf, int bufSize, bool stripCR, int timeout = 60);
-
diff --git a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch
deleted file mode 100644
index 5b5c054ac98c..000000000000
--- a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/327937
-
---- basictcp.h
-+++ basictcp.h
-@@ -89,7 +89,11 @@
-
- #ifdef USE_SSL
- #ifdef USE_OPENSSL
-+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const SSL_METHOD *m_sslMeth;
-+ #else
- SSL_METHOD *m_sslMeth;
-+ #endif
- SSL_CTX* m_sslCtx;
- SSL *m_ssl;
- #else
---- tcp.h
-+++ tcp.h
-@@ -100,7 +100,11 @@
-
- #ifdef USE_SSL
- #ifdef USE_OPENSSL
-+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const SSL_METHOD *m_sslMeth;
-+ #else
- SSL_METHOD *m_sslMeth;
-+ #endif
- SSL_CTX* m_sslCtx;
- SSL *m_ssl;
- #else
diff --git a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch b/net-analyzer/postal/files/06_postal-0.70-ldflags.patch
deleted file mode 100644
index 7bfb92de7f0d..000000000000
--- a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in~ 2011-06-08 11:38:59.123333174 +0300
-+++ Makefile.in 2011-06-08 11:46:02.000000000 +0300
-@@ -24,19 +24,19 @@
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
-
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o
-- $(CXX) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS)
-+ $(CXX) $(LDFLAGS) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS)
-
- rabid: rabid.cpp $(BASEOBJS) postal.h client.o
-- $(CXX) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS)
-+ $(CXX) $(LDFLAGS) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS)
-
- bhm: bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o postal.h
-- $(CXX) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS)
-+ $(CXX) $(LDFLAGS) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS)
-
- ex-test: ex-test.cpp expand.o
-- $(CXX) ex-test.cpp expand.o -o ex-test $(LFLAGS)
-+ $(CXX) $(LDFLAGS) ex-test.cpp expand.o -o ex-test $(LFLAGS)
-
- postal-list: postal-list.cpp expand.o
-- $(CXX) postal-list.cpp expand.o -o postal-list $(LFLAGS)
-+ $(CXX) $(LDFLAGS) postal-list.cpp expand.o -o postal-list $(LFLAGS)
-
- install-bin: $(EXE) $(SEXE)
- mkdir -p $(DESTDIR)$(eprefix)/sbin $(DESTDIR)$(eprefix)/bin
diff --git a/net-analyzer/postal/postal-0.72.ebuild b/net-analyzer/postal/postal-0.72.ebuild
deleted file mode 100644
index 82e1541dd2e7..000000000000
--- a/net-analyzer/postal/postal-0.72.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more"
-HOMEPAGE="http://www.coker.com.au/postal/"
-SRC_URI="http://www.coker.com.au/postal/${P}.tgz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="ssl gnutls"
-#ssl is an alias for openssl. If both ssl and gnutls are enabled, automagic will
-#enable only gnutls.
-DEPEND="ssl? (
- !gnutls? ( >=dev-libs/openssl-0.9.8g )
- gnutls? ( >=net-libs/gnutls-2.2.2 )
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/01_${PN}-0.70-gcc43.patch"
- epatch "${FILESDIR}/02_${PN}-0.72-nossl.patch"
- epatch "${FILESDIR}/03_${PN}-0.70-c++0x-integrated.patch"
- epatch "${FILESDIR}/04_${PN}-0.70-warnings.patch"
- epatch "${FILESDIR}/05_${PN}-0.70-openssl-1.patch"
- epatch "${FILESDIR}/06_${PN}-0.70-ldflags.patch"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-stripping \
- $(use_enable ssl openssl) \
- $(use_enable gnutls)
-}
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 2c486a839804..6dd98931a73c 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,2 +1 @@
-DIST tcpreplay-4.3.1.tar.xz 746804 BLAKE2B c1feb541b8243b00b2fa6ee9742ced4ef47c58a58d3a95be88faa0fa4301da0cb962a620df724cd4526ea31e74a0e7d7161eb44afea37467a19976a20855e0e0 SHA512 2dbad1a88ed19db897cc1222883c02eb7f0808f64cafb3c3ef8f21c0cfcb14d3ebb92a8a01ea203ca128ed675d2e7dcdb30d0bce30eb79e729d9d45d309f9220
DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
deleted file mode 100644
index 3d0c5b4f1d7a..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="utilities for editing and replaying previously captured network traffic"
-HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-LICENSE="BSD GPL-3"
-SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="debug pcapnav +tcpdump"
-
-DEPEND="
- >=sys-devel/autogen-5.18.4[libopts]
- dev-libs/libdnet
- >=net-libs/libpcap-0.9
- tcpdump? ( net-analyzer/tcpdump )
- pcapnav? ( net-libs/libpcapnav )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(
- docs/{CHANGELOG,CREDIT,HACKING,TODO}
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
-)
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
- default
-
- sed -i \
- -e 's|#include |#include |g' \
- src/common/sendpacket.c || die
- sed -i \
- -e 's|@\([A-Z_]*\)@|$(\1)|g' \
- -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
- -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
- src/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- # By default it uses static linking. Avoid that, bug 252940
- econf \
- $(use_enable debug) \
- $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
- $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
- --enable-dynamic-link \
- --enable-local-libopts \
- --enable-shared \
- --with-libdnet \
- --with-testnic2=lo \
- --with-testnic=lo
-}
-
-src_test() {
- if [[ ! ${EUID} -eq 0 ]]; then
- ewarn "Some tests were disabled due to FEATURES=userpriv"
- ewarn "To run all tests issue the following command as root:"
- ewarn " # make -C ${S}/test"
- emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
- else
- emake -j1 test || {
- ewarn "Note that some tests require eth0 iface to be up." ;
- die "self test failed - see ${S}/test/test.log" ; }
- fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild b/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
index ba5f437a519d..4398957f634b 100644
--- a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
LICENSE="GPL-2 bundled-openssl? ( openssl )"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bundled-openssl kerberos"
RDEPEND="
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 7ec466dc3267..160ba37bfe80 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index e9deade53323..efd75effbd72 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,4 +1,4 @@
DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a6976c2b69a61b288a2534c354bcc9b64eca4305aa7774d3b5fc29c97078478bebec7e81f8071865b29a97809e SHA512 304b8cd098608a866d32c65c55ba98a01e10abb473d8bff488c723fd1f6d4a66cf98c6d3044f7986a334739693767608c48999f873e95a51f0fa6c23cb61ecd4
DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
-DIST xl2tpd-1.3.6.tar.gz 553981 BLAKE2B 3e79534fe3eaa906cf09da93b7f6be2931e4c7fc8ff43dd9683ae846e1e2351c3bee81ac8853dee6c7e45ad8b60f8727edbd95d6dd30cc508288227b09da351c SHA512 868c65660e6a45fb8dc22b95542e9d6ca0dc8e5033cc9df04171a651ef273bc5d711a85f61d4a971d714089f7a10ee67460d8ab9f3c007fcffe0e11e81ae0bfd
+DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 3da1a1ee3824..8066f7a44b9e 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -12,6 +12,7 @@
xl2tpd is a fork of l2tpd Layer 2 Tunneling Protocol (L2TP) daemon that can be used to transfer frames of OSI layer 2 protocols through an IP tunnel. While it provides authentication via CHAP or PAP it does not provide encryption itself and should therefore be externally secured (via IPSEC).
xelerance/xl2tpd
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
new file mode 100644
index 000000000000..ff05839b9552
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="https://github.com/xelerance/xl2tpd"
+SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+kernel"
+
+DEPEND="
+ net-libs/libpcap
+ >=sys-kernel/linux-headers-2.6"
+
+RDEPEND="
+ ${DEPEND}
+ net-dialup/ppp"
+
+DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
+
+src_compile() {
+ tc-export CC
+ local OSFLAGS="-DLINUX"
+ use kernel && OSFLAGS+=" -DUSE_KERNEL"
+ emake OSFLAGS="$OSFLAGS"
+}
+
+src_install() {
+ emake PREFIX=/usr DESTDIR="${D}" install
+
+ newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
+
+ systemd_dounit "${FILESDIR}"/xl2tpd.service
+ systemd_dotmpfilesd "${FILESDIR}"/xl2tpd.conf
+
+ einstalldocs
+
+ insinto /etc/xl2tpd
+ newins doc/l2tpd.conf.sample xl2tpd.conf
+ insopts -m 0600
+ newins doc/l2tp-secrets.sample l2tp-secrets
+}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
deleted file mode 100644
index d341d3479b51..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~x86"
-IUSE="dnsretry"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
- net-dialup/ppp"
-DEPEND+=" >=sys-kernel/linux-headers-2.6.23"
-
-src_prepare() {
- sed -i Makefile -e 's| -O2||g' || die "sed Makefile"
- # The below patch is questionable. Why wasn't it submitted upstream? If it
- # ever breaks, it will just be removed. -darkside 20120914
- use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
- tc-export CC
- export OSFLAGS="-DLINUX"
- emake
-}
-
-src_install() {
- emake PREFIX=/usr DESTDIR="${D}" install
- dodoc CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents doc/rfc2661.txt
- insinto /etc/xl2tpd
- newins doc/l2tpd.conf.sample xl2tpd.conf
- newins doc/l2tp-secrets.sample l2tp-secrets
- fperms 0600 /etc/xl2tpd/l2tp-secrets
- newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
- systemd_dounit "${FILESDIR}"/xl2tpd.service
- systemd_dotmpfilesd "${FILESDIR}"/xl2tpd.conf
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 195a68838a92..66a112c7100e 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index f48954925d59..65a72add02cf 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,2 +1 @@
-DIST ddclient-3.8.1.tar.gz 48600 BLAKE2B a945adcb42bd298422c71c0eea6bea36c6b266ce39e97ebfd833b29819a2f30f2651d7f7b17dbfc0720b6209d0c0ed94bf2673624777f07e6de83a7081471995 SHA512 d6722582dffe0c5a806176f24bd3d9117bc1210ea0137aa92138390be16e67d47b746777dc431282a664849c91626969a5e267777126bac03304c7aa34a9dad7
DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
diff --git a/net-dns/ddclient/ddclient-3.8.1-r5.ebuild b/net-dns/ddclient/ddclient-3.8.1-r5.ebuild
deleted file mode 100644
index f4c2cb5db010..000000000000
--- a/net-dns/ddclient/ddclient-3.8.1-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils systemd user
-
-DESCRIPTION="Perl updater client for dynamic DNS services"
-HOMEPAGE="http://ddclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hardened"
-
-RDEPEND=">=dev-lang/perl-5.1
- dev-perl/Digest-SHA1
- dev-perl/IO-Socket-SSL
- hardened? ( sys-apps/iproute2 )
-"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- # Remove pid line, because it is specified in /etc/init.d/ddclient
- ebegin "Removing PID setup from ${PN}.conf"
- if ! sed '/^pid/d' -i "sample-etc_${PN}.conf"; then
- eerror "Failed to remove pid from /etc/${PN}/${PN}.conf"
- fi
- eend $?
-
- use hardened && epatch "${FILESDIR}/iproute2.patch"
-
- epatch "${FILESDIR}/cmd-over-cfg.patch"
-}
-
-src_install() {
- dosbin ${PN}
- dodoc Change* COPYRIGHT README* RELEASENOTE sample*
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
- keepdir /var/cache/${PN}
- fowners -R ${PN}:${PN} /var/cache/${PN}
-
- insinto /etc/${PN}
- insopts -m 0600 -o ${PN} -g ${PN}
- newins sample-etc_${PN}.conf ${PN}.conf
- newins sample-etc_${PN}.conf ${PN}.conf.sample
- fowners -R ${PN}:${PN} /etc/${PN}
-}
diff --git a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
deleted file mode 100644
index 5176c0ebc346..000000000000
--- a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-DESCRIPTION="Perl client used to update dynamic DNS entries"
-HOMEPAGE="https://sourceforge.net/projects/ddclient/"
-SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples iproute2"
-
-RDEPEND="dev-lang/perl
- dev-perl/Data-Validate-IP
- dev-perl/Digest-SHA1
- dev-perl/IO-Socket-INET6
- dev-perl/IO-Socket-SSL
- virtual/perl-Digest-SHA
- virtual/perl-JSON-PP
- iproute2? ( sys-apps/iproute2 )"
-
-pkg_setup() {
- enewgroup ddclient
- enewuser ddclient -1 -1 -1 ddclient
-}
-
-src_prepare() {
- # Remove PID setting, to reliably setup the environment for the init script
- sed -e '/^pid/d' -i sample-etc_ddclient.conf || die
-
- # Remove windows executable
- if use examples; then
- rm sample-etc_dhcpc_dhcpcd-eth0.exe || die
- fi
-
- # Use sys-apps/iproute2 instead of sys-apps/net-tools
- use iproute2 && eapply "${FILESDIR}"/${P}-use_iproute2.patch
-
- default
-}
-
-src_install() {
- dobin ddclient
-
- insinto /etc/ddclient
- insopts -m 0600 -o ddclient -g ddclient
- newins sample-etc_ddclient.conf ddclient.conf
-
- newinitd "${FILESDIR}"/ddclient.initd-r5 ddclient
- systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient.service
- systemd_newtmpfilesd "${FILESDIR}"/ddclient.tmpfiles ddclient.conf
-
- dodoc Change* README* RELEASENOTE TODO UPGRADE
-
- if use examples; then
- docinto examples
- dodoc sample-*
- fi
-}
diff --git a/net-dns/ddclient/files/cmd-over-cfg.patch b/net-dns/ddclient/files/cmd-over-cfg.patch
deleted file mode 100644
index 9033873fde74..000000000000
--- a/net-dns/ddclient/files/cmd-over-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ddclient.old 2011-11-13 10:14:59.957846596 -0500
-+++ ddclient 2011-11-13 10:18:33.864245944 -0500
-@@ -773,7 +773,7 @@
- foreach my $h (sort keys %config) {
- next if $config{$h}{'protocol'} ne lc($s);
- $examined{$h} = 1;
-- my $use = $config{$h}{'use'} || opt('use');
-+ my $use = opt('use') || $config{$h}{'use'};
- local $opt{$use} = $config{$h}{$use} if $config{$h}{$use};
- # bug #13: we should only do this once
- # use isn't enough, we have to save the origin to.
diff --git a/net-dns/ddclient/files/ddclient.confd-r1 b/net-dns/ddclient/files/ddclient.confd-r1
deleted file mode 100644
index 69ad0eeff87d..000000000000
--- a/net-dns/ddclient/files/ddclient.confd-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-# No need to specify a pid in /etc/ddclient/ddclient.conf
-#PIDFILE=/var/run/ddclient/ddclient.pid
diff --git a/net-dns/ddclient/files/ddclient.initd-r3 b/net-dns/ddclient/files/ddclient.initd-r3
deleted file mode 100644
index e0606a60b11c..000000000000
--- a/net-dns/ddclient/files/ddclient.initd-r3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ -d /run ] ; then
- PIDFILE=${PIDFILE:-/run/ddclient/ddclient.pid}
-else
- PIDFILE=${PIDFILE:-/var/run/ddclient/ddclient.pid}
-fi
-
-depend() {
- before cron
- need net
- use dns logger squid
-}
-
-checkconfig() {
- local conf="/etc/ddclient/ddclient.conf"
-
- if [ -e "${conf}" ] ; then
- if [ -n "$(find /etc/ddclient -maxdepth 1 -name ddclient.conf -perm +0044)" ] ; then
- eerror "${conf} must not be world or group readable. Try:"
- eerror " chmod 600 ${conf}"
- eerror " chown ddclient:ddclient ${conf}"
- return 1
- fi
- else
- eerror "${conf} is needed to run ddclient"
- eerror "There is a sample file in /etc/ddclient/"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
-
- local piddir=$(dirname ${PIDFILE})
- if [ ! -d ${piddir} ] ; then
- ebegin "Making ${piddir}"
- mkdir -p ${piddir}
- eend $?
- ebegin "Changing permissions of ${piddir}"
- chown ddclient:ddclient ${piddir}
- eend $?
- fi
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --user ddclient --exec /usr/sbin/ddclient \
- --name ddclient --pidfile ${PIDFILE} -- -pid=${PIDFILE}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --signal USR1 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-dns/ddclient/files/ddclient.initd-r5 b/net-dns/ddclient/files/ddclient.initd-r5
deleted file mode 100644
index a2284a27c1ff..000000000000
--- a/net-dns/ddclient/files/ddclient.initd-r5
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="DDclient"
-pidfile="/run/ddclient/${RC_SVCNAME}.pid"
-
-command="/usr/bin/ddclient"
-command_args="-pid ${pidfile}"
-command_group="ddclient"
-command_user="ddclient"
-
-depend() {
- use dns logger
-}
-
-start_pre() {
- checkpath -f -m 0600 -o ${command_user}:${command_group} /etc/ddclient/ddclient.conf
- checkpath -d -m 0700 -o ${command_user}:${command_group} /run/ddclient
- checkpath -d -m 0700 -o ${command_user}:${command_group} /var/cache/ddclient
-}
diff --git a/net-dns/ddclient/files/ddclient.service b/net-dns/ddclient/files/ddclient.service
deleted file mode 100644
index e2d3608d44d4..000000000000
--- a/net-dns/ddclient/files/ddclient.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dynamic DNS Update Client
-After=network.target
-ConditionPathExists=/etc/ddclient/ddclient.conf
-
-[Service]
-ExecStart=/usr/sbin/ddclient --foreground
-User=ddclient
-Group=ddclient
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/ddclient/files/iproute2.patch b/net-dns/ddclient/files/iproute2.patch
deleted file mode 100644
index f81dd8c00d82..000000000000
--- a/net-dns/ddclient/files/iproute2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u a/ddclient b/ddclient
---- a/ddclient 2011-07-11 17:04:21.000000000 -0400
-+++ b/ddclient 2011-08-12 20:13:15.980466303 -0400
-@@ -588,7 +588,7 @@
- [ "ip", "=s", "-ip address : set the IP address to 'address'" ],
- "",
- [ "if", "=s", "-if interface : obtain IP address from 'interface'" ],
-- [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ],
-+ [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ip addr show {if}" ],
- "",
- [ "web", "=s", "-web provider|url : obtain IP address from provider's IP checking page" ],
- [ "web-skip", "=s", "-web-skip pattern : skip any IP addresses before 'pattern' on the web provider|url" ],
-@@ -1316,7 +1316,7 @@
-
- {
- local $opt{'use'} = 'if';
-- foreach my $if (grep {/^[a-zA-Z]/} `ifconfig -a`) {
-+ foreach my $if (grep {/^[a-zA-Z]/} `ip addr show`) {
- $if =~ s/:?\s.*//is;
- local $opt{'if'} = $if;
- printf "use=if, if=%s address is %s\n", opt('if'), define(get_ip('if'), 'NOT FOUND');
-@@ -1937,7 +1937,7 @@
-
- } elsif ($use eq 'if') {
- $skip = opt('if-skip', $h) || '';
-- $reply = `ifconfig $arg 2> /dev/null`;
-+ $reply = `ip addr show $arg 2> /dev/null`;
- $reply = '' if $?;
-
- } elsif ($use eq 'cmd') {
diff --git a/net-dns/ddclient/metadata.xml b/net-dns/ddclient/metadata.xml
index 2d82a2acf9c1..a65cccd3f082 100644
--- a/net-dns/ddclient/metadata.xml
+++ b/net-dns/ddclient/metadata.xml
@@ -21,7 +21,6 @@
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index dccc263e41f1..c4c7313c1d55 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,4 +1,2 @@
-DIST knot-2.6.9.tar.xz 1126872 BLAKE2B c15b7e61ccad5417ce53f3d3895014931a2825835958735bdd9459634d9d9f39d6bb3681036772e6a510570a7f6a8afc8b0de5e77e67778831dc6415378889fe SHA512 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b
-DIST knot-2.7.2.tar.xz 1148880 BLAKE2B bf3042d762d2b66f47dbd27a1c9ecd03d111259c7db82254c1175e660497fd8343c3f1cf1cc14e6068cb3d3618931b659888a7b97d7d6e4ba9d0e74c00540e31 SHA512 e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d
-DIST knot-2.7.3.tar.xz 1146456 BLAKE2B d584db01b2354c259cf5e5cdfeb2dff677b04e76b68156a2c672fffe95ee8c6516f82b8e199d8ec8cacfcd93f15b370a25172826460b82c5964f38207c9818f2 SHA512 ba735eb06d99f8cb41619f44413f6450178ab249ef9ff282bae36e8e965cb421f082852bbf0ae5814e3e3148f27431fc1f2b4ed30e21bfd0cbea1be189bdadfd
-DIST knot-2.7.4.tar.xz 1148652 BLAKE2B 081a23a0429b4fec1feebbe417bc95fe24d11404a2a6b9e4e71d89f99bc9cf2a5ed2bdc3a0fd2727cc4d45629b71faefda179e68c4781f8b21c475a7b1fe8bdd SHA512 e5f60a23817503468b18eaea517c5936945b901f568c56cb1ca67a208cc6206ff103e9ca03f1bf05018d13a688f54580ae816a5d70510f28a98ae31116a3f674
+DIST knot-2.7.6.tar.xz 1151068 BLAKE2B aba7b9f89d98ddabe5596198b0767b6d88cab2278eda33bea2738bcc2f62bc3b7463ee517488f8d2efa40b11859b3aefaa212999968654e5e5580969a173ec8e SHA512 6b6a727d57337da01e2d44abec7fde4504d112604769b118fe6254b0317f149ed4e9fab321a04517eccedb08e409818d1817fc1136c27d1fd351538e6816022a
+DIST knot-2.8.0.tar.xz 1168900 BLAKE2B e6d54709ce0bbc5411918de337fd2eb1cb939bbaf1b0dec149b169c2a93c6c0f4719028e35ff9a07d940d5e30470a4661e847a83c73ba0baaf89a520d8ee4fc3 SHA512 0cf2840d908bbab3197bff82d37e4a754204a3b79efa7e982719bc19028519d3ff0b2177780dada54e1b070f5f7aa28dab7bbfcc2d2ea086817f3a29b746228e
diff --git a/net-dns/knot/knot-2.6.9.ebuild b/net-dns/knot/knot-2.6.9.ebuild
deleted file mode 100644
index a99e9462b6a7..000000000000
--- a/net-dns/knot/knot-2.6.9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
- "+dnsproxy"
- "dnstap"
- "+noudp"
- "+onlinesign"
- "rosedb"
- "+rrl"
- "+stats"
- "+synthrecord"
- "+whoami"
-)
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
- dev-db/lmdb
- dev-libs/libedit
- dev-libs/userspace-rcu:=
- dev-python/lmdb
- net-libs/gnutls
- caps? ( sys-libs/libcap-ng )
- dnstap? (
- dev-libs/fstrm
- dev-libs/protobuf-c
- )
- idn? (
- !libidn2? ( net-dns/libidn:* )
- libidn2? ( net-dns/libidn2 )
- )
- systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
- local u
- local my_conf=(
- --with-storage="${EPREFIX}/var/lib/${PN}"
- --with-rundir="${EPREFIX}/var/run/${PN}"
- $(use_enable fastparser)
- $(use_enable dnstap)
- $(use_enable doc documentation)
- $(use_enable utils utilities)
- --enable-systemd=$(usex systemd)
- $(use_with idn libidn)
- )
-
- for u in "${KNOT_MODULES[@]#+}"; do
- my_conf+=("$(use_with ${u} module-${u})")
- done
-
- econf "${my_conf[@]}"
-}
-
-src_compile() {
- default
-
- if use doc; then
- emake -C doc html
- HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
- fi
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
-
- rmdir "${D}var/run/${PN}" "${D}var/run/" || die
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/knot.init" knot
- if use systemd; then
- systemd_newunit "${FILESDIR}/knot-1.service" knot.service
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- enewgroup knot 53
- enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.7.2.ebuild b/net-dns/knot/knot-2.7.2.ebuild
deleted file mode 100644
index 1312f7835d72..000000000000
--- a/net-dns/knot/knot-2.7.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
- "+cookies"
- "+dnsproxy"
- "dnstap"
- "geoip"
- "+noudp"
- "+onlinesign"
- "+rrl"
- "+stats"
- "+synthrecord"
- "+whoami"
-)
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
- dev-db/lmdb
- dev-libs/libedit
- dev-libs/userspace-rcu:=
- dev-python/lmdb
- net-libs/gnutls
- caps? ( sys-libs/libcap-ng )
- dnstap? (
- dev-libs/fstrm
- dev-libs/protobuf-c
- )
- geoip? ( dev-libs/libmaxminddb )
- idn? (
- !libidn2? ( net-dns/libidn:* )
- libidn2? ( net-dns/libidn2 )
- )
- systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
- local u
- local my_conf=(
- --with-storage="${EPREFIX}/var/lib/${PN}"
- --with-rundir="${EPREFIX}/var/run/${PN}"
- $(use_enable fastparser)
- $(use_enable dnstap)
- $(use_enable doc documentation)
- $(use_enable utils utilities)
- --enable-systemd=$(usex systemd)
- $(use_with idn libidn)
- )
-
- for u in "${KNOT_MODULES[@]#+}"; do
- my_conf+=("$(use_with ${u} module-${u})")
- done
-
- econf "${my_conf[@]}"
-}
-
-src_compile() {
- default
-
- if use doc; then
- emake -C doc html
- HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
- fi
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
-
- rmdir "${D}var/run/${PN}" "${D}var/run/" || die
- keepdir /var/lib/${PN}
-
- newinitd "${FILESDIR}/knot.init" knot
- if use systemd; then
- systemd_newunit "${FILESDIR}/knot-1.service" knot.service
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- enewgroup knot 53
- enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.7.4.ebuild b/net-dns/knot/knot-2.7.6.ebuild
similarity index 82%
rename from net-dns/knot/knot-2.7.4.ebuild
rename to net-dns/knot/knot-2.7.6.ebuild
index ce8659e1fd17..5ccc7dcad7c8 100644
--- a/net-dns/knot/knot-2.7.4.ebuild
+++ b/net-dns/knot/knot-2.7.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
@@ -26,27 +26,28 @@ KNOT_MODULES=(
"+synthrecord"
"+whoami"
)
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
RDEPEND="
dev-db/lmdb
dev-libs/libedit
dev-libs/userspace-rcu:=
dev-python/lmdb
- net-libs/gnutls
+ net-libs/gnutls:=
caps? ( sys-libs/libcap-ng )
dnstap? (
dev-libs/fstrm
- dev-libs/protobuf-c
+ dev-libs/protobuf-c:=
)
- geoip? ( dev-libs/libmaxminddb )
+ geoip? ( dev-libs/libmaxminddb:= )
idn? (
- !libidn2? ( net-dns/libidn:* )
- libidn2? ( net-dns/libidn2 )
+ !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+ libidn2? ( net-dns/libidn2:= )
)
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:= )
"
-BDEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
doc? ( dev-python/sphinx )
"
diff --git a/net-dns/knot/knot-2.7.3.ebuild b/net-dns/knot/knot-2.8.0.ebuild
similarity index 79%
rename from net-dns/knot/knot-2.7.3.ebuild
rename to net-dns/knot/knot-2.8.0.ebuild
index 1c1b445d8ccc..5ccc7dcad7c8 100644
--- a/net-dns/knot/knot-2.7.3.ebuild
+++ b/net-dns/knot/knot-2.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit systemd user
@@ -26,27 +26,28 @@ KNOT_MODULES=(
"+synthrecord"
"+whoami"
)
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
RDEPEND="
dev-db/lmdb
dev-libs/libedit
dev-libs/userspace-rcu:=
dev-python/lmdb
- net-libs/gnutls
+ net-libs/gnutls:=
caps? ( sys-libs/libcap-ng )
dnstap? (
dev-libs/fstrm
- dev-libs/protobuf-c
+ dev-libs/protobuf-c:=
)
- geoip? ( dev-libs/libmaxminddb )
+ geoip? ( dev-libs/libmaxminddb:= )
idn? (
- !libidn2? ( net-dns/libidn:* )
- libidn2? ( net-dns/libidn2 )
+ !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+ libidn2? ( net-dns/libidn2:= )
)
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
doc? ( dev-python/sphinx )
"
@@ -89,7 +90,7 @@ src_test() {
src_install() {
default
- rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+ rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
keepdir /var/lib/${PN}
newinitd "${FILESDIR}/knot.init" knot
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index d03b90100dde..d14d98d83184 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -42,10 +42,6 @@
Enable the module for query access control
-
- Enable the module that staticaly override certain
- responses
-
Enable the response rate limiting module
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 21999ddc2441..c72c15a52c6b 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,3 +1,4 @@
DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
DIST libidn2-2.0.5.tar.gz 2091929 BLAKE2B 1eb52ae7c9295bf4b5d6e36e6852ffb54b10663a0e3cea06df110bd7798fcb0d1b8e3b7169e4a11e800a23fc9f606167dcb7fc2d4a684e861d73a236de5c578c SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
+DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index 575241a6ca8b..bf10cc63fd6e 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils flag-o-matic multilib-minimal
DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
SRC_URI="
mirror://gnu/libidn/${P}.tar.gz
"
diff --git a/net-dns/libidn2/libidn2-2.0.5.ebuild b/net-dns/libidn2/libidn2-2.0.5.ebuild
index 7d53fcdaf7a8..96124bffc61e 100644
--- a/net-dns/libidn2/libidn2-2.0.5.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils flag-o-matic multilib-minimal
DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
SRC_URI="
mirror://gnu/libidn/${P}.tar.gz
"
diff --git a/net-dns/libidn2/libidn2-2.1.1a.ebuild b/net-dns/libidn2/libidn2-2.1.1a.ebuild
index fd3e3ad6d3bd..a9666effca64 100644
--- a/net-dns/libidn2/libidn2-2.1.1a.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit multilib-minimal
DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
SRC_URI="
mirror://gnu/libidn/${P}.tar.gz
"
diff --git a/net-dns/libidn2/libidn2-99999.ebuild b/net-dns/libidn2/libidn2-99999.ebuild
new file mode 100644
index 000000000000..5e05d730b6ad
--- /dev/null
+++ b/net-dns/libidn2/libidn2-99999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+EGIT_REPO_URI="https://gitlab.com/libidn/libidn2.git/"
+SRC_URI="mirror://gnu/libunistring/libunistring-0.9.10.tar.gz"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+
+RDEPEND="
+ dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-util/gengetopt
+ sys-apps/help2man
+"
+S=${WORKDIR}/${P/a/}
+
+src_unpack() {
+ git-r3_src_unpack
+ unpack ${A}
+}
+
+src_prepare() {
+ mv "${WORKDIR}"/libunistring-0.9.10 unistring || die
+
+ einfo "./bootstrap"
+ ./bootstrap --gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po || die
+
+ default
+
+ eautoreconf
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # Darwin ar chokes when TMPDIR doesn't exist (as done for some
+ # reason in the Makefile)
+ sed -i -e '/^TMPDIR = /d' Makefile.in || die
+ export TMPDIR="${T}"
+ fi
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --disable-doc \
+ --disable-gtk-doc
+}
+
+multilib_src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 263e991683ca..9712f3680394 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 7419c1e9478c..7547639c83b2 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,3 +1 @@
-DIST firehol-3.1.3.tar.xz 1476220 BLAKE2B 19ac9db805fc4452b447a45a7ed35c781bc8595f3ede0af7de0ff5a89ab50a9f8a634e0754869774d767b50d720019a5ac466e9d1726a75a34a283473b17a94b SHA512 6c75b57650d918cfc485f6eb01d69694acd5c7b487a10a566fc26b8d5e0cd6a6a9a09bd8d3219bf4e78aa4fe47f83e5ac399107a07770b787e1ccba3078c5f3f
-DIST firehol-3.1.4.tar.xz 1481320 BLAKE2B 0fabef4a853aece966a8f273cc82947a6e63ac44ccac2494d5d6a2f0916658a78cfe0c28cc2414e797411e4795216400b1fa95193a619f7e26fe545182a5fc44 SHA512 1a17b6e810274b346f66788c4c4736421583e6a4ed76df7a1d7f46dcb99e434460998c05755c8342941413d23c02e2ca0d0bf2123cb555a6c7513d24983a13ed
DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe
diff --git a/net-firewall/firehol/firehol-3.1.3-r1.ebuild b/net-firewall/firehol/firehol-3.1.3-r1.ebuild
deleted file mode 100644
index db92d61855d5..000000000000
--- a/net-firewall/firehol/firehol-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
- sys-apps/iproute2[-minimal,ipv6?]
- net-misc/iputils[ipv6?]
- net-misc/iprange
- net-analyzer/traceroute
- virtual/modutils
- app-arch/gzip
- ipset? (
- net-firewall/ipset
- )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~IP_NF_FILTER \
- ~IP_NF_IPTABLES \
- ~IP_NF_MANGLE \
- ~IP_NF_TARGET_MASQUERADE
- ~IP_NF_TARGET_REDIRECT \
- ~IP_NF_TARGET_REJECT \
- ~NETFILTER_XT_MATCH_LIMIT \
- ~NETFILTER_XT_MATCH_OWNER \
- ~NETFILTER_XT_MATCH_STATE \
- ~NF_CONNTRACK \
- ~NF_CONNTRACK_IPV4 \
- ~NF_CONNTRACK_MARK \
- ~NF_NAT \
- ~NF_NAT_FTP \
- ~NF_NAT_IRC \
- "
- linux-info_pkg_setup
-}
-
-src_configure() {
- econf \
- --disable-vnetbuild \
- $(use_enable ipset update-ipsets) \
- $(use_enable doc) \
- $(use_enable ipv6)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/firehol.confd firehol
- newinitd "${FILESDIR}"/firehol.initd firehol
- newconfd "${FILESDIR}"/fireqos.confd fireqos
- newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-firewall/firehol/firehol-3.1.3.ebuild b/net-firewall/firehol/firehol-3.1.3.ebuild
deleted file mode 100644
index 11a79fd5b628..000000000000
--- a/net-firewall/firehol/firehol-3.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6"
-KEYWORDS="amd64 arm ppc ~x86"
-
-RDEPEND="net-firewall/iptables
- sys-apps/iproute2[-minimal,ipv6?]
- net-misc/iputils[ipv6?]
- net-misc/iprange
- net-analyzer/traceroute
- virtual/modutils
- app-arch/gzip"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~IP_NF_FILTER \
- ~IP_NF_IPTABLES \
- ~IP_NF_MANGLE \
- ~IP_NF_TARGET_MASQUERADE
- ~IP_NF_TARGET_REDIRECT \
- ~IP_NF_TARGET_REJECT \
- ~NETFILTER_XT_MATCH_LIMIT \
- ~NETFILTER_XT_MATCH_OWNER \
- ~NETFILTER_XT_MATCH_STATE \
- ~NF_CONNTRACK \
- ~NF_CONNTRACK_IPV4 \
- ~NF_CONNTRACK_MARK \
- ~NF_NAT \
- ~NF_NAT_FTP \
- ~NF_NAT_IRC \
- "
- linux-info_pkg_setup
-}
-
-src_configure() {
- econf \
- --disable-vnetbuild \
- --disable-update-ipsets \
- $(use_enable doc) \
- $(use_enable ipv6)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/firehol.confd firehol
- newinitd "${FILESDIR}"/firehol.initd firehol
- newconfd "${FILESDIR}"/fireqos.confd fireqos
- newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-firewall/firehol/firehol-3.1.4.ebuild b/net-firewall/firehol/firehol-3.1.4.ebuild
deleted file mode 100644
index d9c5fb2ca8de..000000000000
--- a/net-firewall/firehol/firehol-3.1.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="amd64 arm ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
- sys-apps/iproute2[-minimal,ipv6?]
- net-misc/iputils[ipv6?]
- net-misc/iprange
- net-analyzer/traceroute
- virtual/modutils
- app-arch/gzip
- ipset? (
- net-firewall/ipset
- )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~IP_NF_FILTER \
- ~IP_NF_IPTABLES \
- ~IP_NF_MANGLE \
- ~IP_NF_TARGET_MASQUERADE
- ~IP_NF_TARGET_REDIRECT \
- ~IP_NF_TARGET_REJECT \
- ~NETFILTER_XT_MATCH_LIMIT \
- ~NETFILTER_XT_MATCH_OWNER \
- ~NETFILTER_XT_MATCH_STATE \
- ~NF_CONNTRACK \
- ~NF_CONNTRACK_IPV4 \
- ~NF_CONNTRACK_MARK \
- ~NF_NAT \
- ~NF_NAT_FTP \
- ~NF_NAT_IRC \
- "
- linux-info_pkg_setup
-}
-
-src_configure() {
- econf \
- --disable-vnetbuild \
- $(use_enable ipset update-ipsets) \
- $(use_enable doc) \
- $(use_enable ipv6)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/firehol.confd firehol
- newinitd "${FILESDIR}"/firehol.initd firehol
- newconfd "${FILESDIR}"/fireqos.confd fireqos
- newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index d73477dcc78b..a574edac2420 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/netkit-ftpd/Manifest b/net-ftp/netkit-ftpd/Manifest
deleted file mode 100644
index 5910590cd733..000000000000
--- a/net-ftp/netkit-ftpd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST linux-ftpd-0.17-ssl.patch 36459 BLAKE2B 36db6fb984afa6350623ebb2af3913644e01a999e9aea17e2a064c9599fcca1d69c412d67fda8303e83049ea42b89eacb27dd4d5e794612d41a0eb7b409961d5 SHA512 f27dd2f9a50a2b3c38131c46cdb4420f81abfdbb7cd7e70d00e864da3e4562363d585a308e57b9abce7db64ede8d02e41710101e618f6c14489193776b2b1e71
-DIST linux-ftpd-0.17.tar.gz 46763 BLAKE2B b0370a6d96a666e4b58d3841c544e6f2c767c1b561fe53371b06d561332aa8418593d875a7f340df96a60e6d8e8d8bf08f38f296121de85f9c72914fa3cca3b9 SHA512 160191baa904b4c404473e2c1de23813de1b31cbb11a3c28ff64f9953aec8270b74d865a57d5aaa6d25cf404c8aeadff05348a9b32847a2a137ef4c998557d58
diff --git a/net-ftp/netkit-ftpd/files/ftp.xinetd b/net-ftp/netkit-ftpd/files/ftp.xinetd
deleted file mode 100644
index 1d486c3a45f6..000000000000
--- a/net-ftp/netkit-ftpd/files/ftp.xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-# default: off
-# description: The netkit ftp daemon with optional SSL support.
-
-service ftp
-{
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = /usr/bin/ftpd
- disable = yes
-}
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-CVE-2008-4247.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-CVE-2008-4247.patch
deleted file mode 100644
index e1b50c825bfc..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-CVE-2008-4247.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-http://bugs.gentoo.org/239047
-
---- linux-ftpd-0.17/ftpd/extern.h
-+++ linux-ftpd-0.17/ftpd/extern.h
-@@ -43,7 +43,7 @@ void dologout __P((int));
- void fatal __P((const char *));
- int ftpd_pclose __P((FILE *));
- FILE *ftpd_popen __P((char *, const char *));
--char *ftpd_getline __P((char *, int, FILE *));
-+int ftpd_getline __P((char *, int, FILE *));
- void ftpdlogwtmp __P((const char *, const char *, const char *));
- void lreply __P((int, const char *, ...));
- void makedir __P((char *));
---- linux-ftpd-0.17/ftpd/ftpcmd.y
-+++ linux-ftpd-0.17/ftpd/ftpcmd.y
-@@ -980,7 +980,7 @@ static struct tab *lookup(struct tab *p,
- /*
- * getline - a hacked up version of fgets to ignore TELNET escape codes.
- */
--char * ftpd_getline(char *s, int n, FILE *iop)
-+int ftpd_getline(char *s, int n, FILE *iop)
- {
- int c;
- register char *cs;
-@@ -995,7 +995,7 @@ char * ftpd_getline(char *s, int n, FILE
- if (debug)
- syslog(LOG_DEBUG, "command: %s", s);
- tmpline[0] = '\0';
-- return(s);
-+ return(0);
- }
- if (c == 0)
- tmpline[0] = '\0';
-@@ -1037,11 +1037,22 @@ char * ftpd_getline(char *s, int n, FILE
- }
- }
- *cs++ = c;
-- if (--n <= 0 || c == '\n')
-+ if (--n <= 0) {
-+ /*
-+ * If command doesn't fit into buffer, discard the
-+ * rest of the command and indicate truncation.
-+ * This prevents the command to be split up into
-+ * multiple commands.
-+ */
-+ while (c != '\n' && (c = getc(iop)) != EOF)
-+ ;
-+ return (-2);
-+ }
-+ if (c == '\n')
- break;
- }
- if (c == EOF && cs == s)
-- return (NULL);
-+ return (-1);
- *cs++ = '\0';
- if (debug) {
- if (!guest && strncasecmp("pass ", s, 5) == 0) {
-@@ -1061,7 +1072,7 @@ char * ftpd_getline(char *s, int n, FILE
- syslog(LOG_DEBUG, "command: %.*s", len, s);
- }
- }
-- return (s);
-+ return (0);
- }
-
- void toolong(int signo)
-@@ -1090,9 +1101,14 @@ static int yylex(void)
- case CMD:
- (void) signal(SIGALRM, toolong);
- (void) alarm((unsigned) timeout);
-- if (ftpd_getline(cbuf, sizeof(cbuf)-1, stdin)==NULL) {
-+ n = ftpd_getline(cbuf, sizeof(cbuf)-1, stdin);
-+ if (n == -1) {
- reply(221, "You could at least say goodbye.");
- dologout(0);
-+ } else if (n == -2) {
-+ reply(500, "Command too long.");
-+ alarm(0);
-+ continue;
- }
- (void) alarm(0);
- if ((cp = strchr(cbuf, '\r'))) {
---- linux-ftpd-0.17/ftpd/ftpd.c
-+++ linux-ftpd-0.17/ftpd/ftpd.c
-@@ -2210,6 +2210,7 @@ void dologout(int status)
- static void myoob(int signo)
- {
- char *cp;
-+ int ret;
- int save_errno = errno;
-
- (void)signo;
-@@ -2218,9 +2219,13 @@ static void myoob(int signo)
- if (!transflag)
- return;
- cp = tmpline;
-- if (ftpd_getline(cp, 7, stdin) == NULL) {
-+ ret = ftpd_getline(cp, 7, stdin);
-+ if (ret == -1) {
- reply(221, "You could at least say goodbye.");
- dologout(0);
-+ } else if (ret == -2) {
-+ /* Ignore truncated command */
-+ return;
- }
- upper(cp);
- if (strcmp(cp, "ABOR\r\n") == 0) {
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-build.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-build.patch
deleted file mode 100644
index 6df58378c93f..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure
-+++ configure
-@@ -114,40 +114,6 @@
- echo 'no'
- fi
-
--if [ x$DEBUG = x ]; then
-- echo -n "Checking if $CC accepts -O2... "
-- if (
-- $CC -O2 __conftest.c -o __conftest
-- ) >/dev/null 2>&1; then
-- echo 'yes'
-- CFLAGS="$CFLAGS -O2"
-- else
-- echo 'no'
-- echo -n "Checking if $CC accepts -O... "
-- if (
-- $CC -O __conftest.c -o __conftest
-- ) >/dev/null 2>&1; then
-- echo 'yes'
-- CFLAGS="$CFLAGS -O"
-- else
-- echo 'no'
-- fi
-- fi
--
--else
-- echo -n "Checking if $CC accepts -g... "
-- if (
-- $CC -g __conftest.c -o __conftest
-- ) >/dev/null 2>&1; then
-- echo 'yes'
-- CFLAGS="$CFLAGS -g"
-- else
-- echo 'no'
-- fi
--
--fi
--
--LDFLAGS=
- LIBS=
-
- rm -f __conftest*
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup-ssl.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup-ssl.patch
deleted file mode 100644
index e228eaceda5f..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup-ssl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ftpd/ftpcmd.y
-+++ ftpd/ftpcmd.y
-@@ -109,6 +109,7 @@
- typedef struct ssl_st SSL;
- int SSL_write(SSL *ssl,const char *buf,int num);
- extern int do_ssl_start(void);
-+int ssl_getc(SSL *ssl_con);
- extern int ssl_secure_flag;
- extern int ssl_active_flag;
- extern SSL *ssl_con;
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup.patch
deleted file mode 100644
index 73289adfba05..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cleanup.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ftpd/logwtmp.c
-+++ ftpd/logwtmp.c
-@@ -43,6 +43,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch
deleted file mode 100644
index cb6ad986a914..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.orig 2008-05-11 12:02:50.000000000 -0700
-+++ configure 2008-05-11 12:04:14.000000000 -0700
-@@ -93,7 +93,7 @@
- echo -n 'Checking if C compiler works... '
- if (
- $CC __conftest.c -o __conftest || exit 1
-- ./__conftest || exit 1
-+ [ -e __conftest ] || exit 1
- ) >/dev/null 2>&1; then
- echo 'yes'
- else
-@@ -169,13 +169,13 @@
- EOF
- if (
- $CC $CFLAGS __conftest.c -o __conftest || exit 1
-- ./__conftest || exit 1
-+ [ -e __conftest ] || exit 1
- ) >/dev/null 2>&1; then
- echo 'yes'
- else
- if (
- $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c -o __conftest || exit 1
-- ./__conftest || exit 1
-+ [ -e ./__conftest ] || exit 1
- ) >/dev/null 2>&1; then
- echo '-D__USE_BSD_SIGNAL'
- CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
-@@ -311,7 +311,7 @@
- else
- if (
- $CC $CFLAGS -D_GNU_SOURCE __conftest.c -o __conftest || exit 1
-- ./__conftest || exit 1
-+ [ -e ./__conftest ] || exit 1
- ) >/dev/null 2>&1; then
- echo '-D_GNU_SOURCE'
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -342,7 +342,7 @@
- EOF
- if (
- $CC $CFLAGS __conftest.c $LIBBSD -o __conftest || exit 1
-- ./__conftest || exit 1
-+ [ -e ./__conftest ] || exit 1
- ) >/dev/null 2>&1; then
- echo 'ok'
- else
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-fclose-CVE-2007-6263.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-fclose-CVE-2007-6263.patch
deleted file mode 100644
index 5da61aee7343..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-fclose-CVE-2007-6263.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c
---- linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c
-+++ linux-ftpd-ssl-0.17.18+0.3/ftpd/ftpd.c
-@@ -1729,7 +1729,7 @@
- static FILE * dataconn(const char *name, off_t size, const char *mode, int stou)
- {
- char sizebuf[32];
-- FILE *file;
-+ FILE *file = NULL;
- int retry = 0, tos;
-
- file_size = size;
-@@ -1822,7 +1822,10 @@
- ERR_error_string(ERR_get_error(),NULL));
- perror_reply(425, errbuf);
- /* abort time methinks ... */
-- fclose(file);
-+ if(file != NULL){
-+ fclose(file);
-+ file = NULL;
-+ }
- return NULL;
- } else {
- if (ssl_debug_flag) {
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-gcc41.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-gcc41.patch
deleted file mode 100644
index 5f516ce5d356..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-gcc41.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- linux-ftpd-0.17/ftpd/ftpcmd.y
-+++ linux-ftpd-0.17/ftpd/ftpcmd.y
-@@ -125,7 +125,14 @@
- char cbuf[512];
- char *fromname;
-
--struct tab;
-+struct tab {
-+ const char *name;
-+ short token;
-+ short state;
-+ short implemented; /* 1 if command is implemented */
-+ const char *help;
-+};
-+
- static int yylex __P((void));
- static void sizecmd __P((char *));
- static void help __P((struct tab *, char *));
-@@ -891,13 +898,6 @@
- #define SITECMD 7 /* SITE command */
- #define NSTR 8 /* Number followed by a string */
-
--struct tab {
-- const char *name;
-- short token;
-- short state;
-- short implemented; /* 1 if command is implemented */
-- const char *help;
--};
-
- struct tab cmdtab[] = { /* In order defined in RFC 765 */
- { "AUTH", AUTH, STR1, 1, " auth_type" },
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-setguid.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-setguid.patch
deleted file mode 100644
index f5d0cf75fcfd..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-setguid.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- linux-ftpd-0.17/ftpd/popen.c
-+++ linux-ftpd-0.17/ftpd/popen.c
-@@ -169,8 +169,13 @@
- * XXX: this doesn't seem right... and shouldn't
- * we initgroups, or at least setgroups(0,0)?
- */
-- setgid(getegid());
-- setuid(i);
-+
-+/*
-+ * PSz 25 Aug 06 Must check the return status of these setgid/setuid calls,
-+ * see http://www.bress.net/blog/archives/34-setuid-madness.html
-+ */
-+ if ( setgid(getegid()) != 0 ) _exit(1);
-+ if ( setuid(i) != 0 ) _exit(1);
-
- #ifndef __linux__
- /*
---- linux-ftpd-0.17/ftpd/ftpd.c
-+++ linux-ftpd-0.17/ftpd/ftpd.c
-@@ -1159,6 +1159,13 @@
- }
- strcpy(pw->pw_dir, "/");
- setenv("HOME", "/", 1);
-+ }
-+ /* PSz 25 Aug 06 chdir for real users done after setting UID */
-+ if (seteuid((uid_t)pw->pw_uid) < 0) {
-+ reply(550, "Can't set uid.");
-+ goto bad;
-+ }
-+ if (guest || dochroot) { /* do nothing, handled above */
- } else if (chdir(pw->pw_dir) < 0) {
- if (chdir("/") < 0) {
- reply(530, "User %s: can't change directory to %s.",
-@@ -1167,10 +1174,7 @@
- } else
- lreply(230, "No directory! Logging in with home=/");
- }
-- if (seteuid((uid_t)pw->pw_uid) < 0) {
-- reply(550, "Can't set uid.");
-- goto bad;
-- }
-+
- sigfillset(&allsigs);
- sigprocmask(SIG_UNBLOCK,&allsigs,NULL);
-
-@@ -1408,7 +1412,8 @@
- goto bad;
- sleep(tries);
- }
-- (void) seteuid((uid_t)pw->pw_uid);
-+/* PSz 25 Aug 06 Check return status */
-+ if (seteuid((uid_t)pw->pw_uid) != 0) _exit(1);
- sigfillset(&allsigs);
- sigprocmask (SIG_UNBLOCK, &allsigs, NULL);
-
-@@ -1440,7 +1445,8 @@
- bad:
- /* Return the real value of errno (close may change it) */
- t = errno;
-- (void) seteuid((uid_t)pw->pw_uid);
-+/* PSz 25 Aug 06 Check return status */
-+ if (seteuid((uid_t)pw->pw_uid) != 0) _exit(1);
- sigfillset (&allsigs);
- sigprocmask (SIG_UNBLOCK, &allsigs, NULL);
- (void) close(s);
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-shadowfix.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-shadowfix.patch
deleted file mode 100644
index 79a241ff9c51..000000000000
--- a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-shadowfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- linux-ftpd-0.17/ftpd/Makefile
-+++ linux-ftpd-0.17-patched/ftpd/Makefile
-@@ -19,7 +19,11 @@
- all: ftpd
-
- %.o: %.c
-+ ifdef USE_SHADOW
-+ $(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c
-+ else
- $(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c
-+ endif
-
- ftpcmd.c: %.c: %.y
- $(YACC) $<
---- linux-ftpd-0.17/support/Makefile
-+++ linux-ftpd-0.17-patched/support/Makefile
-@@ -5,7 +5,11 @@
- all: libsupport.a
-
- %.o: %.c
-+ ifdef USE_SHADOW
-+ $(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c
-+ else
- $(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c
-+ endif
-
- libsupport.a: $(OBJS)
- ar -cruv $@ $^
diff --git a/net-ftp/netkit-ftpd/metadata.xml b/net-ftp/netkit-ftpd/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/net-ftp/netkit-ftpd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- base-system@gentoo.org
- Gentoo Base System
-
-
diff --git a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r9.ebuild b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r9.ebuild
deleted file mode 100644
index f5466dcc5136..000000000000
--- a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ssl-cert toolchain-funcs
-
-MY_P="linux-ftpd-${PV}"
-DESCRIPTION="The netkit FTP server with optional SSL support"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz
- mirror://gentoo/${MY_P}-ssl.patch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86"
-IUSE="libressl ssl"
-
-DEPEND="ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= ) )
-"
-RDEPEND="${DEPEND}
- virtual/inetd
- !www-servers/publicfile"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- cd "${S}" || die
- if use ssl; then
- epatch "${DISTDIR}"/${MY_P}-ssl.patch
- epatch "${FILESDIR}"/${P}-cleanup-ssl.patch
- epatch "${FILESDIR}"/${P}-fclose-CVE-2007-6263.patch #199206
- fi
-
- epatch "${FILESDIR}"/${P}-cleanup.patch
- epatch "${FILESDIR}"/${P}-build.patch
- epatch "${FILESDIR}"/${P}-shadowfix.patch
- epatch "${FILESDIR}"/${P}-gcc41.patch
- epatch "${FILESDIR}"/${P}-setguid.patch
- epatch "${FILESDIR}"/${P}-cross.patch
- epatch "${FILESDIR}"/${P}-CVE-2008-4247.patch #239047
-}
-
-src_configure() {
- tc-export CC
- ./configure --prefix=/usr || die
-}
-
-src_compile() {
- emake
-}
-
-src_install() {
- dobin ftpd/ftpd
- doman ftpd/ftpd.8
- dodoc README ChangeLog
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/ftp.xinetd ftp
-}
-
-pkg_postinst() {
- if use ssl; then
- install_cert /etc/ssl/certs/ftpd
- elog "In order to start the server with SSL support"
- elog "You need a certificate /etc/ssl/certs/ftpd.pem."
- elog "A temporary certificiate has been created."
- fi
-}
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
index cc17b5afa12d..35270ff33507 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ftpd_pidfile="/var/run/pure-ftpd.pid"
@@ -9,11 +9,12 @@ daemon="/usr/sbin/pure-ftpd"
script_daemon="/usr/sbin/pure-uploadscript"
depend() {
- need net
+ need localmount
+ use netmount
}
start_pre() {
- if [ -z "$IS_CONFIGURED" ] ; then
+ if [ -z "${IS_CONFIGURED}" ] ; then
eerror "You need to setup /etc/conf.d/pure-ftpd first!"
return 1
fi
@@ -21,7 +22,7 @@ start_pre() {
start() {
UPSCRIPT=""
- if [ -n "$UPLOADSCRIPT" ] ; then
+ if [ -n "${UPLOADSCRIPT}" ] ; then
UPSCRIPT="--uploadscript"
fi
@@ -42,11 +43,11 @@ start() {
--make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
-- $(echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
result=$?
- if [ $result -ne 0 ] ; then
+ if [ ${result} -ne 0 ] ; then
eend 1 "Could not launch Pure-FTPd"
else
eend $result
- if [ -n "$UPLOADSCRIPT" ] ; then
+ if [ -n "${UPLOADSCRIPT}" ] ; then
ebegin "Starting Pure-FTPd upload script"
start-stop-daemon --start --quiet --make-pidfile \
--pidfile ${script_pidfile} \
@@ -58,7 +59,7 @@ start() {
}
stop() {
- if [ -n "$UPLOADSCRIPT" ] ; then
+ if [ -n "${UPLOADSCRIPT}" ] ; then
ebegin "Stopping Pure-FTPd upload script"
start-stop-daemon --stop --retry 20 --quiet \
--pidfile ${script_pidfile}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 792ee5d42736..54029e25a9f8 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/ayttm/Manifest b/net-im/ayttm/Manifest
deleted file mode 100644
index 781aa4123356..000000000000
--- a/net-im/ayttm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ayttm-0.6.3.tar.bz2 1377010 BLAKE2B 692bac07386783f98a4e873b93f8c2a088fb954f39613ec47d151433e59b578f532f80d47b6dc7caab789ea06024a4a82d0f0c8264963d19c076e1b524495b19 SHA512 8480b9e6b6e1c45a3cdd16d991ebf7e12c400d282243f5f44715ba20d4db4523a0343fe49016f7dba3e1a23d963eef52fbb0823c27aedec0db33457319138270
diff --git a/net-im/ayttm/ayttm-0.6.3-r1.ebuild b/net-im/ayttm/ayttm-0.6.3-r1.ebuild
deleted file mode 100644
index 2f183105a741..000000000000
--- a/net-im/ayttm/ayttm-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-DESCRIPTION="A multi-protocol instant messaging client"
-HOMEPAGE="http://ayttm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ayttm/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt icq irc xmpp lj msn nls oscar smtp xscreensaver yahoo"
-
-RDEPEND="app-text/enchant
- dev-libs/glib:2
- dev-libs/openssl:0=
- virtual/libiconv
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/pango
- crypt? ( app-crypt/gpgme )
- xscreensaver? ( x11-libs/libXScrnSaver )
- yahoo? ( net-libs/libyahoo2 )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-opt-xscreensaver.patch \
- "${FILESDIR}"/${P}-opt-webcam.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable crypt aycryption) \
- --disable-esd \
- $(use_enable icq) \
- $(use_enable irc) \
- $(use_enable xmpp jabber) \
- $(use_enable lj) \
- $(use_enable msn) \
- $(use_enable nls) \
- $(use_enable oscar) \
- $(use_enable smtp) \
- $(use_enable xscreensaver) \
- $(use_enable yahoo) \
- --disable-webcam \
- --disable-arts \
- --enable-posix-dlopen \
- --disable-static
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README README.LINUX TODO
- rm -f "${D}"/usr/$(get_libdir)/${PN}/*.la
-}
diff --git a/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch b/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch
deleted file mode 100644
index e805d90746d6..000000000000
--- a/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Make the building of the webcam-related plugins optional.
-
-Patch by Kevin McCarthy
-
---- configure.ac
-+++ configure.ac
-@@ -436,6 +439,10 @@
- AC_MSG_WARN(You need gpgme to compile the aycryption module))
- fi
-
-+if test "$enable_webcam" != no; then
-+ OPTIONAL_PLUG_DIR="$OPTIONAL_PLUG_DIR image_filter"
-+fi
-+
- ###########################################################################
- # End Optional Modules
- ###########################################################################
---- modules/Makefile.am
-+++ modules/Makefile.am
-@@ -1,7 +1,7 @@
- DIST_SUBDIRS = aim-oscar irc jabber msn2 yahoo2 smtp importers \
- livejournal utility aycryption smileys image_filter
-
--SUBDIRS = @OPTIONAL_PLUG_DIR@ importers utility smileys image_filter
-+SUBDIRS = @OPTIONAL_PLUG_DIR@ importers utility smileys
-
- # Gets rid of the datarootdir warning
- datarootdir=@datarootdir@
diff --git a/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch b/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch
deleted file mode 100644
index 7c6f09f5117e..000000000000
--- a/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add --enable-xscreensaver to configure for USE flag support
-
-Patch by Kevin McCarthy
-
---- configure.ac
-+++ configure.ac
-@@ -316,6 +316,9 @@
- #endif
- ])
-
-+AC_ARG_ENABLE(xscreensaver, AC_HELP_STRING([--enable-xscreensaver],
-+ [compile with X Screensaver]), [have_xss=$enableval], [have_xss=no] )
-+
- if test "$have_xss" = yes; then
- # Let's figure out what library it's in...
-
diff --git a/net-im/ayttm/metadata.xml b/net-im/ayttm/metadata.xml
deleted file mode 100644
index 5cbaca7524d5..000000000000
--- a/net-im/ayttm/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- Ayttm is a multi-protocol instant messaging client with some novel features
- such as the ability to connect to livejournal.com and the ability to send
- short messages via RFC2821 SMTP.
-
-
-
- ayttm
-
-
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
deleted file mode 100644
index e109124e1bbb..000000000000
--- a/net-im/climm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST climm-0.7.1.tgz 1296303 BLAKE2B 8fe10eb05c4c2315295be2173e16b9492de20bd4a526c4fbdde4dcf3dc2d287392e9071e26bb7231ed26e808ba2d2893d6415266cb095040c5ffce3b13c36b47 SHA512 8ee8b716229b4181a3b2f7ff3323b4587e80200ca753347f670616da9f25e8fd7cae4da597435d6f71b3a104ad89f3cfe4fd3f9524e259feef220255b6f7d138
diff --git a/net-im/climm/climm-0.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild
deleted file mode 100644
index 02d797c7d539..000000000000
--- a/net-im/climm/climm-0.7.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="ICQ text-mode client with many features"
-HOMEPAGE="http://www.climm.org/"
-SRC_URI="http://www.climm.org/source/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xmpp gnutls tcl ssl"
-
-# In case user don't need xmpp there is a choice gnutls/openssl. Since xmpp
-# requires gnutls then without explicit request to use gnutls (USE=gnutls)
-# for ssl we fall back on gnutls instead of openssl.
-REQUIRED_USE="xmpp? ( ssl gnutls )"
-
-RDEPEND="
- xmpp? (
- || (
- >=dev-libs/iksemel-1.4[ssl]
- >=dev-libs/iksemel-1.3[gnutls]
- )
- )
- ssl? (
- gnutls? (
- >=net-libs/gnutls-0.8.10
- dev-libs/libgcrypt:0
- )
- !gnutls? ( dev-libs/openssl )
- )
- tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
- ssl? ( gnutls? ( virtual/pkgconfig ) )"
-
-src_configure() {
- local myconf
- if use ssl; then
- if use gnutls; then
- einfo "Using gnutls"
- myconf="--enable-ssl=gnutls"
- else
- einfo "Using openSSL"
- myconf="--enable-ssl=openssl"
- fi
- else
- myconf="--disable-ssl"
- fi
-
- econf \
- $(use_enable xmpp) \
- --disable-otr \
- $(use_enable tcl) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-}
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-im/climm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..a59f5e9ad7f9
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 versionator xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
+ +webp"
+
+COMMON_DEPEND="
+ dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+ >=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+ >=dev-util/intltool-0.40.1
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/precis-i18n[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/pygobject[cairo,${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
+ x11-libs/libXScrnSaver
+ crypt? (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+ geolocation? ( app-misc/geoclue[introspection] )
+ jingle? (
+ net-libs/farstream:0.2[introspection]
+ media-libs/gstreamer:1.0[introspection]
+ media-libs/gst-plugins-base:1.0[introspection]
+ media-libs/gst-plugins-ugly:1.0
+ )
+ keyring? (
+ app-crypt/libsecret[crypt,introspection]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ )
+ networkmanager? ( net-misc/networkmanager[introspection] )
+ remote? (
+ >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+ sys-apps/dbus[X]
+ )
+ rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+ spell? (
+ app-text/gspell[introspection]
+ app-text/hunspell
+ )
+ upnp? ( net-libs/gupnp-igd[introspection] )
+ webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/net-im/transwhat/transwhat-0.2.2-r1.ebuild b/net-im/transwhat/transwhat-0.2.2-r1.ebuild
index 3023b97715b4..9f27d93856f0 100644
--- a/net-im/transwhat/transwhat-0.2.2-r1.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2-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 @@ SRC_URI="https://github.com/stv0g/transwhat/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
dev-python/e4u[${PYTHON_USEDEP}]
diff --git a/net-im/yowsup/yowsup-2.5.7-r2.ebuild b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
index bc7978b6177e..3292dc0cf758 100644
--- a/net-im/yowsup/yowsup-2.5.7-r2.ebuild
+++ b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tgalal/yowsup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
dev-python/configargparse[${PYTHON_USEDEP}]
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index c8f85b381913..513a134dba75 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
deleted file mode 100644
index 459b616e7293..000000000000
--- a/net-irc/bip/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bip-0.8.9.tar.gz 256711 BLAKE2B 2af396dccab45bdb0ac54f33290c58147b927974c3d00fbad00317358bdde64c538c1314bfe2513ae1e914cf68ace7e3f9a744f5939abdeb920e7cd6af35e532 SHA512 572adb6e0982d74a39b0380ef6af51ba7f55b880f78e110b93e09616e6345bb4a9a60475df644ec891cae368287d502ba00bbf734370ba50c57b29de6934c138
diff --git a/net-irc/bip/bip-0.8.9.ebuild b/net-irc/bip/bip-0.8.9.ebuild
deleted file mode 100644
index cc037d11faa5..000000000000
--- a/net-irc/bip/bip-0.8.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="Multiuser IRC proxy with SSL support"
-HOMEPAGE="http://bip.milkypond.org/"
-SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug freenode noctcp oidentd vim-syntax"
-
-COMMON_DEPEND="
- dev-libs/openssl:0
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- virtual/yacc
-"
-RDEPEND="${COMMON_DEPEND}
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
- oidentd? ( >=net-misc/oidentd-2.0 )
-"
-
-src_prepare() {
- if use noctcp; then
- sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
- fi
-
- if use freenode; then
- epatch "${FILESDIR}/${PN}-freenode.patch" || die
- fi
-
- sed -i -e "s/-Werror//" Makefile.in || die
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable oidentd)
-}
-
-src_install() {
- dobin src/bip src/bipmkpw
-
- dodoc AUTHORS ChangeLog README NEWS TODO
- newdoc samples/bip.conf bip.conf.sample
- doman bip.1 bip.conf.5 bipmkpw.1
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins samples/bip.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/bip.vim
- fi
-}
-
-pkg_postinst() {
- elog 'The default configuration file is "~/.bip/bip.conf"'
- elog "You can find a sample configuration file in"
- elog "/usr/share/doc/${PF}/bip.conf.sample"
-}
diff --git a/net-irc/bip/files/bip-freenode.patch b/net-irc/bip/files/bip-freenode.patch
deleted file mode 100644
index 437da08f438d..000000000000
--- a/net-irc/bip/files/bip-freenode.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Freenode's ircd-seven uses a custom banlist type for mutes (+q).
-This patch makes bip handle +q the same way as +q.
-Without it, a user wouldn't get the banlist replies for mutes.
-
-diff --git a/src/irc.c b/src/irc.c
-index 556bf97..a5cc039 100644
---- a/src/irc.c
-+++ b/src/irc.c
-@@ -944,7 +947,8 @@ static int irc_cli_mode(struct link_client *ic, struct line *line)
-
- /* This is a wild guess and that sucks. */
- if (!irc_line_elem_equals(line, 0, "MODE") ||
-- strchr(irc_line_elem(line, 2), 'b') == NULL)
-+ (strchr(irc_line_elem(line, 2), 'b') == NULL &&
-+ strchr(irc_line_elem(line, 2), 'q') == NULL))
- return OK_COPY;
-
- ++ic->who_count;
diff --git a/net-irc/bip/files/bip.vim b/net-irc/bip/files/bip.vim
deleted file mode 100644
index 437d7f083633..000000000000
--- a/net-irc/bip/files/bip.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-" Vim filetype detection file for bip config files
-"
-
-au BufNewFile,BufRead bip.conf set filetype=bip
diff --git a/net-irc/bip/metadata.xml b/net-irc/bip/metadata.xml
deleted file mode 100644
index e20cca0de70b..000000000000
--- a/net-irc/bip/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- Bip is an IRC proxy, which means it keeps connected to your preferred
- IRC servers, can store the logs for you, and even send them back to your IRC
- client(s) upon connection. You may want to use bip to keep your logfiles (in a
- unique format and on a unique computer) whatever your client is, when you
- connect from multiple workstations, or when you simply want to have a playback
- of what was said while you were away.
-
-
-
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
deleted file mode 100644
index 1ebdc0be8fbc..000000000000
--- a/net-irc/epic4/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST epic4-2.10.1.tar.bz2 629722 BLAKE2B 9e28c053ce72eeeeb031c42cc2ebb838a8c5acf18764381d26906afa0ba4471c6241ff65b9f537b51054749698bf7ff9672d7f212cee1b19965a99bca47c29ef SHA512 382a0ad6d2778aba037ee1cf065ec7d2ea3827957010f9eea36072fbb8bf14cdba5baffa9a3ce7888305a2451ae61a4b5b5823336fc80b73997fe0d609918656
-DIST epic4-help-20050315.tar.gz 332502 BLAKE2B 6839c828883bf42545e0d54512377558ec031359a296c014152d8ee136063299d6dbf1e7143b8f32a1ee4d4250029206f6a8fdb3f07c295736cd83a3530e4886 SHA512 f59339d4f2c339cb4c3cbc0cce7db8fadbfe469884c16ab9add42e98eb318851e48ce8a04b4920d33c42afff8b39ec41186744eda0460af544c43fe14658e7e6
-DIST epic4-local.bz2 6530 BLAKE2B 3c4e32dc0f47e74ed750e0f12713b026f75137f8f0edfe28d05c2b527c3117edf834e604cb33f2e2569577c39a38c787437ab68ccc8d426e68b6637565ac78df SHA512 2f4bb0aee284ddedd95dd97b17bd1756fcc700ec07b2814d84f3185e215134600fdd0fadf7ecb1d490ebb449f5e9530fcb207ebfaec27cfce1f9570e73103cc1
diff --git a/net-irc/epic4/epic4-2.10.1.ebuild b/net-irc/epic4/epic4-2.10.1.ebuild
deleted file mode 100644
index fa6e98d50759..000000000000
--- a/net-irc/epic4/epic4-2.10.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-HELP_V="20050315"
-
-DESCRIPTION="Epic4 IRC Client"
-HOMEPAGE="http://epicsol.org/"
-SRC_URI="
- ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
- ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz
- mirror://gentoo/epic4-local.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 perl ssl"
-
-DEPEND="
- >=sys-libs/ncurses-5.2
- perl? ( dev-lang/perl )
- ssl? ( >=dev-libs/openssl-0.9.5:0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/epic-defaultserver.patch \
- "${FILESDIR}"/${P}-make-recursion.patch \
- "${FILESDIR}"/${P}-perl.patch
-
- eautoconf
-
- rm -f "${WORKDIR}"/help/Makefile || die
- ecvs_clean
-}
-
-src_configure() {
- replace-flags "-O?" "-O"
-
- # copied from alt overlay
- [[ ${CHOST} == *-interix* ]] && export ac_cv_func_getpgrp_void=yes
-
- econf \
- --libexecdir="${EPREFIX}"/usr/libexec/${PN} \
- $(use_with ipv6) \
- $(use_with perl) \
- $(use_with ssl)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install () {
- einstall \
- sharedir="${ED}"/usr/share \
- libexecdir="${ED}"/usr/libexec/${PN}
-
- dodoc BUG_FORM README KNOWNBUGS VOTES
-
- cd "${S}"/doc || die
- docinto doc
- dodoc \
- *.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
- nicknames outputhelp SILLINESS TS4
-
- insinto /usr/share/epic
- doins -r "${WORKDIR}"/help
-}
-
-pkg_postinst() {
- if [ ! -f "${EROOT}"/usr/share/epic/script/local ]; then
- elog "/usr/share/epic/script/local does not exist, I will now"
- elog "create it. If you do not like the look/feel of this file, or"
- elog "if you'd prefer to use your own script, simply remove this"
- elog "file. If you want to prevent this file from being installed"
- elog "in the future, simply create an empty file with this name."
- cp "${WORKDIR}"/epic4-local "${EROOT}"/usr/share/epic/script/local
- elog
- elog "This provided local startup script adds a number of nifty"
- elog "features to Epic including tab completion, a comprehensive set"
- elog "of aliases, and channel-by-channel logging. To prevent"
- elog "unintentional conflicts with your own scripting, if either the"
- elog "~/.ircrc or ~/.epicrc script files exist, then the local script"
- elog "is *not* run. If you like the script but want to make careful"
- elog "additions (such as selecting your usual servers or setting your"
- elog "nickname), simply copy /usr/share/epic/script/local to ~/.ircrc"
- elog "and then add your additions to the copy."
- fi
-
- # Fix for bug 59075
- chmod 755 "${EROOT}"/usr/share/epic/help
-}
diff --git a/net-irc/epic4/files/epic-defaultserver.patch b/net-irc/epic4/files/epic-defaultserver.patch
deleted file mode 100644
index 1dbc2087cce9..000000000000
--- a/net-irc/epic4/files/epic-defaultserver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur epic4-1.1.14.orig/include/config.h epic4-1.1.14/include/config.h
---- epic4-1.1.14.orig/include/config.h 2003-10-28 05:53:57.000000000 +0000
-+++ epic4-1.1.14/include/config.h 2004-01-03 13:49:53.083473288 +0000
-@@ -42,7 +42,7 @@
- * the client will NOT compile and work properly! Use the default here if
- * you dont have other servers to use.
- */
--#define DEFAULT_SERVER "localhost irc.efnet.net irc.undernet.org irc.dal.net"
-+#define DEFAULT_SERVER "localhost irc.freenode.net irc.efnet.net irc.undernet.org irc.dal.net"
-
- /*
- * The left and right brace characters ('{', '}') are special characters in
diff --git a/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch b/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch
deleted file mode 100644
index 68d7e4c460b6..000000000000
--- a/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -210,6 +210,6 @@
- $(RM) Makefile source/Makefile include/sig.inc config.status config.cache config.log include/defs.h source/info.c.sh
-
- depend:
-- (cd source;make depend)
-+ (cd source;$(MAKE) depend)
-
- # This is the end of the file.
diff --git a/net-irc/epic4/files/epic4-2.10.1-perl.patch b/net-irc/epic4/files/epic4-2.10.1-perl.patch
deleted file mode 100644
index ce41d153abc6..000000000000
--- a/net-irc/epic4/files/epic4-2.10.1-perl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Nathan Phillip Brink
-Subject: Fix broken perl detection somewhat.
-
---- a/configure.in
-+++ b/configure.in
-@@ -636,25 +636,27 @@
- dnl
-
- AC_MSG_CHECKING(whether to support Perl)
--AC_ARG_WITH(perl,
--[ --with-perl[=PATH] Compile with perl support.],
--[ test -z "$withval" && withval=yes ],
--)
--test "xno" != "x$withval" && for base in $withval /usr/local /usr /
--do
-- FOUND=
-- for ext in so a dll ; do
-- test -r $base/lib/libperl.$ext && FOUND=1
-- test -r $base/libperl.$ext && FOUND=1
-- done
-- test -n "$FOUND" || continue
-- AC_MSG_RESULT(yes)
-- LIBS="$LIBS `perl -MExtUtils::Embed -e ldopts`"
-- PERLDOTOH="perl.o"
-- AC_DEFINE(PERL)
-- break
--done
--test -z "$PERLDOTOH" && AC_MSG_RESULT(no)
-+AC_ARG_WITH([perl],
-+ [AS_HELP_STRING([--with-perl[=PATH]], [Compile with perl support.])],
-+ [],
-+ [with_perl=maybe])
-+AS_IF([test "xno" != "x$with_perl"],
-+ [
-+ PERL_LIBS="`perl -MExtUtils::Embed -e ldopts`"
-+ AS_IF([test -n "$PERL_LIBS"],
-+ [
-+ AC_MSG_RESULT([yes])
-+ LIBS="$LIBS $PERL_LIBS"
-+ AC_DEFINE([PERL], [], [Define if perl support should be compiled])
-+ PERLDOTOH="perl.o"
-+ ],
-+ [
-+ AC_MSG_RESULT([no])
-+ AS_IF([test "x$with_perl" != "xmaybe"],
-+ [AC_MSG_ERROR([You specified --with-perl, but I was unable to find libperl])])
-+ ])
-+ ])
-+
- withval=''
-
- dnl ----------------------------------------------------------
-
-Diff finished. Thu Jun 30 22:15:26 2011
diff --git a/net-irc/epic4/metadata.xml b/net-irc/epic4/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/epic4/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/net-irc/shadowircd/Manifest b/net-irc/shadowircd/Manifest
deleted file mode 100644
index 62e6e18fb83e..000000000000
--- a/net-irc/shadowircd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shadowircd-6.3.3.tar.gz 1980432 BLAKE2B d9f443011668bf407624cb5da2a9f8396861e4c4c7e587bae35d7ac3bd9513a109865e56fd92efc1d022d773c10a36ba95cc2f1f763e06b74f46e300cb142b5a SHA512 f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4
diff --git a/net-irc/shadowircd/files/format-security.patch b/net-irc/shadowircd/files/format-security.patch
deleted file mode 100644
index bd6e26e28a59..000000000000
--- a/net-irc/shadowircd/files/format-security.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 6055fe3ee3b7b932e2a21160251fff0f0c6bcc39 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky
-Date: Mon, 24 Jul 2017 10:39:43 -0400
-Subject: [PATCH 1/1] Supply trivial format strings to fix format-security
- warnings.
-
-This commit adds a trivial format string "%s" to a number of function
-calls that are otherwise missing them. This avoids GCC's
-format-security warnings, which cause compilation failures with
--Werror=format-security.
-
-Gentoo-Bug: 520620
----
- bandb/bandb.c | 2 +-
- modules/core/m_kill.c | 4 ++--
- modules/m_away.c | 4 ++--
- modules/m_challenge.c | 8 ++++----
- modules/m_info.c | 6 +++---
- modules/m_map.c | 4 ++--
- modules/m_oper.c | 6 +++---
- modules/m_stats.c | 22 +++++++++++-----------
- src/chmode.c | 4 ++--
- src/parse.c | 2 +-
- src/s_auth.c | 2 +-
- src/sslproc.c | 8 ++++----
- 12 files changed, 36 insertions(+), 36 deletions(-)
-
-diff --git a/bandb/bandb.c b/bandb/bandb.c
-index 33166b1..2d272a1 100644
---- a/bandb/bandb.c
-+++ b/bandb/bandb.c
-@@ -289,7 +289,7 @@ db_error_cb(const char *errstr)
- {
- char buf[256];
- rb_snprintf(buf, sizeof(buf), "! :%s", errstr);
-- rb_helper_write(bandb_helper, buf);
-+ rb_helper_write(bandb_helper, "%s", buf);
- rb_sleep(2 << 30, 0);
- exit(1);
- }
-diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
-index 80df7df..2fa91da 100644
---- a/modules/core/m_kill.c
-+++ b/modules/core/m_kill.c
-@@ -97,7 +97,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
- if((target_p = get_history(user, (long) KILLCHASETIMELIMIT)) == NULL)
- {
- if (strchr(user, '.'))
-- sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
-+ sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
- else
- sendto_one_numeric(source_p, ERR_NOSUCHNICK,
- form_str(ERR_NOSUCHNICK), user);
-@@ -216,7 +216,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
-
- if(IsServer(target_p) || IsMe(target_p))
- {
-- sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
-+ sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
- return 0;
- }
-
-diff --git a/modules/m_away.c b/modules/m_away.c
-index 557371e..13c4c39 100644
---- a/modules/m_away.c
-+++ b/modules/m_away.c
-@@ -85,7 +85,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
- free_away(source_p);
- }
- if(MyConnect(source_p))
-- sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
-+ sendto_one_numeric(source_p, RPL_UNAWAY, "%s", form_str(RPL_UNAWAY));
- return 0;
- }
-
-@@ -99,7 +99,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
- }
-
- if(MyConnect(source_p))
-- sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
-+ sendto_one_numeric(source_p, RPL_NOWAWAY, "%s", form_str(RPL_NOWAWAY));
-
- return 0;
- }
-diff --git a/modules/m_challenge.c b/modules/m_challenge.c
-index 2066095..b8514c4 100644
---- a/modules/m_challenge.c
-+++ b/modules/m_challenge.c
-@@ -172,7 +172,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
-
- if(oper_p == NULL)
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
- source_p->localClient->opername, source_p->name,
- source_p->username, source_p->host,
-@@ -203,7 +203,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
-
- if(oper_p == NULL)
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
- parv[1], source_p->name,
- source_p->username, source_p->host, source_p->sockhost);
-@@ -223,7 +223,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
-
- if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED CHALLENGE (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
- parv[1], source_p->name, source_p->username, source_p->host,
- source_p->sockhost);
-@@ -241,7 +241,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
- {
- if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
- parv[1], source_p->name,
- source_p->username, source_p->host, source_p->sockhost);
-diff --git a/modules/m_info.c b/modules/m_info.c
-index dd14294..bab156f 100644
---- a/modules/m_info.c
-+++ b/modules/m_info.c
-@@ -722,7 +722,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
- /* safe enough to give this on a local connect only */
- sendto_one(source_p, form_str(RPL_LOAD2HI),
- me.name, source_p->name, "INFO");
-- sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
-+ sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
- return 0;
- }
- else
-@@ -736,7 +736,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
- send_info_text(source_p);
- send_birthdate_online_time(source_p);
-
-- sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
-+ sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
- return 0;
- }
-
-@@ -761,7 +761,7 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
-
- send_birthdate_online_time(source_p);
-
-- sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
-+ sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
- }
-
- return 0;
-diff --git a/modules/m_map.c b/modules/m_map.c
-index 7a45140..baadc86 100644
---- a/modules/m_map.c
-+++ b/modules/m_map.c
-@@ -59,7 +59,7 @@ m_map(struct Client *client_p, struct Client *source_p, int parc, const char *pa
- }
-
- dump_map(client_p, &me, buf);
-- sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
-+ sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
- return 0;
- }
-
-@@ -71,7 +71,7 @@ mo_map(struct Client *client_p, struct Client *source_p, int parc, const char *p
- {
- dump_map(client_p, &me, buf);
- scache_send_missing(client_p);
-- sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
-+ sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
-
- return 0;
- }
-diff --git a/modules/m_oper.c b/modules/m_oper.c
-index b403b28..af1e008 100644
---- a/modules/m_oper.c
-+++ b/modules/m_oper.c
-@@ -83,7 +83,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
-
- if(oper_p == NULL)
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
- name, source_p->name,
- source_p->username, source_p->host, source_p->sockhost);
-@@ -100,7 +100,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
-
- if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
- name, source_p->name,
- source_p->username, source_p->host, source_p->sockhost);
-@@ -118,7 +118,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
- {
- if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
- {
-- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
-+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
- ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
- name, source_p->name,
- source_p->username, source_p->host, source_p->sockhost);
-diff --git a/modules/m_stats.c b/modules/m_stats.c
-index dc826bc..51555b4 100644
---- a/modules/m_stats.c
-+++ b/modules/m_stats.c
-@@ -223,7 +223,7 @@ m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *
- if(stats_cmd_table[i].need_oper && !IsOper(source_p))
- {
- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-- form_str (ERR_NOPRIVILEGES));
-+ "%s", form_str (ERR_NOPRIVILEGES));
- break;
- }
- if(stats_cmd_table[i].need_admin && !IsOperAdmin(source_p))
-@@ -285,7 +285,7 @@ stats_connect(struct Client *source_p)
- (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
- !IsOper(source_p))
- {
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str(ERR_NOPRIVILEGES));
- return;
- }
-@@ -487,7 +487,7 @@ stats_hubleaf(struct Client *source_p)
- (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
- !IsOper(source_p))
- {
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
- return;
- }
-@@ -513,7 +513,7 @@ stats_auth (struct Client *source_p)
- {
- /* Oper only, if unopered, return ERR_NOPRIVS */
- if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper (source_p))
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
-
- /* If unopered, Only return matching auth blocks */
-@@ -556,7 +556,7 @@ stats_tklines(struct Client *source_p)
- {
- /* Oper only, if unopered, return ERR_NOPRIVS */
- if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
-
- /* If unopered, Only return matching klines */
-@@ -621,7 +621,7 @@ stats_klines(struct Client *source_p)
- {
- /* Oper only, if unopered, return ERR_NOPRIVS */
- if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
-
- /* If unopered, Only return matching klines */
-@@ -689,7 +689,7 @@ stats_oper(struct Client *source_p)
-
- if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
- {
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
- return;
- }
-@@ -752,7 +752,7 @@ static void
- stats_ports (struct Client *source_p)
- {
- if(!IsOper (source_p) && ConfigFileEntry.stats_P_oper_only)
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
- else
- show_ports (source_p);
-@@ -1063,7 +1063,7 @@ stats_servers (struct Client *source_p)
- if(ConfigServerHide.flatten_links && !IsOper(source_p) &&
- !IsExemptShide(source_p))
- {
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
- return;
- }
-@@ -1137,7 +1137,7 @@ static void
- stats_class(struct Client *source_p)
- {
- if(ConfigFileEntry.stats_y_oper_only && !IsOper(source_p))
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
- else
- report_classes(source_p);
-@@ -1411,7 +1411,7 @@ stats_servlinks (struct Client *source_p)
- if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
- !IsExemptShide(source_p))
- {
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
- form_str (ERR_NOPRIVILEGES));
- return;
- }
-diff --git a/src/chmode.c b/src/chmode.c
-index 0a43199..cd649d3 100644
---- a/src/chmode.c
-+++ b/src/chmode.c
-@@ -644,7 +644,7 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
- if(!IsOper(source_p) && !IsServer(source_p))
- {
- if(!(*errors & SM_ERR_NOPRIVS))
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
- *errors |= SM_ERR_NOPRIVS;
- return;
- }
-@@ -734,7 +734,7 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
- if(!IsOper(source_p) && !IsServer(source_p))
- {
- if(!(*errors & SM_ERR_NOPRIVS))
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
- *errors |= SM_ERR_NOPRIVS;
- return;
- }
-diff --git a/src/parse.c b/src/parse.c
-index a8ce091..9e17de4 100644
---- a/src/parse.c
-+++ b/src/parse.c
-@@ -719,7 +719,7 @@ static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *te
- int
- m_not_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
- {
-- sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
-+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
- return 0;
- }
-
-diff --git a/src/s_auth.c b/src/s_auth.c
-index 2644ff1..52e4633 100644
---- a/src/s_auth.c
-+++ b/src/s_auth.c
-@@ -116,7 +116,7 @@ typedef enum
- }
- ReportType;
-
--#define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)])
-+#define sendheader(c, r) sendto_one_notice(c, "%s", HeaderMessages[(r)])
-
- static rb_dlink_list auth_poll_list;
- static rb_bh *auth_heap;
-diff --git a/src/sslproc.c b/src/sslproc.c
-index 11fadbb..51078fb 100644
---- a/src/sslproc.c
-+++ b/src/sslproc.c
-@@ -455,13 +455,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
- break;
- case 'I':
- ssl_ok = 0;
-- ilog(L_MAIN, cannot_setup_ssl);
-- sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
-+ ilog(L_MAIN, "%s", cannot_setup_ssl);
-+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
- case 'U':
- zlib_ok = 0;
- ssl_ok = 0;
-- ilog(L_MAIN, no_ssl_or_zlib);
-- sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
-+ ilog(L_MAIN, "%s", no_ssl_or_zlib);
-+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
- ssl_killall();
- break;
- case 'z':
---
-2.13.0
-
diff --git a/net-irc/shadowircd/files/shadowircd.confd b/net-irc/shadowircd/files/shadowircd.confd
deleted file mode 100644
index 4712b525985d..000000000000
--- a/net-irc/shadowircd/files/shadowircd.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Specify any extra options to pass to shadowircd
-SHADOWIRCD_OPTS=""
diff --git a/net-irc/shadowircd/files/shadowircd.initd-r1 b/net-irc/shadowircd/files/shadowircd.initd-r1
deleted file mode 100644
index 38ccab8b3f3f..000000000000
--- a/net-irc/shadowircd/files/shadowircd.initd-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/shadowircd-ircd"
-command_args="${SHADOWIRCD_OPTS}"
-command_user="shadowircd"
-extra_started_commands="reload"
-pidfile="/run/shadowircd/ircd.pid"
-
-depend() {
- use dns net
- provide ircd
-}
-
-start_pre() {
- ebegin "Creating /run/shadowircd for ${SVCNAME}"
- checkpath --directory --owner :shadowircd --mode 0770 /run/shadowircd
- eend $?
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
diff --git a/net-irc/shadowircd/metadata.xml b/net-irc/shadowircd/metadata.xml
deleted file mode 100644
index d90bc3272748..000000000000
--- a/net-irc/shadowircd/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- shadowircd/shadowircd
-
-
diff --git a/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild b/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
deleted file mode 100644
index 56dcbf33ad86..000000000000
--- a/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="An IRCd based on charybdis that adds several useful features"
-HOMEPAGE="http://shadowircd.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +ipv6 largenet ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl:0 )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/yacc
- sys-devel/flex"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/format-security.patch" )
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
-}
-
-src_prepare() {
- default
-
- # Fill the example configuration file with proper paths.
- sed -i \
- -e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
- -e "s:etc/:../etc/${PN}/:g" \
- -e "s:logs/:../var/log/shadowircd/:g" \
- -e "s:test\.\(cert\|key\):ssl.\1:g" \
- doc/example.conf \
- doc/reference.conf \
- || die
-}
-
-src_configure() {
- econf \
- ac_cv_prog_cc_g=no \
- --disable-gnutls \
- $(use_enable debug assert soft) \
- $(use_enable debug iodebug) \
- $(use_enable ipv6) \
- $(use_enable !largenet small-net) \
- $(use_enable ssl openssl) \
- $(use_enable zlib) \
- --with-program-prefix=shadowircd- \
- \
- --enable-fhs-paths \
- --sysconfdir="${EPREFIX}"/etc/${PN} \
- --libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
- --with-logdir="${EPREFIX}"/var/log/${PN} \
- --with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
- --with-rundir="${EPREFIX}"/run
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto etc/${PN}
- newins doc/reference.conf ircd.conf
-
- keepdir var/{lib,log}/${PN}
-
- # The runtime directory will be created by the init script, so we
- # kill this here to avoid a QA warning about it.
- rm -rf "${D}"/run || die
-
- # shadowircd needs writing to its state (bandb) and log directories
- fowners :shadowircd /var/{lib,log}/${PN}
- fperms 770 /var/{lib,log}/${PN}
-
- # ensure that shadowircd can access but not modify its configuration
- # while protecting it from others
- fowners :shadowircd /etc/${PN}{,/ircd.conf}
- fperms 750 /etc/${PN}
- fperms 640 /etc/${PN}/ircd.conf
-}
-
-pkg_postinst() {
- elog "All of the shadowircd binaries in PATH have been prefixed with"
- elog "'shadowircd-' to prevent file collisions."
-}
diff --git a/net-irc/unrealircd/unrealircd-4.2.2.ebuild b/net-irc/unrealircd/unrealircd-4.2.2.ebuild
index 97e3418dd68d..16789e1cf4b5 100644
--- a/net-irc/unrealircd/unrealircd-4.2.2.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/${PN}$(ver_cut 1)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux"
IUSE="class-nofakelag curl +extban-stacking libressl +operoverride operoverride-verify
+prefixaq showlistmodes shunnotices +usermod"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d539123b852d..4344976c0b14 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index d1358a6ac3a1..4b76b6257c62 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="debug libressl ntlm ssl static-libs threads"
RDEPEND="
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 8acfd1254889..ef443b885007 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1,4 @@
DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.36.0.tar.xz 1629020 BLAKE2B 7c116988c22801688c50d6d514ddb904920cc54d3c3d141137e6ed8b2182ef4e670f0a0fdebaeabfe0df8cdea4cfd1ee3fb083628f035201f104de6f3614dd25 SHA512 4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76
DIST nghttp2-1.37.0.tar.xz 1628248 BLAKE2B ed5cdfda44b4e38a03d92352520eb765cc1da99080e0cd3e9d663efd5ef2ff219c6ccdbc16cfde001a8377afc796acef250913e1eb422ae2cac2eb95b8f98089 SHA512 67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f
+DIST nghttp2-1.38.0-unbundle_http_parser.patch.xz 2616 BLAKE2B 3f15154d33f32c91aad87f23f56d761501e19e0b53b99d4df720f9e04d6d9c49a52118acbe3da87f8585c2b71b7b430ef60fc33465605f3bf9933635aabb924d SHA512 1b4377b34cf6428164011be9fc86efdd7ab8d3443edf197c45768beea0f843084a842c4cb2abc5179d6036ec99174557e06344ce67a07d98992de64d99faf3a6
+DIST nghttp2-1.38.0.tar.xz 1628356 BLAKE2B 0568d4ac5c1e5e6d7adf762815836502524d59fb55c623f344a8427638407a19447fe1a7753142aa205898f7bda6ebce8ef6f4d85edc6da98ffa98b83d4e363e SHA512 e432d52bcf77379ed5c10ceafb587ec8d66c56bb728cda56487b237cbab1d0073689624419ed306162dab3a51b91cfe0f59cb173b5d81346e2b6d0abd56635bc
diff --git a/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
new file mode 100644
index 000000000000..cc1100a0b0ba
--- /dev/null
+++ b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
@@ -0,0 +1,50 @@
+From cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?=
+Date: Thu, 18 Apr 2019 12:35:54 +0200
+Subject: [PATCH] asio: support boost-1.70
+
+In boost 1.70, deprecated get_io_context() has finally been removed.
+Introduce GET_IO_SERVICE macro that based on boost version uses
+old get_io_service() interface (boost < 1.70), or get_executor().context()
+for boost 1.70+.
+
+Commit based idea seen in monero-project/monero@17769db9462e5201befcb05f86ccbaeabf35caf8
+---
+ src/asio_server_connection.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/asio_server_connection.h b/src/asio_server_connection.h
+index 6be794060..56924c71a 100644
+--- a/src/asio_server_connection.h
++++ b/src/asio_server_connection.h
+@@ -51,6 +51,12 @@
+ #include "util.h"
+ #include "template.h"
+
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace nghttp2 {
+
+ namespace asio_http2 {
+@@ -71,7 +77,7 @@ class connection : public std::enable_shared_from_this>,
+ SocketArgs &&... args)
+ : socket_(std::forward(args)...),
+ mux_(mux),
+- deadline_(socket_.get_io_service()),
++ deadline_(GET_IO_SERVICE(socket_)),
+ tls_handshake_timeout_(tls_handshake_timeout),
+ read_timeout_(read_timeout),
+ writing_(false),
+@@ -82,7 +88,7 @@ class connection : public std::enable_shared_from_this>,
+ boost::system::error_code ec;
+
+ handler_ = std::make_shared(
+- socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
++ GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
+ [this]() { do_write(); }, mux_);
+ if (handler_->start() != 0) {
+ stop();
diff --git a/net-libs/nghttp2/nghttp2-1.37.0.ebuild b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
index 20f89187f0fb..f27032d7957e 100644
--- a/net-libs/nghttp2/nghttp2-1.37.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
@@ -64,5 +64,7 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+ if ! use static-libs ; then
+ find "${ED}"/usr -name '*.la' -delete || die
+ fi
}
diff --git a/net-libs/nghttp2/nghttp2-1.36.0.ebuild b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
similarity index 72%
rename from net-libs/nghttp2/nghttp2-1.36.0.ebuild
rename to net-libs/nghttp2/nghttp2-1.38.0.ebuild
index 20f89187f0fb..23ae1e8d57ba 100644
--- a/net-libs/nghttp2/nghttp2-1.36.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
@@ -5,16 +5,19 @@
EAPI=7
-inherit multilib-minimal
+inherit autotools multilib-minimal
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
inherit git-r3
else
SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
- 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"
fi
+# 675772
+SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.38.0-unbundle_http_parser.patch.xz"
+
DESCRIPTION="HTTP/2 C Library"
HOMEPAGE="https://nghttp2.org/"
@@ -30,8 +33,12 @@ RDEPEND="
cxx? (
${SSL_DEPEND}
dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+ >=net-libs/http-parser-2.9.1:=[${MULTILIB_USEDEP}]
+ )
+ hpack-tools? (
+ >=dev-libs/jansson-2.5
+ >=net-libs/http-parser-2.9.1:=
)
- hpack-tools? ( >=dev-libs/jansson-2.5 )
jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
utils? (
${SSL_DEPEND}
@@ -44,13 +51,26 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+PATCHES=(
+ "${WORKDIR}/${PN}-1.38.0-unbundle_http_parser.patch" # 675772
+ "${FILESDIR}/${P}-boost-1.70.0.patch" #683368
+)
+
+src_prepare() {
+ default
+ # Remove bundled stuff
+ rm -r third-party/http-parser || die
+ eautoreconf
+}
+
multilib_src_configure() {
local myeconfargs=(
--disable-examples
--disable-failmalloc
+ --disable-python-bindings
--disable-werror
+ --without-bundled-http_parser
--without-cython
- --disable-python-bindings
$(use_enable cxx asio-lib)
$(use_enable debug)
$(multilib_native_use_enable hpack-tools)
@@ -64,5 +84,7 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+ if ! use static-libs ; then
+ find "${ED}"/usr -name '*.la' -delete || die
+ fi
}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index e5d039fc7180..0950bfb1def2 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.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
# TODO: Add python support.
@@ -69,5 +69,7 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+ if ! use static-libs ; then
+ find "${ED}"/usr -name '*.la' -delete || die
+ fi
}
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 66d367644854..f7c309597ac9 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-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 ~x64-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 ~x64-solaris"
IUSE="kerberos static-libs libressl"
RESTRICT="test"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index 5c4c67891ba9..88a7e7a9f99d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 2072a7d5f7c5..9b70a8a72d20 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 04e2d3f047d2..b319ea6bed2c 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,16 +1,5 @@
-DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
-DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
-DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
-DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
-DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
-DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
-DIST dovecot-2.3-pigeonhole-0.5.2.tar.gz 1814618 BLAKE2B b1187021673429bee1b45a1f657bea995e9881257919ff55bac63106d65963294ee2b3829167c6d50e351c4bc3c7e88a5ccfb757308d2500c5d4146246145074 SHA512 6bc24d9241f94db795a012346d9bc94b5cc7d7ce0175c03213c2b5d179d80dec95e9bdbd50bed628c8f9f7c51639e692ba5e429212a3b4a654c1e4764ac4f11c
-DIST dovecot-2.3-pigeonhole-0.5.3.tar.gz 1827329 BLAKE2B 0d484906022217b1082233e6a3a20c17bafc68b90ce1c5c956c714d111ffb9ab49a3794e199695bb61a1f3ad6bd46e56e63ee3c140cb01eaa7589ef7bd754b19 SHA512 8403b1976a915836ba875b96825446d46e0d8c7ff245ed1f2b014347fdc78a81f9ed6dbd05bd3b4f1f7072edc5e9a302201cdb375de44436adcbb83919f203f5
-DIST dovecot-2.3-pigeonhole-0.5.4.tar.gz 1831570 BLAKE2B d3e7dea3cdcc2b44476401046f6bd6a110a026d523ada2a898b5c99f509cfe37771dcfd31990139f5f4c1c6b405a9f27359cfd27a6e95525515a3aabb71538f8 SHA512 9c82cce7540f8ab66e2e370e0220c99048d6ac53ed680cd763e0b03d0200e2451cee4303ef97b87a16e7248e1c73b92ba91b47a2a20c75cb2cd62695a28046f3
+DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
+DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc SHA512 21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
-DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13f1ccfb4948ce5eed1a4e76a4e96f0d6770d9841026ec5a515310ebaa4b335063e3516de454db8ba06cc4ee5a00ec SHA512 c085a0d04925485423086736a3c7d919ad0ca9efeff005890382da5333edb68c7d23ccb89fbe2ac44f8f016fc993bf2c669e450794c3ab13463676cbb47c7bf7
-DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
-DIST dovecot-2.3.4.1.tar.gz 6925073 BLAKE2B d8143bad01c107b68525d0cfc110e5bf4e3ffa0af49e7cafdfef263374e146a7ef6ed7107a7c5216c4b52da3640d7a9a80931c01d125d3852fa265171e4d4e09 SHA512 ff21aa0f0cae17dfa66617291688856727412defa48bad2b6be057cb509fbec1c2e134afbfee69929d06b8692a0fcbd8451671ba02860e1673ae1c9483c2c17e
-DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
-DIST dovecot-2.3.5.tar.gz 6970480 BLAKE2B 006f64ce87e3eff04f3df7689ba9caed0b6b4f83eef28ee8fc2bafcf4a90b0255bf3d0d5d6b32571de8eb339f720a4d7b6de7dd5e3bcf6d03ecc5d6fa679799c SHA512 10513c371aeadd52184daaf8dbb9a7559c6db55e34182bbb2c9539dae0897ddcc76f6fe2ce6a81c7ce0cb94c7f79438ae3bb0e7db8ed46615feb337b4078ecc6
+DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734 SHA512 041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5
diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild
deleted file mode 100644
index 0ce65014c0c1..000000000000
--- a/net-mail/dovecot/dovecot-2.2.19.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.9"
-if [[ ${PV} == *_rc* ]] ; then
- rc_dir="rc/"
-else
- rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
- sieve? (
- https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
- )
- managesieve? (
- https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
- ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~sh"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
- caps? ( sys-libs/libcap )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- lucene? ( >=dev-cpp/clucene-2.3 )
- lzma? ( app-arch/xz-utils )
- lz4? ( app-arch/lz4 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- selinux? ( sec-policy/selinux-dovecot )
- solr? ( net-misc/curl dev-libs/expat )
- sqlite? ( dev-db/sqlite:* )
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- tcpd? ( sys-apps/tcp-wrappers )
- vpopmail? ( net-mail/vpopmail )
- zlib? ( sys-libs/zlib )
- virtual/libiconv
- dev-libs/icu:="
-
-RDEPEND="${DEPEND}
- net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use managesieve && ! use sieve; then
- ewarn "managesieve USE flag selected but sieve USE flag unselected"
- ewarn "sieve USE flag will be turned on"
- fi
- # default internal user
- enewgroup dovecot 97
- enewuser dovecot 97 -1 /dev/null dovecot
- # default login user
- enewuser dovenull -1 -1 /dev/null
- # add "mail" group for suid'ing. Better security isolation.
- if use suid; then
- enewgroup mail
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-10-ssl.patch"
- epatch_user
-}
-
-src_configure() {
- local conf=""
-
- if use postgres || use mysql || use sqlite; then
- conf="${conf} --with-sql"
- fi
-
- local storages=""
- for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
- use ${storage} && storages="${storage} ${storages}"
- done
- [ "${storages}" ] || storages="maildir"
-
- # turn valgrind tests off. Bug #340791
- VALGRIND=no econf \
- --localstatedir="${EPREFIX}/var" \
- --runstatedir="${EPREFIX}/run" \
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
- --without-stemmer \
- --with-storages="${storages}" \
- --disable-rpath \
- --with-icu \
- $( systemd_with_unitdir ) \
- $( use_with bzip2 bzlib ) \
- $( use_with caps libcap ) \
- $( use_with kerberos gssapi ) \
- $( use_with ldap ) \
- $( use_with lucene ) \
- $( use_with lz4 ) \
- $( use_with lzma ) \
- $( use_with mysql ) \
- $( use_with pam ) \
- $( use_with postgres pgsql ) \
- $( use_with sqlite ) \
- $( use_with solr ) \
- $( use_with ssl ) \
- $( use_with tcpd libwrap ) \
- $( use_with vpopmail ) \
- $( use_with zlib ) \
- $( use_enable static-libs static ) \
- ${conf}
-
- if use sieve || use managesieve ; then
- # The sieve plugin needs this file to be build to determine the plugin
- # directory and the list of libraries to link to.
- emake dovecot-config
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- econf \
- $( use_enable static-libs static ) \
- --localstatedir="${EPREFIX}/var" \
- --enable-shared \
- --with-dovecot="../${MY_P}" \
- $( use_with managesieve )
- fi
-}
-
-src_compile() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- fi
-}
-
-src_test() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- default
- fi
-}
-
-src_install () {
- default
-
- # insecure:
- # use suid && fperms u+s /usr/libexec/dovecot/deliver
- # better:
- if use suid;then
- einfo "Changing perms to allow deliver to be suided"
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fi
-
- newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
- rm -rf "${ED}"/usr/share/doc/dovecot
-
- dodoc AUTHORS NEWS README TODO
- dodoc doc/*.{txt,cnf,xml,sh}
- docinto example-config
- dodoc doc/example-config/*.{conf,ext}
- docinto example-config/conf.d
- dodoc doc/example-config/conf.d/*.{conf,ext}
- docinto wiki
- dodoc doc/wiki/*
- doman doc/man/*.{1,7}
-
- # Create the dovecot.conf file from the dovecot-example.conf file that
- # the dovecot folks nicely left for us....
- local conf="${ED}/etc/dovecot/dovecot.conf"
- local confd="${ED}/etc/dovecot/conf.d"
-
- insinto /etc/dovecot
- doins doc/example-config/*.{conf,ext}
- insinto /etc/dovecot/conf.d
- doins doc/example-config/conf.d/*.{conf,ext}
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
- rm -f "${confd}/../README"
-
- # .maildir is the Gentoo default
- local mail_location="maildir:~/.maildir"
- if ! use maildir; then
- if use mbox; then
- mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
- keepdir /var/dovecot
- sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
- "${confd}/10-mail.conf" || die "sed failed"
- elif use mdbox ; then
- mail_location="mdbox:~/.mdbox"
- elif use sdbox ; then
- mail_location="sdbox:~/.sdbox"
- fi
- fi
- sed -i -e \
- "s|#mail_location =|mail_location = ${mail_location}|" \
- "${confd}/10-mail.conf" \
- || die "failed to update mail location settings in 10-mail.conf"
-
- # We're using pam files (imap and pop3) provided by mailbase
- if use pam; then
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
- "${confd}/auth-system.conf.ext" \
- || die "failed to update PAM settings in auth-system.conf.ext"
- # mailbase does not provide a sieve pam file
- use managesieve && dosym imap /etc/pam.d/sieve
- sed -i -e \
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
- "${confd}/10-auth.conf" \
- || die "failed to update PAM settings in 10-auth.conf"
- fi
-
- # Disable ipv6 if necessary
- if ! use ipv6; then
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
- || die "failed to update listen settings in dovecot.conf"
- fi
-
- # Update ssl cert locations
- if use ssl; then
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
- || die "ssl conf failed"
- sed -i -e 's:^ssl_cert =.*:ssl_cert = =dev-cpp/clucene-2.3 )
lzma? ( app-arch/xz-utils )
lz4? ( app-arch/lz4 )
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
pam? ( virtual/pam )
postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
selinux? ( sec-policy/selinux-dovecot )
@@ -85,8 +83,7 @@ pkg_setup() {
src_prepare() {
default
# bug 657108
- # elibtoolize
- eautoreconf
+ elibtoolize
}
src_configure() {
@@ -98,20 +95,17 @@ src_configure() {
# turn valgrind tests off. Bug #340791
VALGRIND=no econf \
- --with-rundir="${EPREFIX}/run/dovecot" \
--with-statedir="${EPREFIX}/var/lib/dovecot" \
+ --with-rundir="${EPREFIX}/run/dovecot" \
--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
--without-stemmer \
--disable-rpath \
- --without-libbsd \
--with-icu \
--with-ssl \
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $( use_with argon2 sodium ) \
$( use_with bzip2 bzlib ) \
$( use_with caps libcap ) \
$( use_with kerberos gssapi ) \
- $( use_with lua ) \
$( use_with ldap ) \
$( use_with lucene ) \
$( use_with lz4 ) \
@@ -135,7 +129,7 @@ src_configure() {
cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
econf \
$( use_enable static-libs static ) \
- --localstatedir="${EPREFIX%/}/var" \
+ --localstatedir="${EPREFIX}/var" \
--enable-shared \
--with-dovecot="${S}" \
$( use_with managesieve )
@@ -283,7 +277,7 @@ src_install () {
pkg_postinst() {
# Let's not make a new certificate if we already have one
if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
- -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
einfo "Creating SSL certificate"
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
install_cert /etc/ssl/dovecot/server
diff --git a/net-mail/dovecot/dovecot-2.2.36.ebuild b/net-mail/dovecot/dovecot-2.2.36.ebuild
deleted file mode 100644
index 86321f4a85d5..000000000000
--- a/net-mail/dovecot/dovecot-2.2.36.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.24"
-if [[ ${PV} == *_rc* ]] ; then
- rc_dir="rc/"
-else
- rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
- sieve? (
- https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
- )
- managesieve? (
- https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
- ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
- caps? ( sys-libs/libcap )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- lucene? ( >=dev-cpp/clucene-2.3 )
- lzma? ( app-arch/xz-utils )
- lz4? ( app-arch/lz4 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
- selinux? ( sec-policy/selinux-dovecot )
- solr? ( net-misc/curl dev-libs/expat )
- sqlite? ( dev-db/sqlite:* )
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- tcpd? ( sys-apps/tcp-wrappers )
- textcat? ( app-text/libexttextcat )
- vpopmail? ( net-mail/vpopmail )
- zlib? ( sys-libs/zlib )
- virtual/libiconv
- dev-libs/icu:="
-
-RDEPEND="${DEPEND}
- net-mail/mailbase"
-
-# Dovecot does not support building without ssl. Force it for now
-REQUIRED_USE="ssl"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use managesieve && ! use sieve; then
- ewarn "managesieve USE flag selected but sieve USE flag unselected"
- ewarn "sieve USE flag will be turned on"
- fi
- # default internal user
- enewgroup dovecot 97
- enewuser dovecot 97 -1 /dev/null dovecot
- # default login user
- enewuser dovenull -1 -1 /dev/null
- # add "mail" group for suid'ing. Better security isolation.
- if use suid; then
- enewgroup mail
- fi
-}
-
-src_prepare() {
- eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
- eapply_user
-}
-
-src_configure() {
- local conf=""
-
- if use postgres || use mysql || use sqlite; then
- conf="${conf} --with-sql"
- fi
-
- # turn valgrind tests off. Bug #340791
- VALGRIND=no econf \
- --with-statedir="${EPREFIX}/var/lib/dovecot" \
- --with-rundir="${EPREFIX}/run/dovecot" \
- --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
- --without-stemmer \
- --disable-rpath \
- --with-icu \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $( use_with bzip2 bzlib ) \
- $( use_with caps libcap ) \
- $( use_with kerberos gssapi ) \
- $( use_with ldap ) \
- $( use_with lucene ) \
- $( use_with lz4 ) \
- $( use_with lzma ) \
- $( use_with mysql ) \
- $( use_with pam ) \
- $( use_with postgres pgsql ) \
- $( use_with sqlite ) \
- $( use_with solr ) \
- $( use_with ssl ) \
- $( use_with tcpd libwrap ) \
- $( use_with textcat ) \
- $( use_with vpopmail ) \
- $( use_with zlib ) \
- $( use_enable static-libs static ) \
- ${conf}
-
- if use sieve || use managesieve ; then
- # The sieve plugin needs this file to be build to determine the plugin
- # directory and the list of libraries to link to.
- emake dovecot-config
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- econf \
- $( use_enable static-libs static ) \
- --localstatedir="${EPREFIX}/var" \
- --enable-shared \
- --with-dovecot="../${MY_P}" \
- $( use_with managesieve )
- fi
-}
-
-src_compile() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
- fi
-}
-
-src_test() {
- default
- if use sieve || use managesieve ; then
- cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
- default
- fi
-}
-
-src_install () {
- default
-
- # insecure:
- # use suid && fperms u+s /usr/libexec/dovecot/deliver
- # better:
- if use suid;then
- einfo "Changing perms to allow deliver to be suided"
- fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
- fi
-
- newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
- rm -rf "${ED}"/usr/share/doc/dovecot
-
- dodoc AUTHORS NEWS README TODO
- dodoc doc/*.{txt,cnf,xml,sh}
- docinto example-config
- dodoc doc/example-config/*.{conf,ext}
- docinto example-config/conf.d
- dodoc doc/example-config/conf.d/*.{conf,ext}
- docinto wiki
- dodoc doc/wiki/*
- doman doc/man/*.{1,7}
-
- # Create the dovecot.conf file from the dovecot-example.conf file that
- # the dovecot folks nicely left for us....
- local conf="${ED}/etc/dovecot/dovecot.conf"
- local confd="${ED}/etc/dovecot/conf.d"
-
- insinto /etc/dovecot
- doins doc/example-config/*.{conf,ext}
- insinto /etc/dovecot/conf.d
- doins doc/example-config/conf.d/*.{conf,ext}
- fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
- rm -f "${confd}/../README"
-
- # .maildir is the Gentoo default
- local mail_location="maildir:~/.maildir"
- sed -i -e \
- "s|#mail_location =|mail_location = ${mail_location}|" \
- "${confd}/10-mail.conf" \
- || die "failed to update mail location settings in 10-mail.conf"
-
- # We're using pam files (imap and pop3) provided by mailbase
- if use pam; then
- sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
- "${confd}/auth-system.conf.ext" \
- || die "failed to update PAM settings in auth-system.conf.ext"
- # mailbase does not provide a sieve pam file
- use managesieve && dosym imap /etc/pam.d/sieve
- sed -i -e \
- 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
- "${confd}/10-auth.conf" \
- || die "failed to update PAM settings in 10-auth.conf"
- fi
-
- # Disable ipv6 if necessary
- if ! use ipv6; then
- sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
- || die "failed to update listen settings in dovecot.conf"
- fi
-
- # Update ssl cert locations
- if use ssl; then
- sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
- || die "ssl conf failed"
- sed -i -e 's:^ssl_cert =.*:ssl_cert =
-Date: Mon, 9 Jul 2018 11:33:23 +0300
-Subject: [PATCH] m4: Enable rquota only if rpc/rpc.h exists
-
-It's been removed in glibc 2.26
----
- m4/quota.m4 | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/m4/quota.m4 b/m4/quota.m4
-index 5840e3af89..0695b1e021 100644
---- a/m4/quota.m4
-+++ b/m4/quota.m4
-@@ -7,8 +7,10 @@ AC_DEFUN([DOVECOT_RPCGEN], [
-
- have_rquota=no
- if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
-- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-- have_rquota=yes
-+ AC_CHECK_HEADER([rpc/rpc.h], [
-+ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-+ have_rquota=yes
-+ ])
- fi
- AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
- ])
-From 5803ae4bbd420def0072e1660ea7061c0e5dbcb9 Mon Sep 17 00:00:00 2001
-From: Timo Sirainen
-Date: Mon, 9 Jul 2018 11:39:59 +0300
-Subject: [PATCH] m4, quota: Support rquota using libtirpc
-
----
- m4/quota.m4 | 13 ++++++++++---
- src/plugins/quota/Makefile.am | 3 ++-
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/m4/quota.m4 b/m4/quota.m4
-index 0695b1e021..d75af447e1 100644
---- a/m4/quota.m4
-+++ b/m4/quota.m4
-@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [
-
- have_rquota=no
- if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
-- AC_CHECK_HEADER([rpc/rpc.h], [
-- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-+ PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [
- have_rquota=yes
-+ QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)"
-+ ], [
-+ AC_CHECK_HEADER([rpc/rpc.h], [
-+ have_rquota=yes
-+ ])
- ])
- fi
-+ if test "$have_rquota" = yes; then
-+ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
-+ fi
- AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
- ])
-
- AC_DEFUN([DOVECOT_QUOTA], [
- AC_SEARCH_LIBS(quota_open, quota, [
- AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()])
-- QUOTA_LIBS="-lquota"
-+ QUOTA_LIBS="$QUOTA_LIBS -lquota"
- ])
- AC_SUBST(QUOTA_LIBS)
- ])
-diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
-index f220d4f075..ffebc67404 100644
---- a/src/plugins/quota/Makefile.am
-+++ b/src/plugins/quota/Makefile.am
-@@ -19,7 +19,8 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/src/lib-storage/index/imapc \
- -I$(top_srcdir)/src/lib-storage/index/maildir \
- -I$(top_srcdir)/src/lib-program-client \
-- -I$(top_srcdir)/src/doveadm
-+ -I$(top_srcdir)/src/doveadm \
-+ $(LIBTIRPC_CFLAGS)
-
- NOPLUGIN_LDFLAGS =
- lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version
diff --git a/net-mail/dovecot/files/dovecot-glibc228.patch b/net-mail/dovecot/files/dovecot-glibc228.patch
deleted file mode 100644
index 9549c12f6e8f..000000000000
--- a/net-mail/dovecot/files/dovecot-glibc228.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001
-From: Aki Tuomi
-Date: Wed, 8 Aug 2018 12:33:20 +0300
-Subject: [PATCH] auth: mycrypt - include crypt.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes crypt usage on glibc-2.28
-
-Reported by Reuben Farrelly
-Patch provided by Thore Bödecker
----
- configure.ac | 2 +-
- src/auth/mycrypt.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd545ebfdc..c5d8fae666 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \
- quota.h sys/fs/quota_common.h \
- mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
- xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
-- sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h)
-+ sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h)
-
- CC_CLANG
- AC_CC_PIE
-diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c
-index c49fcf842e..0bd00bc238 100644
---- a/src/auth/mycrypt.c
-+++ b/src/auth/mycrypt.c
-@@ -14,6 +14,9 @@
- # define _XPG6 /* Some Solaris versions require this, some break with this */
- #endif
- #include
-+#ifdef HAVE_CRYPT_H
-+# include
-+#endif
-
- #include "mycrypt.h"
-
diff --git a/net-mail/dovecot/files/dovecot.init-r4 b/net-mail/dovecot/files/dovecot.init-r4
deleted file mode 100644
index 665aa0dc7333..000000000000
--- a/net-mail/dovecot/files/dovecot.init-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
- need localmount
- before postfix
- after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd
- use logger net
-}
-
-checkconfig() {
- DOVECOT_INSTANCE=${SVCNAME##*.}
- if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then
- DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
- else
- DOVECOT_CONF=/etc/dovecot/dovecot.conf
- fi
- if [ ! -e ${DOVECOT_CONF} ]; then
- eerror "You will need an ${DOVECOT_CONF} first"
- return 1
- fi
- if [ -x /usr/sbin/dovecot ]; then
- DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //')
- else
- eerror "dovecot not executable"
- return 1
- fi
- DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/run/dovecot}
- DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/dovecot \
- --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
- eend $?
-}
-
-stop() {
- checkconfig || return 1
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/dovecot \
- --pidfile "${DOVECOT_PIDFILE}"
- eend $?
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
- start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
- --pidfile "${DOVECOT_PIDFILE}"
- eend $?
-}
diff --git a/net-mail/dovecot/files/dovecot.init-r5 b/net-mail/dovecot/files/dovecot.init-r5
deleted file mode 100644
index 8a98603d4b42..000000000000
--- a/net-mail/dovecot/files/dovecot.init-r5
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
- need localmount
- before postfix
- after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd
- use logger net
-}
-
-checkconfig() {
- DOVECOT_INSTANCE=${SVCNAME##*.}
- if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then
- DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf
- else
- DOVECOT_CONF=/etc/dovecot/dovecot.conf
- fi
- if [ ! -e ${DOVECOT_CONF} ]; then
- eerror "You will need an ${DOVECOT_CONF} first"
- return 1
- fi
- if [ -x /usr/sbin/dovecot ]; then
- DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} config -h base_dir)
- else
- eerror "dovecot not executable"
- return 1
- fi
- DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot}
- DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/dovecot \
- --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
- eend $?
-}
-
-stop() {
- checkconfig || return 1
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/dovecot \
- --pidfile "${DOVECOT_PIDFILE}"
- eend $?
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
- start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
- --pidfile "${DOVECOT_PIDFILE}"
- eend $?
-}
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index 496575228ba5..d8223dea238d 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -7,14 +7,9 @@