diff --git a/Manifest.files.gz b/Manifest.files.gz
index 70a767d5de58..8b1f116bfa36 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 e24656cea601..8336e00764b4 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest
index 19513a06589f..86f5b8266148 100644
--- a/app-admin/logstalgia/Manifest
+++ b/app-admin/logstalgia/Manifest
@@ -1 +1 @@
-DIST logstalgia-1.0.7.tar.gz 902050 BLAKE2B 1ba368134c6335949e19a64b4b9167337a7475eac423fc14a3b906c89fa5a84e0062e1e123ef4c2b998c7596710df1844c5e7a46792d0f075b001ccaaa9c6c8d SHA512 862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9
+DIST logstalgia-1.1.2.tar.gz 2330691 BLAKE2B 20fb549282dde860ef1db272c75360219ce4614838264a2ad7dbaa25cd3c8509f215d61ec88679165eda9619d8a3d83d9201796fa7691517ca822fa110f37d14 SHA512 e2bd41cbc6edabc1ff82d0da4ad6f749e0e6d44e5a23ea976c31d19339f56e5f693ba86b81ceee3c7590842df61d61fe69f1378711b8e7d1c30deff330cacb1e
diff --git a/app-admin/logstalgia/logstalgia-1.0.7.ebuild b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
similarity index 87%
rename from app-admin/logstalgia/logstalgia-1.0.7.ebuild
rename to app-admin/logstalgia/logstalgia-1.1.2.ebuild
index 91fcf17890cc..be16497f71ac 100644
--- a/app-admin/logstalgia/logstalgia-1.0.7.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation"
-HOMEPAGE="http://logstalgia.io/"
+HOMEPAGE="https://logstalgia.io/"
SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index 6fb41c3843e8..5c508edb053c 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite?"
inherit distutils-r1
DESCRIPTION="A lightweight password-manager with multiple database backends"
-HOMEPAGE="https://pwman3.github.io"
+HOMEPAGE="https://pwman3.github.io/pwman3/"
SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index fa5fe331e43d..9edf7db35010 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -33,3 +33,4 @@ DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c
DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
DIST systemrescuecd-x86-5.3.0.iso 607547392 BLAKE2B 92aa82e54794adc1705111776b4df21bd39f96bdbed1c6e05bb24b01fd1a12d92fb1209241289f89adca7885fd441ddd61639d5168978b95dd0784faec65f32a SHA512 082a82a2882b62012944184107b2655de6c89f5a6c26145a3edb2b5a54ff6aad6a4ef43edc0468e62895daf4d5365d2722ffa8bf4f2f8e60f1ee7d9a727b013d
+DIST systemrescuecd-x86-5.3.1.iso 573913088 BLAKE2B 3c4da5777d05999e0b3e30b01dc821a4e840bb22d513fa4bfb9fdf601b9811676be8cee7ed9aae0aa7b971916add500b39172964384a2a07b3ed1cf5b946ba04 SHA512 1038622e148995450e61cd27f65af2ecb929ec8d0367fec3dbde01410a33596ec8f183d79ab931595c21deb597d60dae45ad516d8e1f00f32013729bdcd53ec8
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
new file mode 100644
index 000000000000..7bfc35a7dd27
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+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-editors/Manifest.gz b/app-editors/Manifest.gz
index c1da14a924ab..0b553cf508c1 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index 9d16e138aa8a..d81db94d00ef 100644
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ b/app-editors/nano/nano-2.9.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2dc5dd4c49f1..41c3485945c4 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 8d741121bcbc..11381210e22a 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1,3 @@
DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
DIST ebuild-mode-1.45.tar.xz 34520 BLAKE2B 15246a7b0a85d05270e3c4db8dc30c7e7ea704fa62644c11320fad8f25dcae8c17dbae86be5245b6ed9dd7650f247616c7a1fbd07536386ef2841b2351287f7a SHA512 b5842696bd548c11bf6164694c9d0bbd3cbfaa77b8f34cf27544033f39986610a6ec2e030c72da68f7645e851e6e377eb557d3eb721b8ad1b6b920dc8bf80750
+DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
new file mode 100644
index 000000000000..ba9fd8affe46
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like dev-python/docutils-glep for glep."
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f80bc312bd34..73aade6c615e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index 4448838ad32d..5839d29ef5cf 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,2 +1,3 @@
DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd
DIST reg-0.15.5.tar.gz 4053475 BLAKE2B 60541d7f02f3ee658fa185206f76df1045975101f0a25a636493a454984a8a2c836b1b74f7b8b6768c66ce0e12b12708b3f42d233e15ba64f0251b02a841bb76 SHA512 c1293868ea30dcdfc5251f95a5f287f8043be3a2372fdd08c0836919f6722c5931eb429f9047769b442bf3fdbb50c476e8509c62cb20b4b45d30793571cce44e
+DIST reg-0.15.6.tar.gz 4071110 BLAKE2B 376313ab4aef0f8bce21ddbed8f179aec14755990f6d99e5733c1550c58998f279e3c0beee7b2e11f25167bf7fb717dd731b69571adc410ad7475afcc98baef5 SHA512 1a5635af82f7a7951af325ffbc0d84c2e35ec0ecc040873ff7f0c7037fd2677cea235348c4fb0bf9397f1fd2ccee86e96ca080a1fbc28e60eb985e55e4a8a085
diff --git a/app-emulation/reg/reg-0.15.6.ebuild b/app-emulation/reg/reg-0.15.6.ebuild
new file mode 100644
index 000000000000..b09c7ab9af15
--- /dev/null
+++ b/app-emulation/reg/reg-0.15.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot user
+
+EGO_PN="github.com/genuinetools/reg"
+GIT_COMMIT="37fbf846946ae60a75e5d30e3d6ba6d4dd0489ed"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup reg
+ enewuser reg -1 -1 /var/lib/reg reg
+}
+
+src_prepare() {
+ pushd src/${EGO_PN} || die
+ default
+ popd || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+ popd || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc src/${EGO_PN}/README.md
+ insinto /var/lib/${PN}
+ doins -r src/${EGO_PN}/server/*
+ newinitd "${FILESDIR}"/reg.initd reg
+ newconfd "${FILESDIR}"/reg.confd reg
+
+ keepdir /var/log/reg
+ fowners -R reg:reg /var/log/reg /var/lib/reg/static
+}
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 408ebf7906c9..e7131adde7f5 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -3,5 +3,9 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329
DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
+DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
+DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
+DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
+DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93
DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.10.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.1.ebuild
new file mode 100644
index 000000000000..b026a94b44ef
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=2
+[[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+ https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+ $GRUB_URL/grub-0.97.tar.gz
+ $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+ $LIBPCI_URL/pciutils-2.2.9.tar.bz2
+ $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+ $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+ $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+ ${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+ sys-devel/bin86
+ sys-apps/texinfo
+ x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+retar-externals() {
+ # Purely to unclutter src_prepare
+ local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+ # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+ sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+ -i "${WORKDIR}"/zlib-1.2.3/configure
+ sed -e 's:^AR=ar rc:AR=ar:' \
+ -e s':$(AR) $@:$(AR) rc $@:' \
+ -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+ einfo "zlib Makefile edited"
+
+ cd "${WORKDIR}"
+ tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+ tar czp grub-0.97 -f grub-0.97.tar.gz
+ tar czp lwip -f lwip-1.3.0.tar.gz
+ tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+ tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+ mv $set "${S}"/stubdom/
+ einfo "tarballs moved to source"
+}
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ # if the user *really* wants to use their own custom-cflags, let them
+ if use custom-cflags; then
+ einfo "User wants their own CFLAGS - removing defaults"
+ # try and remove all the default custom-cflags
+ find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+ -i {} \;
+ fi
+
+ # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+ cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+ # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+ epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+ # fix jobserver in Makefile
+ epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+ #Substitute for internal downloading. pciutils copied only due to the only .bz2
+ cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+ retar-externals || die "re-tar procedure failed"
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --disable-werror \
+ --disable-xen"
+
+ econf ${myconf}
+}
+
+src_compile() {
+ use custom-cflags || unset CFLAGS
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+ if use x86; then
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ elif use amd64; then
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+ if has_multilib_profile; then
+ multilib_toolchain_setup x86
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ fi
+ fi
+}
+
+src_install() {
+ if use x86; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ if use amd64; then
+ emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+ if has_multilib_profile; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ fi
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.0.ebuild
new file mode 100644
index 000000000000..5d15b2bf7afd
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=1
+[[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+ https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+ $GRUB_URL/grub-0.97.tar.gz
+ $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+ $LIBPCI_URL/pciutils-2.2.9.tar.bz2
+ $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+ $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+ $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+ ${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+ sys-devel/bin86
+ sys-apps/texinfo
+ x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+retar-externals() {
+ # Purely to unclutter src_prepare
+ local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+ # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+ sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+ -i "${WORKDIR}"/zlib-1.2.3/configure
+ sed -e 's:^AR=ar rc:AR=ar:' \
+ -e s':$(AR) $@:$(AR) rc $@:' \
+ -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+ einfo "zlib Makefile edited"
+
+ cd "${WORKDIR}"
+ tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+ tar czp grub-0.97 -f grub-0.97.tar.gz
+ tar czp lwip -f lwip-1.3.0.tar.gz
+ tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+ tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+ mv $set "${S}"/stubdom/
+ einfo "tarballs moved to source"
+}
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ # if the user *really* wants to use their own custom-cflags, let them
+ if use custom-cflags; then
+ einfo "User wants their own CFLAGS - removing defaults"
+ # try and remove all the default custom-cflags
+ find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+ -i {} \;
+ fi
+
+ # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+ cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+ # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+ epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+ # fix jobserver in Makefile
+ epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+ #Substitute for internal downloading. pciutils copied only due to the only .bz2
+ cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+ retar-externals || die "re-tar procedure failed"
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --disable-werror \
+ --disable-xen"
+
+ econf ${myconf}
+}
+
+src_compile() {
+ use custom-cflags || unset CFLAGS
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+ if use x86; then
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ elif use amd64; then
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+ if has_multilib_profile; then
+ multilib_toolchain_setup x86
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ fi
+ fi
+}
+
+src_install() {
+ if use x86; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ if use amd64; then
+ emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+ if has_multilib_profile; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ fi
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild
index adacfc22b1cd..7eda6fb5ce29 100644
--- a/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
UPSTREAM_VER=2
SECURITY_VER=
# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/xen-4.10.1-r2.ebuild b/app-emulation/xen/xen-4.10.1-r2.ebuild
index 4aa52ebfe2bf..e8efb6489997 100644
--- a/app-emulation/xen/xen-4.10.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.10.1-r2.ebuild
@@ -12,11 +12,11 @@ MY_P=${PN}-${MY_PV}
if [[ $PV == *9999 ]]; then
inherit git-r3
- KEYWORDS=""
+ KEYWORDS="amd64"
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm -x86"
+ KEYWORDS="amd64 ~arm -x86"
UPSTREAM_VER=2
SECURITY_VER=
GENTOO_VER=
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 783302c190c9..d96c361bd652 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/fujiplay/Manifest b/app-misc/fujiplay/Manifest
index cf4af29ecfe5..ef977f241d8a 100644
--- a/app-misc/fujiplay/Manifest
+++ b/app-misc/fujiplay/Manifest
@@ -1 +1,2 @@
+DIST fujiplay-1.33.tar.gz 12588 BLAKE2B 4be2b4d44696f5d43942c19cde308874684c87762b2778026750c4db9ba249c2ec8b7986bca5c526c7199289b3094157c068067db38a015372fd6fbd5a1e285d SHA512 168ce95b6926da2438fb858b2537060877145b28638217214f72833fcc75b76dd7e5bba9ed0ca966cd2f7f1c31ca3302ee4662907bf743c393314d615d795149
DIST fujiplay.tgz 12588 BLAKE2B 4be2b4d44696f5d43942c19cde308874684c87762b2778026750c4db9ba249c2ec8b7986bca5c526c7199289b3094157c068067db38a015372fd6fbd5a1e285d SHA512 168ce95b6926da2438fb858b2537060877145b28638217214f72833fcc75b76dd7e5bba9ed0ca966cd2f7f1c31ca3302ee4662907bf743c393314d615d795149
diff --git a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
index 7f03c696c20e..1ae946336242 100644
--- a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
+++ b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
@@ -1,5 +1,5 @@
---- fujiplay.c 1999-02-23 10:30:31.000000000 +0100
-+++ fujiplay.c 2006-08-05 00:50:08.000000000 +0200
+--- a/fujiplay.c 1999-02-23 10:30:31.000000000 +0100
++++ b/fujiplay.c 2006-08-05 00:50:08.000000000 +0200
@@ -759,40 +759,38 @@
return 1;
}
diff --git a/app-misc/fujiplay/fujiplay-1.33-r1.ebuild b/app-misc/fujiplay/fujiplay-1.33-r1.ebuild
new file mode 100644
index 000000000000..796eccb8d312
--- /dev/null
+++ b/app-misc/fujiplay/fujiplay-1.33-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
+HOMEPAGE="https://www.math.u-psud.fr/~bousch/fujiplay.html"
+SRC_URI="https://www.math.u-psud.fr/~bousch/${PN}.tgz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}"/${P}-unterminated-strings.patch )
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin fujiplay yycc2ppm
+ dodoc README fujiplay.lsm mx700-commands.html
+ emake all clean
+}
+
+pkg_postinst() {
+ ln -s /dev/ttyS0 /dev/fujifilm || die
+ elog "A symbolic link /dev/ttyS0 -> /dev/fujifilm was created."
+ elog "You may want to create a serial group to allow non-root"
+ elog "members R/W access to the serial device."
+ elog
+}
+
+pkg_postrm() {
+ rm -f /dev/fujifilm || die
+ elog
+ elog "The symbolic link /dev/fujifilm was removed."
+ elog
+}
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index 94a7b4478e73..b37343e1df46 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,2 +1 @@
-DIST tmux-xpanes-2.2.2.tar.gz 34457 BLAKE2B b4f33ac6576db4100a4d6895c3c705fe3d44093a1c63d89c20f4203fb71160415903ae70880387f0419ec5bebdb9244a9e5802d9ae8a9c441e3ceebea1e70582 SHA512 0d5242daf95c0af78b64184ba1473620783072851f34fe2a91d4806dc529402bd506ada2e8a455b687f4504bac5cac8300249d555446edaa54a41f3b2eddd45c
DIST tmux-xpanes-3.0.0.tar.gz 45256 BLAKE2B 6637e27816af643498bb7523fcdd39fc5e9272adb83101a20fd5c77f0917ae832986b3f811dab2020b0906dd81808438b9dba5cef737d502a0d91d2a72c4de19 SHA512 2a7187ac7251211f7fd6832cc60182621ae12f40de30cb3826452ea0e8b032351a261d1b1e7d79d87dfea3bbe95fd5140157e1b1e1ff29492f4df489aaec4711
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
deleted file mode 100644
index 8b1b598c9eab..000000000000
--- a/app-misc/tmux-xpanes/tmux-xpanes-2.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="tmux-based terminal divider"
-HOMEPAGE="https://github.com/greymd/tmux-xpanes"
-SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="zsh-completion"
-
-RDEPEND="
- app-misc/tmux
- dev-lang/perl
- dev-libs/openssl:0=
- zsh-completion? ( app-shells/zsh )"
-
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-DOCS=( CONTRIBUTING.md LICENSE README.md )
-
-src_install() {
- dobin bin/*
- doman man/*.1
- einstalldocs
- if use zsh-completion; then
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/*
- fi
-}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild
index 9c3375a45245..dda36039900c 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="tmux-based terminal divider"
HOMEPAGE="https://github.com/greymd/tmux-xpanes"
SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
diff --git a/app-misc/tmux2html/Manifest b/app-misc/tmux2html/Manifest
new file mode 100644
index 000000000000..bbedc665f063
--- /dev/null
+++ b/app-misc/tmux2html/Manifest
@@ -0,0 +1 @@
+DIST tmux2html-0.1.11.tar.gz 20002 BLAKE2B 690e170bf903682a9bdbbfa49ec7a2995d19bfa9372533b5cecff5b7dfa4c389832a8e2315c3438d435c3b4f75bec8b7fc43161691912ef29d910779d46af24e SHA512 b478a697413acd90a92b3a349fc3c477ee1014f47816190d2066058711e2025a9f99e3f973dfd3165782a566d12aae4e3c491f58a924769d1d28c3f48c9e9601
diff --git a/app-misc/tmux2html/metadata.xml b/app-misc/tmux2html/metadata.xml
new file mode 100644
index 000000000000..70d20d789e99
--- /dev/null
+++ b/app-misc/tmux2html/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ shell-tools@gentoo.org
+ Gentoo Shell Tools Project
+
+
+ greymd/tmux-xpanes
+
+
diff --git a/app-misc/tmux2html/tmux2html-0.1.11.ebuild b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
new file mode 100644
index 000000000000..81bf38621577
--- /dev/null
+++ b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Render full tmux windows or individual panes as HTML"
+HOMEPAGE="https://github.com/tweekmonster/tmux2html"
+SRC_URI="https://github.com/tweekmonster/tmux2html/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+ app-misc/tmux
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 78ff4768f0ec..d042c4ccd304 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
index 01637fc6d612..285959c3464f 100644
--- a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
@@ -63,8 +63,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -144,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
@@ -439,6 +440,7 @@ src_configure() {
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
$(use_enable vlc)
+ $(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 01637fc6d612..285959c3464f 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -63,8 +63,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -144,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
@@ -439,6 +440,7 @@ src_configure() {
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
$(use_enable vlc)
+ $(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 95989401be93..54d654db3d59 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,8 +63,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -144,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
@@ -441,6 +442,7 @@ src_configure() {
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
$(use_enable vlc)
+ $(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2bfdd71dc7f5..2d546a3ecb1f 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/eix/eix-0.33.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
index 3f61ef866261..572f9750bbf5 100644
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ b/app-portage/eix/eix-0.33.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 634fe63b6a52..f07795f51987 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -11,10 +11,6 @@
Upstream developer, CC on bugs, do not copy ebuilds
from his overlay
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-