diff --git a/Manifest.files.gz b/Manifest.files.gz
index 494c76c08a7b..44cfaf0fe583 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 9594cfcfbc35..bcc2fe5db33f 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0647ce67ef2d..ecd7ea3bbe83 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
+DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc SHA512 5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
diff --git a/app-admin/calamares/calamares-3.1.11.ebuild b/app-admin/calamares/calamares-3.1.11.ebuild
new file mode 100644
index 000000000000..80d1eb1af83d
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-auth/polkit-qt[qt5(+)]
+ >=sys-libs/kpmcore-3.0.3:5=
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ >=sys-block/parted-3.0
+ || ( sys-boot/grub:2 sys-boot/systemd-boot )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ virtual/udev
+ networkmanager? ( net-misc/networkmanager )
+ upower? ( sys-power/upower )
+"
+
+src_prepare() {
+ python_setup
+ export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+ PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+ PYTHON_LIBS="$(python_get_LIBS)"
+
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWEBVIEW_FORCE_WEBKIT=OFF
+ -DWITH_PYTHONQT=$(usex pythonqt)
+ )
+
+ kde5_src_configure
+ sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+ sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+ kde5_src_install
+ dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/calamares-3.1.7.ebuild b/app-admin/calamares/calamares-3.1.7.ebuild
index 780fcfe4fd0f..80d1eb1af83d 100644
--- a/app-admin/calamares/calamares-3.1.7.ebuild
+++ b/app-admin/calamares/calamares-3.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit kde5 python-r1
DESCRIPTION="Distribution-independent installer framework"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 434d8cc7050a..cb652b50726e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
-DIST sudo-1.8.22b1.tar.gz 3000952 BLAKE2B afe485e31e48ad6022b831fc088abcc80f78ab927436e932c3659be3956d2ae5be893fe1f602fcfbe2d64cb70d1d056c2c28020c05fe24db6a494037b5370cae SHA512 2289e0203898feccb31529899230b7e1f5e634af5e71d252628dc9a6f1bc73257f3b44d0068f1cba244cc33fa677538c327fcd291537811ac57fd4b65dc5a4ea
+DIST sudo-1.8.22b3.tar.gz 3021539 BLAKE2B 8e6c207fe2e56e76b46040ce7a468089a1ecdbc02c1fc514926c2b129c1d7869d307be79d8567d42d38eb2a3df9abae0864a14954fb8da4fb880f9fc223ad9f7 SHA512 e80c7a0f10aaacfb875503e35b7f16c8fe5c019848338e6d8a4c354a42f5613a23713a12ec7a5ceba78bc428223c3d9ccfc285703f8cd04d0c34658d4a21f45e
diff --git a/app-admin/sudo/sudo-1.8.22_beta1.ebuild b/app-admin/sudo/sudo-1.8.22_beta3.ebuild
similarity index 99%
rename from app-admin/sudo/sudo-1.8.22_beta1.ebuild
rename to app-admin/sudo/sudo-1.8.22_beta3.ebuild
index 0af84eaf37f1..2e08b4eb383c 100644
--- a/app-admin/sudo/sudo-1.8.22_beta1.ebuild
+++ b/app-admin/sudo/sudo-1.8.22_beta3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 31300e50b6e2..cd8e1154eecf 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 4a16121683b6..d83d5e4e6587 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1 +1,2 @@
DIST brotli-0.6.0.tar.gz 19838761 BLAKE2B 0630e9afcb04ecfd7cc6ba8dcbbe10c5ff16d9a975e13f48bd9b519bcf006afdd672aed542768590e2c5481e808e4f49c520e8a0294ce15e72cb3810a576fdde SHA512 36caa277790efeb5bff0fdc090cdcf00fd9995c4e81a60ed31d36af2e13848ec1afe5d84e6926eebbee013525191e9404e112cb7fbede16097221c5bc3dfb5d5
+DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild
new file mode 100644
index 000000000000..b2991a9b89aa
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/${PV}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/google/${PN}.git"
+ inherit git-r3
+else
+ PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTING="$(usex test)"
+ )
+ cmake-utils_src_configure
+ use python && distutils-r1_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use python && distutils-r1_src_compile
+}
+
+python_test(){
+ esetup.py test || die
+}
+
+src_test() {
+ cmake-utils_src_test
+ use python && distutils-r1_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
new file mode 100644
index 000000000000..5b876796ed3c
--- /dev/null
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/${PV}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/google/${PN}.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTING="$(usex test)"
+ )
+ cmake-utils_src_configure
+ use python && distutils-r1_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use python && distutils-r1_src_compile
+}
+
+python_test(){
+ esetup.py test || die
+}
+
+src_test() {
+ cmake-utils_src_test
+ use python && distutils-r1_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+ use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
new file mode 100644
index 000000000000..779b5e66bd98
--- /dev/null
+++ b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ac55f6b3..2dc7232c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE)
+
+ include(GNUInstallDirs)
+
+-# When building shared libraries it is important to set the correct rpath.
+-# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
+-set(CMAKE_SKIP_BUILD_RPATH FALSE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+-if ("${isSystemDir}" STREQUAL "-1")
+- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
+-endif()
+-
+ # Parse version information from common/version.h. Normally we would
+ # define these values here and write them out to configuration file(s)
+ # (i.e., config.h), but in this case we parse them from
diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml
index 0a0fddcd4ed6..f2d6ceadef4d 100644
--- a/app-arch/brotli/metadata.xml
+++ b/app-arch/brotli/metadata.xml
@@ -2,8 +2,8 @@
- bicatali@gentoo.org
- Sébastien Fabbro
+ candrews@gentoo.org
+ Craig Andrews
Brotli is a generic-purpose lossless compression algorithm that
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 950a2d7f2cf9..1570763e6a11 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1,2 @@
-DIST libarchive-3.2.2.tar.gz 5458241 BLAKE2B 99a3f01e780a3cac1142645887f31fc4d68c9a60a3539c259745274ea612373b41a7e93d95c27739c87c6050a0304ff069a0f1435fdbf0a13d47935209547c20 SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7
DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch b/app-arch/libarchive/files/CVE-2017-5601.patch
deleted file mode 100644
index 4ba85ff9072f..000000000000
--- a/app-arch/libarchive/files/CVE-2017-5601.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
-From: Martin Matuska
-Date: Thu, 19 Jan 2017 22:00:18 +0100
-Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
- Fixes a heap buffer overflow reported in Secunia SA74169
-
----
- libarchive/archive_read_support_format_lha.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
-index 52a5531..d77a7c2 100644
---- a/libarchive/archive_read_support_format_lha.c
-+++ b/libarchive/archive_read_support_format_lha.c
-@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
- /* Get a real compressed file size. */
- lha->compsize -= extdsize - 2;
-
-+ if (lha->compsize < 0)
-+ goto invalid; /* Invalid compressed file size */
-+
- if (sum_calculated != headersum) {
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "LHa header sum error");
diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
deleted file mode 100644
index 34485b16533b..000000000000
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://www.libarchive.org/"
-SRC_URI="http://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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
- acl? ( virtual/acl[${MULTILIB_USEDEP}] )
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
- kernel_linux? (
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
- )
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- kernel_linux? (
- virtual/os-headers
- e2fsprogs? ( sys-fs/e2fsprogs )
- )"
-
-PATCHES=(
- "${FILESDIR}"/CVE-2017-5601.patch
-)
-
-src_prepare() {
- default
- elibtoolize # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
- local myconf=()
- myconf=(
- $(use_enable acl)
- $(use_enable static-libs static)
- $(use_enable xattr)
- $(use_with bzip2 bz2lib)
- $(use_with expat)
- $(use_with !expat xml2)
- $(use_with iconv)
- $(use_with lz4)
- $(use_with lzma)
- $(use_with lzo lzo2)
- $(use_with nettle)
- $(use_with zlib)
- )
- if multilib_is_native_abi ; then myconf+=(
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
- ); else myconf+=(
- --disable-bsdcat
- --disable-bsdcpio
- --disable-bsdtar
- ); fi
-
- # We disable lzmadec because we support the newer liblzma from xz-utils
- # and not liblzmadec with this version.
- myconf+=(
- --without-lzmadec
- )
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- emake libarchive.la
- fi
-}
-
-multilib_src_test() {
- # Replace the default src_test so that it builds tests in parallel
- multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- emake DESTDIR="${D}" install
-
- # Create symlinks for FreeBSD
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
- # Exclude cat for the time being #589876
- for bin in cpio tar; do
- dosym bsd${bin} /usr/bin/${bin}
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1
- doman "${T}"/${bin}.1
- done
- fi
- else
- emake DESTDIR="${D}" \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-
- # Libs.private: should be used from libarchive.pc instead
- prune_libtool_files
-}
-
-multilib_src_install_all() {
- cd "${S}" || die
- einstalldocs
-}
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
index c44da5e07a39..daa605b9674c 100644
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH=dev
else
SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
fi
DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index 9a6c5e1fb7cd..94d16b7719a8 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
LICENSE="Info-ZIP"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index cd7996c443c2..a9ab0fbe5e74 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 4ba3d5eb2e20..18945a78ec68 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,2 +1,2 @@
-DIST argon2-20160821.tar.gz 1170019 BLAKE2B c69e918376ec064702fc59dd92f1b240c66686932db7fcbf0b475307cd96e2354aaa06dfa5493744b71749b90d5935265990bea93ab6734a51085fbe74f1a48d SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f
DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
+DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild
deleted file mode 100644
index b407a8dd9f52..000000000000
--- a/app-crypt/argon2/argon2-20160821.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
- "${FILESDIR}/${P}-makefile-install-target.patch"
- "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
- )
-src_prepare() {
- default
- if ! use static-libs; then
- sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
- fi
- sed -i -e 's/-O3 //' Makefile || die "sed failed"
- sed -i -e 's/-g //' Makefile || die "sed failed"
- sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
- sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}
diff --git a/app-crypt/argon2/argon2-20161029-r1.ebuild b/app-crypt/argon2/argon2-20161029-r1.ebuild
index 7bc3ecb38fcd..1af92a371835 100644
--- a/app-crypt/argon2/argon2-20161029-r1.ebuild
+++ b/app-crypt/argon2/argon2-20161029-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
+SLOT="0/0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="static-libs"
diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
similarity index 58%
rename from app-crypt/argon2/argon2-20161029.ebuild
rename to app-crypt/argon2/argon2-20171227.ebuild
index ca5a7d99ac39..053764e3b4b3 100644
--- a/app-crypt/argon2/argon2-20161029.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,21 +8,20 @@ HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="static-libs"
S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
- "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
- )
+
src_prepare() {
default
if ! use static-libs; then
sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
fi
- sed -i -e 's/-O3 //' Makefile || die "sed failed"
- sed -i -e 's/-g //' Makefile || die "sed failed"
- sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
- sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+ sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBRARY_REL="$(get_libdir)" install || die
}
diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
deleted file mode 100644
index bcd8562a21c4..000000000000
--- a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e9d27c8..90c1818 100644
---- a/Makefile
-+++ b/Makefile
-@@ -80,11 +80,25 @@ endif
-
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
- LIB_ST := lib$(LIB_NAME).a
-+LIBRARIES = $(LIB_SH) $(LIB_ST)
-+HEADERS = include/argon2.h
-
--.PHONY: clean dist format $(GENKAT)
-+INSTALL = install
-+
-+DESTDIR =
-+PREFIX = /usr
-+INCLUDE_REL = include
-+LIBRARY_REL = lib
-+BINARY_REL = bin
-+
-+INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
-+INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
-+INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
-+
-+.PHONY: clean dist format $(GENKAT) all install
-
- all: clean $(RUN) libs
--libs: $(LIB_SH) $(LIB_ST)
-+libs: $(LIBRARIES)
-
- $(RUN): $(SRC) $(SRC_RUN)
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-@@ -129,3 +143,11 @@ testci: $(SRC) src/test.c
- format:
- clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
- -i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
-+
-+install: $(RUN) libs
-+ $(INSTALL) -d $(INST_INCLUDE)
-+ $(INSTALL) $(HEADERS) $(INST_INCLUDE)
-+ $(INSTALL) -d $(INST_LIBRARY)
-+ $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+ $(INSTALL) -d $(INST_BINARY)
-+ $(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
deleted file mode 100644
index 11892de11158..000000000000
--- a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1838c13..85aa710 100644
---- a/Makefile
-+++ b/Makefile
-@@ -87,8 +87,10 @@ endif
- endif
-
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
-+LIB_SH_VERSION := $(LIB_SH).0
- LIB_ST := lib$(LIB_NAME).a
- LIBRARIES = $(LIB_SH) $(LIB_ST)
-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
- HEADERS = include/argon2.h
-
- INSTALL = install
-@@ -153,9 +155,11 @@ format:
- -i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
-
- install: $(RUN) libs
-+ mv $(LIB_SH) $(LIB_SH_VERSION)
-+ ln -sf $(LIB_SH_VERSION) $(LIB_SH)
- $(INSTALL) -d $(INST_INCLUDE)
- $(INSTALL) $(HEADERS) $(INST_INCLUDE)
- $(INSTALL) -d $(INST_LIBRARY)
-- $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+ $(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
- $(INSTALL) -d $(INST_BINARY)
- $(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
index d4ab4191e921..b877484ca660 100644
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@@ -10,6 +10,9 @@
Proxy Maintainers
Argon2 is a password hashing tool and library that won the Password Hashing Competition (PHC)
+
+ Reflect ABI of libargon2.so.
+
P-H-C/phc-winner-argon2
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d931cc242514..a88ede454e92 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 51c94235043f..fe3b2faea66b 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,3 @@
-DIST containerd-0.2.9_p20170605.tar.gz 1229549 BLAKE2B 9dd68595694b5b624007ecd8a8a6546abeacbd45c6f4bd79754c275a2148938f17f7313f59567a7095d3d292807bf0eda9b79a5c9129a36f05eaa2478b97fde5 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9
DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
DIST containerd-1.0.0_beta2_p20171019.tar.gz 3682585 BLAKE2B a67b581e3e5ddf2e95d551a9cca3dafa14772dc6ec1f1b1226ce21b0d7f88f3f80669b21f471fede50d5dd68d3916ef8696d0551c333c57e87a8ee2db3d25488 SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
deleted file mode 100644
index e574004b67ee..000000000000
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
-else
- MY_PV="${PV/_/-}"
- EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~ppc64"
- inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened +seccomp"
-
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170706
- seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
- local options=( $(usex seccomp "seccomp" '') )
- export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
- LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
- dobin bin/containerd* bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
index 90c87cf44750..25e1ed88476f 100644
--- a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ else
MY_PV="${PV/_/-}"
EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc64"
+ KEYWORDS="amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
index 0235cd99b405..5a4839ae1018 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
else
EGIT_COMMIT="7b2b1feb1de4817d522cc372af149ff48d25028e"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc64"
+ KEYWORDS="amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index 2a4d0d92790f..f206b78d06bb 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -1,3 +1,3 @@
-DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 BLAKE2B b0d5d3788cdbaf17af23fe102a3b5ebba9324505d2389e2acd3300680cfdff682dc170b214e1a000d081e791943c160c7d797acb90173f4549caa554493c86e5 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf
DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 BLAKE2B fed7b3cb3bbf214c61f9bc84752f143de9f18aa1ad1720c80df171eaa82f545cdafdbd58f64ee21e05db67f7fcfa139622fc8356aa7584db87b72d46e3285907 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d
DIST docker-runc-1.0.0_rc4_p20170926.tar.gz 1188421 BLAKE2B ba21aaed4c434358876e9a1656a0592e5df90e16ebd52b69a2ddd3344aba2db5e335de1c88aeed27101ec5441174da148d0da02ade0b517d36d45e0aff53ca9e SHA512 bad4643ce37dbba168cc3b0820cf7dc8166ff2d7970de519f86ca09123b59999174dd98b7bc550b714dc8235732923e0090031c789deb603f310e042a39f1d76
+DIST docker-runc-1.0.0_rc4_p20171108.tar.gz 1189298 BLAKE2B e213955ef59e7d5a43f1567c67d72b99d7de503340ed8c777a43a70c4f2b1dbfce2905377c912958f736cf31247334d1c2ab29fae203a297561c26ad43a4e4c1 SHA512 a5bf97ce284317e03e63ee0e39228d77848fcde2f6322de06eebc2536978b5d87fd8c3fbccb2e74ef8c80fbaa28f3d0b24074cb9fde01e268593332aacd57695
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
index 8ea1d028f5b3..680647433350 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ else
EGIT_COMMIT="3f2f8b84a77f73d38244dd690525642a72156c64"
RUNC_COMMIT="3f2f8b84" # Change this when you update the ebuild
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc64"
+ KEYWORDS="amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
similarity index 86%
rename from app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
rename to app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
index 930d6d1ff44e..f8b7a5ec0385 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,10 +8,10 @@ if [[ ${PV} == *9999 ]]; then
inherit golang-vcs
else
MY_PV="${PV/_/-}"
- EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
- RUNC_COMMIT="810190" # Change this when you update the ebuild
+ EGIT_COMMIT="b2567b37d7b75eb4cf325b77297b140ea686ce8f"
+ RUNC_COMMIT="b2567b3" # Change this when you update the ebuild
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~ppc64"
+ KEYWORDS="~amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 7713521b1c99..b61899ce8866 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,4 +1,3 @@
-DIST docker-17.06.2.tar.gz 9684548 BLAKE2B bfe36c5fbc98bb2b1e8534cb59b54aef9b371fd46f7585c99c16c46d391356302fe9e3e064c7561cde617b8a5b97a07f994eb2452452a61a4c6ed38c434d9665 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b
-DIST docker-17.09.0.tar.gz 10132253 BLAKE2B 2964f20fd0badbea7961ccc4026fa107edbb42e92a63bfba18aed456c474990d76d118baec423c6d3cb6a89215a802b822b245222b73552569f03f0f30684819 SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638
DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858adf87e5dd8ff84b03aca75d711375fafb06683a6a57cd2549c1a0a0edb2d7c7c1d4cf1b9ceefce18f4f91164b931 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f
DIST docker-17.11.0.tar.gz 10649392 BLAKE2B fff44885f535020bfd8cd6ab9c347df12610779de90290330e1315a2570c1e85a8d0c497320528f44187389b61c3f177f8032c3edc236347900034dfe3eaf764 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e
+DIST docker-17.12.0.tar.gz 11011208 BLAKE2B aee4a1b8af69b2418c62b0f5fc8cf6b1a0945ccbc870572e5835ec23bd9b6d5919fe9e8170b9d3c20eea479fec05aa97f380e1229b09cccbdbca9ed2baaa9f0b SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67
diff --git a/app-emulation/docker/docker-17.06.2.ebuild b/app-emulation/docker/docker-17.06.2.ebuild
deleted file mode 100644
index 8d869dab470f..000000000000
--- a/app-emulation/docker/docker-17.06.2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
- # Docker cannot be fetched via "go get", thanks to autogenerated code
- EGIT_REPO_URI="https://${EGO_PN}.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
- inherit git-r3
-else
- inherit versionator
- if [ "$(get_version_component_count)" = 4 ]; then
- MY_PV="$(replace_version_separator 3 '-ce-')"
- else
- MY_PV="$PV-ce"
- fi
- DOCKER_GITCOMMIT="cec0b72"
- EGIT_COMMIT="v${MY_PV}"
- SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm"
- [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
- inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
- >=dev-db/sqlite-3.7.9:3
- device-mapper? (
- >=sys-fs/lvm2-2.02.89[thin]
- )
- seccomp? ( >=sys-libs/libseccomp-2.2.1 )
- apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
- ${CDEPEND}
-
- dev-go/go-md2man
-
- btrfs? (
- >=sys-fs/btrfs-progs-3.16.1
- )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
- ${CDEPEND}
- >=net-firewall/iptables-1.4
- sys-process/procps
- >=dev-vcs/git-1.7
- >=app-arch/xz-utils-4.9
-
- ~app-emulation/containerd-0.2.9_p20170605
- ~app-emulation/docker-runc-1.0.0_rc3_p20170706[apparmor?,seccomp?]
- app-emulation/docker-proxy
- container-init? ( >=sys-process/tini-0.15.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
- ~KEYS
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
- ~NF_NAT ~NF_NAT_NEEDED
- ~POSIX_MQUEUE
-
- ~USER_NS
- ~SECCOMP
- ~CGROUP_PIDS
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
- ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
- ~CGROUP_PERF
- ~CGROUP_HUGETLB
- ~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
- ~VXLAN
- ~XFRM_ALGO ~XFRM_USER
- ~IPVLAN
- ~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
- if kernel_is lt 3 10; then
- ewarn ""
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
- fi
-
- # for where these kernel versions come from, see:
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
- if ! {
- kernel_is ge 3 16 \
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
- || { kernel_is 3 12 && kernel_is ge 3 12 25; }
- }; then
- ewarn ""
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
- ewarn ""
- ewarn "See also https://github.com/docker/docker/issues/2960"
- fi
-
- if kernel_is le 3 18; then
- CONFIG_CHECK+="
- ~RESOURCE_COUNTERS
- "
- fi
-
- if kernel_is le 3 13; then
- CONFIG_CHECK+="
- ~NETPRIO_CGROUP
- "
- else
- CONFIG_CHECK+="
- ~CGROUP_NET_PRIO
- "
- fi
-
- if kernel_is lt 4 5; then
- CONFIG_CHECK+="
- ~MEMCG_KMEM
- "
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
- fi
-
- if kernel_is lt 4 7; then
- CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES
- "
- fi
-
- if use aufs; then
- CONFIG_CHECK+="
- ~AUFS_FS
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
- fi
-
- if use btrfs; then
- CONFIG_CHECK+="
- ~BTRFS_FS
- ~BTRFS_FS_POSIX_ACL
- "
- fi
-
- if use device-mapper; then
- CONFIG_CHECK+="
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- fi
-
- if use overlay; then
- CONFIG_CHECK+="
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
- "
- fi
-
- linux-info_pkg_setup
-
- # create docker group for the code checking for it in /etc/group
- enewgroup docker
-}
-
-src_compile() {
- export GOPATH="${WORKDIR}/${P}"
-
- # setup CFLAGS and LDFLAGS for separate build target
- # see https://github.com/tianon/docker-overlay/pull/10
- export CGO_CFLAGS="-I${ROOT}/usr/include"
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
- # if we're building from a tarball, we need the GITCOMMIT value
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
- # fake golang layout
- ln -s docker-ce/components/engine ../docker || die
- ln -s docker-ce/components/cli ../cli || die
-
- # let's set up some optional features :)
- export DOCKER_BUILDTAGS=''
- for gd in aufs btrfs device-mapper overlay; do
- if ! use $gd; then
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
- fi
- done
-
- for tag in apparmor pkcs11 seccomp; do
- if use $tag; then
- DOCKER_BUILDTAGS+=" $tag"
- fi
- done
-
- pushd components/engine || die
-
- if use hardened; then
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
- -i hack/make/dynbinary-daemon || die
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
- fi
-
- # build daemon
- ./hack/make.sh dynbinary || die 'dynbinary failed'
-
- popd || die # components/engine
-
- pushd components/cli || die
-
- # build cli
- emake \
- LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
- VERSION="$(cat ../../VERSION)" \
- GITCOMMIT="${DOCKER_GITCOMMIT}" \
- dynbinary || die
-
- # build man pages
- go build -o gen-manpages github.com/docker/cli/man || die
- ./gen-manpages --root . --target ./man/man1 || die
- ./man/md2man-all.sh -q || die
- rm gen-manpages || die
- # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
- popd || die # components/cli
-}
-
-src_install() {
- dosym containerd /usr/bin/docker-containerd
- dosym containerd-shim /usr/bin/docker-containerd-shim
- dosym runc /usr/bin/docker-runc
- use container-init && dosym tini /usr/bin/docker-init
-
- pushd components/engine || die
- newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
- newinitd contrib/init/openrc/docker.initd docker
- newconfd contrib/init/openrc/docker.confd docker
-
- systemd_dounit contrib/init/systemd/docker.{service,socket}
-
- udev_dorules contrib/udev/*.rules
-
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
- dodoc -r docs/*
-
- insinto /usr/share/vim/vimfiles
- doins -r contrib/syntax/vim/ftdetect
- doins -r contrib/syntax/vim/syntax
-
- # note: intentionally not using "doins" so that we preserve +x bits
- dodir /usr/share/${PN}/contrib
- cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
- popd || die # components/engine
-
- pushd components/cli || die
-
- newbin build/docker-* docker
-
- doman man/man*/*
-
- dobashcomp contrib/completion/bash/*
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/_*
- popd || die # components/cli
-}
-
-pkg_postinst() {
- udev_reload
-
- elog
- elog "To use Docker, the Docker daemon must be running as root. To automatically"
- elog "start the Docker daemon at boot, add Docker to the default runlevel:"
- elog " rc-update add docker default"
- elog "Similarly for systemd:"
- elog " systemctl enable docker.service"
- elog
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
- elog " usermod -aG docker youruser"
- elog
-}
diff --git a/app-emulation/docker/docker-17.09.1.ebuild b/app-emulation/docker/docker-17.09.1.ebuild
index 10c65a98732e..bae5865672df 100644
--- a/app-emulation/docker/docker-17.09.1.ebuild
+++ b/app-emulation/docker/docker-17.09.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ else
DOCKER_GITCOMMIT="19e2cf6"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm"
+ KEYWORDS="amd64 ~arm"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/docker/docker-17.09.0.ebuild b/app-emulation/docker/docker-17.12.0.ebuild
similarity index 97%
rename from app-emulation/docker/docker-17.09.0.ebuild
rename to app-emulation/docker/docker-17.12.0.ebuild
index 4f2669f8f5a1..9dc16b296175 100644
--- a/app-emulation/docker/docker-17.09.0.ebuild
+++ b/app-emulation/docker/docker-17.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ else
else
MY_PV="$PV-ce"
fi
- DOCKER_GITCOMMIT="afdb6d4"
+ DOCKER_GITCOMMIT="486a48d"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm"
@@ -60,9 +60,9 @@ RDEPEND="
sys-process/procps
>=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9
-
- ~app-emulation/containerd-0.2.9_p20170917
- ~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?]
+ dev-libs/libltdl
+ ~app-emulation/containerd-1.0.0
+ ~app-emulation/docker-runc-1.0.0_rc4_p20171108[apparmor?,seccomp?]
>=app-emulation/docker-proxy-0.8.0_p20170917
container-init? ( >=sys-process/tini-0.16.1[static] )
"
@@ -254,7 +254,7 @@ src_compile() {
./gen-manpages --root . --target ./man/man1 || die
./man/md2man-all.sh -q || die
rm gen-manpages || die
- # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+ # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
popd || die # components/cli
}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 1752e6a8183e..8e625de6ccc3 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,3 @@
-DIST VBoxGuestAdditions_5.1.26.iso 59496448 BLAKE2B c2ea9dac192b09efb41daf57fd12541fc86ae13a21eb5650e2b2bb2256c13b3cfd00f0020d12d92eaa3dead9b3a7928cf766be7d58e2e2b7d5116d5b0d7d7c9c SHA512 5329ce9bb787efed088a9f89412974cef3a982a351c0053b3daf15a9c95c55f99556e2b86cdcd39c168042503eb00eaa83fb99f8f5c4c97d177dd2b61bb33f5d
DIST VBoxGuestAdditions_5.1.30.iso 59494400 BLAKE2B 37f70eb8dd17e0492a106fa5e2cea1ed93b0a0a955e75a3a32d5bd45c447c6c4ff8e78e13b19922a34e8e982d1de5bbf0815a8e81c2a8ea2596477318d7acbf5 SHA512 3205444339a0c85a3b234ba462add21033b5b3eee18eecc15b150b21f5f9f1aadb92b7049bef6be1201e1acfd1edd6f2924c38d56a52770113c8401bcca9abcb
DIST VBoxGuestAdditions_5.2.2.iso 60481536 BLAKE2B 560dc43a901cfaad4d9d6ca6f065614751765de7d78575c0dfe7d8ebcb0bf828a2b676ae91f6b346f179065e0f093e54742821c8a60765ec347d07288ae7b9fe SHA512 3c75468821287e4abe80e319ea8d4cd66c3075061610f74619c474b8c5bd8542ab55fe8747cb710e34863fcbc056b03c9256ad7d4b32fe9b0b56d74c4d93f3b5
DIST VBoxGuestAdditions_5.2.4.iso 57868288 BLAKE2B 8affaa8a4bfdc434081e62a194b751fc143f748995b769cf565497751787a15fafc627b994ef8d30ea98275039cf8d85e6e5cdc3a7d806961f063c9c6fd1423d SHA512 51445f43ed337f7ea850b599c7dc80837e697de0ef1eb33e79b2dccadda50c1cb1fd37e98387648564cb47c4d593f7138e68410033c83ec0a4a65f04a057723d
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
deleted file mode 100644
index 4fd01d14b29e..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://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"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
- !=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
- return 0
-}
-
-src_install() {
- insinto /usr/share/${PN/-additions}
- newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 17b9cd2a8fdb..ab8acd9f497d 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,12 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 BLAKE2B 593d70c49e47b49cc64d1c4c8f78703e6cd608f4ef6ab836492822429d213c1b70323cfe7847a206d284821572431423a841e8d802a3f47519818906cee63e39 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6
DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.2-119230.tar.gz 19504049 BLAKE2B ff3be5b81c409c33d7c831e2bba6df7d7ab87e6422d8cc4cbc3599f75c84100fceec5547b8f9b44d204941b48102a23a4c2183340ec017159ae7c37e07d21813 SHA512 cf3f08f7ee966b5a991fe029b3d4014f333678f0fddb9d75589695811dc4d780651a6dbdddf55a6466631bf8a9dce099256468490847229ac2c26dba9fc57d27
DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
-DIST VirtualBox-5.1.26-117224-Linux_amd64.run 87981522 BLAKE2B a1067daca90eb45509aa314d8e346f565cca845c8ec2fdbe6d27ec6d12e4cf6a288638a083295da62858bcda44b2f97720475b246e9e03013ab68c9c5e191720 SHA512 9b486fd52918469fdffaa39bbef234d22fad9d3b562fa04443bf6c1040e744db6dc9bd103ead299127b82c5d4bc96c1e05f677cacd623affa6569408c8d26df5
-DIST VirtualBox-5.1.26-117224-Linux_x86.run 87090639 BLAKE2B 89ec5ed5a9c0a5c16fbe4e3bbab5035c027d1c24ca561536a9c7e1924a5b7b5ddd180aa798212a3dc213439dc844761b73212d7fb1ed7611b0a91b078e96c950 SHA512 3aafad5374dc79c0fdd9bf1da6708ae4ce2f43d9fce3222326424bf03d6b73a7283ba5ebeb01a9ab6b24eeb8a8ec7c23af84e40f3edeb512c2101c329f4091e7
DIST VirtualBox-5.1.30-118389-Linux_amd64.run 88186323 BLAKE2B 4700613906658a223134130e99eb4f669ffc875e732e9b43d237926b9a33d385d6056240ae5f498d13b6a0cf26c600b293657fc64c838db498bd3935fa23a8e4 SHA512 b6312abbf5c0e4bf22aca50a81d297a0ed21d5b4b72242e21750ac088c56817dc90ac1ae068dd9006f4f736130510f26f55793b8c09999c590da09908e304280
DIST VirtualBox-5.1.30-118389-Linux_x86.run 87397839 BLAKE2B cc0fb245f98883dc19cfc9a64d8c7a9593d8ae784895a9a8224c146779ab65901052ba5d62f57c9cd5bc46d23e208cc97046fd6641eb8848e90c4828bd745813 SHA512 643ef90453e3a6a6d3fbb365176a72de1743230a58ee45f1cb22fd8bb57c9cfe6013ec1ffdb0076a248d1987a1e3fea13ca71ef9ca983cb8e6378d30c76451fb
DIST VirtualBox-5.2.2-119230-Linux_amd64.run 90346949 BLAKE2B f6ae64b7b9b5ad41865a12792bd611d05c8899250c1740fcfabc0c6c07ce495e143b29c8bc8b5b2c2dbe690076c8593c030de4374af9d31a82e99dc9c58fec40 SHA512 a99d0922b341b821976bc944a5882d2804ca7ceb565a9512ce86c3968fb0d27dc533009dde51bea4881d729c97277597d329927183be4ffd081b5ed73c8f5ec3
DIST VirtualBox-5.2.2-119230-Linux_x86.run 89548224 BLAKE2B de4cfd7a21caa49bc5752bfe097e99ec5e55eb9abcfafc34eb9f74e88c12fb6d0af1754e88180daf7f420ca3b968a25a3a0d6b878ebe6f7eb51c543ed24fbb1d SHA512 cd83828fdde57ac6c9b1bed58a8500c7ad2d2e83b83a4ffe304addd1d5df277dbddebc1e9c779030e5352b66b6a7505309fb0b5cfbbb575f122a7f126c397591
DIST VirtualBox-5.2.4-119785-Linux_amd64.run 88575441 BLAKE2B c0cdf3cb1c17f1de000926e0b1db9902c965040723a62de95ef518bd4180ce95d4c2c5830abbdbf65823447af22d71f574b85e8ccc322ddc05137556f4381401 SHA512 f5741e29348a7a307146b8f34e0e9c4bccd8368879ba7c4e3836de21ad014f31ecf1bb7033173f8651483d4a11ffca7c8b475f9149474533cd7ab8c31ba8cbb9
DIST VirtualBox-5.2.4-119785-Linux_x86.run 87653837 BLAKE2B 069005e59da03e9cc6d8ef3cc296c192095c4b37bc17de5e768d13f46e1d8bdd7573e6b1a2b359cee5a37c2a2bb9808707317c07b4dd3d76cbbc0ed0824f55bb SHA512 245a90b8312988d6b19765ecd404bc569b370c400353294a564dde4ab57a006fda3e24dd423d7ba3afdfcd20484b95adc86d598ebbd640f1742d9c92ed010021
-DIST VirtualBoxSDK-5.1.26-117224.zip 9860247 BLAKE2B 6525792471a71aca9824e2fa9a0c9b722f248bf4873f3f683a04ab335bb06257fd051e1baeb2c106d663c09e805f88784bb01614042660949566766002183b4e SHA512 d2bef837d61bfb35ba550f004345c2c412c2f62da23ffded6dff8aa33281fdce7c0a8f6b70c131b35e04c34ca0a4221bf97a78e65a470c657980572ebedb0774
DIST VirtualBoxSDK-5.1.30-118389.zip 9861374 BLAKE2B 4890a76c5bdf6ec8215095ce3246ee518a6cf527136fd896bec3503175115de05e52f946b5c44fa82ecb087900a5eb4f2bbd0cfa79a4eba94ba4d48f757f9604 SHA512 89d3407860f202329e5958e724b848884a9047f01000090d1000bce22005311b3650c1ef1fb1fc998c29cc77887af856b64a5ac76154408cae7b921860d8a9f1
DIST VirtualBoxSDK-5.2.2-119230.zip 10146673 BLAKE2B 8bdb6ffcd9e0a59c5a27676a9cd71c402b6a8dd7c03fc7e543e620e3f96b02f252e46432b3724fad508953636a9643731fe60c7cad2ef79a107d83ea154aca3b SHA512 2bfd6e391af3ad55dfced0dcf551112c364317b226bdc29bab42420055c2dc6053f9ab5ce28eace15bb9c7680ddc83c0bc77c53938d05d507cdd51a6c781a27f
DIST VirtualBoxSDK-5.2.4-119785.zip 10150272 BLAKE2B 58b16d12f6d2939ef0a45e0bf627f7977740ef9c3f277935c624f6b226cfa84390ea3d74a840c9da85bfc392b60ecebb2a8bc1dae51db92848bea42deaaea536 SHA512 b23637d9eb086c999733a5a0725a8a97ade5af11ccb7fa6e74bd20281270333d551ea22ae404f462726a2250593b624cbbb8169af9d16a07bd2383bdc74da92e
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
deleted file mode 100644
index fa2dda552ac8..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
- MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
- MY_PV="${MY_PV/beta/BETA}"
- MY_PV="${MY_PV/rc/RC}"
-else
- MY_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
- x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
- http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
- SRC_URI+="
- sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
- IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
- !app-emulation/virtualbox-additions
- ~app-emulation/virtualbox-modules-${MAIN_PV}
- !headless? (
- dev-libs/glib
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libpng
- media-libs/libsdl[X]
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- chm? ( dev-libs/expat )
- )
- dev-libs/libxml2
- sys-fs/lvm2
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXmu
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXdmcp
- ${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S=${WORKDIR}
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
- unpack_makeself ${MY_P}_${ARCH}.run
- unpack ./VirtualBox.tar.bz2
-
- mkdir "${S}"/${EXTP_PN} || die
- pushd "${S}"/${EXTP_PN} &>/dev/null || die
- unpack ${EXTP_P}.tar.gz
- popd &>/dev/null || die
-
- if [[ "${PV}" != *beta* ]] && use sdk ; then
- unpack VirtualBoxSDK-${SDK_PV}.zip
- fi
-}
-
-src_configure() {
- :;
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- # create virtualbox configurations files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-config" vbox.cfg
-
- if ! use headless ; then
- newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
- # set up symlinks (bug #572012)
- dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
- local size ico icofile
- for size in 16 24 32 48 64 72 96 128 256 ; do
- pushd "${S}"/icons/${size}x${size} &>/dev/null || die
- if [[ -f "virtualbox.png" ]] ; then
- doicon -s ${size} virtualbox.png
- fi
- for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
- icofile="virtualbox-${ico}.png"
- if [[ -f "${icofile}" ]] ; then
- doicon -s ${size} ${icofile}
- fi
- done
- popd &>/dev/null || die
- done
- doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
- insinto /usr/share/pixmaps
- newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
- fi
-
- pushd "${S}"/${EXTP_PN} &>/dev/null || die
- insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
- popd &>/dev/null || die
- rm -rf "${S}"/${EXTP_PN}
-
- insinto /opt/VirtualBox
- dodir /opt/bin
-
- doins UserManual.pdf
-
- if [[ "${PV}" != *beta* ]] && use sdk ; then
- doins -r sdk
- fi
-
- if use additions; then
- doins -r additions
- fi
-
- if use vboxwebsrv; then
- doins vboxwebsrv
- fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
- fperms 0750 /opt/VirtualBox/vboxwebsrv
- dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- if use rdesktop-vrdp; then
- doins rdesktop-vrdp
- doins -r rdesktop-vrdp-keymaps
- fperms 0750 /opt/VirtualBox/rdesktop-vrdp
- dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
- fi
-
- if ! use headless && use chm; then
- doins kchmviewer VirtualBox.chm
- fowners root:vboxusers /opt/VirtualBox/kchmviewer
- fperms 0750 /opt/VirtualBox/kchmviewer
- fi
-
- # This ebuild / package supports only py2.7. When py3 comes is unknown.
- # The compile phase makes VBoxPython2_7.so.
- # py3 support would presumably require a binary pre-compiled by py3.
- use python && doins VBoxPython.so VBoxPython2_7.so
-
- rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
- vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
- VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
- webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
- 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
- VBoxPython?_*.so
-
- if use headless ; then
- rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
- fi
-
- doins -r * || die
-
- # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
- dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
- dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
- dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
- dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
- dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
- local each
- for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
- fowners root:vboxusers /opt/VirtualBox/${each}
- fperms 0750 /opt/VirtualBox/${each}
- pax-mark -m "${D}"/opt/VirtualBox/${each}
- done
- # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
- fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
- fperms 4750 /opt/VirtualBox/VBoxNetDHCP
- fperms 4750 /opt/VirtualBox/VBoxNetNAT
-
- if ! use headless ; then
- # Hardened build: Mark selected binaries set-user-ID-on-execution
- for each in VBox{SDL,Headless} VirtualBox; do
- fowners root:vboxusers /opt/VirtualBox/${each}
- fperms 4510 /opt/VirtualBox/${each}
- pax-mark -m "${D}"/opt/VirtualBox/${each}
- done
-
- dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
- dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
- else
- # Hardened build: Mark selected binaries set-user-ID-on-execution
- fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
- fperms 4510 /opt/VirtualBox/VBoxHeadless
- pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
- fi
-
- exeinto /opt/VirtualBox
- newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
- fowners root:vboxusers /opt/VirtualBox/VBox.sh
- fperms 0750 /opt/VirtualBox/VBox.sh
-
- dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
- dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
- dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
- dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- local udevdir="$(get_udevdir)"
- insinto ${udevdir}/rules.d
- doins "${FILESDIR}"/10-virtualbox.rules
- sed "s@%UDEVDIR%@${udevdir}@" \
- -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
- # move udev scripts into ${udevdir} (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
- fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- gnome2_icon_cache_update
-
- udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
- elog ""
- if ! use headless ; then
- elog "To launch VirtualBox just type: \"VirtualBox\""
- elog ""
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "Please visit http://www.virtualbox.org/wiki/Editions for"
- elog "an overview about the different features of ${PN}"
- elog "and virtualbox-ose"
- if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 7e8455c20bc1..be7b65902620 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,3 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 BLAKE2B 593d70c49e47b49cc64d1c4c8f78703e6cd608f4ef6ab836492822429d213c1b70323cfe7847a206d284821572431423a841e8d802a3f47519818906cee63e39 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6
DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.30-118389.tar.gz 19624724 BLAKE2B de52acef8ad0785e576b361721d3a2f0b3d7e3820964d7e47fb6ffa7fd33bc4126f0e496396a412994e5eadc17fbd72699295865aa520f5e4b7a8ca53007e905 SHA512 6b468879f0fb6d6f916c40fb60f418457c526c20ebb1a6253bfc38392e0ae965e3b54590173b0d974070ced1646db82035950fb7dd54b22e20f4ad29850d6cf4
DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.2-119230.tar.gz 19504049 BLAKE2B ff3be5b81c409c33d7c831e2bba6df7d7ab87e6422d8cc4cbc3599f75c84100fceec5547b8f9b44d204941b48102a23a4c2183340ec017159ae7c37e07d21813 SHA512 cf3f08f7ee966b5a991fe029b3d4014f333678f0fddb9d75589695811dc4d780651a6dbdddf55a6466631bf8a9dce099256468490847229ac2c26dba9fc57d27
DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.4-119785.tar.gz 19465971 BLAKE2B eb37636ba0c856654ee0a06fb09fea848cef834cf75dcabf92d2a52994b0e2add74539213d9c3f7793496ffeaa35e623ebd9068e5dd5c7cfa8944e6a14ad2448 SHA512 97f496c9e3ef63a513c6fc31127459136b2bbef885a277d30c832831f079e3fbe8c6900b1799db1a4497a32b116cafb2fe982bd28a201da8d6f4222f70c548d8
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
deleted file mode 100644
index 3c6c739d35e3..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator
-
-MAIN_PV="$(get_version_component_range 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
- MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
- DEP_PV="${MY_PV}"
- MY_PV="${MY_PV/beta/BETA}"
- MY_PV="${MY_PV/rc/RC}"
-else
- MY_PV="${MAIN_PV}"
- DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
- insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 774382693bf7..a1a0aee3c756 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,6 +1,4 @@
-DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add
DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
DIST VirtualBox-5.2.2.tar.bz2 118424845 BLAKE2B c918ff1d3989d2d94cec807b596b5daceece6388575f40c70b3581288be664e39cd0f0dae974516d1122110d5660185bac7bcf336418d8f44455290cafb52a7d SHA512 415956cfe987a20eb0a372288c29f0e388bd706a3b94ff69b92ef5bbf2e9aecd75761a56f5421ef97d165f756cd7fd46b9eaf16b74b7d2460b831d7f03aae7dc
DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
-DIST virtualbox-5.1.24-patches-01.tar.xz 2708 BLAKE2B 6779a7ad1b013cf2e735817eae9785451c6a91e4a61558a650cfdc67d80b63db0eb33992a3207b0acc1e80b75caef14d9d291705ca7b3c96c4185c31e585e92d SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
deleted file mode 100644
index 6d9fa5fc7d0b..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.24-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xrandr
- x11-apps/xrefresh
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
- sys-apps/dbus
- !!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.9998_pre20131130
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-libs/pam
- sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
-PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
- vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
- use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
- linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
- enewgroup vboxguest
- enewuser vboxguest -1 /bin/sh /dev/null vboxguest
- # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
- enewgroup vboxsf
-}
-
-src_unpack() {
- unpack ${A}
-
- # Create and unpack a tarball with the sources of the Linux guest
- # kernel modules, to include all the needed files
- "${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
- unpack ./vbox-kmod.tar.gz
-
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- cd "${S}"
- rm -rf kBuild/bin tools
-}
-
-src_prepare() {
- # PaX fixes (see bug #298988)
- pushd "${WORKDIR}" &>/dev/null || die
- eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
- popd &>/dev/null || die
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
- use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
- # stupid new header references...
- for vboxheader in {product,revision,version}-generated.h ; do
- for mdir in vbox{guest,sf} ; do
- ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
- "${WORKDIR}/${mdir}/${vboxheader}"
- done
- done
-
- # Remove pointless GCC version check
- sed -e '/^check_gcc$/d' -i configure || die
-
- eapply "${WORKDIR}/patches"
-
- eapply_user
-}
-
-src_configure() {
- # build the user-space tools, warnings are harmless
- local cmd=(
- ./configure
- --nofatal
- --disable-xpcom
- --disable-sdl-ttf
- --disable-pulse
- --disable-alsa
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
- --target-arch=${ARCH}
- --with-linux="${KV_OUT_DIR}"
- --build-headless
- )
- echo "${cmd[@]}"
- "${cmd[@]}" || die "configure failed"
- source ./env.sh
- export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
- MAKE="kmk" \
- emake TOOL_YASM_AS=yasm \
- VBOX_ONLY_ADDITIONS=1 \
- KBUILD_VERBOSE=2
-
- # Now creating the kernel modules. We must do this _after_
- # we compiled the user-space tools as we need two of the
- # automatically generated header files. (>=3.2.0)
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-
- cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
- insinto /sbin
- newins mount.vboxsf mount.vboxsf
- fperms 4755 /sbin/mount.vboxsf
-
- newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
- insinto /usr/sbin/
- newins VBoxService vboxguest-service
- fperms 0755 /usr/sbin/vboxguest-service
-
- insinto /usr/bin
- doins VBoxControl
- fperms 0755 /usr/bin/VBoxControl
-
- # VBoxClient user service and xrandr wrapper
- if use X ; then
- doins VBoxClient
- fperms 0755 /usr/bin/VBoxClient
-
- pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
- || die
- newins 98vboxadd-xclient VBoxClient-all
- fperms 0755 /usr/bin/VBoxClient-all
- popd &>/dev/null || die
- fi
-
- # udev rule for vboxdrv
- local udev_rules_dir="/lib/udev/rules.d"
- dodir ${udev_rules_dir}
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
-
- # VBoxClient autostart file
- insinto /etc/xdg/autostart
- doins "${FILESDIR}"/vboxclient.desktop
-
- # sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if ! use X ; then
- elog "use flag X is off, enable it to install the"
- elog "X Window System video driver."
- fi
- elog ""
- elog "Please add users to the \"vboxguest\" group so they can"
- elog "benefit from seamless mode, auto-resize and clipboard."
- elog ""
- elog "The vboxsf group has been added to make automount services work."
- elog "These services are part of the shared folders support."
- elog ""
- elog "Please add:"
- elog "/etc/init.d/${PN}"
- elog "to the default runlevel in order to start"
- elog "needed services."
- elog "To use the VirtualBox X driver, use the following"
- elog "file as your /etc/X11/xorg.conf:"
- elog " /usr/share/doc/${PF}/xorg.conf.vbox"
- elog ""
- elog "Also make sure you use the Mesa library for OpenGL:"
- elog " eselect opengl set xorg-x11"
- elog ""
- elog "An autostart .desktop file has been installed to start"
- elog "VBoxClient in desktop sessions."
- elog ""
- elog "You can mount shared folders with:"
- elog " mount -t vboxsf "
- elog ""
- elog "Warning:"
- elog "this ebuild is only needed if you are running gentoo"
- elog "inside a VirtualBox Virtual Machine, you don't need"
- elog "it to run VirtualBox itself."
- elog ""
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index cd5418fad2a3..c55f45ebe17b 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,3 @@
-DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 BLAKE2B f3f0676854e7c597281c4937e2753a117844f584248c824bce2f931adb3f1ee234b71b60f701da7043916fe716c3973ede0f39d6614c60a483fedf34cc70d49e SHA512 c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010
DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 BLAKE2B 00d33cad237af1f0d5b4dbea38f84e0327d10d97fc309a8c7536433cb4fddf3614e6de160646077040b4fdc6dd126cfa2250081084ca0243cc572d9f5e9d5dfd SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a
DIST vbox-kernel-module-src-5.2.2.tar.xz 633924 BLAKE2B 85307332f3b0eaea1832b357c4f44a90c38165caaf3dae5d073a92f04f7d1ddf440e8a53fecf2dab4f0179002051382fa4fe1af8be12279bfc921f578c1743a1 SHA512 ec513912567bf58f367f08e212a5d3b82e7caae5fec6985f2253ee9405907b567c8cbd2dea277ddef1344711927eb75525f95d6204ef07cb1325d22185ccb5a4
DIST vbox-kernel-module-src-5.2.4.tar.xz 634212 BLAKE2B d8be416f958f672c2ab50b5197f708bc1febca292d5262eec710c07561be7de810fb1dfd5961ef9367c91e0ac1b6033419f85444471e8d40406d4ab860de2a23 SHA512 3c2113a8781cde1a44954267ee469db91c843305a5b1468b1fd346af3f3626a3d98c8a958ec0e255401f569f75e652dbbb1a85fd6cc6b203cf170745c630cee1
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
deleted file mode 100644
index fc282ccbb370..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-# package that comes from virtualbox-bin
-
-EAPI=6
-
-inherit eutils linux-mod user
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
- enewgroup vboxusers
-
- CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
- ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
-
- linux-mod_pkg_setup
-
- BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
- if kernel_is -ge 2 6 33 ; then
- # evil patch for new kernels - header moved
- grep -lR linux/autoconf.h * | xargs sed -i -e 's:::'
- fi
-
- if use pax_kernel && kernel_is -ge 3 0 0 ; then
- epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
- fi
-
- default
-}
-
-src_install() {
- linux-mod_src_install
- insinto /usr/lib/modules-load.d/
- doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
- elog "\"vboxnetadp\" and \"vboxpci\" to:"
- elog " /etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 48d4569de5f7..4f4540aef005 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,7 +1,5 @@
-DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add
DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee
DIST VirtualBox-5.2.2.tar.bz2 118424845 BLAKE2B c918ff1d3989d2d94cec807b596b5daceece6388575f40c70b3581288be664e39cd0f0dae974516d1122110d5660185bac7bcf336418d8f44455290cafb52a7d SHA512 415956cfe987a20eb0a372288c29f0e388bd706a3b94ff69b92ef5bbf2e9aecd75761a56f5421ef97d165f756cd7fd46b9eaf16b74b7d2460b831d7f03aae7dc
DIST VirtualBox-5.2.4.tar.bz2 118481693 BLAKE2B 874f5e65d97befaf72767626a1f3271a0b7c30f8dc998dc10aee9478039cecd14ce11c9c624ba596c09641aae9a41ca91ae33e5a82218bc8acd8cd32ebb727e1 SHA512 19cb168393098fd28ab2017a27d09a558721d57b31c5d3610deb68a17dfa7fd7ffe9ad7be18714a314724ab5ecb54e7ab5fb76183e8e89afbed2da79649e2798
-DIST virtualbox-5.1.24-patches-01.tar.xz 2708 BLAKE2B 6779a7ad1b013cf2e735817eae9785451c6a91e4a61558a650cfdc67d80b63db0eb33992a3207b0acc1e80b75caef14d9d291705ca7b3c96c4185c31e585e92d SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d
DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
diff --git a/app-emulation/virtualbox/virtualbox-5.1.26.ebuild b/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
deleted file mode 100644
index 40f87adb01dd..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.1.24-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
- ~app-emulation/virtualbox-modules-${PV}
- dev-libs/libIDL
- >=dev-libs/libxslt-1.1.19
- net-misc/curl
- dev-libs/libxml2
- media-libs/libpng:0=
- media-libs/libvpx:0=
- sys-libs/zlib
- !headless? (
- media-libs/libsdl:0[X,video]
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- opengl? ( virtual/opengl media-libs/freeglut )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- opengl? ( dev-qt/qtopengl:5 )
- x11-libs/libXinerama
- )
- )
- java? ( >=virtual/jre-1.6:= )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- lvm? ( sys-fs/lvm2 )
- udev? ( >=virtual/udev-171 )
- vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.9998_pre20131130-r1
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-libs/libcap
- sys-power/iasl
- virtual/pkgconfig
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- doc? (
- app-text/docbook-sgml-dtd:4.4
- dev-texlive/texlive-basic
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-fontsextra
- )
- !headless? ( x11-libs/libXinerama )
- java? ( >=virtual/jre-1.6:= )
- pam? ( sys-libs/pam )
- pax_kernel? ( sys-apps/elfix )
- pulseaudio? ( media-sound/pulseaudio )
- qt5? ( dev-qt/linguist-tools:5 )
- vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
- ${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
- usr/lib/virtualbox/VBoxSDL.so
- usr/lib/virtualbox/VBoxSharedFolders.so
- usr/lib/virtualbox/VBoxDD2.so
- usr/lib/virtualbox/VBoxOGLrenderspu.so
- usr/lib/virtualbox/VBoxPython.so
- usr/lib/virtualbox/VBoxDD.so
- usr/lib/virtualbox/VBoxDDU.so
- usr/lib/virtualbox/VBoxREM64.so
- usr/lib/virtualbox/VBoxSharedClipboard.so
- usr/lib/virtualbox/VBoxHeadless.so
- usr/lib/virtualbox/VBoxRT.so
- usr/lib/virtualbox/VBoxREM.so
- usr/lib/virtualbox/VBoxSettings.so
- usr/lib/virtualbox/VBoxKeyboard.so
- usr/lib/virtualbox/VBoxSharedCrOpenGL.so
- usr/lib/virtualbox/VBoxVMM.so
- usr/lib/virtualbox/VirtualBox.so
- usr/lib/virtualbox/VBoxOGLhosterrorspu.so
- usr/lib/virtualbox/components/VBoxC.so
- usr/lib/virtualbox/components/VBoxSVCM.so
- usr/lib/virtualbox/components/VBoxDDU.so
- usr/lib/virtualbox/components/VBoxRT.so
- usr/lib/virtualbox/components/VBoxREM.so
- usr/lib/virtualbox/components/VBoxVMM.so
- usr/lib/virtualbox/VBoxREM32.so
- usr/lib/virtualbox/VBoxPython2_7.so
- usr/lib/virtualbox/VBoxXPCOMC.so
- usr/lib/virtualbox/VBoxOGLhostcrutil.so
- usr/lib/virtualbox/VBoxNetDHCP.so
- usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
- java? ( sdk )
- python? ( sdk )
- vboxwebsrv? ( java )
- ${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
- if ! use headless && ! use qt5 ; then
- einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
- elif use headless && use qt5 ; then
- einfo "You selected USE=\"headless qt5\", defaulting to"
- einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
- fi
-
- if ! use opengl ; then
- einfo "No USE=\"opengl\" selected, this build will lack"
- einfo "the OpenGL feature."
- fi
- if ! use python ; then
- einfo "You have disabled the \"python\" USE flag. This will only"
- einfo "disable the python bindings being installed."
- fi
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- tc-ld-disable-gold #bug 488176
- tc-export CC CXX LD AR RANLIB
- export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -r kBuild/bin tools || die
-
- # Replace pointless GCC version check with something less stupid.
- # This is needed for the qt5 version check.
- sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' -i configure || die
-
- # Don't use "echo -n"
- sed 's@ECHO_N="echo -n"@ECHO_N="printf"@' -i configure || die
-
- # Disable things unused or split into separate ebuilds
- sed -e "s@MY_LIBDIR@$(get_libdir)@" \
- "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
- # Respect LDFLAGS
- sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
- -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
- # Do not use hard-coded ld (related to bug #488176)
- sed -e '/QUIET)ld /s@ld @$(LD) @' \
- -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
- # Use PAM only when pam USE flag is enbaled (bug #376531)
- if ! use pam ; then
- elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
- sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
- src/VBox/HostServices/Makefile.kmk || die
- fi
-
- # add correct java path
- if use java ; then
- sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
- -i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
- fi
-
- # Only add nopie patch when we're on hardened
- if gcc-specs-pie ; then
- eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
- fi
-
- # Only add paxmark patch when we're on pax_kernel
- if use pax_kernel ; then
- eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
- fi
-
- eapply "${WORKDIR}/patches"
-
- eapply_user
-}
-
-src_configure() {
- local myconf=(
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
- --disable-dbus
- --disable-kmods
- )
- use alsa || myconf+=( --disable-alsa )
- use debug && myconf+=( --build-debug )
- use doc || myconf+=( --disable-docs )
- use java || myconf+=( --disable-java )
- use lvm || myconf+=( --disable-devmapper )
- use opengl || myconf+=( --disable-opengl )
- use pulseaudio || myconf+=( --disable-pulse )
- use python || myconf+=( --disable-python )
- use vboxwebsrv && myconf+=( --enable-webservice )
- use vnc && myconf+=( --enable-vnc )
- if ! use headless ; then
- use qt5 || myconf+=( --disable-qt )
- else
- myconf+=( --build-headless --disable-opengl )
- fi
- if use amd64 && ! has_multilib_profile ; then
- myconf+=( --disable-vmmraw )
- fi
- # not an autoconf script
- ./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
- source ./env.sh || die
-
- # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
- MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
- MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
- MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
- MAKE="kmk" emake \
- VBOX_BUILD_PUBLISHER=_Gentoo \
- TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
- TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
- TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
- TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
- VBOX_GCC_OPT="${CXXFLAGS}" \
- TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
- all
-}
-
-src_install() {
- local binpath="release"
- use debug && binpath="debug"
- cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
- local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
-
- vbox_inst() {
- local binary="${1}"
- local perms="${2:-0750}"
- local path="${3:-${vbox_inst_path}}"
-
- [[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
- [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
- insinto ${path}
- doins ${binary}
- fowners root:vboxusers ${path}/${binary}
- fperms ${perms} ${path}/${binary}
- }
-
- # Create configuration files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
- # Set the correct libdir
- sed \
- -e "s@MY_LIBDIR@$(get_libdir)@" \
- -i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
- # Install the wrapper script
- exeinto ${vbox_inst_path}
- newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
- fowners root:vboxusers ${vbox_inst_path}/VBox
- fperms 0750 ${vbox_inst_path}/VBox
-
- # Install binaries and libraries
- insinto ${vbox_inst_path}
- doins -r components
-
- # *.rc files for x86_64 are only available on multilib systems
- local rcfiles="*.rc"
- if use amd64 && ! has_multilib_profile ; then
- rcfiles=""
- fi
- for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
- vbox_inst ${each}
- done
-
- # These binaries need to be suid root.
- for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
- vbox_inst ${each} 4750
- done
-
- # Install EFI Firmware files (bug #320757)
- pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
- for fwfile in VBoxEFI{32,64}.fd ; do
- vbox_inst ${fwfile} 0644
- done
- popd &>/dev/null || die
-
- # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
- # VBoxXPCOMIPCD (bug #524202)
- for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
- pax-mark -m "${D}"${vbox_inst_path}/${each}
- done
-
- # Symlink binaries to the shipped wrapper
- for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
- dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- if ! use headless ; then
- vbox_inst VBoxSDL 4750
- pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
-
- for each in vboxsdl VBoxSDL ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
-
- if use qt5 ; then
- vbox_inst VirtualBox 4750
- pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
-
- if use opengl ; then
- vbox_inst VBoxTestOGL
- pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
- fi
-
- for each in virtualbox VirtualBox ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
-
- insinto /usr/share/${PN}
- doins -r nls
-
- newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
- fi
-
- pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
- for size in 16 32 48 64 128 ; do
- newicon -s ${size} ${PN}-${size}px.png ${PN}.png
- done
- newicon ${PN}-48px.png ${PN}.png
- doicon -s scalable ${PN}.svg
- popd &>/dev/null || die
- pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
- for size in 16 24 32 48 64 72 96 128 256 512 ; do
- for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
- icofile="${PN}-${ico}-${size}px.png"
- if [[ -f "${icofile}" ]] ; then
- newicon -s ${size} ${icofile} ${PN}-${ico}.png
- fi
- done
- done
- popd &>/dev/null || die
- fi
-
- if use lvm ; then
- vbox_inst VBoxVolInfo 4750
- dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
- fi
-
- if use sdk ; then
- insinto ${vbox_inst_path}
- doins -r sdk
-
- if use java ; then
- java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
- java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
- fi
- fi
-
- if use udev ; then
- # New way of handling USB device nodes for VBox (bug #356215)
- local udevdir="$(get_udevdir)"
- insinto ${udevdir}
- doins VBoxCreateUSBNode.sh
- fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
- fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
- insinto ${udevdir}/rules.d
- sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
- > "${T}"/10-virtualbox.rules || die
- doins "${T}"/10-virtualbox.rules
- fi
-
- if use vboxwebsrv ; then
- vbox_inst vboxwebsrv
- dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- if use doc ; then
- dodoc UserManual.pdf
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if use udev ; then
- udevadm control --reload-rules \
- && udevadm trigger --subsystem-match=usb
- fi
-
- if ! use headless && use qt5 ; then
- elog "To launch VirtualBox just type: \"virtualbox\"."
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "The latest user manual is available for download at:"
- elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "IMPORTANT!"
- elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
- elog "\"env-update\" as root and logout and relogin as the user you wish"
- elog "to run ${PN} as."
- elog ""
- elog "Starting with version 4.0.0, ${PN} has USB-1 support."
- elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- elog "package."
- elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
- elog "the \"extension\" USE flag. For installation of the guest additions ISO"
- elog "image, please emerge"
- elog " app-emulation/virtualbox-additions"
- elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- if ! use udev ; then
- elog ""
- elog "WARNING!"
- elog "Without USE=udev, USB devices will likely not work in ${PN}."
- elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild b/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
index 9a20365745cc..31a7801b26bc 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -316,8 +316,10 @@ src_install() {
done
dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+ if use pam ; then
+ # VRDPAuth only works with this (bug #351949)
+ dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+ fi
# set an env-variable for 3rd party tools
echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
diff --git a/app-emulation/virtualbox/virtualbox-5.2.2.ebuild b/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
index f6ef3647989f..292349146a95 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -316,8 +316,10 @@ src_install() {
done
dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+ if use pam ; then
+ # VRDPAuth only works with this (bug #351949)
+ dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+ fi
# set an env-variable for 3rd party tools
echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
diff --git a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
index f6ef3647989f..292349146a95 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -316,8 +316,10 @@ src_install() {
done
dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+ if use pam ; then
+ # VRDPAuth only works with this (bug #351949)
+ dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+ fi
# set an env-variable for 3rd party tools
echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 462a618a105f..a6dc0172d0ba 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/qchartdiary/Manifest b/app-office/qchartdiary/Manifest
deleted file mode 100644
index f85649c69fd4..000000000000
--- a/app-office/qchartdiary/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QChartDiary-0.6.4.1-src.tar.gz 72683 BLAKE2B adaa070e3befdc495ffb341d92390b0dc2ef5028c193a25a856c4a7b61b9ef407a8bdd4f8b28a6b44851ba4d409c4712a199ab2b1b04f4817191e00dff1dcc3d SHA512 8f804daf4fc8f61c0f584f667ac109771976808ae03f1d5fa9debe4bee3ce4010906fcb337b0007bcf0058ec83f5f9381187155c42ba118915ae64857982fd89
diff --git a/app-office/qchartdiary/metadata.xml b/app-office/qchartdiary/metadata.xml
deleted file mode 100644
index acd8e0ee3226..000000000000
--- a/app-office/qchartdiary/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- hwoarang@gentoo.org
- Markos Chandras
-
-
- qchartdiary
-
-
diff --git a/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild b/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild
deleted file mode 100644
index cca0b4e30ce7..000000000000
--- a/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit qt4-r2
-
-MY_PN="QChartDiary"
-
-DESCRIPTION="Free Qt4 diary/agenda application"
-HOMEPAGE="http://qt-apps.org/content/show.php?content=99294"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
- dev-qt/qtsql:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-DOCS="AUTHORS CHANGELOG README"
-
-src_prepare() {
- sed -i "s/doc\/${MY_PN}/doc\/${PF}/" ${MY_PN}.pro \
- || die "failed to fix documentation path"
- qt4-r2_src_prepare
-}
-
-src_install() {
- qt4-r2_src_install
- dobin ${MY_PN} || die "dobin failed"
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ab26c40d48e0..ff9615deeda3 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/repmgr/metadata.xml b/dev-db/repmgr/metadata.xml
index 06d2f4bd93e4..d8c0e2f2db10 100644
--- a/dev-db/repmgr/metadata.xml
+++ b/dev-db/repmgr/metadata.xml
@@ -4,7 +4,4 @@
robbat2@gentoo.org
-
- betelgeuse@gentoo.org
-
-
+
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 562cdebb39a8..33b6eee3d942 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/php/php-7.2.0.ebuild b/dev-lang/php/php-7.2.0.ebuild
index 19cc9bdf940d..fd201e4c1c5f 100644
--- a/dev-lang/php/php-7.2.0.ebuild
+++ b/dev-lang/php/php-7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -49,7 +49,7 @@ COMMON_DEPEND="
acl? ( sys-apps/acl )
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-
- bicatali@gentoo.org
- feel free to fix/update
-
cpp@gentoo.org
Gentoo C++ Project
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 07fc832c93a6..1a107dbae519 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,3 +1,4 @@
DIST libunistring-0.9.5.tar.gz 3487957 BLAKE2B 31c345d503476467ac0178cb127d85d2af343bc7d65504600b2950d44e50996d84d77750cc89af643667568f1d01beb2742aba5122bd4e4a50ab8c8225f1cf63 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4
DIST libunistring-0.9.6.tar.gz 3565883 BLAKE2B 8cd9e05f78e37246036ae134ae7d6c570da46c04822f749297ffeec7ec529ad17cee22a9d9ebbf3f1e36398efde41714c3953efdc3859d3f1e454281ad591249 SHA512 244f4ef6343047d2dedfdbe536a7a29584a58f668a41ba3183fc86d2f167186acf120708e024e31551ee2f035b9bee35e9ed24a276a4de9359cf08aec198c20a
DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
+DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
diff --git a/dev-libs/libunistring/libunistring-0.9.8.ebuild b/dev-libs/libunistring/libunistring-0.9.8.ebuild
new file mode 100644
index 000000000000..ba7327e2d797
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal libtool
+
+DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-nodocs.patch
+)
+
+src_prepare() {
+ default
+ elibtoolize # for Solaris shared libraries
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+ default
+
+ prune_libtool_files
+}
+
+multilib_src_install_all() {
+ default
+
+ if use doc; then
+ dohtml doc/*.html
+ doinfo doc/*.info
+ fi
+}
diff --git a/dev-libs/starpu/metadata.xml b/dev-libs/starpu/metadata.xml
index c50a1737c9b5..8e975146000a 100644
--- a/dev-libs/starpu/metadata.xml
+++ b/dev-libs/starpu/metadata.xml
@@ -1,10 +1,7 @@
-
- bicatali@gentoo.org
- Feel free to update and/or fix
-
+
StarPU is a runtime system that offers support for heterogeneous
multicore machines. While many efforts are devoted to design efficient
diff --git a/dev-python/Babel/Babel-2.1.1.ebuild b/dev-python/Babel/Babel-2.1.1.ebuild
deleted file mode 100644
index 8d2b76ef7aba..000000000000
--- a/dev-python/Babel/Babel-2.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-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"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- # Make the tests use implementation-specific datadir,
- # because they try to write in it.
- sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
- -i tests/messages/test_frontend.py || die
- sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # Create implementation-specific datadir for tests.
- cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
- export BUILD_DIR
- py.test || die
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Babel-2.3.4.ebuild b/dev-python/Babel/Babel-2.3.4.ebuild
deleted file mode 100644
index c333bf32f4e1..000000000000
--- a/dev-python/Babel/Babel-2.3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-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"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
-)
-
-python_prepare_all() {
- # Make the tests use implementation-specific datadir,
- # because they try to write in it.
- sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
- -i tests/messages/test_frontend.py || die
- sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # Create implementation-specific datadir for tests.
- cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
- py.test || die
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Babel-2.4.0.ebuild b/dev-python/Babel/Babel-2.4.0.ebuild
deleted file mode 100644
index 9ec087d4bd7e..000000000000
--- a/dev-python/Babel/Babel-2.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-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"
-IUSE="doc test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- # Make the tests use implementation-specific datadir,
- # because they try to write in it.
- sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
- -i tests/messages/test_frontend.py || die
- sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # Create implementation-specific datadir for tests.
- cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
- py.test || die
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 6ac52401f2a4..311dc91cc7ce 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,4 +1 @@
-DIST Babel-2.1.1.tar.gz 3437647 BLAKE2B 0007a2225e99e5643d36527d3b84f330df5e9010a4ef8e920da90bce7389a0504fc889fe6e149e756f51db2ebd77eff04c7e5c6295e01f4225bfef9d6e1de790 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94
-DIST Babel-2.3.4.tar.gz 6866920 BLAKE2B 2f4b5d33364e20aef2ef47fe606dd0d531fc00ea80556584d3493c4b5af497a096c45c79683405a878a64c119730789f51ddcb993ee75e403f0097878b95871a SHA512 1fdba01946e7a8ebe3fef23843e23707cd060b0a179d775e29f938318d824e8779df2852fb8bbd18f61fc47de33af5d988c509dc67f54ea4cb3a4a66767869a5
-DIST Babel-2.4.0.tar.gz 6607513 BLAKE2B 2936a0eb1ea0ecae827681f1a86e3fd66c4952c4563b1b5e01c81695a233abe59c2b63c4c2aa6c0e71934f004aaea459ad0ecee73aab0780c47d7d41b2ee00db SHA512 4e1341144dfb319c172a446facc47204c9b9f49972c8646b62e082975d8ec41c35e503e610d7114ef5346a5c073e87ed8d40a65a60d9540fb7ca947681cc0beb
DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
diff --git a/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch b/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
deleted file mode 100644
index fdfb31d7c62a..000000000000
--- a/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 476515c2418039e471656f47efbfc43e5230c1fd Mon Sep 17 00:00:00 2001
-From: Isaac Jurado
-Date: Sun, 29 May 2016 10:50:42 +0200
-Subject: [PATCH] Fix the way local time is constructed in tests
-
-In summer time zones, the test for "get_timezone_name" failed because the
-construct used to obtain a local time did not deal properly with DST offsets.
-As recommended by pytz, it is better to convert to local time from UTC.
----
- tests/test_dates.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_dates.py b/tests/test_dates.py
-index 3bb9e8b..b0d093e 100644
---- a/tests/test_dates.py
-+++ b/tests/test_dates.py
-@@ -624,8 +624,9 @@ def test_get_timezone_name():
- assert dates.get_timezone_name(tz, locale='en', width='long',
- zone_variant='daylight') == u'Pacific Daylight Time'
-
-+ localnow = datetime.utcnow().replace(tzinfo=timezone('UTC')).astimezone(dates.LOCALTZ)
- assert (dates.get_timezone_name(None, locale='en_US') ==
-- dates.get_timezone_name(datetime.now().replace(tzinfo=dates.LOCALTZ), locale='en_US'))
-+ dates.get_timezone_name(localnow, locale='en_US'))
-
- assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
-
---
-2.13.0
-
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 90ecda809d6c..526c7e684436 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 3ddafa2b9b63..6bc965e4e1dc 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,3 +1,2 @@
-DIST PyContracts-1.7.15.tar.gz 89602 BLAKE2B 76cf500392bb06e649a1f6c5715709728ded871920e3e3a1e4fc1c239e04e0425e8d250638d9157db7abfbcd378a793cfa85481ac9f8e3a6740ca92615e4b845 SHA512 db52b0de04e28913068b072eb9bcd2913b121c65a975a2d5b27cb093f1c131aecb0c36360b4e1a34ec16890dc1055a4bd64f1a88e8f581b804d65536d878e717
DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
diff --git a/dev-python/PyContracts/PyContracts-1.7.15.ebuild b/dev-python/PyContracts/PyContracts-1.7.15.ebuild
deleted file mode 100644
index d3cb547abe47..000000000000
--- a/dev-python/PyContracts/PyContracts-1.7.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-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"
-IUSE="test"
-
-RDEPEND="
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Upstream allows tests to fail
-RESTRICT=test
-
-python_test() {
- nosetests \
- $(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
- || die
-}
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 239df56014cb..2c9b700b66f7 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,2 +1 @@
-DIST pyeclib-1.4.0.tar.gz 6682441 BLAKE2B 284c7b7357b42e758878496dcf795c737e63579eca28d7bc8dc35ef055a693f5bee235e34778850bc373300da3da3f8fc78c4065aab5d59b3efbd840dc9e12a1 SHA512 849da9ad32e26ca4e923bc00482734d6431bdcf402eff6b0c5ead4264c7be9e8502eb0bea6e60fa8565d361d9d7d81e01e38fd3c85c4e87c4d6b8b30be328e0c
DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
diff --git a/dev-python/PyECLib/PyECLib-1.4.0.ebuild b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
deleted file mode 100644
index 7d57a5c8f14a..000000000000
--- a/dev-python/PyECLib/PyECLib-1.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
-SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
-S="${WORKDIR}/pyeclib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
- ${CDEPEND}"
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 2745e3a3fb11..00170246eb93 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,2 +1 @@
-DIST PyPDF2-1.24.tar.gz 59891 BLAKE2B 6d36949a956b26f37ea9a5f1b5fe9be8cb0406dc9e461e8f54eb46ee28711d83746e6ed1cfdb6c051ac6eac70199cfe26c3611176ab73577dea88b5854fca1e0 SHA512 91a9338b0338eee1cfddc25dd0f21494f73696e630b08a71ff9195fe7b0fc77cf6c07b38a0c6aa4856536be6fe0a474c3b292c13fdd0187b62cb8848e69b29f9
DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
diff --git a/dev-python/PyPDF2/PyPDF2-1.24.ebuild b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
deleted file mode 100644
index 598db4a46387..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.24.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}/ https://mstamy2.github.com/PyPDF2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-python_install_all() {
- use examples && local EXAMPLES=( Sample_Code/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index 9b76e468ee05..0d9f184ee6da 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,2 +1 @@
-DIST PySocks-1.5.6.tar.gz 9189 BLAKE2B 50833088e06bc3b4de5be7c0bd7ad7044f291a655cfb548e12353fdc1563750712f261dc6105343f6bed242690bfd9224e23b2e32cbc6672ed78496da7930eb0 SHA512 3255591864c532f9ce3c0304d7b33165bb09c0a332fb0d126f61315e98f50e1af0f792517533166558fe457dce2d08f2b320adf9dd87b58618e0941d72daee49
DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
diff --git a/dev-python/PySocks/PySocks-1.5.6.ebuild b/dev-python/PySocks/PySocks-1.5.6.ebuild
deleted file mode 100644
index dfbcd5cbc53c..000000000000
--- a/dev-python/PySocks/PySocks-1.5.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index 5fcf1a979bfb..25f39f35ec07 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,3 +1,2 @@
DIST SaltTesting-2015.7.10.tar.gz 77163 BLAKE2B 974c0f336da7c7222501cce31e5ebd5946901337bc185b24ce6e3efa5780924894e4293a8fc80dedbc85ea3e442dd6c793d75d1a4094c5f4e6960a60f3a9000d SHA512 8f8979fcbb13ff6f56c67d726aaa95a5e9fb0e73338487b87d72acdf4621f327bdc6944f5e27baee46f15d3537c7b37321aa5535d1b6d4b88c79c0c72acfb099
-DIST SaltTesting-2017.2.23.tar.gz 91715 BLAKE2B 477f1c633842b48e084630bd4f4c18f9345a48c7755e024dc13d57ee09222e1317add5edfddb14541a513d257bbdf4a741c6003a409278a0c33bbfeec23ec116 SHA512 d45085463dadcce3ab91b496cd580c5d091d875258e791d7c9c60746d8c1367471aea6ea855551116f505a43afbead83d14a44e2f40f1acd0d55d5367bcccd03
DIST SaltTesting-2017.6.1.tar.gz 90438 BLAKE2B 2d24dc88e8e352d027cf7bdf58a05afe7ec189c20312d821401fcb93fa1d2098078e6b3eb6e9bc86a7bca732b767553f1130cfedd93b91b8bc516fe72243cc1d SHA512 1d1a33385e9313450a17912440671567c957b74bfe6fea2e11921c8fde30ad5fc54b147b2c9d12763b946eac89e37346e1e5547fe310ee6a8bdb17ca601a09fb
diff --git a/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild b/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
deleted file mode 100644
index 8c61110b76c0..000000000000
--- a/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-2
- EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
- dev-python/psutil[${PYTHON_USEDEP}]
- >=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
deleted file mode 100644
index 8aa4acca7073..000000000000
--- a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
-HOMEPAGE="https://pypi.python.org/pypi/aioeventlet https://bitbucket.org/haypo/aioeventlet"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- dev-python/eventlet[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index 725fae4abd87..35bdebd8ba99 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,2 +1 @@
-DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
deleted file mode 100644
index 8595ce17c0db..000000000000
--- a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="asyncio based SMTP server"
-HOMEPAGE="http://aiosmtpd.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
-
-src_prepare() {
- rm -r examples
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 9b53841d3148..a2a37538ae43 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,2 @@
-DIST alembic-0.8.10.tar.gz 976028 BLAKE2B d9309b5ea4be7b42394e1273e3113f9eb1c181806fb21eb414f4b2102e8df25b4f123538c96891d28a9f7d16904b42f6a1980a2f7a93297d170d28dd3448d879 SHA512 28456eb41a2b2d0d870f34cfddf46c25ed01fd1ee99b1a3697e6c0c5369f49245e54db0d7232cc839cf03a5c48efb48a8b967586b3a81ba9462b485b6782a415
DIST alembic-0.9.3.tar.gz 991744 BLAKE2B 2d18836fee1bd9a57cdc1b8f6159b9c1dc79b82a1bccd8cb62a597dfe47751992929630b9460e430be38bfd43d48cd1981858fa6b924a7283a48c12226867ef5 SHA512 1f39521a1cc9e1e8f8d344f2e48e1f656aed2ffda8e0608b9c5a9a7a1f0e4d16865ae0fba903023512a198afc70e72c683b0ff2bd1bc2e9ba6667009e940a63e
DIST alembic-0.9.5.tar.gz 990808 BLAKE2B a8155d15a9de2acb7a2f01829a0d01eeae5a7981a72aaa95e0d9d53433f52d0695d7e5414dbded1e5d53253a5e2d1cef67b12ed6be58d901859f3eae137486c1 SHA512 7588a681a6cf50a58ad697cb879d465d259880a473647d598242609c6321a8be7f53fc0d9a24fe976c4c65750eb0acc1a8e60253d4ccda33c87319ac9985e8b8
diff --git a/dev-python/alembic/alembic-0.8.10.ebuild b/dev-python/alembic/alembic-0.8.10.ebuild
deleted file mode 100644
index 0d136584e356..000000000000
--- a/dev-python/alembic/alembic-0.8.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test doc"
-
-# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
-# because it shatters the testsuite. If 'someone' cares to adhere to correct form
-# and edit to -0.7.3, feel free, and then pick up the pieces.
-RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/python-editor-0.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}] )"
-# For test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # suite passes all if run from source. The residual fail & error are quite erroneous
- rm tests/test_script_consumption.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- ${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 876464b4267a..16f78f0b3d16 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,2 +1 @@
-DIST appdirs-1.4.0.tar.gz 14358 BLAKE2B de0248d7ca8211a287bb76f516d5ae5d3b3ac0a5c3e2060fe0fbdf3fa9131e6ab26d0b0d293cdec4cf86f26e852fad7534eb44c386797d18964232fe85239bde SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac
DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild
deleted file mode 100644
index 5bee3f5d4868..000000000000
--- a/dev-python/appdirs/appdirs-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# api.doctests is missing in the dist zipfile
-# and the 'internal' doctest does nothing
-RESTRICT=test
-
-python_test() {
- cd test || die
- "${PYTHON}" test.py \
- || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 8678584cf234..df6ba5e20231 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1 +1,2 @@
+DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
DIST google-apitools-0.5.4.tar.gz 255413 BLAKE2B 549aca8a2ef41f5f6de408efcd9ad3dc3c27fb9d0ce6c2c93794bd89355b0ed19499ad602aa79cac88d4aacf3c4e2820accbeb3e9c156caf3466bc36d5b0a7ec SHA512 63953a3ce4e7485344f54434ae4e6de75e4ca1ca380858143735b02560a5ac808d5f2ffed346b09402c156632a34ea1ded27d152538a98ec40981230f7d38764
diff --git a/dev-python/google-apitools/google-apitools-0.5.16.ebuild b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
new file mode 100644
index 000000000000..389a7b7a8dba
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+ >=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
index ec1907817312..a70b39fe2bc7 100644
--- a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
@@ -24,12 +24,12 @@ IUSE=""
# In case of using the (linked) cpp implementation we should be fine with the same subslot.
RDEPEND="${PYTHON_DEPS}
dev-python/namespace-google[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
!
+
+
+
+ python@gentoo.org
+
+
+ nicolasbock@gentoo.org
+
+
+ HP servers come with a powerful out of band management
+ interface called Integrated Lights out, or iLO. It has an
+ extensive web interface and commercially available tools for
+ centrally managing iLO devices and their servers.
+
+
+ seveas/python-hpilo
+
+
diff --git a/dev-python/python-hpilo/python-hpilo-3.9.ebuild b/dev-python/python-hpilo/python-hpilo-3.9.ebuild
new file mode 100644
index 000000000000..a291d1ad427b
--- /dev/null
+++ b/dev-python/python-hpilo/python-hpilo-3.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="iLO automation from python or shell"
+HOMEPAGE="https://pypi.python.org/pypi/python-hpilo"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+ ${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/python-hpilo/python-hpilo-4.0.ebuild b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
new file mode 100644
index 000000000000..a291d1ad427b
--- /dev/null
+++ b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="iLO automation from python or shell"
+HOMEPAGE="https://pypi.python.org/pypi/python-hpilo"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+ ${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8f1d933afe28..3691a176894b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml
index 33d6c739e338..e7d5f3b34fd5 100644
--- a/dev-util/bazel/metadata.xml
+++ b/dev-util/bazel/metadata.xml
@@ -4,9 +4,6 @@
zmedico@gentoo.org
-
- bicatali@gentoo.org
-
bazelbuild/bazel
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
index d57bc4d86fdb..0f9287ff41d9 100644
--- a/dev-util/cmt/metadata.xml
+++ b/dev-util/cmt/metadata.xml
@@ -1,9 +1,7 @@
-
- bicatali@gentoo.org
-
+
CMT is a configuration management environment, based on some
management conventions and comprises several shell-based
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
index 2d34940e1994..32c4a333fca0 100644
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@@ -1,10 +1,7 @@
-
- bicatali@gentoo.org
- Sébastien Fabbro
-
+
conan
conan-io/conan
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index 01d45bd73055..3cb63fd818d9 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,4 +1 @@
-DIST docker-ls-0.2.1_p20161102.tar.gz 20313 BLAKE2B 5dd9fa07934327851d60accac653ab05353c2d919811e7d7b2efe740b1e31915bf76659af6f96c76ff41c73e98adf5d70d67aaa6f1cfa8a1431266e8efc90fba SHA512 fd44fcb21db696e9565b8e4e84ef4aaeee7d1101fc0e1f2978a452cc8ec8016fce47508afe201b7096f06066b030eedd9d78c8d3408ca82d2e96431661857e3f
DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
-DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-DIST github.com-golang-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz 1317212 BLAKE2B 00078092ba94d76ef3111401707de65c254ad13a2737b63d00b123aee9020acc83d016781e65bab4dc23a5697898498e744f0c2f6bd58c0e6f73b47af4b1c9e5 SHA512 163ca4b00188133d5c4d82dd685deaf2b889ae76b97021697d96dd8f11675a57361352e204d774a6fb7941f45dc8027ddb324abf0a4799ed19c3052181536992
diff --git a/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild b/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
deleted file mode 100644
index 127c5f1c57e2..000000000000
--- a/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mayflower/${PN}/..."
-EGIT_COMMIT="3c5e2decd5c6717d4f375a2588179758d62bb591"
-EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml"
- "golang.org/x/crypto 728b753d0135da6801d45a38e6f43ff55779c5c2 github.com/golang/crypto" )
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tools for browsing and manipulating docker registries"
-HOMEPAGE="https://github.com/mayflower/docker-ls"
-SRC_URI="${ARCHIVE_URI}
- ${EGO_VENDOR_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -i -e "s/\"git\", \"rev-parse\", \"--short\", \"HEAD\"/\"echo\", \"${EGIT_COMMIT:0:8}\"/"\
- src/${EGO_PN%/*}/generators/version.go || die
-}
-
-src_compile() {
- pushd src || die
- GOPATH="${WORKDIR}/${P}" go generate ${EGO_PN} || die
- GOPATH="${WORKDIR}/${P}" go install ${EGO_PN%/*}/cli/... || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- dodoc src/${EGO_PN%/*}/{README,CHANGELOG}.md
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index cd264f665aa1..ac48119b787f 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7b12a6e7d7f3..b9f69a824b14 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -586,12 +586,10 @@ cmake-utils_src_configure() {
ELSE ()
SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
+ SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "")
- SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
- SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE)
ENDIF (NOT APPLE)
_EOF_
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index f3ff7a04908d..16d497a92350 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/capicity/Manifest b/games-board/capicity/Manifest
deleted file mode 100644
index b54a01178c8f..000000000000
--- a/games-board/capicity/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST CapiCity_1.0.tar.gz 363899 BLAKE2B b536f2c16bdaa2a11e42550cadfe0be092b82e6d3bd2d655c8214748cd040a8fe662d953dea7dcf219475c2fc5ea347f0b76be2f72d55b14d445e4e2c81f822d SHA512 0d2b03bb806e13dabe8fad8dc8c00ce43944229e79f2ad573bd3d4e384e472937818558ddc2ff9e5d45c88bf66d2300d447265c0d4045255ca626dbc26dcc0cc
-DIST Capid_1.0.tar.gz 95151 BLAKE2B 9dfd68c79b3079ee2d7d6f2f4b4a53c7570ec9512b0d9dc69a1013f9cb4186b476f174937e2cfa8988b2eccf44ec00fd995b1fd001eb919edce35987580f3c37 SHA512 9bb9bf3e8dc17689cf404dae414759821317b100e553f074fc1a66921fa59161df48839f3f26c040c3045621ff4ab62af3b9919509cef0d9f21bf8a03003166a
diff --git a/games-board/capicity/capicity-1.0-r1.ebuild b/games-board/capicity/capicity-1.0-r1.ebuild
deleted file mode 100644
index 114de8e7f541..000000000000
--- a/games-board/capicity/capicity-1.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils qmake-utils
-
-DESCRIPTION="Monopd compatible boardgame for Monopoly-like games, previously named capitalism"
-HOMEPAGE="http://linux-ecke.de/CapiCity/"
-SRC_URI="dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/Capid_${PV}.tar.gz )
- !dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/CapiCity_${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtscript:4
- !dedicated? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- default
- S=${WORKDIR}/$(usex dedicated Capid CapiCity)_${PV}
-}
-
-src_configure() {
- if use dedicated ; then
- eqmake4 Capid.pro
- else
- eqmake4 CapiCity.pro
- fi
-}
-
-src_install() {
- local res
-
- if use dedicated ; then
- dobin Capid
- dodoc doc/*
- else
- dobin CapiCity
- dodoc changelog README
-
- for res in 16 22 24 32 48 64; do
- newicon -s ${res} icons/${res}x${res}.png ${PN}.png
- done
-
- make_desktop_entry CapiCity "Capi City"
- fi
-}
-
-pkg_preinst() {
- use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use dedicated || gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use dedicated || gnome2_icon_cache_update
-}
diff --git a/games-board/capicity/metadata.xml b/games-board/capicity/metadata.xml
deleted file mode 100644
index 011e42b48be2..000000000000
--- a/games-board/capicity/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- capitalism
-
-
diff --git a/games-board/holdingnuts/Manifest b/games-board/holdingnuts/Manifest
deleted file mode 100644
index ac1facc50da7..000000000000
--- a/games-board/holdingnuts/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST holdingnuts-0.0.5.tar.bz2 1456227 BLAKE2B 638cd28e997e0b3d86b1ee4b857db02d336ef38495261d890fdc8252918487050a228f2cde367b24f485cef290b22df9042e8111b821491fc0635bffa0e0b8fc SHA512 95eb6d73c5b72c10bf04a03f9fb039bb1573ef74b6a3c820d5cc79fb81b8c6e2df24c5266a4067f4044ce050ba29bf1e2c65c46de50dd7cd3beac4736397053a
diff --git a/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch b/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch
deleted file mode 100644
index c5993b64bb8c..000000000000
--- a/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fixed gamelogic bug with wheel-straight: check suit of ace if testing for straight-flush
-Origin: https://sourceforge.net/apps/trac/holdingnuts/changeset/741
---- a/src/libpoker/GameLogic.cpp
-+++ b/src/libpoker/GameLogic.cpp
-@@ -179,7 +179,11 @@
-
- // is an A2345-straight ("wheel")
- if (count == 4 && (last_face == Card::Two && allcards->front().getFace() == Card::Ace))
-- is_straight = true;
-+ {
-+ // check suit when testing for StraightFlush
-+ if (suit == -1 || allcards->front().getSuit() == suit)
-+ is_straight = true;
-+ }
-
- if (is_straight)
- {
\ No newline at end of file
diff --git a/games-board/holdingnuts/holdingnuts-0.0.5-r2.ebuild b/games-board/holdingnuts/holdingnuts-0.0.5-r2.ebuild
deleted file mode 100644
index daad81defad1..000000000000
--- a/games-board/holdingnuts/holdingnuts-0.0.5-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils cmake-utils
-
-DESCRIPTION="An open source poker client and server"
-HOMEPAGE="http://www.holdingnuts.net/"
-SRC_URI="http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dedicated"
-
-RDEPEND="
- !dedicated? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- alsa? ( >=media-libs/libsdl-1.2.10:0[alsa] )
- )"
-
-DEPEND="${RDEPEND}
- >=dev-util/cmake-2.6.3"
-
-PATCHES=(
- "${FILESDIR}"/${P}-wheel.patch # upstream patch (bug #307901)
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e '/^Path/d' holdingnuts.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(-DWITH_AUDIO=$(usex alsa)
- -DENABLE_CLIENT=$(usex !dedicated)
- -DWITH_DEBUG=$(usex debug))
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use dedicated ; then
- domenu ${PN}.desktop
- doicon ${PN}.png
- doman docs/${PN}.6
- fi
-
- dodoc ChangeLog docs/protocol_spec.txt
- doman docs/${PN}-server.6
-}
diff --git a/games-board/holdingnuts/metadata.xml b/games-board/holdingnuts/metadata.xml
deleted file mode 100644
index 882df6af6590..000000000000
--- a/games-board/holdingnuts/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- downloads
-
-
diff --git a/games-board/kcheckers/Manifest b/games-board/kcheckers/Manifest
deleted file mode 100644
index 53db36d6ba7c..000000000000
--- a/games-board/kcheckers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kcheckers-0.8.1.tar.gz 81431 BLAKE2B 9d6d00447ae939406e0e14d610f856a07fe802b61d4ffc1a838bb6a700e96fe9423895ec2ec0fdceafb24ea55dc2268b80e67a7d00b477726e54be74c2a61328 SHA512 c5febbcc7f0362169879a29a159c86aa4f3d859ee3bebea243535ca07949366078406b87e5e5534586485601b92a79b621cef7ba96f2224acc5331e3624d1b73
diff --git a/games-board/kcheckers/kcheckers-0.8.1-r1.ebuild b/games-board/kcheckers/kcheckers-0.8.1-r1.ebuild
deleted file mode 100644
index b88b44e2866f..000000000000
--- a/games-board/kcheckers/kcheckers-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-DESCRIPTION="Qt version of the classic boardgame checkers"
-HOMEPAGE="http://qcheckers.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:/usr/local:/usr:" \
- common.h || die
-}
-
-src_configure() {
- eqmake4
-}
-
-src_install() {
- dobin kcheckers
-
- insinto /usr/share/${PN}
- doins -r i18n/* themes
-
- newicon icons/biglogo.png ${PN}.png
- make_desktop_entry ${PN} KCheckers
-
- dodoc AUTHORS ChangeLog FAQ README TODO
-}
diff --git a/games-board/kcheckers/metadata.xml b/games-board/kcheckers/metadata.xml
deleted file mode 100644
index 7212e2dc377e..000000000000
--- a/games-board/kcheckers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- qcheckers
-
-
diff --git a/games-board/qcheckers/Manifest b/games-board/qcheckers/Manifest
deleted file mode 100644
index 4be6f7d6e41e..000000000000
--- a/games-board/qcheckers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QCheckers-20091230.tar.gz 45259 BLAKE2B f631f29ca856315c798c29253f8d5d895f0c9eede8b336b7a9bd3d8eed222b4130602b22bb61a1922b7afb3871005adfa696c8fbab26d1990a19062e0473c9ba SHA512 c2cdb679a13804723064e87be1879185d14618e5147ead93b65a65d02100f3c47bed9243d845754b3aa862a0d4f7c803e5df42fa3bc3513b08a9a08b611a3d90
diff --git a/games-board/qcheckers/metadata.xml b/games-board/qcheckers/metadata.xml
deleted file mode 100644
index 578f723f8165..000000000000
--- a/games-board/qcheckers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- qcheckers
-
-
diff --git a/games-board/qcheckers/qcheckers-20091230-r1.ebuild b/games-board/qcheckers/qcheckers-20091230-r1.ebuild
deleted file mode 100644
index 89ddf4f6e906..000000000000
--- a/games-board/qcheckers/qcheckers-20091230-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-MY_PN=${PN/qc/QC}
-
-DESCRIPTION="Qt4 based checkers game"
-HOMEPAGE="https://code.google.com/p/qcheckers/"
-SRC_URI="https://qcheckers.googlecode.com/files/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_PN}
-
-src_configure() {
- eqmake4 ${MY_PN}.pro
-}
-
-src_install() {
- dobin ${MY_PN}
- newicon icons/help-about.png ${PN}.png
- make_desktop_entry ${MY_PN} ${MY_PN}
- dodoc README
-}
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
deleted file mode 100644
index 2a5d4469e1f9..000000000000
--- a/games-board/qgo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qgo-1.5.4_p20100322.tar.bz2 2486631 BLAKE2B eb4d97eb5950a95a12669ebba1d11852c7ecdcced373090e5e7e4a9d8dc8d06f42d7abb701d55837b916540856cc237134ae436e77f731e4e3c42dab287b3a8d SHA512 bdb6e5147cc0847ca0cf776ecce5a00af9ebc7bb06d148b79bf073d15fdcfe494a2d71d3fd1c2aa29ea70735fb3208b9b9be42adcb84c894c9d419c12d60f2a6
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
deleted file mode 100644
index bdf94eba6d80..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/network/tygemconnection.cpp 2014-10-29 23:49:21.436929924 -0400
-+++ b/src/network/tygemconnection.cpp 2014-10-29 23:50:43.481183852 -0400
-@@ -4768,7 +4768,7 @@
- unsigned int i;
-
- QString encoded_name;
-- name[15] = 0x00;
-+ name[14] = 0x00;
- int records = (msg[0] << 8) + msg[1];
- if((records * 16) + 4 != (int)size)
- {
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
deleted file mode 100644
index a02fae6df648..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/src/board/board.cpp 2010-06-01 08:20:32.000000000 +0200
-+++ b/src/board/board.cpp 2010-06-01 08:20:54.000000000 +0200
-@@ -347,7 +347,7 @@
- }
-
- //redraws the image on a brush to set the background
-- canvas->setBackgroundBrush ( QBrush::QBrush(image));
-+ canvas->setBackgroundBrush ( QBrush(image));
-
- }
-
---- a/src/board/clockdisplay.cpp 2010-06-01 08:31:10.000000000 +0200
-+++ b/src/board/clockdisplay.cpp 2010-06-01 08:31:38.000000000 +0200
-@@ -274,13 +274,13 @@
-
- if(b_time > 3600 || w_time > 3600)
- {
-- bt = QTime::QTime(0,0).addSecs(abs(b_time)).toString("h:mm:ss") ;
-- wt = QTime::QTime(0,0).addSecs(abs(w_time)).toString("h:mm:ss") ;
-+ bt = QTime(0,0).addSecs(abs(b_time)).toString("h:mm:ss") ;
-+ wt = QTime(0,0).addSecs(abs(w_time)).toString("h:mm:ss") ;
- }
- else
- {
-- bt = QTime::QTime(0,0).addSecs(abs(b_time)).toString("m:ss") ;
-- wt = QTime::QTime(0,0).addSecs(abs(w_time)).toString("m:ss") ;
-+ bt = QTime(0,0).addSecs(abs(b_time)).toString("m:ss") ;
-+ wt = QTime(0,0).addSecs(abs(w_time)).toString("m:ss") ;
- }
-
- switch(timeSystem)
---- a/src/gtp/qgtp.cpp 2010-06-01 08:34:09.000000000 +0200
-+++ b/src/gtp/qgtp.cpp 2010-06-01 08:34:28.000000000 +0200
-@@ -341,7 +341,7 @@
- _cpt++;
-
- qDebug("flush -> %s",s);
-- uint i= programProcess->write(QByteArray::QByteArray(s));
-+ uint i= programProcess->write(QByteArray(s));
-
- // int j= programProcess->waitForBytesWritten ( 100 );
-
---- a/src/board/imagehandler.cpp 2010-06-01 08:34:55.000000000 +0200
-+++ b/src/board/imagehandler.cpp 2010-06-01 08:35:17.000000000 +0200
-@@ -93,8 +93,8 @@
- {
- altGhostPixmaps = new QList();//::QList();
-
-- QPixmap alt1 = QPixmap::QPixmap(":/new/prefix1/ressources/pics/alt_ghost_black.png");
-- QPixmap alt2 = QPixmap:: QPixmap(":/new/prefix1/ressources/pics/alt_ghost_white.png");
-+ QPixmap alt1 = QPixmap(":/new/prefix1/ressources/pics/alt_ghost_black.png");
-+ QPixmap alt2 = QPixmap(":/new/prefix1/ressources/pics/alt_ghost_white.png");
-
- if (alt1.isNull() || alt2.isNull())
- qFatal("Could not load alt_ghost pixmaps.");
---- a/src/board/mark.cpp 2010-06-01 08:36:39.000000000 +0200
-+++ b/src/board/mark.cpp 2010-06-01 08:36:51.000000000 +0200
-@@ -109,7 +109,7 @@
- setPen(QPen(col, 2));
- // else
-
-- pa = QPolygon::QPolygon(3);
-+ pa = QPolygon(3);
-
- // setPen(QPen(col, 1));
- setSize(s, s);
---- a/src/network/gamedialog.cpp 2010-06-01 08:45:26.000000000 +0200
-+++ b/src/network/gamedialog.cpp 2010-06-01 08:45:40.000000000 +0200
-@@ -1123,7 +1123,7 @@
- * probably FIXME, I just wonder why its like that in the first place */
-
- QPalette p(QApplication::palette());
-- p.setColor( QPalette::Base , QColor::QColor("cyan"));
-+ p.setColor( QPalette::Base , QColor("cyan"));
-
- qDebug("GameDialog::recvRequest");
- /* If there's no existing request, then nothing should have changed
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
deleted file mode 100644
index 52b4ec2faaf4..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp
---- qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp 2010-02-26 19:43:41.000000000 +0100
-+++ qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp 2017-10-02 20:33:32.661506058 +0200
-@@ -534,7 +534,7 @@
- }
-
- // this is the initial packet
-- char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
-+ unsigned char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
- if(write((const char *)packet, 8) < 0)
- qWarning("*** failed sending init packet to reconnected host");
- return 0;
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
deleted file mode 100644
index 203bf4857258..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/network/playergamelistings.h 2010-11-08 13:49:25.000000000 +0100
-+++ b/src/network/playergamelistings.h 2010-11-08 13:52:24.000000000 +0100
-@@ -66,21 +66,21 @@
- bool hidden;
- PlayerListing() : id(0),
- online(0),
-- name(0),
-- notnickname(0),
-- info(0),
-- idletime(0),
-+ name(QString::null),
-+ notnickname(QString::null),
-+ info(QString::null),
-+ idletime(QString::null),
- seconds_idle(0),
-- rank(0),
-+ rank(QString::null),
- rank_score(0),
-- country(0),
-+ country(QString::null),
- wins(0),
- losses(0),
- rated_games(0),
- observing(0),
- playing(0),
-- extInfo(0),
-- email_address(0),
-+ extInfo(QString::null),
-+ email_address(QString::null),
- nmatch(0),
- nmatch_handicapMin(0),
- specialbyte(0),
-@@ -189,7 +189,7 @@
- _white_rank_score(0),
- _black_rank_score(0),
- observers(0),
-- result(0),
-+ result(QString::null),
- flags(IN_PROGRESS),
- rated(0),
- owner_id(0),
---- a/src/board/board.h 2010-11-08 13:57:26.000000000 +0100
-+++ b/src/board/board.h 2010-11-08 13:58:17.000000000 +0100
-@@ -50,7 +50,7 @@
-
- void removeGhosts();
- void setVarGhost(StoneColor c, int x, int y);
-- void setMark(int x, int y, MarkType t, bool update=true, QString txt=0, bool overlay=true);
-+ void setMark(int x, int y, MarkType t, bool update=true, QString txt=QString::null, bool overlay=true);
- Mark* hasMark(int x, int y);
- void removeMark(int x, int y, bool update = false);
- void removeDeadMarks();
---- a/src/board/boardwindow.h 2010-11-08 14:21:19.000000000 +0100
-+++ b/src/board/boardwindow.h 2010-11-08 14:21:39.000000000 +0100
-@@ -45,7 +45,7 @@
- ~BoardWindow();
-
- void init();
-- bool loadSGF(const QString fileName, const QString SGFLoaded=0);
-+ bool loadSGF(const QString fileName, const QString SGFLoaded=QString::null);
- bool doSave(QString fileName, bool force);
- QString getCandidateFileName();
-
---- a/src/sgf/sgfparser.h 2010-11-08 14:29:05.000000000 +0100
-+++ b/src/sgf/sgfparser.h 2010-11-08 14:29:27.000000000 +0100
-@@ -51,7 +51,7 @@
- */
- protected:
- int minPos(int n1, int n2, int n3);
-- bool corruptSgf(int where=0, QString reason=NULL);
-+ bool corruptSgf(int where=0, QString reason=QString::null);
-
- bool parseProperty(const QString &toParse, const QString &prop, QString &result);
-
diff --git a/games-board/qgo/metadata.xml b/games-board/qgo/metadata.xml
deleted file mode 100644
index 819cb6fe5c96..000000000000
--- a/games-board/qgo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- qgo
-
-
diff --git a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
deleted file mode 100644
index 7c65e182f470..000000000000
--- a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-DESCRIPTION="An ancient boardgame, very common in Japan, China and Korea"
-HOMEPAGE="http://qgo.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qttest:4
- media-libs/alsa-lib"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc45.patch
- "${FILESDIR}"/${P}-qt47.patch
- "${FILESDIR}"/${P}-buffer.patch
- "${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
- default
- sed -i \
- -e 's:$(QTDIR)/bin/lrelease:lrelease:' \
- src/src.pro || die
-}
-
-src_configure() {
- eqmake4 qgo2.pro
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- dodoc AUTHORS
-
- insinto /usr/share/${PN}/languages
- doins src/translations/*.qm
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d6e1efcd8a13..264afd1be393 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dboxfe/Manifest b/games-emulation/dboxfe/Manifest
deleted file mode 100644
index ac26f8a8da57..000000000000
--- a/games-emulation/dboxfe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dboxfe-0.1.3.tar.bz2 260934 BLAKE2B a267aa002a662254739fef6d3a92473d6efaae588898d5074c7f6af2f5ab3e35034859d5953a6820a0f7c2fd817922744ca604ee753024d3d108b0706bc76089 SHA512 2c4f56b03daa4701b1c28c6082c89cb5e737c2d808215ea994ecbaf18d7e02a5616291b229768a86e4ff272e4d84fffaf4ec3350efad72b4f6aa6195804a7ad2
diff --git a/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild b/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild
deleted file mode 100644
index 5ada0d983da2..000000000000
--- a/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Creates and manages configuration files for DOSBox"
-HOMEPAGE="https://sourceforge.net/projects/dboxfe.berlios/"
-SRC_URI="mirror://sourceforge/dboxfe.berlios/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
- dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
- >=games-emulation/dosbox-0.65"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_install() {
- default
- dobin bin/dboxfe
- newicon res/default.png ${PN}.png
- make_desktop_entry dboxfe "DosBoxFE"
-}
diff --git a/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch b/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch
deleted file mode 100644
index b5927823d0cf..000000000000
--- a/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/dboxfe.pro 2010-09-29 23:53:38.000000000 +0200
-+++ b/dboxfe.pro 2010-09-29 23:54:11.000000000 +0200
-@@ -83,6 +83,7 @@
- # Unix/Linux settings
- unix{
- TARGET = dboxfe
-+ QMAKE_LFLAGS += $(LDFLAGS)
- #QMAKE_POST_LINK = strip -s bin/dboxfe
- RCC_DIR = .unix/rcc
- MOC_DIR += .unix/moc
---- a/dboxfetray/dboxfetray.pro 2010-09-29 23:55:31.000000000 +0200
-+++ b/dboxfetray/dboxfetray.pro 2010-09-29 23:56:12.000000000 +0200
-@@ -56,6 +56,7 @@
- # Unix/Linux settings
- unix{
- TARGET = dboxfetray
-+ QMAKE_LFLAGS += $(LDFLAGS)
- #QMAKE_POST_LINK = strip -s bin/dboxfetray
- RCC_DIR = .unix/rcc
- MOC_DIR += .unix/moc
diff --git a/games-emulation/dboxfe/metadata.xml b/games-emulation/dboxfe/metadata.xml
deleted file mode 100644
index fb66d2dcbef0..000000000000
--- a/games-emulation/dboxfe/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- wine@gentoo.org
- Gentoo Wine Project
-
-
- dboxfe.berlios
-
-
diff --git a/games-emulation/virtualjaguar/Manifest b/games-emulation/virtualjaguar/Manifest
deleted file mode 100644
index bc0be59501e5..000000000000
--- a/games-emulation/virtualjaguar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST virtualjaguar-2.1.2.tar.bz2 2917041 BLAKE2B f9639b27549818b43b446ecf490a50d17c12c8951924e204ceb730afbd1842c5c066f4f20da3d3035f388ea0c698563f6ead3e4a56ffbcc82c39ecb10ddaa63f SHA512 96b842762773631b5df25721d4913f771580c8e23c017a3572539c15a028a4e7743870f2ce3f30380f553781d3beed26693d7e04191efc1475c0cc6fef9f91fb
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar b/games-emulation/virtualjaguar/files/virtualjaguar
deleted file mode 100644
index df4bb14d73f8..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# Script for launching virtualjaguar
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-source /lib/gentoo/functions.sh || exit 1
-
-shopt -s nullglob
-
-if [[ ! -d ~/.vj/bios ]] ; then
- mkdir -p ~/.vj/bios
-fi
-
-if [[ ! -d ~/.vj/eeproms ]] ; then
- mkdir -p ~/.vj/eeproms
-fi
-
-if [[ ! -d ~/.vj/ROMs ]] ; then
- mkdir -p ~/.vj/ROMs
-fi
-
-cd ~/.vj
-
-# check for bios
-if [[ -z "`cd ./bios && ls`" ]] ; then
- # if the bios directory is empty, then ... well ...
- echo
- eerror " Put your BIOS file into ~/.vj/bios/"
- eerror " or virtualjaguar will not work!"
- exit 1
-fi
-
-# execute program (with args)
-exec GENTOODIR/vj "$@"
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch b/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch
deleted file mode 100644
index 8145de9bbd15..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-Backported from following commit:
-
-From c9d57b57d70ab2ae842144828175820fb207a3b0 Mon Sep 17 00:00:00 2001
-From: Shamus Hammons
-Date: Wed, 18 May 2016 00:31:26 +0000
-Subject: [PATCH] Fixes for compilation against GCC 6.
-
-So Debian decides to be more rice than Gentoo, and makes the jump to GCC
-6 for some unknown reason. Thus, in order to prevent VJ from getting
-dumped out of Debian for incompatibility with GCC 6, we have the
-following update. Thanks to John Paul Adrian Glaubitz for the report, and
-to Teemu Hukkanen for Debian chroot advice. :-)
----
- Makefile | 2 +-
- src/blitter.cpp | 2 +-
- src/gui/about.cpp | 3 +--
- src/gui/controllerwidget.cpp | 10 ++++++----
- src/gui/mainwin.cpp | 2 +-
- src/jagbios.cpp | 4 +++-
- src/jagbios.h | 4 +++-
- src/jagbios2.cpp | 4 +++-
- src/jagbios2.h | 4 +++-
- src/jagcdbios.cpp | 4 +++-
- src/jagcdbios.h | 4 +++-
- src/jagdevcdbios.cpp | 4 +++-
- src/jagdevcdbios.h | 4 +++-
- src/jagstub1bios.cpp | 4 +++-
- src/jagstub1bios.h | 4 +++-
- src/jagstub2bios.cpp | 4 +++-
- src/jagstub2bios.h | 4 +++-
- src/joystick.cpp | 4 ++--
- 18 files changed, 48 insertions(+), 23 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4fd8eae..29f5f49 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@ virtualjaguar: sources libs makefile-qt
-
- makefile-qt: virtualjaguar.pro
- @echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
-- $(Q)$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
-+ $(Q)$(CROSS)qmake -qt=5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
-
- libs: obj/libm68k.a obj/libjaguarcore.a
- @echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
-diff --git a/src/blitter.cpp b/src/blitter.cpp
-index 588e6c2..7193daf 100644
---- a/src/blitter.cpp
-+++ b/src/blitter.cpp
-@@ -5387,7 +5387,7 @@ Addq_x := JOIN (addq_x, addq_x[0..5], addqt_x[6..15]);
- Addq_y := JOIN (addq_y, addq_y[0..15]);*/
-
- ////////////////////////////////////// C++ CODE //////////////////////////////////////
-- int16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 };
-+ uint16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 };
- addq_x = addqt_x & mask[modx];
- addq_y = addqt_y & 0xFFFF;
- //////////////////////////////////////////////////////////////////////////////////////
-diff --git a/src/gui/about.cpp b/src/gui/about.cpp
-index 1b3df54..71cec73 100644
---- a/src/gui/about.cpp
-+++ b/src/gui/about.cpp
-@@ -51,9 +51,8 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
- "Ryan C. Gordon for Virtual Jaguar's web presence
"
- "Curt Vendel for various Jaguar & other goodies
"
- "Reboot for reasons too numerous to mention
"
-- "The Free Jaguar Project (you know why) ;-)
"
- "The guys over at Atari Age :-)
"
-- "byuu for BSNES and showing us what was possible"
-+ "byuu for BSNES Higan and showing us what was possible"
- ));
- text = new QLabel(s);
- layout->addWidget(text);
-diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp
-index f7ea8d0..38ce415 100644
---- a/src/gui/controllerwidget.cpp
-+++ b/src/gui/controllerwidget.cpp
-@@ -47,8 +47,8 @@ char ControllerWidget::hatName[4][16] = { "Up", "Rt", "Dn", "Lf" };
- char ControllerWidget::axisName[2][8] = { "+", "-" };
-
- // This is hard-coded crap. It's crap-tastic!
--// These are the positions to draw the button names at, ordered by the BUTTON_* sequence
--// found in joystick.h.
-+// These are the positions to draw the button names at, ordered by the BUTTON_*
-+// sequence found in joystick.h.
- int ControllerWidget::buttonPos[21][2] = { { 74, 32 }, { 71, 67 }, { 53, 49 }, { 93, 49 },
- { 110, 200 }, { 110, 175 }, { 110, 151 }, { 110, 126 },
- { 148, 200 }, { 148, 175 }, { 148, 151 }, { 148, 126 },
-@@ -239,7 +239,8 @@ void ControllerWidget::mouseMoveEvent(QMouseEvent * event)
-
- for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
- {
-- // We loop through the button text positions, to see which one is closest.
-+ // We loop through the button text positions, to see which one is
-+ // closest.
- double distX = (double)(event->x() - buttonPos[i][0]);
- double distY = (double)(event->y() - buttonPos[i][1]);
- double currentDistance = sqrt((distX * distX) + (distY * distY));
-@@ -265,7 +266,8 @@ void ControllerWidget::leaveEvent(QEvent * /*event*/)
-
- void ControllerWidget::DrawBorderedText(QPainter & painter, int x, int y, QString text)
- {
-- // Text is drawn centered at (x, y) as well, using a bounding rect for the purpose.
-+ // Text is drawn centered at (x, y) as well, using a bounding rect for the
-+ // purpose.
- QRect rect(0, 0, 60, 30);
- QPen oldPen = painter.pen();
- painter.setPen(QColor(0, 0, 0, 255)); // This is R,G,B,A
-diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
-index 9f64c62..cb01b02 100644
---- a/src/gui/mainwin.cpp
-+++ b/src/gui/mainwin.cpp
-@@ -964,7 +964,7 @@ void MainWin::LoadSoftware(QString file)
- running = false; // Prevent bad things(TM) from happening...
- pauseForFileSelector = false; // Reset the file selector pause flag
-
-- char * biosPointer = jaguarBootROM;
-+ uint8_t * biosPointer = jaguarBootROM;
-
- if (vjs.hardwareTypeAlpine)
- biosPointer = jaguarDevBootROM2;
-diff --git a/src/jagbios.cpp b/src/jagbios.cpp
-index 8c03e6f..7951524 100644
---- a/src/jagbios.cpp
-+++ b/src/jagbios.cpp
-@@ -4,7 +4,9 @@
- // NOTE: This is the Jaguar Series K boot ROM
- //
-
--char jaguarBootROM[0x20000] = {
-+#include "jagbios.h"
-+
-+uint8_t jaguarBootROM[0x20000] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x41, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x30, 0xBC, 0x18, 0x61, 0x32, 0x3C, 0x35, 0xCC, 0x30, 0x39, 0x00, 0xF1, 0x40, 0x02, 0x08, 0x00, 0x00, 0x05,
- 0x66, 0x04, 0x32, 0x3C, 0x35, 0xDD, 0x31, 0x41, 0x00, 0x02, 0x46, 0xFC, 0x27, 0x00, 0x2E, 0x7C, 0x00, 0x00, 0x40, 0x00, 0x31, 0x7C, 0x00, 0x00, 0x00, 0x58, 0x21, 0x7C, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x2A, 0x33, 0xFC, 0x00, 0x04, 0x00, 0xF1, 0x00, 0x14, 0x08, 0x00, 0x00, 0x04, 0x67, 0x00, 0x00, 0x74, 0x33, 0xFC, 0x00, 0xB5, 0x00, 0xF1, 0x00, 0x12, 0x31, 0x7C, 0x03, 0x4C, 0x00, 0x2E,
-diff --git a/src/jagbios.h b/src/jagbios.h
-index 3f6ae5e..9e9a383 100644
---- a/src/jagbios.h
-+++ b/src/jagbios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGBIOS_H__
- #define __JAGBIOS_H__
-
--extern char jaguarBootROM[];
-+#include
-+
-+extern uint8_t jaguarBootROM[];
-
- #endif // __JAGBIOS_H__
-diff --git a/src/jagbios2.cpp b/src/jagbios2.cpp
-index 413e5e6..5076405 100644
---- a/src/jagbios2.cpp
-+++ b/src/jagbios2.cpp
-@@ -4,7 +4,9 @@
- // NOTE: This is the Jaguar Series M boot ROM
- //
-
--char jaguarBootROM2[0x20000] = {
-+#include "jagbios2.h"
-+
-+uint8_t jaguarBootROM2[0x20000] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x41, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x30, 0xBC, 0x18, 0x61, 0x70, 0xFF, 0x51, 0xC8, 0xFF, 0xFE, 0x32, 0x3C, 0x35, 0xCC, 0x30, 0x39, 0x00, 0xF1,
- 0x40, 0x02, 0x08, 0x00, 0x00, 0x05, 0x66, 0x04, 0x32, 0x3C, 0x35, 0xDD, 0x31, 0x41, 0x00, 0x02, 0x46, 0xFC, 0x27, 0x00, 0x2E, 0x7C, 0x00, 0x00, 0x40, 0x00, 0x31, 0x7C, 0x00, 0x00, 0x00, 0x58,
- 0x21, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x23, 0xFC, 0x00, 0x07, 0x00, 0x07, 0x00, 0xF1, 0xA1, 0x0C, 0x23, 0xFC, 0x00, 0x07, 0x00, 0x07, 0x00, 0xF0, 0x21, 0x0C, 0x23, 0xFC, 0x00, 0x00,
-diff --git a/src/jagbios2.h b/src/jagbios2.h
-index 9944947..961e585 100644
---- a/src/jagbios2.h
-+++ b/src/jagbios2.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGBIOS2_H__
- #define __JAGBIOS2_H__
-
--extern char jaguarBootROM2[];
-+#include
-+
-+extern uint8_t jaguarBootROM2[];
-
- #endif // __JAGBIOS2_H__
-diff --git a/src/jagcdbios.cpp b/src/jagcdbios.cpp
-index eea4cf0..a4c407a 100644
---- a/src/jagcdbios.cpp
-+++ b/src/jagcdbios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
-
--char jaguarCDBootROM[0x40000] = {
-+#include "jagcdbios.h"
-+
-+uint8_t jaguarCDBootROM[0x40000] = {
- 0xF6, 0x1A, 0x8C, 0x5F, 0xF0, 0x28, 0xD5, 0xC2, 0xDE, 0xE7, 0xB6, 0x87, 0xD6, 0xEA, 0x4A, 0x42, 0x9A, 0x9B, 0x2E, 0xCB, 0xE7, 0x35, 0x3C, 0x3B, 0xA2, 0xA6, 0x74, 0xF9, 0xC9, 0x86, 0xE2, 0xD7,
- 0x67, 0xC0, 0x9A, 0xFB, 0x61, 0x37, 0x37, 0x89, 0x70, 0x3B, 0xE0, 0x84, 0x97, 0x0A, 0xD2, 0xC5, 0x9F, 0xC1, 0x62, 0xB5, 0x2E, 0xD1, 0x26, 0x02, 0x44, 0xC3, 0xE1, 0xD4, 0xD6, 0xC2, 0xE7, 0x6A,
- 0x56, 0x27, 0x2E, 0x60, 0x74, 0xE9, 0x05, 0xCE, 0x65, 0xB9, 0x87, 0x74, 0x64, 0x65, 0xF2, 0xB2, 0x00, 0xF7, 0xFB, 0xBC, 0xB9, 0xA2, 0x2D, 0x73, 0xC1, 0x75, 0xF5, 0xD1, 0xF3, 0xDB, 0xB5, 0x17,
-diff --git a/src/jagcdbios.h b/src/jagcdbios.h
-index 2fb0861..23e5abe 100644
---- a/src/jagcdbios.h
-+++ b/src/jagcdbios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGCDBIOS_H__
- #define __JAGCDBIOS_H__
-
--extern char jaguarCDBootROM[];
-+#include
-+
-+extern uint8_t jaguarCDBootROM[];
-
- #endif // __JAGCDBIOS_H__
-diff --git a/src/jagdevcdbios.cpp b/src/jagdevcdbios.cpp
-index 85dbe91..e4ce4b4 100644
---- a/src/jagdevcdbios.cpp
-+++ b/src/jagdevcdbios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
-
--char jaguarDevCDBootROM[0x40000] = {
-+#include "jagdevcdbios.h"
-+
-+uint8_t jaguarDevCDBootROM[0x40000] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-diff --git a/src/jagdevcdbios.h b/src/jagdevcdbios.h
-index 432e48c..fe6ae8c 100644
---- a/src/jagdevcdbios.h
-+++ b/src/jagdevcdbios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGDEVCDBIOS_H__
- #define __JAGDEVCDBIOS_H__
-
--extern char jaguarDevCDBootROM[];
-+#include
-+
-+extern uint8_t jaguarDevCDBootROM[];
-
- #endif // __JAGDEVCDBIOS_H__
-diff --git a/src/jagstub1bios.cpp b/src/jagstub1bios.cpp
-index 80fdd43..7fb85d5 100644
---- a/src/jagstub1bios.cpp
-+++ b/src/jagstub1bios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
-
--char jaguarDevBootROM1[0x20000] = {
-+#include "jagstub1bios.h"
-+
-+uint8_t jaguarDevBootROM1[0x20000] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x4D, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x49, 0xF9, 0x00, 0xF1, 0x40, 0x00, 0x3C, 0xFC, 0x18, 0x61, 0x3C, 0xBC, 0x35, 0xCC, 0x46, 0xFC, 0x27, 0x00,
- 0x4F, 0xF8, 0x03, 0x00, 0x70, 0xFF, 0x74, 0x02, 0x51, 0xC8, 0xFF, 0xFC, 0x38, 0xBC, 0x80, 0x0D, 0xC4, 0x6C, 0x00, 0x02, 0x66, 0x06, 0x4E, 0xF9, 0x00, 0xE0, 0x1B, 0xFA, 0x41, 0xF9, 0x00, 0xE0,
- 0x00, 0x00, 0x47, 0xF8, 0x04, 0x00, 0x30, 0x3C, 0x06, 0xFF, 0x26, 0xD8, 0x51, 0xC8, 0xFF, 0xFC, 0x30, 0x3C, 0x06, 0xFF, 0x24, 0x23, 0xB4, 0xA0, 0x67, 0x04, 0x60, 0x00, 0x12, 0x1A, 0x51, 0xC8,
-diff --git a/src/jagstub1bios.h b/src/jagstub1bios.h
-index a4b6f72..200e84b 100644
---- a/src/jagstub1bios.h
-+++ b/src/jagstub1bios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGSTUB1BIOS_H__
- #define __JAGSTUB1BIOS_H__
-
--extern char jaguarDevBootROM1[];
-+#include
-+
-+extern uint8_t jaguarDevBootROM1[];
-
- #endif // __JAGSTUB1BIOS_H__
-diff --git a/src/jagstub2bios.cpp b/src/jagstub2bios.cpp
-index 884680a..41d55c4 100644
---- a/src/jagstub2bios.cpp
-+++ b/src/jagstub2bios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
-
--char jaguarDevBootROM2[0x20000] = {
-+#include "jagstub2bios.h"
-+
-+uint8_t jaguarDevBootROM2[0x20000] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x4D, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x49, 0xF9, 0x00, 0xF1, 0x40, 0x00, 0x3C, 0xFC, 0x18, 0x61, 0x3C, 0xBC, 0x35, 0xCC, 0x46, 0xFC, 0x27, 0x00,
- 0x4F, 0xF8, 0x03, 0x00, 0x70, 0xFF, 0x76, 0x02, 0x51, 0xC8, 0xFF, 0xFC, 0x41, 0xF9, 0x00, 0xE0, 0x00, 0x00, 0x47, 0xF8, 0x04, 0x00, 0x30, 0x3C, 0x06, 0xFF, 0x26, 0xD8, 0x51, 0xC8, 0xFF, 0xFC,
- 0x30, 0x3C, 0x06, 0xFF, 0x24, 0x23, 0xB4, 0xA0, 0x66, 0x00, 0x12, 0x34, 0x51, 0xC8, 0xFF, 0xF6, 0x48, 0x79, 0x00, 0x00, 0x04, 0x64, 0x45, 0xF9, 0x00, 0xE0, 0x15, 0x94, 0x95, 0xFC, 0x00, 0xDF,
-diff --git a/src/jagstub2bios.h b/src/jagstub2bios.h
-index fcec2e3..c80d98d 100644
---- a/src/jagstub2bios.h
-+++ b/src/jagstub2bios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGSTUB2BIOS_H__
- #define __JAGSTUB2BIOS_H__
-
--extern char jaguarDevBootROM2[];
-+#include
-+
-+extern uint8_t jaguarDevBootROM2[];
-
- #endif // __JAGSTUB1BIOS_H__
-diff --git a/src/joystick.cpp b/src/joystick.cpp
-index 4b25493..25aef85 100644
---- a/src/joystick.cpp
-+++ b/src/joystick.cpp
-@@ -137,6 +137,6 @@ uint16_t JoystickReadWord(uint32_t offset)
- if (offset0 != 0xFF)
- {
-- uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } };
-+ uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } };
- data &= (joypad0Buttons[mask[offset0][0]] ? 0xFFFD : 0xFFFF);
-
- if (mask[offset0][1] != -1)
-@@ -147,6 +147,6 @@ uint16_t JoystickReadWord(uint32_t offset)
- if (offset1 != 0xFF)
- {
-- uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } };
-+ uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } };
- data &= (joypad1Buttons[mask[offset1][0]] ? 0xFFF7 : 0xFFFF);
-
- if (mask[offset1][1] != -1)
diff --git a/games-emulation/virtualjaguar/metadata.xml b/games-emulation/virtualjaguar/metadata.xml
deleted file mode 100644
index e73cd94a1388..000000000000
--- a/games-emulation/virtualjaguar/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-The Virtual Atari Jaguar GCC/SDL portable Jaguar emulator which is based on
-the source code released by Cal2 of Potato Emulation.
-
-
diff --git a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild b/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
deleted file mode 100644
index d4d53cd4f1c9..000000000000
--- a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator gnome2-utils qmake-utils toolchain-funcs
-
-DESCRIPTION="an Atari Jaguar emulator"
-HOMEPAGE="http://www.icculus.org/virtualjaguar/"
-SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/libcdio
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4[-egl]
- media-libs/libsdl[joystick,opengl,sound,video]
- sys-libs/zlib
- virtual/opengl"
-DEPEND="${RDEPEND}
- >=sys-devel/gcc-4.4"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
- default
- sed -i \
- -e '/^Categories/s/$/;/' \
- virtualjaguar.desktop || die
-}
-
-src_configure() {
- eqmake4 virtualjaguar.pro -o makefile-qt
-}
-
-src_compile() {
- emake -j1 libs
- emake
-}
-
-src_install() {
- dobin ${PN}
- dodoc README docs/{TODO,WHATSNEW}
- doman docs/virtualjaguar.1
- domenu virtualjaguar.desktop
- newicon -s 128 res/vj-icon.png ${PN}.png
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- elog "The ${PN} ROM path is no-longer hardcoded, "
- elog "set it from within, the ${PN} GUI."
- elog
- elog "The ROM extension supported by ${PN} is .j64, "
- elog ".jag files will be interpreted as Jaguar Server executables."
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 80c7a115ae7c..5ae27c6728f9 100644
Binary files a/games-kids/Manifest.gz and b/games-kids/Manifest.gz differ
diff --git a/games-kids/cubetest/Manifest b/games-kids/cubetest/Manifest
deleted file mode 100644
index 0a6d0f634960..000000000000
--- a/games-kids/cubetest/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cubetest-0.9.4.tar.bz2 764429 BLAKE2B f3ea59fdfa6015f52fa1fee692144b4312485a0573cb7b5fcb92aad5b3a7c80781d196d5a014ac30418f116d3989375ff5dab868bc3a898d6f4e034d5854a910 SHA512 91f1d312ba4cfb08d359ab43347088592977a0d5758baf64a17d62b49d7a53f5b112e16d2a98e3217c6eb06426ef320039d1ae8af8298eb010952473116c916b
diff --git a/games-kids/cubetest/cubetest-0.9.4-r1.ebuild b/games-kids/cubetest/cubetest-0.9.4-r1.ebuild
deleted file mode 100644
index b55bc9ebc1b7..000000000000
--- a/games-kids/cubetest/cubetest-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A program to train your spatial insight"
-HOMEPAGE="http://www.vandenoever.info/software/cubetest/"
-SRC_URI="http://www.vandenoever.info/software/cubetest/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4[qt3support]
- dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
- local i
-
- default
-
- for i in $(find src/ -iname *_moc.cpp) ; do
- moc ${i/_moc.cpp/.h} -o $i || die
- done
-}
diff --git a/games-kids/cubetest/files/cubetest-0.9.4-build.patch b/games-kids/cubetest/files/cubetest-0.9.4-build.patch
deleted file mode 100644
index 71411700c336..000000000000
--- a/games-kids/cubetest/files/cubetest-0.9.4-build.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ru cubetest-0.9.4.orig/configure cubetest-0.9.4/configure
---- cubetest-0.9.4.orig/configure 2005-12-05 17:29:43.000000000 -0500
-+++ cubetest-0.9.4/configure 2009-09-20 21:23:24.886585972 -0400
-@@ -19741,13 +19741,16 @@
- if test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT_REQUIRED_VERSION
-+ QtCore >= \$QT_REQUIRED_VERSION
- Qt3Support >= \$QT_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "QtGui >= $QT_REQUIRED_VERSION
-+ QtCore >= $QT_REQUIRED_VERSION
- Qt3Support >= $QT_REQUIRED_VERSION") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= $QT_REQUIRED_VERSION
-+ QtCore >= $QT_REQUIRED_VERSION
- Qt3Support >= $QT_REQUIRED_VERSION" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -19758,13 +19761,16 @@
- if test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT_REQUIRED_VERSION
-+ QtCore >= \$QT_REQUIRED_VERSION
- Qt3Support >= \$QT_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "QtGui >= $QT_REQUIRED_VERSION
-+ QtCore >= $QT_REQUIRED_VERSION
- Qt3Support >= $QT_REQUIRED_VERSION") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "QtGui >= $QT_REQUIRED_VERSION
-+ QtCore >= $QT_REQUIRED_VERSION
- Qt3Support >= $QT_REQUIRED_VERSION" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -19775,6 +19781,7 @@
-
- if test $pkg_failed = yes; then
- QT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtGui >= $QT_REQUIRED_VERSION
-+ QtCore >= $QT_REQUIRED_VERSION
- Qt3Support >= $QT_REQUIRED_VERSION"`
- # Put the nasty error message in config.log where it belongs
- echo "$QT_PKG_ERRORS" 1>&5
-@@ -19842,6 +19849,7 @@
-
- fi
-
-+ QT_CXXFLAGS="$QT_CFLAGS $QT_CXXFLAGS"
- { echo "$as_me:$LINENO: Set QT_CXXFLAGS... $QT_CXXFLAGS" >&5
- echo "$as_me: Set QT_CXXFLAGS... $QT_CXXFLAGS" >&6;}
- { echo "$as_me:$LINENO: Set QT_LIBS... $QT_LIBS" >&5
-Only in cubetest-0.9.4: configure.orig
-diff -ru cubetest-0.9.4.orig/src/cubetest/cubetest_it.ts cubetest-0.9.4/src/cubetest/cubetest_it.ts
---- cubetest-0.9.4.orig/src/cubetest/cubetest_it.ts 2005-12-05 14:48:20.000000000 -0500
-+++ cubetest-0.9.4/src/cubetest/cubetest_it.ts 2009-09-20 21:23:06.640704967 -0400
-@@ -19,11 +19,11 @@
-
-
- Well done! The correct answer is %1.
-- Bene! La risposta esatta è %1.
-+ Bene! La risposta esatta è %1.
-
-
- Wrong! The correct answer is %1.
-- Sbagliato! La risposta esatta è %1.
-+ Sbagliato! La risposta esatta è %1.
-
-
- Next question
-@@ -69,11 +69,11 @@
-
-
- Difficulty
-- Difficoltà
-+ Difficoltà
-
-
- Can I play Daddy?
-- Posso giocare, Papà?
-+ Posso giocare, Papà?
-
-
- Don't hurt my brain
-@@ -113,7 +113,7 @@
-
-
- CubeTest is written by Jos van den Oever and released under the General Public License.
-- CubeTest è stato scritto da Jos van der Oever ed è rilasciato con la Licenza Pubblica Generale (GPL) di GNU.
-+ CubeTest è stato scritto da Jos van der Oever ed è rilasciato con la Licenza Pubblica Generale (GPL) di GNU.
-
-
- Easy
-@@ -132,4 +132,4 @@
- Ostico
-
-
--
-\ No newline at end of file
-+
diff --git a/games-kids/cubetest/metadata.xml b/games-kids/cubetest/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-kids/cubetest/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index c237c27534aa..4ff93b99f026 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/ggencoder/Manifest b/games-misc/ggencoder/Manifest
deleted file mode 100644
index c7de6c47f9b5..000000000000
--- a/games-misc/ggencoder/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ggencoder-0.91a.tar.bz2 82184 BLAKE2B a52cbb1c97cb35a219d74f0b20d62f2e0f357e8cfd6136b985f9bc0df5822d2f31a3cb714f01d7d856da49376696813af1ed14d194dd233d82e4bb749da931d1 SHA512 496fa9f181d39e425cb3766fcf5d307c3bb55ec206f79195e8aafd9e34a313ac88b3fa2594501fd509d76dda45c47ebe2f097df2d85abf006f56c859f37510f4
diff --git a/games-misc/ggencoder/ggencoder-0.91a.ebuild b/games-misc/ggencoder/ggencoder-0.91a.ebuild
deleted file mode 100644
index b0c564518876..000000000000
--- a/games-misc/ggencoder/ggencoder-0.91a.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="Utility to encode and decode Game Genie (tm) codes"
-HOMEPAGE="http://games.technoplaza.net/ggencoder/qt/"
-SRC_URI="http://games.technoplaza.net/ggencoder/qt/history/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}/source
-
-src_install() {
- dobin ${PN}
- dodoc ../docs/ggencoder.txt
- if use doc ; then
- dohtml -r ../apidocs/html/*
- fi
-}
diff --git a/games-misc/ggencoder/metadata.xml b/games-misc/ggencoder/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/ggencoder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
diff --git a/games-misc/qlife/Manifest b/games-misc/qlife/Manifest
deleted file mode 100644
index 53aa1598351c..000000000000
--- a/games-misc/qlife/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qlife_linux.tar.gz 66056 BLAKE2B 803c3e5a2298e751274b43e71493639d5d68e15cf8d74b4f331f455b78296b72d8b6be7813fe1b8063e8fb1fb574d5334b95ee7e10baddd192993f53447ed332 SHA512 3cd3cddff667476bb7d89c52ed85be3a3c8a8018cce19aff2e8bd54e7a2a54d4b1453d16d693edf17545519373f96b448e468bd5ca6b675291e7b3d1ab378eaf
diff --git a/games-misc/qlife/metadata.xml b/games-misc/qlife/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/qlife/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
diff --git a/games-misc/qlife/qlife-1.1-r1.ebuild b/games-misc/qlife/qlife-1.1-r1.ebuild
deleted file mode 100644
index a3494653eec4..000000000000
--- a/games-misc/qlife/qlife-1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-MY_PN=${PN/ql/QL}
-
-DESCRIPTION="Simulates the classical Game of Life invented by John Conway"
-HOMEPAGE="http://open-maker.tuxfamily.org/blog/index.php?post/2009/03/28/QLife"
-SRC_URI="http://open-maker.tuxfamily.org/blog/public/${PN}_linux.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}/sources
-
-src_configure() {
- eqmake4 ${MY_PN}.pro
-}
-
-src_install() {
- dobin ${MY_PN}
- newicon data/egg.png ${PN}.png
- make_desktop_entry ${MY_PN} ${MY_PN}
-}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 703e576e678e..835e54d97bcc 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/bubble-chains/Manifest b/games-puzzle/bubble-chains/Manifest
deleted file mode 100644
index 0f84253284e2..000000000000
--- a/games-puzzle/bubble-chains/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chains-0.1.1-src.7z 3282431 BLAKE2B 6d62a7f84cfba2e94e2abf138a87f0ee2f534d1c247b27c146070c738d691433424268553f758c033d72db9c87a694f26f815066d6b86e26ba1ed7f240b92d1a SHA512 2557974ccfa474329924684d859abae8555bdf7fc8e3264883ed0802255bd29ae486b8150b5ffd2d1b4176d0b8d98aec35f7717da4a6606a6c21026a41f1297c
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
deleted file mode 100644
index 71eb17a7bb69..000000000000
--- a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic qt4-r2 games
-
-MY_P=${P/bubble-}-src
-
-DESCRIPTION="Arcade-puzzle game"
-HOMEPAGE="http://bubble-chains.sintegrial.com/"
-SRC_URI="http://${PN}.sintegrial.com/files/${MY_P}.7z"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXrandr
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- media-libs/libsdl[sound,video]
- media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- app-arch/p7zip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- append-cxxflags $(pkg-config sdl --cflags)
- sed -i \
- -e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
- -e "s:/usr/local/games:${GAMES_DATADIR}:g" \
- -e "s:LIBS += -lSDLmain:LIBS += -lSDL -lX11:" \
- Game.pro main.cpp || die
-}
-
-src_configure() {
- eqmake4 Game.pro
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- dodoc README
- newicon images/img64_base.png ${PN}.png
- make_desktop_entry chains "Bubble Chains"
- prepgamesdirs
-}
diff --git a/games-puzzle/bubble-chains/metadata.xml b/games-puzzle/bubble-chains/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/bubble-chains/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
diff --git a/games-puzzle/jag/Manifest b/games-puzzle/jag/Manifest
deleted file mode 100644
index d3ca5b940afe..000000000000
--- a/games-puzzle/jag/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jag-0.3.2-data.zip 6237911 BLAKE2B 1c7deb2e0b3318439b1f5ff7808339d24be348dc1dddbb25fd8e4fb4cdf806a5ff7c349dc487f5d09f261da07f09aac59f9a58c454e952bc6446f031bffdf612 SHA512 fd8d625d47c12779baf9158475d378a8a09d8c96e48ebf8f8b23e3967db8fe38fada33625ac155550ec72f96e259b229311652e09001bb146a326ee202f2e32f
-DIST jag-0.3.2-src.zip 995053 BLAKE2B 0fc3da08a7d1facc18cf962e3a0fe168a52b897da248adcac5edae621c244400b200eb0ae2b52de67e69594382cd2ed46fa3ef7f20f65593776a14e0fcc2be1c SHA512 96379500aabb282324c7308304359412faa503ca2a62a22951313b612f7d065378ba3fa880ff0b2cb42ebd92ddbce22f8e3c088fc6a5361462beaf8b21aed8dc
diff --git a/games-puzzle/jag/jag-0.3.2.ebuild b/games-puzzle/jag/jag-0.3.2.ebuild
deleted file mode 100644
index e4eff536e414..000000000000
--- a/games-puzzle/jag/jag-0.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2 games
-
-DESCRIPTION="Arcade 2D Puzzle Game"
-HOMEPAGE="http://jag.xlabsoft.com/"
-SRC_URI="http://jag.xlabsoft.com/files/${P}-src.zip
- http://jag.xlabsoft.com/files/${P}-data.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor"
-
-RDEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- x11-libs/libXrandr
- media-libs/libsdl[sound,video]
- media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
- mv "${WORKDIR}"/${P}-data/data "${WORKDIR}"/${P}-src/
- sed -i \
- -e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
- -e "s:/usr/local/games:${GAMES_DATADIR}:g" \
- -e "s:LIBS += -lSDLmain:LIBS += -lSDL -lX11:" \
- Game.pro main.cpp editor/editor.pro \
- || die "sed failed"
-}
-
-src_configure() {
- qt4-r2_src_configure
- if use editor; then
- cd editor
- eqmake4 editor.pro
- fi
-}
-
-src_compile() {
- qt4-r2_src_compile
- if use editor; then
- cd editor
- qt4-r2_src_compile
- fi
-}
-
-src_install() {
- qt4-r2_src_install
- newicon images/logo.png ${PN}.png
- make_desktop_entry jag Jag
-
- if use editor; then
- cd editor
- qt4-r2_src_install
- make_desktop_entry jag-editor "Jag Level editor" ${PN}
- fi
-
- prepgamesdirs
-}
diff --git a/games-puzzle/jag/metadata.xml b/games-puzzle/jag/metadata.xml
deleted file mode 100644
index 77b6c07ca6a5..000000000000
--- a/games-puzzle/jag/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 8cbe3dabc1e8..34061a982965 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index e06a2ada3e0c..49a885e59440 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,3 @@
DIST bluedevil-5.10.5.tar.xz 144576 BLAKE2B d8a3fc88f2af954aacd32287d23d230ded4d1cbc20787bc30afa3c75024eed3202f1b6276e758e63e0bd30c4e37ec6eb0c06010b515743795aa2c5741d879b95 SHA512 fb4b58dd9a98c72f74125245fa1d89048a6deb02c0bfa538338c58f3efa5f02a71d14a0518d0354db4c7ff79bf3690489f1d3172480217ef118aaf7ffdbe113a
DIST bluedevil-5.11.4.tar.xz 147268 BLAKE2B 68c0960f3da66b9b4b25fa559d4c78dc05af7846c548f68e25d770e5d269e9d0093f37eebd732b4350be9dcfa27572f2ef4e70160be01b428319ad6d21b0a02c SHA512 b03369ddb414f9abd6ec60bcb9f5f1fc08064b47912a20a156b3c6751ba6daa96d64fb693355c720c955efdb2d8e7a43fd60d22c3e788c24b2fc05a172728fcf
+DIST bluedevil-5.11.5.tar.xz 153380 BLAKE2B 1342ea233c6ea2b7a325eefafe1528d27d1f060bdf628ecd6c7dcddb0323ed10d6dc11ddcbf96a9f6913202ea327979a4f06d9cc7fdc70d02595b0a593a9a819 SHA512 273c1d3a649c7e78e78f27a10199057e2b06940e281eeeb7555bd2d40a6d9f9f7aaa38b5c0a84549f3ff13ec3209b63dde00dcce2ef8855a0cf46030f477594b
diff --git a/kde-plasma/bluedevil/bluedevil-5.11.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.11.5.ebuild
new file mode 100644
index 000000000000..d57eb297ca48
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.11.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep plasma)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+ x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !app-mobilephone/obexd
+ !app-mobilephone/obex-data-server
+ !kde-plasma/bluedevil:4
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 111f14e3a846..64cf60fbac8d 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,3 @@
DIST breeze-grub-5.10.5.tar.xz 3132960 BLAKE2B 5e09c1a9d0d535ef36c0443eae75245a45190e47eae481a7472cd70af01197bdf90ff9830e6980ec45ac0b4fb19328f1f30cddf6aafccbc8f8df8c98df1a5cb0 SHA512 918ef829f00adbaf2e791028c92b24f7ea9c455591017afd5c76fa82c66a6e7fae48c8ecc9817bab0551316af0b8397c1ff41422537178004de1479439290f1e
DIST breeze-grub-5.11.4.tar.xz 3135056 BLAKE2B eb741fb41f5a33617851b2db5e4531399028f5ed1cb699f64e03b09b589ef9474cbc669a0a3cc7f3ccce934f563cc3fde5325ae415e6688ec2df910c0dd69ab0 SHA512 ef38844374048d708d13c22ce9e11ca931c17b5614fca4af0787be89de8ed53769ef74403e145d30884c54774da421d51568b9f27b136dc6ae0a9a809e342b9b
+DIST breeze-grub-5.11.5.tar.xz 3157272 BLAKE2B 1c4f9bed314f4968b00e7283203ce24ffa7911c4e7fcd0631ddb942ece5eaa104773bf267ee23449125cc902a20e7d8eae5be595d12c7b1eeae055455b5849d4 SHA512 87802343c23cf4a73160a669fbec69cd529b992c31fb6d4a3578e31f5c9eeb4bc418ba811e705d95c37b1e2047bd08619c369f3e16208dba7fcde1f8d56bd6f8
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild
new file mode 100644
index 000000000000..8ef3ef186a85
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+ default
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ insinto /usr/share/grub/themes
+ doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 5a579e010ee0..bf727610c33b 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
DIST breeze-gtk-5.10.5.tar.xz 211368 BLAKE2B cfe3512475633a8510d06cf144bf310309abb79afa91d625be2b4443198fd6b289080f3188560026f3c84ab77bdc6c55711130a0fb9a1cf258e7ea55b2b6954e SHA512 3ba76d370ff5dca9e31f6aa609a308725a9d6f4ccdae6a487d5f48427c5faf5566d877ac199d4dbd9d7bf01bce09ed305dc0c9146c608fed2d69f3cea6dda497
DIST breeze-gtk-5.11.4.tar.xz 212068 BLAKE2B 7ef0572363f384e9a960aadf1bc8bc6ffec59bb6ef0bb2dfa337ae48c76b61158461257f9ec3e1c041961073c68c64fcffc906af74c535ada562eee13a94e836 SHA512 d2b18cea6b92467dee238bfea2732524119daa2924e70b606f571f64fc656a2eecceb39b2c0e17bd7cd82593c43346ac39d4876d2d13a1faca8dd66b5a4697a2
+DIST breeze-gtk-5.11.5.tar.xz 218340 BLAKE2B 9f729336e0a5844fc8258f9900f7e5dc738c33e4d6a63f3a8b7fcc0f5fdf202d36a991397568dcdd3c608e3a93e9c5ff085d47b2d91a345f7b6587b530b035b1 SHA512 d940624cff5b785d2b32ca6329f463b4c545ae613fb5e7364537703086900f920fe72c25f5731ba24409e27469e2281b5d74bfd36ffedee66cbd8ac62be0c53d
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild
new file mode 100644
index 000000000000..ef50e787f58e
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 97ceb7fab81a..00a8b16271b3 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,3 @@
DIST breeze-plymouth-5.10.5.tar.xz 104904 BLAKE2B c3a13885c98d5c9720abec314a26ce5e100d9ec04a62ee4d97491cc87e28e9b774debc13bc8f95c29bf0da9f9a17a38a917ccce88f68e89f32544b298e0a742d SHA512 179f3f61198ef983812fe97e1f62898a6fb943063e21acca441ac4776d38192fc0b5f1ecf7f7b73f1e4efdbcc6fec31ec669a6a47ce7ea1b858a2d6b63c7e5bc
DIST breeze-plymouth-5.11.4.tar.xz 104908 BLAKE2B f1913fe89babc8359fcdbab4694122dfe9cb72963954f9de5b09a2508f6b8e4c72cdcf2f72d7950cd1bb57d3705b804a6fbb91c705c494354d13c1d1c45dd3f3 SHA512 4bd607b493f1e181930cae383203f2e6101d4b9bd1df284988d6a0536c978be5ee10c7f77b5f5ae0c990b0c73d81af3843e9b41757dff8b8830ab3d5f9513b9a
+DIST breeze-plymouth-5.11.5.tar.xz 106612 BLAKE2B d2f3f63e1f04f31de8b98a4ca63a529cbd2282db64527fe6faf030bd6bfa441da9213b467ac441eddffd870028f3e5bbfe79562fa7eb3f485d5f391f4c7d1dae SHA512 218045bf35efff475bf9aa4f1e8d117b42b671ba036a7dd67a2b6a8538ee4317f84415e53ffd17bb9645f7971bf575beae1cc1de7b6f67e37166fde25cf92c44
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild
new file mode 100644
index 000000000000..7c86b9c8d818
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep extra-cmake-modules)
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DDISTRO_NAME="Gentoo Linux"
+ -DDISTRO_VERSION=
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 9df8b0033379..b42472508368 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,3 @@
DIST breeze-5.10.5.tar.xz 17426192 BLAKE2B 587142752a7c2f11fca3463d73200a073a99f225bb377e77b48cc093c5851f45ed37303b6f361ead925a6f661ada24f2ed0e38f14664acce6176e9ea21d8a753 SHA512 4af601d1b8f446d6e9d0a381e84ec932294de862f8b13b8e17d01c81d89249d4d841b236498094f21e4402f1448b4f103a49f8010fef90ce603a8493691c3747
DIST breeze-5.11.4.tar.xz 22208400 BLAKE2B fca4770da5ed77341b2dc0d5d2fc32d0ccc354ff4a04607eec43a0c2e97fca049079d5b0a42b34090277192d498e8bbf0d4169f2b03cc38f274a55447690b11c SHA512 f43ce0cb2e2c5aba4f1d6ce1a0cc87a65cb3cd4a6bbd11ca071012e6f1d789c4ad26ee194af05dedee3fcfff6ce10c4ca0a7265e3b31299e7ea0bc9e354fbf74
+DIST breeze-5.11.5.tar.xz 22228964 BLAKE2B f3fdcc10b7350acf612bec9edf4cbea544c6f1dbbc713c8cf9903054b3fb015fffa3a9be5fed4ce5d19209a476d9a84fbcc219ff5cdcdc93e05f3537bb209e85 SHA512 4ef2e7507f7175af7725157611bfe6339d417749d565e50760a5da70db7603f59a9c41deec42f343149442b2e82204eb9519354fb91e407d4c89a9300edad2df
diff --git a/kde-plasma/breeze/breeze-5.11.5.ebuild b/kde-plasma/breeze/breeze-5.11.5.ebuild
new file mode 100644
index 000000000000..d16baa9e1fe0
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.11.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qt4 wayland X"
+
+REQUIRED_USE="qt4? ( X )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep frameworkintegration)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_plasma_dep kdecoration)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ qt4? (
+ kde-frameworks/kdelibs:4
+ x11-libs/libX11
+ )
+ wayland? ( $(add_frameworks_dep kwayland) )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libxcb
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kpackage)
+ qt4? ( dev-util/automoc:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep breeze-icons)
+ $(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+ kde5_pkg_setup
+ MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=()
+
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+ use debug || append-cppflags -DQT_NO_DEBUG
+ mycmakeargs+=(
+ -DUSE_KDE4=true
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ )
+ cmake-utils_src_configure
+ else
+ mycmakeargs+=(
+ $(cmake-utils_use_find_package wayland KF5Wayland)
+ $(cmake-utils_use_find_package X XCB)
+ )
+ kde5_src_configure
+ fi
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+ multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index efb9f817df81..8ad50865dd42 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1 +1,2 @@
DIST drkonqi-5.11.4.tar.xz 736784 BLAKE2B c947432f42d1396644e396fce1bdcd1936a9a7212687a88f00087fa9455818f66b9f7cd1812ac5127918e5bddbb6253ad9d686f9b570cf9aed197771ba521cd2 SHA512 9c7927938ee8f9c86ff259abce9b804ee646dfd306d2d373ea32906e1a514e3d6e73e184a47330250e6cee83f9ac95eb2952f9350d3f5b30c3a69957257de132
+DIST drkonqi-5.11.5.tar.xz 746660 BLAKE2B 9ca5290ff64186347bc03133440c54da94256064868e1c854fb7813b7211d480e34ada74ae312dc7f18219ea81072eef5e2e4204e0bfcf7a712296157c37086b SHA512 6bf7435e091494627f50d2c047467e585f31e51ad5ecab242664230b118272303d245c07ff65fb3fbdbcfe2fb1283134fa69c029c5e42b4df98e6f9a859c0105
diff --git a/kde-plasma/drkonqi/drkonqi-5.11.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.5.ebuild
new file mode 100644
index 000000000000..e360d46812db
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.11.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlrpcclient)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/drkonqi:4
+ !
Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool