diff --git a/Manifest.files.gz b/Manifest.files.gz
index 37f495d9d56a..bf6440b84ef7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index d984fa47f6c7..5fb6e0ada6ec 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/etcd/Manifest b/acct-group/etcd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/etcd/etcd-0.ebuild b/acct-group/etcd/etcd-0.ebuild
new file mode 100644
index 000000000000..841bf1ab43ea
--- /dev/null
+++ b/acct-group/etcd/etcd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=426
diff --git a/acct-group/etcd/metadata.xml b/acct-group/etcd/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/etcd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/mosquitto/metadata.xml b/acct-group/mosquitto/metadata.xml
index b978ba7d36bd..c74515c3e34a 100644
--- a/acct-group/mosquitto/metadata.xml
+++ b/acct-group/mosquitto/metadata.xml
@@ -5,12 +5,4 @@
mattst88@gentoo.org
Matt Turner
-
- ramage.lucas@protonmail.com
- Lucas Ramage
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 1537c86bd402..0db3e6baaaeb 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/etcd/Manifest b/acct-user/etcd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/etcd/etcd-0.ebuild b/acct-user/etcd/etcd-0.ebuild
new file mode 100644
index 000000000000..83c47c1df732
--- /dev/null
+++ b/acct-user/etcd/etcd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for etcd"
+ACCT_USER_HOME=/var/lib/etcd
+ACCT_USER_ID=426
+ACCT_USER_GROUPS=( etcd )
+
+acct-user_add_deps
diff --git a/acct-user/etcd/metadata.xml b/acct-user/etcd/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/etcd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-user/mosquitto/metadata.xml b/acct-user/mosquitto/metadata.xml
index b978ba7d36bd..c74515c3e34a 100644
--- a/acct-user/mosquitto/metadata.xml
+++ b/acct-user/mosquitto/metadata.xml
@@ -5,12 +5,4 @@
mattst88@gentoo.org
Matt Turner
-
- ramage.lucas@protonmail.com
- Lucas Ramage
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f3d0ad20e3f2..c8235a1327b5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/lib_users/lib_users-0.14.ebuild b/app-admin/lib_users/lib_users-0.14.ebuild
index d001e7f9a824..7edb2878fdc4 100644
--- a/app-admin/lib_users/lib_users-0.14.ebuild
+++ b/app-admin/lib_users/lib_users-0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 06bfabd50cf4..9532357df52e 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild
index dd9a716907e4..c07e9c3cdddb 100644
--- a/app-arch/libarchive/libarchive-3.4.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~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 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
RDEPEND="
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
index 3a61ba9f510f..338d10a35564 100644
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
S=${WORKDIR}
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index db0d82346bdd..cbc5476fba22 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 4934269b26e6..6ed7ea812201 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -1,7 +1,7 @@
-DIST upx-3.95-amd64_linux.tar.xz 456788 BLAKE2B 1ed17ebb799da2c17ec863067f33526f87b84e2fea9643678939c9ac70afdc6c7b689dcf9e5ec716c0b4a6684ecf03370f08c5e2db707e6c3ec2adfb60e0b9f4 SHA512 23067ce45123eaee3810464e91c3ed65527bbed3b9546aa42d3eeae842efdf0ab5de70c584631e5642deaacf16cc574918889ca35b0611afa1b10fb489bda861
-DIST upx-3.95-arm64_linux.tar.xz 457592 BLAKE2B c9c009ba7b63743bc98653f76b8f8f03cc74cfa490e48e0c01b7d8fc9c2146026b1f5a8bf9141a35ab02cd40ab5658bded9180f26ea9f210d1e1fd9f2322c738 SHA512 7a8541bec07f9630521edb98844f7d8f6302d9ff4874ece18673598c8872e626681119e89a64ebfaf3e707bcc6e07f3072f34416e97256d25c8cbcf707f123bb
-DIST upx-3.95-armeb_linux.tar.xz 412608 BLAKE2B 2acd5a06512696f4c52a33014fe25515aedaa9704942048ab0dd5b3b6db48c75160056818f03ee960f93c3a886d1aa501a496509dd04f31b79c6d0a93d2bdb3e SHA512 9e1d9057f1bf0a4262b3d672b1a50f192380e29189d5d0bd8963ec79247a9246db53b3ff9c180ab4c961e464dd1c8fe1c8e7541a3a2cc3c0f8a56fecdedfe956
-DIST upx-3.95-i386_linux.tar.xz 477560 BLAKE2B 7ee9d05227c8b39e186a8e0521eea2831780e142bbf3ec608e805bf33b4ab9ac72b249204b42f640d695a56b03b4576f9ae838129a823ec9fe1ed9b497b1de1b SHA512 bd1c6fb1f1f90732a666d6a254896a6c359d3f21c6be6f751aa8899e03487c696b9cacc79ed3c05af4e53b3e3374c5b64f5af9a4e85e11e4c31d972c0f25ac42
-DIST upx-3.95-mipsel_linux.tar.xz 477840 BLAKE2B f3863d7f8eb33554c5873b0cab0190bcc1f0efb3e40e1aad09a96f6fd2319234620d393f9b0fea344940a42be969862f9e60f05440e7608c77183da6f1899225 SHA512 27c8a328b18ed236856f36d9f520d1f7ee006d181e77674d2b8b2296993c34e6394befbefded58f9a70403d2e65b5a143a748adffe8f517393c884f8e9e4abe5
-DIST upx-3.95-powerpc64le_linux.tar.xz 498012 BLAKE2B 111c174887aed8f748278b0480e3e4e32793c8c8f6aa78cfac684c82f27be6c762921baef2bb39a0a07f004bc2c5af0d3953a6aa4fa41f3c65e543bf74dfb10d SHA512 5ec4d811baf9865669972ca8fd57e455d1baf88340e6cb87170486ff398a38c0e6781026d3a3d9a2b3ccbb8420b1c43825b78aedc24ce3adeda79bc5d57473a2
-DIST upx-3.95-powerpc_linux.tar.xz 473136 BLAKE2B 3b4800db76df4f864cde650827b2fe4d34f97e31d7fe0ff5859e3542042b8b8029df8fb50eb8891634319c75b3e406c2be5c67384585d833852ebb586fb7b7b0 SHA512 f0114c3eea0fa55a8105c3111ddd1c3bf15acf14747529ffd3c4b31a25328571ba85f22ef7b7e5f83113a4bb1dce77029abf279ec46d78bf955cd7ccb77eaf40
+DIST upx-3.96-amd64_linux.tar.xz 462784 BLAKE2B bac24742528b241c15bb49cfd6f006c485c28c051606deefc9b3c64d045658d029fe8dd1110120b6c21c03c30c0220ff8638d7e254a0376037b0d0ab013e9f3d SHA512 b4e7ad9ca58e07a0a59bcc1959d7901b1960a0975e4030b16c6aebfccd2f5f9163318f8f5b4a08bfd513138fe4c0fa3e3683f9141f221faa7bdfb8eaba4d0782
+DIST upx-3.96-arm64_linux.tar.xz 462376 BLAKE2B 202e888def2d60dab9d119548ac85ac6dcd0bff7e0c442fccd9a81961dc10ad96e7fe19b4a7a250c65d0bf9dd49ced8cdc7fdfb08cc7b75953a02afbff682865 SHA512 f1f6556068df27747dd40cdce3f3dfeb5c9a8723bfa76772715db69473267dd11242bf026c5a45e869b0f343559ede232d9a0067f4e4adce555cef1f26013f65
+DIST upx-3.96-armeb_linux.tar.xz 418060 BLAKE2B bb987a0a1466b3e5f4f2797888bf28c844f42eab3800dae00106cf4078c7196d6737ce9a3b9d1792d1ad1a190da8e90f2d29272127a20e4b2a9f5551511659ff SHA512 1bb570926a44c5471e00e3e2797728fa8122bc4035884f8fe8d7f4f3100e7dbddb84c80ad13c02d1a7454b1df504f96b8c0543913b1963c434ee2191d748e486
+DIST upx-3.96-i386_linux.tar.xz 485836 BLAKE2B 1bbcbde3d510eec9a38876958bb127eebe46c1f18146a62e5697fcfac0aa34bc910f3908e1783541466e46b305cdfd353902682c97301df38cd0550ca0302c34 SHA512 c679ddaf447735378d116cbff48276e13f9703f19a11364cad411915a153e2d7a6377f2ae8ce0f0383557ec889f44bb9860fd0b65bafce9935c6f381d485b13d
+DIST upx-3.96-mipsel_linux.tar.xz 483832 BLAKE2B c7f79ecc0e9f0b3f4ae9beaf0dc06e43e4cd747fde5bbd8d24505a008171f55c14ef411927cd112dd7fb170923679266170975e89cbeab43b17d842c20e29ff0 SHA512 252f64bb2d44d687daca645b1e0cd91665a562e86e1ce8fa95b57709134f74810f29f5792f7b8a1fe6c0517728632613a202a209465f1bd56ccbb383d9eea1ae
+DIST upx-3.96-powerpc64le_linux.tar.xz 505260 BLAKE2B 9e92e5e72436a3309c788a96a03c98bfd53bf51d3a22e85c6e58669b8c5536e107949fa860b25e1abc759b229aef76607819e62db353983f6f87f04d59395599 SHA512 8b577444366288427d6b114793b3f8fb42bf223b82bb78a391e5233c3cb3fe6906722ff7430aeaa764ef3feb77f052da469eab9d0dee90182929beefc5b1f17c
+DIST upx-3.96-powerpc_linux.tar.xz 479488 BLAKE2B 2d07dd57b742dd5a3ddcc86298618a939bd46a4af6f9bed41a3e0f12456bffb0ba7d76c866076489cb03130a9b9d84493f5401db5e76571cda4d7e9d65bef691 SHA512 a8f38f2467bc31d8cff2dc0fed191d1451aed766ab49336c7c99fe1b1a48455b08d9d45b14c78d655bc3c811c5fa2466701e1a990a5c954b0ce84499458024cb
diff --git a/app-arch/upx-bin/metadata.xml b/app-arch/upx-bin/metadata.xml
index 97da883f8ae3..b1093ce78b05 100644
--- a/app-arch/upx-bin/metadata.xml
+++ b/app-arch/upx-bin/metadata.xml
@@ -12,5 +12,4 @@
upx/upx
- UPX is a versatile executable packer with a excellent compression ratio
diff --git a/app-arch/upx-bin/upx-bin-3.95.ebuild b/app-arch/upx-bin/upx-bin-3.96.ebuild
similarity index 97%
rename from app-arch/upx-bin/upx-bin-3.95.ebuild
rename to app-arch/upx-bin/upx-bin-3.96.ebuild
index affd20a17ce8..7caa782afd3c 100644
--- a/app-arch/upx-bin/upx-bin-3.95.ebuild
+++ b/app-arch/upx-bin/upx-bin-3.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index b1b537bdcd18..1464eec2d85e 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1 +1 @@
-DIST upx-3.95-src.tar.xz 790776 BLAKE2B e7e5e24ba3675ab9f9f3daa36d6d3f00b6af614c2ca64c4d185a065afcdc02373ccf0200f7116ebbfaa1f9b961078f40296b1c716eca80aba86e95d6a9463b99 SHA512 0e1d3e26462057f16587197e73301957e870107808fdbcd24d9976094dfa0e5efbe8da0f9b6732a99f05990dcd4be242a87ea19a7110dc052c6dc982cd596416
+DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
diff --git a/app-arch/upx/metadata.xml b/app-arch/upx/metadata.xml
index 97da883f8ae3..b1093ce78b05 100644
--- a/app-arch/upx/metadata.xml
+++ b/app-arch/upx/metadata.xml
@@ -12,5 +12,4 @@
upx/upx
- UPX is a versatile executable packer with a excellent compression ratio
diff --git a/app-arch/upx/upx-3.95.ebuild b/app-arch/upx/upx-3.96.ebuild
similarity index 95%
rename from app-arch/upx/upx-3.95.ebuild
rename to app-arch/upx/upx-3.96.ebuild
index c991b587c2bf..73fe7d2befec 100644
--- a/app-arch/upx/upx-3.95.ebuild
+++ b/app-arch/upx/upx-3.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a6855c408d5a..cf9e5f3d36c3 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index d68cbbc1a7bb..64034c02aa82 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,2 +1 @@
-DIST okteta-0.26.2.tar.xz 976264 BLAKE2B 6bd0708ecab61097130ad3b96d44c4a58a7711f6d9ecc9c70d3db792728489f395e691b0157f0cf8ffc0e07b1796ce6fde9f689108c3236412ad37c4e87a210a SHA512 9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246
DIST okteta-0.26.3.tar.xz 947272 BLAKE2B c4502315a3713aebfb6f19adb92b01268346b0f71f1f59007b7f0dc06aa1ad71993a7b022669f7912ad10cec6c7d2eed9b552d66294f6b6657e664c3b1ba95bd SHA512 345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6
diff --git a/app-editors/okteta/okteta-0.26.2.ebuild b/app-editors/okteta/okteta-0.26.2.ebuild
deleted file mode 100644
index 4e9dc984c24f..000000000000
--- a/app-editors/okteta/okteta-0.26.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://kde.org/applications/utilities/okteta
-https://utils.kde.org/projects/okteta/"
-IUSE="crypt designer"
-
-DEPEND="
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript 'scripttools')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- crypt? ( app-crypt/qca:2[qt5(+)] )
- designer? ( $(add_qt_dep designer) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DOMIT_EXAMPLES=ON
- $(cmake_use_find_package crypt Qca-qt5)
- -DBUILD_DESIGNERPLUGIN=$(usex designer)
- )
-
- kde5_src_configure
-}
-
-src_test() {
- local myctestargs=( -j1 )
-
- kde5_src_test
-}
diff --git a/app-editors/okteta/okteta-0.26.3.ebuild b/app-editors/okteta/okteta-0.26.3.ebuild
index a03835d9b894..dea05ea663b9 100644
--- a/app-editors/okteta/okteta-0.26.3.ebuild
+++ b/app-editors/okteta/okteta-0.26.3.ebuild
@@ -17,7 +17,7 @@ https://utils.kde.org/projects/okteta/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 98119ca073ce..40b2d4adeac2 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/bochs/bochs-9999.ebuild b/app-emulation/bochs/bochs-9999.ebuild
new file mode 100644
index 000000000000..fa7208ddc58f
--- /dev/null
+++ b/app-emulation/bochs/bochs-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit subversion
+
+DESCRIPTION="LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/bochs/code/trunk/bochs"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64"
+REQUIRED_USE="
+ avx? ( x86-64 )
+ gdb? ( !debugger !smp )
+ debugger? ( !gdb )
+"
+
+RDEPEND="
+ X? ( x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXpm )
+ sdl? ( media-libs/libsdl )
+ svga? ( media-libs/svgalib )
+ readline? ( sys-libs/readline:= )
+ ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+ doc? ( app-text/docbook-sgml-utils )
+ sys-apps/sed
+ >=app-text/opensp-1.5
+"
+
+src_prepare() {
+ default
+ sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
+ Makefile.in || die
+}
+
+src_configure() {
+ econf \
+ --enable-all-optimizations \
+ --enable-idle-hack \
+ --enable-cdrom \
+ --enable-clgd54xx \
+ --enable-cpu-level=6 \
+ --enable-disasm \
+ --enable-e1000 \
+ --enable-gameport \
+ --enable-iodebug \
+ --enable-monitor-mwait \
+ --enable-ne2000 \
+ --enable-plugins \
+ --enable-pci \
+ --enable-pnic \
+ --enable-raw-serial \
+ --enable-sb16=linux \
+ --enable-usb \
+ --enable-usb-ohci \
+ --enable-usb-xhci \
+ --prefix=/usr \
+ --with-nogui \
+ --without-wx \
+ $(use_enable 3dnow) \
+ $(use_enable avx) \
+ $(use_enable debugger) \
+ $(use_enable doc docbook) \
+ $(use_enable gdb gdb-stub) \
+ $(use_enable readline) \
+ $(use_enable smp) \
+ $(use_enable x86-64) \
+ $(use_with ncurses term) \
+ $(use_with sdl) \
+ $(use_with svga) \
+ $(use_with vnc rfb) \
+ $(use_with X x) \
+ $(use_with X x11) \
+ ${myconf}
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 60c4da2a17a5..1baa517747db 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-python/eselect-python-20190417.ebuild b/app-eselect/eselect-python/eselect-python-20190417.ebuild
index 1e385f9ddd9f..b301c2264d5d 100644
--- a/app-eselect/eselect-python/eselect-python-20190417.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20190417.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
else
SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index cf5727ab5492..373839275903 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/zhcon/Manifest b/app-i18n/zhcon/Manifest
deleted file mode 100644
index bec7b2bc0c36..000000000000
--- a/app-i18n/zhcon/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 BLAKE2B eb7b3bc38ae77c7a0add2a0693822fb34a7721ec4224a5be6fc533f0c69878a66c123a12b2d38a09ab1a3360f3d1e0658ccaf35e138d102748675cd60f81df21 SHA512 c4725e600cde5a629735506c8eaa3b78df4606cd2745891a21c4f25889cff10b6fe4cbeb3cf60b85ad62ed0e46c8e7bbb802b7675f79f3a1d82f6942c393d4ad
-DIST zhcon-0.2.5.tar.gz 5011644 BLAKE2B 326add20cac0bab31c4a34a0261374f2daf8db84f0fafd774c3498c4ba42275a6258bac0b74447626e691c1e86bcd6e0a6408cb8d6af5c1ff2a8912b5dc3d411 SHA512 35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch b/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
deleted file mode 100644
index beece66b1da8..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -NrU5 zhcon-0.2.6.orig/src/basefont.cpp zhcon-0.2.6/src/basefont.cpp
---- zhcon-0.2.6.orig/src/basefont.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/basefont.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
-
-+#include
-+
- BaseFont::BaseFont(string & fn, int w, int h)
- :mFd(0)
- ,mpBuf(0)
- ,mWidth(w)
- ,mHeight(h) {
-diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear4.cpp zhcon-0.2.6/src/display/fblinear4.cpp
---- zhcon-0.2.6.orig/src/display/fblinear4.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -20,10 +20,12 @@
- #include
- #include
- #include "global.h"
- #include "fblinear4.h"
-
-+#include
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x0000,0xf000,0x0f00,0xff00,
- 0x00f0,0xf0f0,0x0ff0,0xfff0,
- 0x000f,0xf00f,0x0f0f,0xff0f,
-diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear8.cpp zhcon-0.2.6/src/display/fblinear8.cpp
---- zhcon-0.2.6.orig/src/display/fblinear8.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -20,10 +20,12 @@
- #include
- #include
- #include "global.h"
- #include "fblinear8.h"
-
-+#include
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x00000000,0xff000000,0x00ff0000,0xffff0000,
- 0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
- 0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
-diff -NrU5 zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp zhcon-0.2.6/src/display/fbvgaplanes.cpp
---- zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -36,10 +36,12 @@
- : "a" ((char) value),
- "d" ((unsigned short) port));
- }
- #endif
-
-+#include
-+
- /* based on kernel
- * Force strict CPU ordering.
- * And yes, this is required on UP too when we're talking
- * to devices.
- *
-diff -NrU5 zhcon-0.2.6.orig/src/display/vgadev.cpp zhcon-0.2.6/src/display/vgadev.cpp
---- zhcon-0.2.6.orig/src/display/vgadev.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -35,10 +35,12 @@
- #include
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
-
-+#include
-+
- #define GRAPH_BASE 0xA0000
- #define GRAPH_ADDR 0x3ce
- #define GRAPH_DATA 0x3cf
-
- char *VGADev::mpBuf = NULL;
-diff -NrU5 zhcon-0.2.6.orig/src/graphdev.cpp zhcon-0.2.6/src/graphdev.cpp
---- zhcon-0.2.6.orig/src/graphdev.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp 2008-04-29 23:16:14.000000000 +0200
-@@ -24,20 +24,23 @@
- #include
- #include
- #include
- #include
- #include
-+#include
- #include "debug.h"
-
- #include "display/fbdev.h"
- #include "display/vgadev.h"
- #if defined(linux) || defined(__FreeBSD__)
- #ifdef HAVE_GGI_LIB
- #include "display/libggi.h"
- #endif
- #endif
-
-+#include
-+
- using namespace std;
- // mmap framebuffer address
- GraphDev *GraphDev::mpGraphDev = NULL;
-
- // font
-diff -NrU5 zhcon-0.2.6.orig/src/inputclient.cpp zhcon-0.2.6/src/inputclient.cpp
---- zhcon-0.2.6.orig/src/inputclient.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputclient.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -14,10 +14,12 @@
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-
-+#include
-+
- #include "inputclient.h"
-
- Console* InputClient::mpCon = NULL;
- InputClient::InputClient()
- : mVisible(false),
-diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.cpp zhcon-0.2.6/src/inputmanager.cpp
---- zhcon-0.2.6.orig/src/inputmanager.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputmanager.cpp 2008-04-29 23:19:01.000000000 +0200
-@@ -22,10 +22,11 @@
- using namespace std;
-
- #include
- #include
- #include
-+#include
-
- #include "global.h"
- #include "debug.h"
- #include "keymap.h"
- #include "console.h"
-diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.h zhcon-0.2.6/src/inputmanager.h
---- zhcon-0.2.6.orig/src/inputmanager.h 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputmanager.h 2008-04-29 23:15:37.000000000 +0200
-@@ -24,10 +24,11 @@
- *@author ejoy
- */
- using namespace std;
- #include
- #include
-+#include
-
- #include "mouse.h"
- #if defined(__FreeBSD__)
- #include
- #endif
-diff -NrU5 zhcon-0.2.6.orig/src/window.cpp zhcon-0.2.6/src/window.cpp
---- zhcon-0.2.6.orig/src/window.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/window.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -22,10 +22,12 @@
- #include
- #include "global.h"
- #include "debug.h"
- #include "window.h"
-
-+#include
-+
- //static members for all the windows
- Window* Window::mpConsole = NULL;
- char* Window::mpOverlaps = NULL;
-
- Window::Window(int x1, int y1, int x2, int y2, int type)
-diff -NrU5 zhcon-0.2.6.orig/src/zhcon.cpp zhcon-0.2.6/src/zhcon.cpp
---- zhcon-0.2.6.orig/src/zhcon.cpp 2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/zhcon.cpp 2008-04-29 23:15:37.000000000 +0200
-@@ -81,10 +81,12 @@
- #ifndef NDEBUG
- #include "debug.h"
- ofstream debug("debug");
- #endif
-
-+#include
-+
- Zhcon* Zhcon::mpZhcon = NULL;
- int Zhcon::mTtyPid = 0;
- Zhcon::STATE Zhcon::mState = STOP;
-
- void Zhcon::SignalVtLeave(int signo) {
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch b/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
deleted file mode 100644
index 67d5b961a070..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/display/lrmi.c b/src/display/lrmi.c
-index 85c6fe6..5c74260 100644
---- a/src/display/lrmi.c
-+++ b/src/display/lrmi.c
-@@ -33,6 +33,13 @@ This software has NO WARRANTY. Use it at your own risk.
-
- #include "lrmi.h"
-
-+#if defined(__linux__) && !defined(TF_MASK)
-+ #define TF_MASK X86_EFLAGS_TF
-+ #define IF_MASK X86_EFLAGS_IF
-+ #define VIF_MASK X86_EFLAGS_VIF
-+ #define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- #define REAL_MEM_BASE ((void *)0x10000)
- #define REAL_MEM_SIZE 0x10000
- #define REAL_MEM_BLOCKS 0x100
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
deleted file mode 100644
index 58da5e99766a..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/winime.cpp b/src/winime.cpp
-index 0c52393..85729a3 100644
---- a/src/winime.cpp
-+++ b/src/winime.cpp
-@@ -56,10 +56,10 @@ mCandilistBufLen(0)
-
- memcpy(&mHead, mpBuf, sizeof(mHead));
- int len = strlen(mHead.mCodeSet);
-- mpIndex1 = (char **) (mpBuf + sizeof(mHead));
-- mpIndex2 = (char **) (mpBuf + sizeof(mHead) + len * sizeof(char *));
-- mpText = mpBuf + sizeof(mHead) + len * sizeof(char *) +
-- len * len * sizeof(char *);
-+ mpIndex1 = (int *) (mpBuf + sizeof(mHead));
-+ mpIndex2 = (int *) (mpBuf + sizeof(mHead) + len * sizeof(int));
-+ mpText = mpBuf + sizeof(mHead) + len * sizeof(int) +
-+ len * len * sizeof(int);
- }
-
- WinIme::~WinIme() {
-@@ -246,32 +246,33 @@ int WinIme::Search(char c) {
- // p = *t;
- }
- else
-- p = mpIndex1[Index(c)];
-+ p = (char *)mpIndex1[Index(c)];
-
- if (p == (char *) 0xffffffff)
- found = false;
-- p = (unsigned int) p + mpText;
-+ p = (unsigned long) p + mpText;
- } //2nd level index
- else if (mNum == 1) {
- int l = strlen(mHead.mCodeSet);
- if (c == mHead.mWildChar) {
- char **t;
- t =
-- find_if(mpIndex2 + Index(mInput[0]) * l,
-- mpIndex2 + (Index(mInput[0]) + 1) * l,
-+ find_if((char **)(mpIndex2 + Index(mInput[0]) * l),
-+ (char **)(mpIndex2 + (Index(mInput[0]) + 1) * l),
- bind2nd(not_equal_to < char *>(),
- (char *) 0xffffffff));
-- if (t == mpIndex2 + (Index(mInput[0]) + 1) * l)
-+ if (t == ((char **)mpIndex2) + (Index(mInput[0]) + 1) * l)
- p = (char *) 0xffffffff;
- else
- p = *t;
-- } else
-- p = mpIndex2[Index(mInput[0]) * l + Index(c)];
-+ } else {
-+ int dd = Index(mInput[0]) * l + Index(c);
-+ p = (char *)(mpIndex2[Index(mInput[0]) * l + Index(c)]);
-+ }
-
- if (p == (char *) 0xffffffff)
- found = false;
--
-- p = (unsigned int) p + mpText;
-+ p = (unsigned long) p + mpText;
- } else if (mNum < mHead.mMaxCodes) {
- p = mpOffset[mNum - 1];
- if (p == (char *) 0xffffffff)
-diff --git a/src/winime.h b/src/winime.h
-index c2f51ab..816a270 100644
---- a/src/winime.h
-+++ b/src/winime.h
-@@ -83,8 +83,8 @@ class WinIme {
- char* mpOffset[12];
- int mFd;
- char* mpBuf;
-- char** mpIndex1;
-- char** mpIndex2;
-+ int *mpIndex1;
-+ int *mpIndex2;
- char* mpText;
- char* mpCur; //current search position
- unsigned int mBufSize;
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
deleted file mode 100644
index 5b4b24137f1e..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- zhcon-0.2.5.orig/configure.in 2010-01-31 15:12:10.521592172 +0100
-+++ zhcon-0.2.5/configure.in 2010-01-31 15:12:33.939593092 +0100
-@@ -170,18 +170,25 @@
- dnl-----------------------------------------------------------------------
- dnl Checks for gpm
- dnl-----------------------------------------------------------------------
--usegpm="yes"
--AC_CHECK_HEADERS(gpm.h,,usegpm="no")
--AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
-+AC_ARG_WITH([gpm], AS_HELP_STRING([--without-gpm], [Build without gpm library (default: test)]))
-+
-+usegpm='no'
-+if test "x$with_gpm" != "xno"; then
-+ AC_CHECK_HEADERS(gpm.h,,AC_ERROR([gpm.h not found]))
-+ AC_CHECK_LIB(gpm,Gpm_Open,,AC_ERROR([libgpm not found]))
-+ usegpm='yes'
-+fi
-
- dnl-----------------------------------------------------------------------
- dnl Checks for libggi
- dnl-----------------------------------------------------------------------
--useggi="yes"
--AC_CHECK_HEADERS(ggi/ggi.h,,useggi="no")
--AC_CHECK_LIB(ggi, main,,useggi="no")
--if test "$useggi" = 'yes';then
-- AC_DEFINE(HAVE_GGI_LIB)
-+AC_ARG_WITH([ggi], AS_HELP_STRING([--without-ggi], [Build without ggi library (default: test)]))
-+
-+useggi='no'
-+if test "x$with_ggi" != "xno"; then
-+ AC_CHECK_HEADERS(ggi/ggi.h,,AC_ERROR([ggi.h not found]))
-+ AC_CHECK_LIB(ggi, ggiInit,, AC_ERROR([libggi not found]))
-+ useggi='yes'
- fi
-
- AC_OUTPUT([Makefile
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
deleted file mode 100644
index cf8b07d3de4f..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 63172e4..6c2afcc 100644
---- a/configure.in
-+++ b/configure.in
-@@ -132,7 +132,7 @@ fi
- AC_SUBST(ZHCON_LOCALE_DIR)
-
- AC_CHECK_LIB(util, forkpty)
--AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], [break;])
-
- dnl for freebsd
- dnl AC_CHECK_LIB(c, i386_set_ioperm)
-@@ -172,7 +172,7 @@ dnl Checks for gpm
- dnl-----------------------------------------------------------------------
- usegpm="yes"
- AC_CHECK_HEADERS(gpm.h,,usegpm="no")
--AC_CHECK_LIB(gpm,main,,usegpm="no")
-+AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
-
- dnl-----------------------------------------------------------------------
- dnl Checks for libggi
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
deleted file mode 100644
index 0624a934e02c..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in 2006-06-22 13:02:59.197841560 +0800
-+++ b/configure.in 2006-06-22 12:48:59.000000000 +0800
-@@ -55,7 +55,7 @@
-
- CFLAGS="$CFLAGS -funsigned-char -O2"
- CXXFLAGS="$CXXFLAGS -funsigned-char -O2"
--if test $enable_debug = 'yes';then
-+if test "x$enable_debug" = "xyes";then
- CFLAGS="$CFLAGS -O0 -g3 -Wall"
- CXXFLAGS="$CXXFLAGS -O0 -g3 -Wall"
- else
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
deleted file mode 100644
index ccde407ef81a..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
---- zhcon-0.2.5.orig/doc/Makefile.am 2006-05-03 02:57:18.000000000 +0900
-+++ zhcon-0.2.5/doc/Makefile.am 2011-01-25 18:08:26.483746175 +0900
-@@ -3,8 +3,8 @@
- EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
-
- install-data-local:
-- $(mkinstalldirs) $(mandir)/man1/
-- $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
-+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
-+ $(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
-
- uninstall-local:
-- -rm -f $(mandir)/man1/zhcon.1
-+ -rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
-diff -Naur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
---- zhcon-0.2.5.orig/font/Makefile.am 2006-04-25 01:39:04.000000000 +0900
-+++ zhcon-0.2.5/font/Makefile.am 2011-01-25 18:08:26.483746175 +0900
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.bpsf
-
- install-data-local:
-- $(mkinstalldirs) $(libdir)/zhcon/font/
-- $(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
-+ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
-+ $(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
-
- uninstall-local:
-- -rm -f $(libdir)/zhcon/font/*.bpsf
-+ -rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
-diff -Naur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
---- zhcon-0.2.5.orig/input/Makefile.am 2006-04-25 01:38:44.000000000 +0900
-+++ zhcon-0.2.5/input/Makefile.am 2011-01-25 18:08:26.483746175 +0900
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.mb
-
- install-data-local:
-- $(mkinstalldirs) $(libdir)/zhcon/input/
-- $(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
-+ $(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
-+ $(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
-
- uninstall-local:
-- -rm -f $(libdir)/zhcon/input/*.mb
-+ -rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
-diff -Naur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
---- zhcon-0.2.5.orig/src/Makefile.am 2006-05-03 02:12:41.000000000 +0900
-+++ zhcon-0.2.5/src/Makefile.am 2011-01-25 18:11:42.446555911 +0900
-@@ -7,15 +7,12 @@
-
- SUBDIRS = display
-
--install-exec-local:
-- chmod 4755 $(bindir)/zhcon
--
- install-data-local:
-- $(mkinstalldirs) $(prefix)/etc
-- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf
-
- uninstall-local:
-- -rm -f $(prefix)/etc/zhcon.conf
-+ -rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf
-
- # set the include path found by configure
- INCLUDES= $(all_includes)
-diff -Naur zhcon-0.2.5.orig/tools/Makefile.am zhcon-0.2.5/tools/Makefile.am
---- zhcon-0.2.5.orig/tools/Makefile.am 2006-04-25 01:38:46.000000000 +0900
-+++ zhcon-0.2.5/tools/Makefile.am 2011-01-25 18:04:22.701226453 +0900
-@@ -9,11 +9,6 @@
- #getbpsf_LDADD = -L/usr/X11R6/lib -lX11
- #getbpsf_CPPFLAGS = -I/usr/X11R6/include
-
--LDFLAGS=
--CXXFLAGS=
--CCFLAGS=
--LIBS=
--
- EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\
- gpm-1.19.6-patched.tar.gz
-
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
deleted file mode 100644
index 551d656dd6e2..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN /src/Makefile.am /tmp/src/Makefile.am
---- a/src/Makefile.am 2006-06-22 12:35:01.531885552 +0800
-+++ b/src/Makefile.am 2006-06-22 12:31:44.000000000 +0800
-@@ -5,6 +5,8 @@
-
- zhcon_LDADD = display/libdisplay.a
-
-+zhcon_CPPFLAGS = -DSYSCONF_DIR=\"${sysconfdir}\"
-+
- SUBDIRS = display
-
- install-exec-local:
-diff -ruN src/zhcon.cpp /tmp/src/zhcon.cpp
---- a/src/zhcon.cpp 2006-06-22 12:35:01.398905768 +0800
-+++ b/src/zhcon.cpp 2006-06-22 12:32:41.000000000 +0800
-@@ -123,7 +123,7 @@
- string cfgfile = getenv("HOME");
- cfgfile += "/.zhconrc";
- if (access(cfgfile.c_str(), R_OK) != 0)
-- cfgfile = PREFIX "/etc/zhcon.conf";
-+ cfgfile = SYSCONF_DIR"/zhcon.conf";
-
- //for debug,a pause enable us to attach zhcon's pid in gdb
- //char c;cin>>c;
diff --git a/app-i18n/zhcon/metadata.xml b/app-i18n/zhcon/metadata.xml
deleted file mode 100644
index b720aad5796d..000000000000
--- a/app-i18n/zhcon/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- cjk@gentoo.org
- Cjk
-
- zhcon is a Fast double-byte virtual console for
-Chinese/Japanese/Korean (CJK) running under GNU/Linux and FreeBSD.
-It adds the ability of displaying and inputting CJK double-byte
-characters on console device. Currently Japanese display and input
-function seems to be broken.
-
- zhcon
-
-
diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
deleted file mode 100644
index e32f503d307b..000000000000
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-MY_P="${P/6/5}"
-
-DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
-HOMEPAGE="http://zhcon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zhcon/${MY_P}.tar.gz
- mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ggi gpm"
-
-DEPEND="ggi? ( media-libs/libggi[X] )
- gpm? ( sys-libs/gpm )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}.sysconfdir.patch
- "${FILESDIR}"/${P}.configure.in.patch
- "${FILESDIR}"/${P}+gcc-4.3.patch
- "${FILESDIR}"/${P}+linux-headers-2.6.26.patch
- "${FILESDIR}"/${P}-curses.patch
- "${FILESDIR}"/${P}-amd64.patch
- "${FILESDIR}"/${P}-automagic-fix.patch
- "${FILESDIR}"/${P}.make-fix.patch
-)
-
-src_prepare() {
- eapply "${WORKDIR}"/zhcon-0.2.5-to-0.2.6.diff
- default
- for f in $(grep -lir HAVE_GGI_LIB *); do
- sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
- done
- # Required for newer automake
- touch config.rpath || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with ggi) \
- $(use_with gpm)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS ChangeLog README NEWS TODO THANKS
- dodoc README.BSD README.gpm README.utf8
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7deba75219a4..90712f1ef6e1 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 821a61e21436..3dda59ac8d5d 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -5,14 +5,6 @@
mattst88@gentoo.org
Matt Turner
-
- ramage.lucas@protonmail.com
- Lucas Ramage
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-