diff --git a/Manifest.files.gz b/Manifest.files.gz index 8e96d33aed5b..b5210b653ba9 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index 51697cf4628b..fc5233d2b592 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest deleted file mode 100644 index 687815efd8f5..000000000000 --- a/app-backup/bup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf diff --git a/app-backup/bup/bup-0.29.2.ebuild b/app-backup/bup/bup-0.29.2.ebuild deleted file mode 100644 index e4d3a98673fa..000000000000 --- a/app-backup/bup/bup-0.29.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="A highly efficient backup system based on the git packfile format" -HOMEPAGE="https://bup.github.io/ https://github.com/bup/bup" -SRC_URI="https://github.com/bup/bup/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+doc test web" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - app-arch/par2cmdline - sys-libs/readline:0 - dev-vcs/git - $(python_gen_cond_dep ' - dev-python/fuse-python[${PYTHON_MULTI_USEDEP}] - dev-python/pylibacl[${PYTHON_MULTI_USEDEP}] - dev-python/pyxattr[${PYTHON_MULTI_USEDEP}] - web? ( www-servers/tornado[${PYTHON_MULTI_USEDEP}] ) - ')" -DEPEND="${RDEPEND} - test? ( - dev-lang/perl - net-misc/rsync - ) - doc? ( app-text/pandoc ) -" - -# unresolved sandbox issues -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${P}-sitedir.patch ) - -src_configure() { - # only build/install docs if enabled - export PANDOC=$(usex doc pandoc "") - - ./configure || die -} - -src_test() { - emake test -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr DOCDIR="/usr/share/${PF}" \ - SITEDIR="$(python_get_sitedir)" install - python_fix_shebang "${ED}" - python_optimize "${ED}" -} diff --git a/app-backup/bup/files/bup-0.29.2-sitedir.patch b/app-backup/bup/files/bup-0.29.2-sitedir.patch deleted file mode 100644 index 920b3dc27921..000000000000 --- a/app-backup/bup/files/bup-0.29.2-sitedir.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- bup-0.29.2/Makefile -+++ bup-0.29.2/Makefile -@@ -25,7 +25,7 @@ - os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok)) - os := $(call shout,$(os),Unable to determine OS) - --CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS) -+CFLAGS := -Wall -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS) - CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS) - SOEXT:=.so - -@@ -93,10 +93,11 @@ - dest_docdir := $(DESTDIR)$(DOCDIR) - dest_bindir := $(DESTDIR)$(BINDIR) - dest_libdir := $(DESTDIR)$(LIBDIR) -+dest_sitedir := $(DESTDIR)$(SITEDIR) - - install: all -- $(INSTALL) -d $(dest_bindir) \ -- $(dest_libdir)/bup $(dest_libdir)/cmd \ -+ $(INSTALL) -d $(dest_bindir) $(dest_libdir) \ -+ $(dest_sitedir)/bup $(dest_libdir)/cmd \ - $(dest_libdir)/web $(dest_libdir)/web/static - test -z "$(man_roff)" || install -d $(dest_mandir)/man1 - test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1 -@@ -109,10 +110,10 @@ - done - $(INSTALL) -pm 0644 \ - lib/bup/*.py \ -- $(dest_libdir)/bup -+ $(dest_sitedir)/bup - $(INSTALL) -pm 0755 \ - lib/bup/*$(SOEXT) \ -- $(dest_libdir)/bup -+ $(dest_sitedir)/bup - $(INSTALL) -pm 0644 \ - lib/web/static/* \ - $(dest_libdir)/web/static/ diff --git a/app-backup/bup/metadata.xml b/app-backup/bup/metadata.xml deleted file mode 100644 index 1d0a6394f969..000000000000 --- a/app-backup/bup/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Support browsing backups via a web interface - - - bup/bup - - diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest deleted file mode 100644 index 8b2e2f05fe33..000000000000 --- a/app-backup/kup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kup-0.7.3.tar.gz 1024916 BLAKE2B aab2a1c58bc7feb6cc734a61385841b9c9b47995ba0c7e66b0596ddd7ae77b2a2b750f23f452e591c609f4a59a894815f8cfcb82c8bc266769b6e908463c009c SHA512 62609eb3c9a873045a9f02d22be5413f73f909e77d82f287ff5b2f816d2d6930a8d8ca77537a52189a98fe11441eb10f5530dfdab02ed0c09b53a2c4b5b4be80 diff --git a/app-backup/kup/files/kup-0.7.3-libgit2.patch b/app-backup/kup/files/kup-0.7.3-libgit2.patch deleted file mode 100644 index a6b1c536afc1..000000000000 --- a/app-backup/kup/files/kup-0.7.3-libgit2.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 2ca19e917f895e24a5379be669b9ad77ff5692f5 Mon Sep 17 00:00:00 2001 -From: Simon Persson -Date: Mon, 16 Mar 2020 17:03:33 +0800 -Subject: Remove copy of libgit2 - -API seems to have stabilized a lot, such that different distros can be -expected to have a compatible version. ---- - CMakeLists.txt | 13 +- - filedigger/CMakeLists.txt | 2 +- - filedigger/main.cpp | 12 - - kioslave/CMakeLists.txt | 2 +- - kioslave/bupslave.cpp | 8 - - -From ee720980113162c019eecabc01dfa5763cfb7585 Mon Sep 17 00:00:00 2001 -From: Adriaan de Groot -Date: Mon, 6 Apr 2020 23:06:53 +0200 -Subject: Link to libgit2 via imported target - ---- - filedigger/CMakeLists.txt | 2 +- - kioslave/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2118193..76a1367 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,18 +6,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - - project(kup) - --# Use this option if you want to use the system LibGit2 library. --# This is not recommended unless you know what you are doing. --option(USE_SYSTEM_LIBGIT2 "Don't set this option unless your are sure that your system version of LibGit2 library is fully compatible with Kup." OFF) --if (USE_SYSTEM_LIBGIT2) -- find_package(LibGit2 REQUIRED) -- set(libgit_link_name git2) --else (USE_SYSTEM_LIBGIT2) -- set(BUILD_SHARED_LIBS ON) -- add_subdirectory(libgit2-0.19.0) -- include_directories(${CMAKE_SOURCE_DIR}/libgit2-0.19.0/include) -- set(libgit_link_name git24kup) --endif (USE_SYSTEM_LIBGIT2) -+find_package(LibGit2 REQUIRED) - - if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "DebugFull") - message(WARNING "enabling debug output!") -diff --git a/filedigger/CMakeLists.txt b/filedigger/CMakeLists.txt -index 2fcdd82..fd6a3a0 100644 ---- a/filedigger/CMakeLists.txt -+++ b/filedigger/CMakeLists.txt -@@ -37,7 +37,7 @@ KF5::I18n - KF5::I18n - KF5::IconThemes - KF5::JobWidgets --${libgit_link_name} -+LibGit2::LibGit2 - ) - - ########### install files ############### -diff --git a/filedigger/main.cpp b/filedigger/main.cpp -index 6682985..43fe9ae 100644 ---- a/filedigger/main.cpp -+++ b/filedigger/main.cpp -@@ -21,11 +21,7 @@ - #include "filedigger.h" - #include "mergedvfs.h" - --#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - #include --#else --#include --#endif - - #include - #include -@@ -66,19 +62,11 @@ int main(int pArgCount, char **pArgArray) { - } - - // This needs to be called first thing, before any other calls to libgit2. -- #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_init(); -- #else -- git_threads_init(); -- #endif - - FileDigger *lFileDigger = new FileDigger(lRepoPath, lParser.value(QStringLiteral("branch"))); - lFileDigger->show(); - int lRetVal = lApp.exec(); -- #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_shutdown(); -- #else -- git_threads_shutdown(); -- #endif - return lRetVal; - } -diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt -index 7187f33..83e6122 100644 ---- a/kioslave/CMakeLists.txt -+++ b/kioslave/CMakeLists.txt -@@ -17,7 +17,7 @@ target_link_libraries(kio_bup - Qt5::Core - KF5::KIOCore - KF5::I18n --${libgit_link_name} -+LibGit2::LibGit2 - ) - - install(TARGETS kio_bup DESTINATION ${PLUGIN_INSTALL_DIR}) -diff --git a/kioslave/bupslave.cpp b/kioslave/bupslave.cpp -index 1a7e1a3..0812658 100644 ---- a/kioslave/bupslave.cpp -+++ b/kioslave/bupslave.cpp -@@ -64,22 +64,14 @@ BupSlave::BupSlave(const QByteArray &pPoolSocket, const QByteArray &pAppSocket) - { - mRepository = nullptr; - mOpenFile = nullptr; -- #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_init(); -- #else -- git_threads_init(); -- #endif - } - - BupSlave::~BupSlave() { - if(mRepository != nullptr) { - delete mRepository; - } -- #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_shutdown(); -- #else -- git_threads_shutdown(); -- #endif - } - - void BupSlave::close() { --- -cgit v1.1 - diff --git a/app-backup/kup/kup-0.7.3.ebuild b/app-backup/kup/kup-0.7.3.ebuild deleted file mode 100644 index 8af41a81c73b..000000000000 --- a/app-backup/kup/kup-0.7.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Backup scheduler for KDE's Plasma desktop" -HOMEPAGE="https://www.linux-apps.com/p/1127689" -SRC_URI="https://github.com/spersson/${PN^}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-libs/libgit2:= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 -" -RDEPEND="${DEPEND} - app-backup/bup - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - net-misc/rsync -" - -S="${WORKDIR}/${PN^}-${P}" - -PATCHES=( "${FILESDIR}/${P}-libgit2.patch" ) - -src_prepare() { - ecm_src_prepare - rm -r libgit2-0.19.0 || die "Failed to remove bundled libgit2-0.19.0" -} diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml deleted file mode 100644 index 2fdbf33d963d..000000000000 --- a/app-backup/kup/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index c4448a7894ff..23cfa681d087 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest deleted file mode 100644 index f465955a2651..000000000000 --- a/app-misc/openastro-data/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e7cfb96565676ed68945bed24a2927c9844fdedda980c9afdc06c4a88765d3aa31a2559fa5cec06381f90c27a244ed16b3f05e8f3a SHA512 79e2fa921b883400e29bcd7be3cf3f791d60ea164e3062b61e95608ec815aa3e8df093712658f71c45b60259ffe41531d32f4b65db5e7f642b63f267e9cce7af diff --git a/app-misc/openastro-data/metadata.xml b/app-misc/openastro-data/metadata.xml deleted file mode 100644 index 225f6c806bf0..000000000000 --- a/app-misc/openastro-data/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - devel@openastro.org - Pelle van der Scheer - - https://bugs.launchpad.net/openastro.org - - diff --git a/app-misc/openastro-data/openastro-data-1.8.ebuild b/app-misc/openastro-data/openastro-data-1.8.ebuild deleted file mode 100644 index 376f9c888788..000000000000 --- a/app-misc/openastro-data/openastro-data-1.8.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -MY_PN=${PN/-data} -MY_PN=${MY_PN}.org-data - -DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database" -HOMEPAGE="https://www.openastro.org" -SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="GPL-3+" -SLOT="0" - -S=${WORKDIR}/${MY_PN}-${PV} diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest deleted file mode 100644 index adb605d4d8ff..000000000000 --- a/app-misc/openastro/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openastro.org_1.1.56.orig.tar.gz 212271 BLAKE2B d0252ae7f3c4c4f255ab1e402f3491b2b61e295f2d2064bd6a25ba07424526cbba01f2fe9f255eced0037b4d05edd1b0cde2e0fdae5c0fd7849652d5f8bfb1c7 SHA512 0446575bde71ca5bc88177bf1d5b8088cd1bb8e29ecfbd83ff15ebc4da4f07534c987f8a00b555a0af85c613e5d6bd2cec60898b586110c2230570446e4b7f2d diff --git a/app-misc/openastro/metadata.xml b/app-misc/openastro/metadata.xml deleted file mode 100644 index 8ee7525f685c..000000000000 --- a/app-misc/openastro/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - devel@openastro.org - Pelle van der Scheer - - https://bugs.launchpad.net/openastro.org - - - Enable exporting Astrological Charts to jpeg - Enable exporting Astrological Charts to png - - diff --git a/app-misc/openastro/openastro-1.1.56.ebuild b/app-misc/openastro/openastro-1.1.56.ebuild deleted file mode 100644 index ed85dc27bf73..000000000000 --- a/app-misc/openastro/openastro-1.1.56.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -MY_PN=${PN}.org - -DESCRIPTION="A fully-featured Open Source Astrology Program" -HOMEPAGE="https://www.openastro.org" -SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="jpeg png" - -DEPEND=" - app-misc/openastro-data[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pycairo[svg(+),${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pyswisseph[${PYTHON_USEDEP}] - gnome-base/librsvg:2[introspection] - x11-libs/gtk+:3[introspection]" -RDEPEND="${DEPEND} - jpeg? ( media-gfx/imagemagick[jpeg,svg] ) - png? ( media-gfx/imagemagick[png,svg] )" - -S=${WORKDIR}/${MY_PN}-${PV} diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 5168afab2ca5..ae33cea7be04 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest deleted file mode 100644 index fb6d6960dd5b..000000000000 --- a/app-text/doconce/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31 diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild deleted file mode 100644 index 44c6bb34b507..000000000000 --- a/app-text/doconce/doconce-1.4.4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 - -DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats" -HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/" -SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -IUSE="doc" -KEYWORDS="~amd64 ~x86" -RDEPEND="dev-python/future[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -src_install() { - default - if use doc; then - sed -e "s|http://hplgit.github.io/doconce/doc|file:///usr/share/doc/${PF}|g" -i doc/web/index.html - docompress -x /usr/share/doc - dodoc -r doc/web doc/pub - fi -} diff --git a/app-text/doconce/metadata.xml b/app-text/doconce/metadata.xml deleted file mode 100644 index 2e6a499d5337..000000000000 --- a/app-text/doconce/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - DocOnce is a modestly tagged (Markdown-like) markup language targeting scientific reports, - software documentation, books, blog posts, and slides involving much math and code in the text. - From DocOnce source you can generate LaTeX, Sphinx, HTML, IPython notebooks, Markdown, - MediaWiki, and other formats. - This means that you from a single source can get the most up-to-date publishing technologies - for paper, tablets, and phones. - - - Doconce - hplgit/doconce - - diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 2ca84d27f230..39b3abd78083 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 8f98e9801a8f..7e3ba5ea6874 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,16 +1,26 @@ DIST mariadb-10.1.38.tar.gz 63535685 BLAKE2B c179ea2f60287c2bc1c0d1c47ae989ac2653a24063e8344cef2f3062fc6798e18b969e8f9aa8287104ce2518e6c644cb8d3a4650b5a0bc5dfde973e76e618955 SHA512 184582f3a902a989ba3d9c4d21288c014c8b469adbbb4cbabc621c5006022cef29baed8c1140ed4476b124da83b76dfa414295ed0c3374be826e75aca953a77b DIST mariadb-10.1.43.tar.gz 63635313 BLAKE2B 60617d3021bb478633a995b93a3659a287ecab49bb1997efc430e2f453a8145307f0db02799b43560a51c92ef528060f93fb82fd0362ea34052f68590144bff0 SHA512 47e9693c6c1d25d2c3541efe001569c17e70721edcbfc3d0ccc96f3638820123436c18d2cbc3c2ad252adf1eda446feff0370eb97f9e57b6711757ac899b47e8 DIST mariadb-10.1.44.tar.gz 63660764 BLAKE2B fb88660687c57217c82a05442b1f6e1d85a10fbcdb54b5c455409fd6e280aede27aafe61020eae278a0424b7b21f4afc4e581dd68ce9690948970ef22127ecd0 SHA512 4216524dae5eaf882d3667345fdccc58fa29cb02fb04367900d25c1d120b609d9c7af460dea37ba15ba3fb89f4390f9b15072f5c1ecc434c64b840fa14bab8a9 +DIST mariadb-10.1.45-patches-01.tar.xz 8104 BLAKE2B f1fb2ea82624904f4a8d0e0788cccf8f103aa720965ec925158bfc6d189e4a4d55ecd99e07e437f7286d03163588a26ad5afc8f930b66286e0597ef1870320a7 SHA512 57ccffb5787821398714cbe54da91e95bf3bf47cdf084a60abf6a642437a6b21f7328a05829a9e92ec9af0dacc5c77258daddd6213ed6d3862c9e1dadcf07068 +DIST mariadb-10.1.45.tar.gz 63673824 BLAKE2B 002aedf61282244905256757fe18eebe67f8a05d45496eee4804e5fba9edf58ece15188d6537ed45245b9342bc514376727c91261ec3f3a3d809c569c84a63de SHA512 708daf6cf98a914ca378e3461f3431f13d6274e20ef37de239e5d90db58215c50bfbc450e6b3b00d847cc819ab9de2bc780831009581e43db38d63397a417ace DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2 DIST mariadb-10.2.29.tar.gz 73087972 BLAKE2B aa3fe880f00b02846b26f16fcd37d18ebe217a2c9680c8c535042d2759852c929cd649d662c6a2bc603d934a6ba770ef945752c99d150f539e1fdd0d9be0ad51 SHA512 cee4e0d1a2b203cadaaa5678c5ce17302f18ffa55d07c8329392b1ea84740340c006eb9ab5920beef80835c2a399d5fffca409b8288e10ae62d290af62ec4ab8 DIST mariadb-10.2.31.tar.gz 73134720 BLAKE2B a410f71cffd7ff904cb16d9d00bbb4b1d6d17a4931de1635a14dce7c7c66d8dfd097b0c261959809cf2f327d196b11f3196129c2894efb5bab0141aca10ea3c7 SHA512 2cf28e4e049618f633470e7a4cd4f3bc8c2a74bf9796bfd026da7c75812e6d4962323785fdbca7a5b505c2e4fe95e3b47cd2e24e4dec2dcd230ac8a25f49b9b9 +DIST mariadb-10.2.32-patches-01.tar.xz 5744 BLAKE2B 04e6feba66a2152c85ff251af96bfc611eaa4f2194c3d34d3dadf2f0d389d5fc0cd425fb1d369e972fd8fc13d13b2ec4b5db1ff28459e33ad5ec770a85995b04 SHA512 bc0c7988a724dbaa0d36a9472a0315e04a5291bb0f88eafe1231f3c94c97ad5da2e36a06d968892b1026e4e2347c7e906a2881c66d89f4be95c6b6a3b1dd1475 +DIST mariadb-10.2.32.tar.gz 73646729 BLAKE2B 581906d67f0aada9e85aec7bfee03ed8927a4e836f0639fa5f31576f5df70ce2b6ed3da0b96ad616f5ed71d7717531a073cb911c6d92274f6724911e086104af SHA512 824aa94724b639337a5b4c2e86a1f5ceaeaa940eb234f852df1ba0aafd64e269335e2aca0b05d52164e090cfd6f7d14477df9e096473aa5d9286d47944a765b4 DIST mariadb-10.3.20.tar.gz 71990355 BLAKE2B f950f0eb836751d0eebb9ae561fe3b5aefade04a0d389465918aa2a887e4f717ab4e6bd835dea8f9a88aacfe10c0b091fc2a59882a1781a3f2903ef07a759f5d SHA512 8080cb6db85c587f39f128e98b00c3e6428bf3e828271a227bb2c61c97683c965802baa6e5f825317f7e2963683c0f81699642853deeca6977faa2b6932044a3 DIST mariadb-10.3.22.tar.gz 72050820 BLAKE2B 9e08f1360f8db2c5f466d4f6f967145286412a5598c7de8828eb8f8f3dd113b38f039c38335f9251f3bba19c67c5f62d57808eabc57480338b64dae0c5588774 SHA512 57a6551b8939f54742963202d50a537e69e8ab9b2dca42ce3d2a09c0f7af368fded71f36af26f6cbd956d54fe43853981ba8fe28b7a3ba97c7d52ea4a0d233f6 +DIST mariadb-10.3.23-patches-01.tar.xz 5148 BLAKE2B 162c62a4c5a25e4c6fa059352d11ec1bebf5c2166373a455f54bce2e4e157578c29fd7e149a6e78c2884ac5ac25148c9108dd6f77f92730efa88cd823b49c7aa SHA512 bfdf042ba066afb7ddaa612864dcbc1921c72c26e1df718477c899dd9430ee7a26e19987248c74979a1d19f07fe863bd4671f655767cee62a725464e972a111a +DIST mariadb-10.3.23.tar.gz 72582611 BLAKE2B 493605519f714cbe87b938f6ca3243d29189adbfcbb33c4e10a4a3f01b08d875f18b96b647dc92566b785c2cef9862ebacfd55954d13ab0a7a745606e40fb6e9 SHA512 535cd2ce80a95b6c0a1aa559cc3275dfcd559c3a4f958fab3382923190a16e6bc5b4ad79acaa518244512ff618568c239c0edef8a701d958362ede19a29c2986 DIST mariadb-10.4.10.tar.gz 78352896 BLAKE2B c0e448fba455feb9385b7d57e1a727e84eaf4cfa52ce0dbd6ff062aa0b5abc42005680fb185416d04fbd7bb62d9bbd6c93e4cb77b145418cf6be92747f8b1c2a SHA512 4a9b9a37bc3a273de4bd781dac3636256364dae6efbba45765d6b28995da3d64e180422cd10418d1c7acd7fd8843fe2a2638c07e0f56b0c09170c58812cc6b71 DIST mariadb-10.4.12.tar.gz 79120835 BLAKE2B 1c511e788f8ddc9b9d2e580b29c380ada85d7cc46febe6a6bec626fd6239e4f50480b7a31dcd7e1a9474c6ed9626a910e996257ac8366646a22decc0226c45f0 SHA512 518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 +DIST mariadb-10.4.13-patches-01.tar.xz 5140 BLAKE2B 76bec85715d03cf17d54994205f0a5e452c5bad0353c2a14d6bdad92f0771b54b54753856709b8379fe91efbff48a610414b54b891dd17eabda043a5059e60e7 SHA512 923c54850b1e55ed60988133d615b80aecce3e73c7914b8b02aeea1c61c154ba5ff2ae3575f24d7341b6bf6de9aae2f5751fb951a5a88eafbea7db254da2d4fe +DIST mariadb-10.4.13.tar.gz 80608459 BLAKE2B e9ada14da6ec7492311068549a5b6e5a66e1177312013b25472c084a21fbace543ec43b47f2e12190d45432648d508f311198521f42359561f8d75ea60f98205 SHA512 68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566 DIST mariadb-5.5.66.tar.gz 45962591 BLAKE2B 41befba24abec2af876168a11fc205d328c137baa49e5e521787898e4b973d1dc548ef459228811caa99fa3c2b7a9fe96f3eb7a04bf62f0bb20966e4ffd2ea9b SHA512 403f3bc67018e01eb2277a88d3a7ac673d50df8f7a67607f9d14e3167d1bdd4ca202983df69c97688ff51edbd6d6b43af3541c75e968d1d01713a7b6495e4c8c DIST mariadb-5.5.67.tar.gz 45971908 BLAKE2B 494fdc5d13c3560b074514f30a828e6689b820a1eefc0d0ec67f00a9dced6f4d3c305ed81ad39dddbb07659ccfbab418900f822baf502067d706ba84d2e7fd78 SHA512 494b2b0d863e2fed6f02f8d61134a645aa113bb0e17ba08b304350dfa974f6fce2a2fcc231fb413872156f70f08fbd2604f58d642fffe085f3b093176a3e68c9 +DIST mariadb-5.5.68.tar.gz 45969389 BLAKE2B 5b3a647649c614825adccbc83faa40ba330dae0a1f8005b2297cc6a44fbc00bf817f2d854af315f995e1065bd4d14a2f21a9cec44b5c78402524467d876d8157 SHA512 3419790aa88a7e2a5d80e56ca94683d22ca2d5d817dfe19904d11454f34cfc3b9d55e603295ea58580a3c9fe96a6c6f9b650e1058c4e8f2f2e82f09165436865 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf SHA512 d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa DIST mysql-extras-20200203-1749Z.tar.bz2 344999 BLAKE2B 46441f3c210c87b8ce1df89e9480d0bd5be216b0a1380c3ca330294e787bf2fb2b7078438f032dd0381363e756312d7634350a0b02c00b3145d4787a9ad65cad SHA512 210d240efef4d7bb64d356cae240039d9bd65e2bd4af47e01131ab5bf48779f4c0519e50d212d50db998e6b9bf9d73f1a03b0bbf4f7d6dc6f978660c8ac8a21f +DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 3ad0da663c31831d3b511b88df34b6a28bb781cfd88fd4479b43273aa15946e63c7ae43d5497207edc6cc53a72bd42b8ce2e2058dfb236afd940bd0282190e98 SHA512 8f7b39017efb08e1ae98c4c68728bc86f8427b88b2a22688abf6975c6706122086dc93289beb511bbaf17cd5a790c76406e81315a11830829efe9170ce4f6a42 diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild new file mode 100644 index 000000000000..6a9d03e4addf --- /dev/null +++ b/dev-db/mariadb/mariadb-10.1.45.ebuild @@ -0,0 +1,924 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +SUBSLOT="18" + +JAVA_PKG_OPT_USE="jdbc" + +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils systemd flag-o-matic prefix toolchain-funcs \ + multiprocessing java-pkg-opt-2 cmake-utils multilib-build + +# Patch version +PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.1.45-patches-01.tar.xz" + +SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz + ${PATCH_SET}" + +HOMEPAGE="https://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" +LICENSE="GPL-2" +SLOT="0/${SUBSLOT:-0}" +IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos + innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam + +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup + systemd systemtap static static-libs tcmalloc test tokudb xml yassl" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" + +REQUIRED_USE="jdbc? ( extraengine server !static ) + server? ( tokudb? ( jemalloc !tcmalloc ) ) + ?? ( tcmalloc jemalloc ) + static? ( yassl !pam )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) + !yassl? ( + !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) + libressl? ( dev-libs/libressl:0= ) + ) + >=sys-libs/zlib-1.2.3:0= + sys-libs/ncurses:0= + !bindist? ( + sys-libs/binutils-libs:0= + >=sys-libs/readline-4.1:0= + ) + server? ( + backup? ( app-arch/libarchive:0= ) + cracklib? ( sys-libs/cracklib:0= ) + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + sys-libs/zlib[minizip] + ) + innodb-lz4? ( app-arch/lz4 ) + innodb-lzo? ( dev-libs/lzo ) + innodb-snappy? ( app-arch/snappy ) + kerberos? ( virtual/krb5 ) + mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) + numa? ( sys-process/numactl ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( sys-libs/pam:0= ) + systemd? ( sys-apps/systemd:= ) + tokudb? ( app-arch/snappy ) + ) + !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) + >=dev-libs/libpcre-8.41-r1:3= + !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] ) +" +DEPEND="virtual/yacc + static? ( sys-libs/ncurses[static-libs] ) + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + server? ( + extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) + test? ( acct-group/mysql acct-user/mysql ) + ) + ${COMMON_DEPEND}" +RDEPEND="selinux? ( sec-policy/selinux-mysql ) + client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) + !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster + ${COMMON_DEPEND} + server? ( + galera? ( + sys-apps/iproute2 + =sys-cluster/galera-25* + sst-rsync? ( sys-process/lsof ) + sst-mariabackup? ( net-misc/socat[ssl] ) + sst-xtrabackup? ( net-misc/socat[ssl] ) + ) + !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) + extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) + ) + perl? ( + !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes + ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) + server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1) + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] ; then + local GCC_MAJOR_SET=$(gcc-major-version) + local GCC_MINOR_SET=$(gcc-minor-version) + + if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on + # non x86{,_64} arches + if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + if has test ${FEATURES} ; then + # Bug #213475 - MySQL _will_ object strenuously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! has userpriv ${FEATURES} ; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + fi + fi + + java-pkg-opt-2_pkg_setup +} + +src_unpack() { + unpack ${A} + + mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die +} + +src_prepare() { + eapply "${WORKDIR}"/mariadb-patches + + eapply_user + + _disable_engine() { + echo > "${S%/}/storage/${1}/CMakeLists.txt" || die + } + + _disable_plugin() { + echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die + } + + if use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die + fi + + # Don't build bundled xz-utils for tokudb + echo > "${S%/}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + + # Fix -fno-common error + sed -i -e '/^datasink_t datasink_buffer;$/d' extra/mariabackup/xbstream.c || die + + local plugin + local server_plugins=( handler_socket auth_socket feedback metadata_lock_info + locale_info qc_info server_audit semisync sql_errlog ) + local test_plugins=( audit_null auth_examples daemon_example fulltext ) + if ! use server; then # These plugins are for the server + for plugin in "${server_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + if ! use test; then # These plugins are only used during testing + for plugin in "${test_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + # Collides with mariadb-connector-c bug 655980 + _disable_plugin auth_dialog + + # Avoid useless library checks + use mroonga || _disable_engine mroonga + use oqgraph || _disable_engine oqgraph + _disable_engine example + + # Don't clash with dev-db/mysql-connector-c + sed -i -e 's/ my_print_defaults.1//' \ + -e 's/ perror.1//' \ + "${S}"/man/CMakeLists.txt || die + + cmake-utils_src_prepare + java-pkg-opt-2_src_prepare +} + +src_configure() { + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mariadb + -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') + -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin + -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" + -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_ZLIB=system + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DWITHOUT_CLIENTLIBS=YES + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + -DENABLE_DTRACE=$(usex systemtap) + -DWITH_SSL=$(usex yassl bundled system) + -DPLUGIN_CLIENT_ED25519=NO + -DPLUGIN_AUTH_GSSAPI_CLIENT=NO + ) + + if use server ; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DPLUGIN_FEDERATED=NO + -DPLUGIN_FEDERATEDX=NO ) + fi + + mycmakeargs+=( + -DWITH_JEMALLOC=$(usex jemalloc system) + -DWITH_PCRE=system + -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) + -DPLUGIN_SPHINX=$(usex sphinx YES NO) + -DPLUGIN_TOKUDB=$(usex tokudb YES NO) + -DPLUGIN_AUTH_PAM=$(usex pam YES NO) + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) + -DPLUGIN_CASSANDRA=NO + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) + -DPLUGIN_SPIDER=$(usex extraengine YES NO) + -DPLUGIN_CONNECT=$(usex extraengine YES NO) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DCONNECT_WITH_JDBC=$(usex jdbc) + # Build failure and autodep wrt bug 639144 + -DCONNECT_WITH_MONGO=OFF + -DWITH_WSREP=$(usex galera) + -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) + -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) + -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DPLUGIN_AUTH_GSSAPI_CLIENT=NO + -DWITH_MARIABACKUP=$(usex backup ON OFF) + -DWITH_LIBARCHIVE=$(usex backup ON OFF) + -DWITH_SYSTEMD=$(usex systemd yes no) + -DWITH_NUMA=$(usex numa ON OFF) + -DINSTALL_SQLBENCHDIR='' + ) + + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DMYSQL_USER=mysql + -DDISABLE_SHARED=$(usex static YES NO) + -DWITH_DEBUG=$(usex debug) + -DWITH_EMBEDDED_SERVER=OFF + -DENABLED_PROFILING=$(usex profiling) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc || use tcmalloc ; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITH_EMBEDDED_SERVER=OFF + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + -DWITH_SYSTEMD=no + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +# Official test instructions: +# USE='extraengine perl server' \ +# FEATURES='test userpriv' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +src_test() { + _disable_test() { + local rawtestname bug reason + rawtestname="${1}" ; shift + bug="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" + echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + return 0 + fi + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + if [[ -z "${MTR_PARALLEL}" ]] ; then + local -x MTR_PARALLEL=$(makeopts_jobs) + + if [[ ${MTR_PARALLEL} -gt 4 ]] ; then + # Running multiple tests in parallel usually require higher ulimit + # and fs.aio-max-nr setting. In addition, tests like main.multi_update + # are known to hit timeout when system is busy. + # To avoid test failure we will limit MTR_PARALLEL to 4 instead of + # using "auto". + local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" + info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" + einfo "${info_msg}" + unset info_msg + MTR_PARALLEL=4 + fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" + fi + + # Try to increase file limits to increase test coverage + if ! ulimit -n 16500 1>/dev/null 2>&1 ; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1 ; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1 ; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die + + local -a disabled_tests + disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" ) + disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" ) + disabled_tests+=( "main.func_time;0;Dependent on time test was written" ) + disabled_tests+=( "main.grant;0;Sporadically failing test" ) + disabled_tests+=( "main.join_cache;0;Sporadically failing test" ) + disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" ) + disabled_tests+=( "main.stat_tables;0;Sporadically failing test" ) + disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" ) + disabled_tests+=( "mariabackup.*;0;Broken test suite" ) + disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" ) + disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" ) + disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" ) + disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" ) + + if ! use latin1 ; then + disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" ) + disabled_tests+=( "main.information_schema;0;Requires USE=latin1" ) + disabled_tests+=( "main.mysql;0;Requires USE=latin1" ) + disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" ) + fi + + if ! use profiling ; then + disabled_tests+=( "sys_vars.sysvars_server_notembedded;0;Requires USE=profiling" ) + fi + + local test_infos_str test_infos_arr + for test_infos_str in "${disabled_tests[@]}" ; do + IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" + + if [[ ${#test_infos_arr[@]} != 3 ]] ; then + die "Invalid test data set, not matching format: ${test_infos_str}" + fi + + _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" + done + unset test_infos_str test_infos_arr + + # run mysql-test tests + pushd "${TESTDIR}" &>/dev/null || die + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd &>/dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +src_install() { + cmake-utils_src_install + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die + fi + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + local mycnf_src="my.cnf-5.6-r1" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" my.cnf + + if use server ; then + einfo "Including support files and sample configurations" + docinto "support-files" + local script + for script in \ + "${S}"/support-files/magic + do + [[ -f "$script" ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S}"/scripts/mysql* ; do + [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" + done + # Manually install supporting files that conflict with other packages + # but are needed for galera and initial installation + exeinto /usr/libexec/mariadb + doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" + fi + + #Remove mytop if perl is not selected + [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + if use server ; then + if use pam; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" + einfo + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + elog + elog "If you are switching server implentations, you should run the" + elog "mysql_upgrade tool." + einfo + else + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + fi + + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + fi +} + +pkg_config() { + _getoptval() { + local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" + } + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" + fi + if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" + fi + if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now" + einfo "or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see https://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + + # Filling timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) + einfo "Command: ${cmd[*]}" + su -s /bin/sh -c "${cmd[*]}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + use prefix || options="${options} --user=mysql" + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${pidfile} \ + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -e "${sql}" + eend $? + + if [[ -n "${sqltmp}" ]] ; then + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + fi + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild new file mode 100644 index 000000000000..f30106882cc4 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.2.32.ebuild @@ -0,0 +1,1005 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +SUBSLOT="18" + +JAVA_PKG_OPT_USE="jdbc" + +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils systemd flag-o-matic prefix toolchain-funcs \ + multiprocessing java-pkg-opt-2 cmake-utils + +# Patch version +PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.2.32-patches-01.tar.xz" + +SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz + ${PATCH_SET}" + +HOMEPAGE="https://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" +LICENSE="GPL-2 LGPL-2.1+" +SLOT="0/${SUBSLOT:-0}" +IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga + numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx + sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc + test tokudb xml yassl" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" + +REQUIRED_USE="jdbc? ( extraengine server !static ) + server? ( tokudb? ( jemalloc !tcmalloc ) ) + ?? ( tcmalloc jemalloc ) + static? ( yassl !pam )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) + >=sys-libs/zlib-1.2.3:0= + kerberos? ( virtual/krb5 ) + yassl? ( net-libs/gnutls:0= ) + !yassl? ( + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + sys-libs/ncurses:0= + !bindist? ( + sys-libs/binutils-libs:0= + >=sys-libs/readline-4.1:0= + ) + server? ( + backup? ( app-arch/libarchive:0= ) + cracklib? ( sys-libs/cracklib:0= ) + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + innodb-lz4? ( app-arch/lz4 ) + innodb-lzo? ( dev-libs/lzo ) + innodb-snappy? ( app-arch/snappy ) + mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) + numa? ( sys-process/numactl ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( sys-libs/pam:0= ) + systemd? ( sys-apps/systemd:= ) + tokudb? ( app-arch/snappy ) + ) + >=dev-libs/libpcre-8.41-r1:3= +" +DEPEND="virtual/yacc + static? ( sys-libs/ncurses[static-libs] ) + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + server? ( + extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) + test? ( acct-group/mysql acct-user/mysql ) + ) + ${COMMON_DEPEND}" +RDEPEND="selinux? ( sec-policy/selinux-mysql ) + !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster + !=virtual/jre-1.6 ) ) + ) + perl? ( + !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes + ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) + server? ( ~virtual/mysql-5.6[static=] + galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1) + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] ; then + local GCC_MAJOR_SET=$(gcc-major-version) + local GCC_MINOR_SET=$(gcc-minor-version) + + if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on + # non x86{,_64} arches + if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + if has test ${FEATURES} ; then + # Bug #213475 - MySQL _will_ object strenuously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! has userpriv ${FEATURES} ; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + fi + fi + + java-pkg-opt-2_pkg_setup +} + +src_unpack() { + unpack ${A} + + mv -f "${WORKDIR%/}/${P}" "${S}" || die +} + +src_prepare() { + eapply "${WORKDIR}"/mariadb-patches + + eapply_user + + _disable_plugin() { + echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die + } + _disable_engine() { + echo > "${S%/}/storage/${1}/CMakeLists.txt" || die + } + + local malloc + for malloc in jemalloc tcmalloc ; do + if use ${malloc}; then + echo "TARGET_LINK_LIBRARIES(mysqld ${malloc})" >> "${S}/sql/CMakeLists.txt" + fi + done + + # Don't build bundled xz-utils for tokudb + echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + + local plugin + local server_plugins=( handler_socket auth_socket feedback metadata_lock_info + locale_info qc_info server_audit sql_errlog auth_ed25519 ) + local test_plugins=( audit_null auth_examples daemon_example fulltext + debug_key_management example_key_management ) + if ! use server; then # These plugins are for the server + for plugin in "${server_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + if ! use test; then # These plugins are only used during testing + for plugin in "${test_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + _disable_engine test_sql_discovery + fi + + _disable_engine example + + if ! use oqgraph ; then # avoids extra library checks + _disable_engine oqgraph + fi + + if use mroonga ; then + # Remove the bundled groonga + # There is no CMake flag, it simply checks for existance + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + else + _disable_engine mroonga + fi + + # Don't clash with dev-db/mysql-connector-c + sed -i -e 's/ my_print_defaults.1//' \ + -e 's/ perror.1//' \ + "${S}"/man/CMakeLists.txt || die + + # Fix galera_recovery.sh script + sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \ + scripts/galera_recovery.sh || die + + cmake-utils_src_prepare + java-pkg-opt-2_src_prepare +} + +src_configure() { + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mariadb + -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin + -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" + -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_LIBEDIT=0 + -DWITH_ZLIB=system + -DWITHOUT_LIBWRAP=1 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)" + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF) + -DCONC_WITH_EXTERNAL_ZLIB=YES + -DWITH_EXTERNAL_ZLIB=YES + -DSUFFIX_INSTALL_DIR="" + -DWITH_UNITTEST=OFF + -DWITHOUT_CLIENTLIBS=YES + -DCLIENT_PLUGIN_DIALOG=OFF + -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF + -DCLIENT_PLUGIN_CLIENT_ED25519=OFF + -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC + -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF + ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + if ! use yassl ; then + mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC ) + else + mycmakeargs+=( -DWITH_SSL=bundled ) + fi + + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + -DENABLE_DTRACE=$(usex systemtap) + ) + + if use server ; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DPLUGIN_FEDERATED=NO + -DPLUGIN_FEDERATEDX=NO ) + fi + + mycmakeargs+=( + -DWITH_JEMALLOC=$(usex jemalloc system) + -DWITH_PCRE=system + -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) + -DPLUGIN_SPHINX=$(usex sphinx YES NO) + -DPLUGIN_TOKUDB=$(usex tokudb YES NO) + -DPLUGIN_AUTH_PAM=$(usex pam YES NO) + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) + -DPLUGIN_CASSANDRA=NO + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) + -DPLUGIN_SPIDER=$(usex extraengine YES NO) + -DPLUGIN_CONNECT=$(usex extraengine YES NO) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DCONNECT_WITH_JDBC=$(usex jdbc) + # Build failure and autodep wrt bug 639144 + -DCONNECT_WITH_MONGO=OFF + -DWITH_WSREP=$(usex galera) + -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) + -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) + -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DWITH_MARIABACKUP=$(usex backup ON OFF) + -DWITH_LIBARCHIVE=$(usex backup ON OFF) + -DINSTALL_SQLBENCHDIR=share/mariadb + -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO) + # systemd is only linked to for server notification + -DWITH_SYSTEMD=$(usex systemd yes no) + -DWITH_NUMA=$(usex numa ON OFF) + ) + + # Workaround for MDEV-14524 + use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 ) + + if use test ; then + # This is needed for the new client lib which tests a real, open server + mycmakeargs+=( -DSKIP_TESTS=ON ) + fi + + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DMYSQL_USER=mysql + -DDISABLE_SHARED=$(usex static YES NO) + -DWITH_DEBUG=$(usex debug) + -DWITH_EMBEDDED_SERVER=OFF + -DWITH_PROFILING=$(usex profiling) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc || use tcmalloc ; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITH_EMBEDDED_SERVER=OFF + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + -DWITH_SYSTEMD=no + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +# Official test instructions: +# USE='extraengine perl server' \ +# FEATURES='test userpriv' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +src_test() { + _disable_test() { + local rawtestname bug reason + rawtestname="${1}" ; shift + bug="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" + echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + return 0 + fi + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + if [[ -z "${MTR_PARALLEL}" ]] ; then + local -x MTR_PARALLEL=$(makeopts_jobs) + + if [[ ${MTR_PARALLEL} -gt 4 ]] ; then + # Running multiple tests in parallel usually require higher ulimit + # and fs.aio-max-nr setting. In addition, tests like main.multi_update + # are known to hit timeout when system is busy. + # To avoid test failure we will limit MTR_PARALLEL to 4 instead of + # using "auto". + local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" + info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" + einfo "${info_msg}" + unset info_msg + MTR_PARALLEL=4 + fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" + fi + + # Try to increase file limits to increase test coverage + if ! ulimit -n 16500 1>/dev/null 2>&1 ; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1 ; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1 ; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die + + local -a disabled_tests + disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" ) + disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" ) + disabled_tests+=( "main.func_time;0;Dependent on time test was written" ) + disabled_tests+=( "main.grant;0;Sporadically failing test" ) + disabled_tests+=( "main.join_cache;0;Sporadically failing test" ) + disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" ) + disabled_tests+=( "main.stat_tables;0;Sporadically failing test" ) + disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" ) + disabled_tests+=( "mariabackup.*;0;Broken test suite" ) + disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" ) + disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" ) + disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" ) + disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" ) + + if ! use latin1 ; then + disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" ) + disabled_tests+=( "main.information_schema;0;Requires USE=latin1" ) + disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" ) + fi + + local test_infos_str test_infos_arr + for test_infos_str in "${disabled_tests[@]}" ; do + IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" + + if [[ ${#test_infos_arr[@]} != 3 ]] ; then + die "Invalid test data set, not matching format: ${test_infos_str}" + fi + + _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" + done + unset test_infos_str test_infos_arr + + # run mysql-test tests + pushd "${TESTDIR}" &>/dev/null || die + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd &>/dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +src_install() { + cmake-utils_src_install + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die + fi + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die + eprefixify "${TMPDIR}/my.cnf" + doins "${TMPDIR}/my.cnf" + insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d" + cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die + eprefixify "${TMPDIR}/50-distro-client.cnf" + doins "${TMPDIR}/50-distro-client.cnf" + + if use server ; then + mycnf_src="my.cnf.distro-server" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + if use prefix ; then + sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ + "${TMPDIR}/my.cnf.ok" || die + fi + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf + + einfo "Including support files and sample configurations" + docinto "support-files" + local script + for script in \ + "${S}"/support-files/magic + do + [[ -f "$script" ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S}"/scripts/mysql* ; do + [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" + done + # Manually install supporting files that conflict with other packages + # but are needed for galera and initial installation + exeinto /usr/libexec/mariadb + doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" + fi + + #Remove mytop if perl is not selected + [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst + + # Here we need to see if the implementation switched client libraries + # We check if this is a new instance of the package and a client library already exists + local SHOW_ABI_MESSAGE libpath + if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then + libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so") + elog "Due to ABI changes when switching between different client libraries," + elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." + elog "Please run: revdep-rebuild --library ${libpath}" + ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" + fi +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + if use server ; then + if use pam; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" + einfo + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + elog + elog "If you are switching server implentations, you should run the" + elog "mysql_upgrade tool." + einfo + else + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + fi + + if use galera ; then + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + if use sst-xtrabackup ; then + ewarn "As per https://mariadb.com/kb/en/meta/xtrabackup_warning/, XtraBackup" + ewarn "as an SST is broken by default beginning with 10.2.19 with the setting" + ewarn "innodb_safe_truncate=ON. Please migrate to sst-mariabackup instead." + ewarn "sst-xtrabackup is being removed in 10.3 and higher." + fi + fi + fi + + # Note about configuration change + einfo + elog "This version of mariadb reorganizes the configuration from a single my.cnf" + elog "to several files in /etc/mysql/${PN}.d." + elog "Please backup any changes you made to /etc/mysql/my.cnf" + elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension." + elog "You may have as many files as needed and they are read alphabetically." + elog "Be sure the options have the appropriate section headers, i.e. [mysqld]." + einfo +} + +pkg_config() { + _getoptval() { + local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" + } + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" + fi + if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" + fi + if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now" + einfo "or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see https://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + + # Filling timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) + einfo "Command: ${cmd[*]}" + su -s /bin/sh -c "${cmd[*]}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + use prefix || options="${options} --user=mysql" + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${pidfile} \ + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -e "${sql}" + eend $? + + if [[ -n "${sqltmp}" ]] ; then + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + fi + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild new file mode 100644 index 000000000000..df2fca71d2c3 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.3.23.ebuild @@ -0,0 +1,1008 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +SUBSLOT="18" + +JAVA_PKG_OPT_USE="jdbc" + +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils systemd flag-o-matic prefix toolchain-funcs \ + multiprocessing java-pkg-opt-2 cmake-utils + +# Patch version +PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.3.23-patches-01.tar.xz" + +SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz + ${PATCH_SET}" + +HOMEPAGE="https://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" +LICENSE="GPL-2 LGPL-2.1+" +SLOT="0/${SUBSLOT:-0}" +IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga + numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx + sst-rsync sst-mariabackup static systemd systemtap tcmalloc + test tokudb xml yassl" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" + +REQUIRED_USE="jdbc? ( extraengine server !static ) + server? ( tokudb? ( jemalloc !tcmalloc ) ) + ?? ( tcmalloc jemalloc ) + static? ( yassl !pam )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) + >=sys-libs/zlib-1.2.3:0= + kerberos? ( virtual/krb5 ) + yassl? ( net-libs/gnutls:0= ) + !yassl? ( + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + sys-libs/ncurses:0= + !bindist? ( + sys-libs/binutils-libs:0= + >=sys-libs/readline-4.1:0= + ) + server? ( + backup? ( app-arch/libarchive:0= ) + cracklib? ( sys-libs/cracklib:0= ) + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + innodb-lz4? ( app-arch/lz4 ) + innodb-lzo? ( dev-libs/lzo ) + innodb-snappy? ( app-arch/snappy ) + mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) + numa? ( sys-process/numactl ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( sys-libs/pam:0= ) + systemd? ( sys-apps/systemd:= ) + tokudb? ( app-arch/snappy ) + ) + >=dev-libs/libpcre-8.41-r1:3= +" +DEPEND="virtual/yacc + static? ( sys-libs/ncurses[static-libs] ) + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + server? ( + extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) + test? ( acct-group/mysql acct-user/mysql ) + ) + ${COMMON_DEPEND}" +RDEPEND="selinux? ( sec-policy/selinux-mysql ) + !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster + !=virtual/jre-1.6 ) ) + ) + perl? ( + !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes + ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) + server? ( ~virtual/mysql-5.6[static=] )" + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1) + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] ; then + local GCC_MAJOR_SET=$(gcc-major-version) + local GCC_MINOR_SET=$(gcc-minor-version) + + if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on + # non x86{,_64} arches + if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + if has test ${FEATURES} ; then + # Bug #213475 - MySQL _will_ object strenuously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! has userpriv ${FEATURES} ; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + fi + fi + + java-pkg-opt-2_pkg_setup +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst + + # Here we need to see if the implementation switched client libraries + # We check if this is a new instance of the package and a client library already exists + local SHOW_ABI_MESSAGE libpath + if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then + libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so") + elog "Due to ABI changes when switching between different client libraries," + elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." + elog "Please run: revdep-rebuild --library ${libpath}" + ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" + fi +} + +src_unpack() { + unpack ${A} + + mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die +} + +src_prepare() { + eapply "${WORKDIR}"/mariadb-patches + + eapply_user + + _disable_plugin() { + echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die + } + _disable_engine() { + echo > "${S%/}/storage/${1}/CMakeLists.txt" || die + } + + if use jemalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" + elif use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" + fi + + # Don't build bundled xz-utils for tokudb + echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + + local plugin + local server_plugins=( handler_socket auth_socket feedback metadata_lock_info + locale_info qc_info server_audit sql_errlog auth_ed25519 ) + local test_plugins=( audit_null auth_examples daemon_example fulltext + debug_key_management example_key_management versioning ) + if ! use server; then # These plugins are for the server + for plugin in "${server_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + if ! use test; then # These plugins are only used during testing + for plugin in "${test_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + _disable_engine test_sql_discovery + fi + + _disable_engine example + + if ! use oqgraph ; then # avoids extra library checks + _disable_engine oqgraph + fi + + if use mroonga ; then + # Remove the bundled groonga + # There is no CMake flag, it simply checks for existance + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + else + _disable_engine mroonga + fi + + # Don't clash with dev-db/mysql-connector-c + sed -i -e 's/ my_print_defaults.1//' \ + -e 's/ perror.1//' \ + "${S}"/man/CMakeLists.txt || die + + # Fix galera_recovery.sh script + sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \ + scripts/galera_recovery.sh || die + + cmake-utils_src_prepare + java-pkg-opt-2_src_prepare +} + +src_configure() { + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mariadb + -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin + -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" + -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_LIBEDIT=0 + -DWITH_ZLIB=system + -DWITHOUT_LIBWRAP=1 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)" + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF) + -DCONC_WITH_EXTERNAL_ZLIB=YES + -DWITH_EXTERNAL_ZLIB=YES + -DSUFFIX_INSTALL_DIR="" + -DWITH_UNITTEST=OFF + -DWITHOUT_CLIENTLIBS=YES + -DCLIENT_PLUGIN_DIALOG=OFF + -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF + -DCLIENT_PLUGIN_CLIENT_ED25519=OFF + -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC + -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF + ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + if ! use yassl ; then + mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC ) + else + mycmakeargs+=( -DWITH_SSL=bundled ) + fi + + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + -DENABLE_DTRACE=$(usex systemtap) + ) + + if use server ; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DPLUGIN_FEDERATED=NO + -DPLUGIN_FEDERATEDX=NO ) + fi + + mycmakeargs+=( + -DWITH_PCRE=system + -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) + -DPLUGIN_SPHINX=$(usex sphinx YES NO) + -DPLUGIN_TOKUDB=$(usex tokudb YES NO) + -DPLUGIN_AUTH_PAM=$(usex pam YES NO) + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) + -DPLUGIN_CASSANDRA=NO + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) + -DPLUGIN_SPIDER=$(usex extraengine YES NO) + -DPLUGIN_CONNECT=$(usex extraengine YES NO) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DCONNECT_WITH_JDBC=$(usex jdbc) + # Build failure and autodep wrt bug 639144 + -DCONNECT_WITH_MONGO=OFF + -DWITH_WSREP=$(usex galera) + -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) + -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) + -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DWITH_MARIABACKUP=$(usex backup ON OFF) + -DWITH_LIBARCHIVE=$(usex backup ON OFF) + -DINSTALL_SQLBENCHDIR="" + -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO) + # systemd is only linked to for server notification + -DWITH_SYSTEMD=$(usex systemd yes no) + -DWITH_NUMA=$(usex numa ON OFF) + ) + + # Workaround for MDEV-14524 + use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 ) + + if use test ; then + # This is needed for the new client lib which tests a real, open server + mycmakeargs+=( -DSKIP_TESTS=ON ) + fi + + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DMYSQL_USER=mysql + -DDISABLE_SHARED=$(usex static YES NO) + -DWITH_DEBUG=$(usex debug) + -DWITH_EMBEDDED_SERVER=OFF + -DWITH_PROFILING=$(usex profiling) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc || use tcmalloc ; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITH_EMBEDDED_SERVER=OFF + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + -DWITH_SYSTEMD=no + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +# Official test instructions: +# USE='extraengine perl server' \ +# FEATURES='test userpriv' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +src_test() { + _disable_test() { + local rawtestname bug reason + rawtestname="${1}" ; shift + bug="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" + echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + return 0 + fi + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + if [[ -z "${MTR_PARALLEL}" ]] ; then + local -x MTR_PARALLEL=$(makeopts_jobs) + + if [[ ${MTR_PARALLEL} -gt 4 ]] ; then + # Running multiple tests in parallel usually require higher ulimit + # and fs.aio-max-nr setting. In addition, tests like main.multi_update + # are known to hit timeout when system is busy. + # To avoid test failure we will limit MTR_PARALLEL to 4 instead of + # using "auto". + local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" + info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" + einfo "${info_msg}" + unset info_msg + MTR_PARALLEL=4 + fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" + fi + + # Try to increase file limits to increase test coverage + if ! ulimit -n 16500 1>/dev/null 2>&1 ; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1 ; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1 ; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die + + local -a disabled_tests + disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" ) + disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" ) + disabled_tests+=( "main.func_time;0;Dependent on time test was written" ) + disabled_tests+=( "main.grant;0;Sporadically failing test" ) + disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" ) + disabled_tests+=( "main.stat_tables;0;Sporadically failing test" ) + disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" ) + disabled_tests+=( "mariabackup.*;0;Broken test suite" ) + disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" ) + disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" ) + disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" ) + disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" ) + + if ! use latin1 ; then + disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" ) + disabled_tests+=( "main.information_schema;0;Requires USE=latin1" ) + disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" ) + fi + + local test_infos_str test_infos_arr + for test_infos_str in "${disabled_tests[@]}" ; do + IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" + + if [[ ${#test_infos_arr[@]} != 3 ]] ; then + die "Invalid test data set, not matching format: ${test_infos_str}" + fi + + _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" + done + unset test_infos_str test_infos_arr + + # run mysql-test tests + pushd "${TESTDIR}" &>/dev/null || die + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd &>/dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +src_install() { + cmake-utils_src_install + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die + fi + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die + eprefixify "${TMPDIR}/my.cnf" + doins "${TMPDIR}/my.cnf" + insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d" + cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die + eprefixify "${TMPDIR}/50-distro-client.cnf" + doins "${TMPDIR}/50-distro-client.cnf" + + if use server ; then + mycnf_src="my.cnf.distro-server" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + if use prefix ; then + sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ + "${TMPDIR}/my.cnf.ok" || die + fi + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf + + einfo "Including support files and sample configurations" + docinto "support-files" + local script + for script in \ + "${S}"/support-files/magic + do + [[ -f "$script" ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S}"/scripts/mysql* ; do + [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" + done + # Manually install supporting files that conflict with other packages + # but are needed for galera and initial installation + exeinto /usr/libexec/mariadb + doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" + fi + + # Remove mytop if perl is not selected + if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then + rm -f "${ED}/usr/bin/mytop" || die + fi + + # Fix a dangling symlink when galera is not built + if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then + rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die + fi + + # Remove broken SST scripts that are incompatible + local scriptremove + for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do + if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then + rm "${ED}/usr/bin/${scriptremove}" || die + fi + done +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + if use server ; then + if use pam; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" + einfo + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + elog + elog "If you are switching server implentations, you should run the" + elog "mysql_upgrade tool." + einfo + else + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + fi + + if use galera ; then + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + fi + fi + + # Note about configuration change + einfo + elog "This version of mariadb reorganizes the configuration from a single my.cnf" + elog "to several files in /etc/mysql/${PN}.d." + elog "Please backup any changes you made to /etc/mysql/my.cnf" + elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension." + elog "You may have as many files as needed and they are read alphabetically." + elog "Be sure the options have the appropriate section headers, i.e. [mysqld]." + einfo +} + +pkg_config() { + _getoptval() { + local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" + } + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" + fi + if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" + fi + if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now" + einfo "or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see https://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + + # Filling timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) + einfo "Command: ${cmd[*]}" + su -s /bin/sh -c "${cmd[*]}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + use prefix || options="${options} --user=mysql" + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${pidfile} \ + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -e "${sql}" + eend $? + + if [[ -n "${sqltmp}" ]] ; then + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + fi + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild new file mode 100644 index 000000000000..ac886d21e774 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.4.13.ebuild @@ -0,0 +1,1035 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +SUBSLOT="18" + +JAVA_PKG_OPT_USE="jdbc" + +inherit eutils systemd flag-o-matic prefix toolchain-funcs \ + multiprocessing java-pkg-opt-2 cmake + +# Patch version +PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.4.13-patches-01.tar.xz" + +SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz + ${PATCH_SET}" + +HOMEPAGE="https://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" +LICENSE="GPL-2 LGPL-2.1+" +SLOT="0/${SUBSLOT:-0}" +IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga + numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx + sst-rsync sst-mariabackup static systemd systemtap tcmalloc + test tokudb xml yassl" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" + +REQUIRED_USE="jdbc? ( extraengine server !static ) + server? ( tokudb? ( jemalloc !tcmalloc ) ) + ?? ( tcmalloc jemalloc ) + static? ( yassl !pam )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) + >=sys-libs/zlib-1.2.3:0= + kerberos? ( virtual/krb5 ) + yassl? ( net-libs/gnutls:0= ) + !yassl? ( + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + sys-libs/ncurses:0= + !bindist? ( + sys-libs/binutils-libs:0= + >=sys-libs/readline-4.1:0= + ) + server? ( + backup? ( app-arch/libarchive:0= ) + cracklib? ( sys-libs/cracklib:0= ) + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + innodb-lz4? ( app-arch/lz4 ) + innodb-lzo? ( dev-libs/lzo ) + innodb-snappy? ( app-arch/snappy ) + mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) + numa? ( sys-process/numactl ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( sys-libs/pam:0= ) + systemd? ( sys-apps/systemd:= ) + tokudb? ( app-arch/snappy ) + ) + >=dev-libs/libpcre-8.41-r1:3= +" +BDEPEND="virtual/yacc + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) +" +DEPEND="static? ( sys-libs/ncurses[static-libs] ) + server? ( + extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) + test? ( acct-group/mysql acct-user/mysql ) + ) + ${COMMON_DEPEND}" +RDEPEND="selinux? ( sec-policy/selinux-mysql ) + !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster + !=virtual/jre-1.6 ) ) + ) + perl? ( + !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes + ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) + server? ( ~virtual/mysql-5.6[static=] )" + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1) + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1) + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] ; then + local GCC_MAJOR_SET=$(gcc-major-version) + local GCC_MINOR_SET=$(gcc-minor-version) + + if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on + # non x86{,_64} arches + if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + + if has test ${FEATURES} ; then + # Bug #213475 - MySQL _will_ object strenuously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! has userpriv ${FEATURES} ; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + fi + fi + + java-pkg-opt-2_pkg_setup +} + +src_unpack() { + unpack ${A} + + mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die +} + +src_prepare() { + eapply "${WORKDIR}"/mariadb-patches + + eapply_user + + _disable_plugin() { + echo > "${S}/plugin/${1}/CMakeLists.txt" || die + } + _disable_engine() { + echo > "${S}/storage/${1}/CMakeLists.txt" || die + } + + if use jemalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" + elif use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" + fi + + # Don't build bundled xz-utils for tokudb + echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + + local plugin + local server_plugins=( handler_socket auth_socket feedback metadata_lock_info + locale_info qc_info server_audit sql_errlog auth_ed25519 ) + local test_plugins=( audit_null auth_examples daemon_example fulltext + debug_key_management example_key_management versioning ) + if ! use server; then # These plugins are for the server + for plugin in "${server_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + if ! use test; then # These plugins are only used during testing + for plugin in "${test_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + _disable_engine test_sql_discovery + echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die + fi + + _disable_engine example + + if ! use oqgraph ; then # avoids extra library checks + _disable_engine oqgraph + fi + + if use mroonga ; then + # Remove the bundled groonga + # There is no CMake flag, it simply checks for existance + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + else + _disable_engine mroonga + fi + + # Fix static bindings in galera replication + sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \ + "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die + sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \ + "${S}"/wsrep-lib/src/CMakeLists.txt || die + + # Don't clash with dev-db/mysql-connector-c + sed -i -e 's/ my_print_defaults.1//' \ + -e 's/ perror.1//' \ + "${S}"/man/CMakeLists.txt || die + + # Fix galera_recovery.sh script + sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \ + scripts/galera_recovery.sh || die + + sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \ + "${S}"/scripts/mysql_install_db.sh || die + + cmake_src_prepare + java-pkg-opt-2_src_prepare +} + +src_configure() { + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + # It fails on alpha without this + use alpha && append-ldflags "-Wl,--no-relax" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mariadb + -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin + -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" + -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_LIBEDIT=0 + -DWITH_ZLIB=system + -DWITHOUT_LIBWRAP=1 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)" + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF) + -DCONC_WITH_EXTERNAL_ZLIB=YES + -DWITH_EXTERNAL_ZLIB=YES + -DSUFFIX_INSTALL_DIR="" + -DWITH_UNITTEST=OFF + -DWITHOUT_CLIENTLIBS=YES + -DCLIENT_PLUGIN_DIALOG=OFF + -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF + -DCLIENT_PLUGIN_CLIENT_ED25519=OFF + -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC + -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF + ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + if ! use yassl ; then + mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC ) + else + mycmakeargs+=( -DWITH_SSL=bundled ) + fi + + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + -DENABLE_DTRACE=$(usex systemtap) + ) + + if use server ; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DPLUGIN_FEDERATED=NO + -DPLUGIN_FEDERATEDX=NO ) + fi + + mycmakeargs+=( + -DWITH_PCRE=system + -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) + -DPLUGIN_SPHINX=$(usex sphinx YES NO) + -DPLUGIN_TOKUDB=$(usex tokudb YES NO) + -DPLUGIN_AUTH_PAM=$(usex pam YES NO) + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) + -DPLUGIN_CASSANDRA=NO + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) + -DPLUGIN_SPIDER=$(usex extraengine YES NO) + -DPLUGIN_CONNECT=$(usex extraengine YES NO) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DCONNECT_WITH_JDBC=$(usex jdbc) + # Build failure and autodep wrt bug 639144 + -DCONNECT_WITH_MONGO=OFF + -DWITH_WSREP=$(usex galera) + -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) + -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) + -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) + -DWITH_MARIABACKUP=$(usex backup ON OFF) + -DWITH_LIBARCHIVE=$(usex backup ON OFF) + -DINSTALL_SQLBENCHDIR="" + -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO) + # systemd is only linked to for server notification + -DWITH_SYSTEMD=$(usex systemd yes no) + -DWITH_NUMA=$(usex numa ON OFF) + ) + + # Workaround for MDEV-14524 + use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 ) + + if use test ; then + # This is needed for the new client lib which tests a real, open server + mycmakeargs+=( -DSKIP_TESTS=ON ) + fi + + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DMYSQL_USER=mysql + -DDISABLE_SHARED=$(usex static YES NO) + -DWITH_DEBUG=$(usex debug) + -DWITH_EMBEDDED_SERVER=OFF + -DWITH_PROFILING=$(usex profiling) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc || use tcmalloc ; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITH_EMBEDDED_SERVER=OFF + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + -DWITH_SYSTEMD=no + ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +# Official test instructions: +# USE='extraengine perl server' \ +# FEATURES='test userpriv' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +src_test() { + _disable_test() { + local rawtestname bug reason + rawtestname="${1}" ; shift + bug="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" + echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + return 0 + fi + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + if [[ -z "${MTR_PARALLEL}" ]] ; then + local -x MTR_PARALLEL=$(makeopts_jobs) + + if [[ ${MTR_PARALLEL} -gt 4 ]] ; then + # Running multiple tests in parallel usually require higher ulimit + # and fs.aio-max-nr setting. In addition, tests like main.multi_update + # are known to hit timeout when system is busy. + # To avoid test failure we will limit MTR_PARALLEL to 4 instead of + # using "auto". + local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" + info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" + einfo "${info_msg}" + unset info_msg + MTR_PARALLEL=4 + fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" + fi + + # Try to increase file limits to increase test coverage + if ! ulimit -n 16500 1>/dev/null 2>&1 ; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1 ; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1 ; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die + + local -a disabled_tests + disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" ) + disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" ) + disabled_tests+=( "main.func_time;0;Dependent on time test was written" ) + disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" ) + disabled_tests+=( "main.stat_tables;0;Sporadically failing test" ) + disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" ) + disabled_tests+=( "mariabackup.*;0;Broken test suite" ) + disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" ) + disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" ) + disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" ) + disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" ) + + if ! use latin1 ; then + disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" ) + disabled_tests+=( "main.information_schema;0;Requires USE=latin1" ) + disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" ) + fi + + local test_infos_str test_infos_arr + for test_infos_str in "${disabled_tests[@]}" ; do + IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" + + if [[ ${#test_infos_arr[@]} != 3 ]] ; then + die "Invalid test data set, not matching format: ${test_infos_str}" + fi + + _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" + done + unset test_infos_str test_infos_arr + + # run mysql-test tests + pushd "${TESTDIR}" &>/dev/null || die + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd &>/dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +src_install() { + cmake_src_install + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die + fi + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die + eprefixify "${TMPDIR}/my.cnf" + doins "${TMPDIR}/my.cnf" + insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d" + cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die + eprefixify "${TMPDIR}/50-distro-client.cnf" + doins "${TMPDIR}/50-distro-client.cnf" + + if use server ; then + mycnf_src="my.cnf.distro-server" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + if use prefix ; then + sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ + "${TMPDIR}/my.cnf.ok" || die + fi + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf + + einfo "Including support files and sample configurations" + docinto "support-files" + local script + for script in \ + "${S}"/support-files/magic + do + [[ -f "$script" ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S}"/scripts/mysql* ; do + [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" + done + # Manually install supporting files that conflict with other packages + # but are needed for galera and initial installation + exeinto /usr/libexec/mariadb + doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" + + if use pam ; then + keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir + fi + fi + + # Remove mytop if perl is not selected + if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then + rm -f "${ED}/usr/bin/mytop" || die + fi + + # Fix a dangling symlink when galera is not built + if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then + rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die + fi + + # Remove broken SST scripts that are incompatible + local scriptremove + for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do + if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then + rm "${ED}/usr/bin/${scriptremove}" || die + fi + done +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}" + + if use server ; then + if use pam; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" + einfo + chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + elog + elog "If you are switching server implentations, you should run the" + elog "mysql_upgrade tool." + einfo + else + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + fi + + if use galera ; then + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + local rver + for rver in ${REPLACING_VERSIONS} ; do + if ver_test "${rver}" -lt "10.4.0" ; then + ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster." + ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4" + ewarn "for more information" + fi + done + fi + fi + fi + + # Note about configuration change + einfo + elog "This version of mariadb reorganizes the configuration from a single my.cnf" + elog "to several files in /etc/mysql/${PN}.d." + elog "Please backup any changes you made to /etc/mysql/my.cnf" + elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension." + elog "You may have as many files as needed and they are read alphabetically." + elog "Be sure the options have the appropriate section headers, i.e. [mysqld]." + einfo +} + +pkg_config() { + _getoptval() { + local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" + } + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" + fi + if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" + fi + if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then + + einfo "Please provide a password for the mysql 'root'@'localhost' user now" + einfo "or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + einfo "Not entering a password defaults to UNIX authentication" + read -rsp " >" pwd1 ; echo + + if [[ -n "${pwd1}" ]] ; then + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + fi + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see https://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + for opt in host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + + # Filling timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) + einfo "Command: ${cmd[*]}" + su -s /bin/sh -c "${cmd[*]}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [[ $? -ne 0 ]]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + if [[ -z ${sqltmp} && -z ${MYSQL_ROOT_PASSWORD} ]] ; then + einfo "Done" + exit 0 + fi + + use prefix || options="${options} --user=mysql" + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${pidfile} \ + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + [[ -S "${socket}" ]] || + die "Completely failed to start up mysqld with: ${mysqld}" + + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}')" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -e "${sql}" + unset sql + eend $? + fi + + if [[ -n "${sqltmp}" ]] ; then + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + fi + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} diff --git a/dev-db/mariadb/mariadb-5.5.68.ebuild b/dev-db/mariadb/mariadb-5.5.68.ebuild new file mode 100644 index 000000000000..87e9a50bd381 --- /dev/null +++ b/dev-db/mariadb/mariadb-5.5.68.ebuild @@ -0,0 +1,835 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +MY_EXTRAS_VER="20200523-1221Z" +SUBSLOT="18" + +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build + +SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz " + +# Gentoo patches to MySQL +if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then + SRC_URI="${SRC_URI} + mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi + +HOMEPAGE="https://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" +LICENSE="GPL-2" +SLOT="0/${SUBSLOT:-0}" +IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl + oqgraph pam +perl profiling selinux +server sphinx + static static-libs systemtap tcmalloc + test tokudb yassl" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" + +REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) ) + ?? ( tcmalloc jemalloc ) + static? ( yassl !pam )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then + MY_PATCH_DIR="${WORKDIR%/}/mysql-extras" + inherit git-r3 + EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" + EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras" + EGIT_CLONE_TYPE=shallow +else + MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" +fi + +PATCHES=( + "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" + "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch" + "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-5.5.50.patch" + "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" + "${MY_PATCH_DIR}/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch" +) + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) + !yassl? ( + !libressl? ( =sys-libs/zlib-1.2.3:0= + sys-libs/ncurses:0= + !bindist? ( + >=sys-libs/readline-4.1:0= + ) + server? ( + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( sys-libs/pam:0= ) + ) + !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] ) +" +DEPEND="virtual/yacc + static? ( sys-libs/ncurses[static-libs] ) + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + ${COMMON_DEPEND}" +RDEPEND="selinux? ( sec-policy/selinux-mysql ) + client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) + !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster + server? ( !prefix? ( dev-db/mysql-init-scripts ) ) + ${COMMON_DEPEND} + perl? ( !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] ; then + local GCC_MAJOR_SET=$(gcc-major-version) + local GCC_MINOR_SET=$(gcc-minor-version) + if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on + # non x86{,_64} arches + if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + fi + if has test ${FEATURES} && \ + use server && ! has userpriv ${FEATURES} ; then + eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + + # This should come after all of the die statements + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + if use server ; then + if use pam; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" + einfo + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + elog + elog "If you are switching server implentations, you should run the" + elog "mysql_upgrade tool." + einfo + else + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + fi + + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + fi +} + +src_unpack() { + unpack ${A} + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack + + mv -f "${WORKDIR%/}/${P}" "${S}" || die +} + +src_prepare() { + _disable_engine() { + echo > "${S%/}/storage/${1}/CMakeLists.txt" || die + } + + _disable_plugin() { + echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die + } + + if use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die + fi + + # Don't build bundled xz-utils for tokudb + echo > "${S%/}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' "${S%/}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/ft-index/portability/CMakeLists.txt" || die + + local plugin + local server_plugins=( handler_socket auth_socket feedback qc_info server_audit semisync sql_errlog ) + local test_plugins=( audit_null auth_examples daemon_example fulltext ) + if ! use server; then # These plugins are for the server + for plugin in "${server_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + if ! use test; then # These plugins are only used during testing + for plugin in "${test_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + # Collides with mariadb-connector-c bug 655980 + _disable_plugin auth_dialog + + # Don't build example + _disable_engine example + + if ! use oqgraph ; then # avoids extra library checks + _disable_engine oqgraph + fi + + # Don't clash with dev-db/mysql-connector-c + sed -i -e 's/ my_print_defaults.1//' \ + -e 's/ perror.1//' \ + "${S}"/man/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mariadb + -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin + -DINSTALL_SCRIPTDIR=share/mariadb/scripts + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" + -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_ZLIB=system + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DWITHOUT_CLIENTLIBS=YES + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + -DENABLE_DTRACE=$(usex systemtap) + ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + if ! use yassl ; then + mycmakeargs+=( -DWITH_SSL=system ) + else + mycmakeargs+=( -DWITH_SSL=bundled ) + fi + + if use server ; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 ) + fi + + mycmakeargs+=( + -DWITH_JEMALLOC=$(usex jemalloc system) + -D$(usex sphinx WITH WITHOUT)_SPHINX_STORAGE_ENGINE=1 + -D$(usex tokudb WITH WITHOUT)_TOKUDB_STORAGE_ENGINE=1 + -D$(usex oqgraph WITH WITHOUT)_AUTH_PAM=1 + -DINSTALL_SQLBENCHDIR=share/mariadb + ) + + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DDISABLE_SHARED=$(usex static YES NO) + -DWITH_EMBEDDED_SERVER=OFF + -DENABLED_PROFILING=$(usex profiling) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc || use tcmalloc ; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED%/}/usr/include/mysql/server/private/config.h" || die + fi + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED%/}/usr/data" ]] ; then + rm -Rf "${ED%/}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf + local mycnf_src="my.cnf-5.5" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR%/}/${mycnf_src}" \ + > "${TMPDIR%/}/my.cnf.ok" || die + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok" + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR%/}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR%/}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" my.cnf + + if use server ; then + einfo "Including support files and sample configurations" + docinto "support-files" + local script + for script in \ + "${S%/}"/support-files/magic + do + [[ -f "$script" ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S%/}"/scripts/mysql* ; do + [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" + done + # Manually install supporting files that conflict with other packages + # but are needed for galera and initial installation + exeinto /usr/libexec/mariadb + doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" + fi + + #Remove mytop if perl is not selected + [[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop" +} + +# Official test instructions: +# USE='extraengine perl server' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +src_test() { + + _disable_test() { + local rawtestname reason + rawtestname="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}'" + echo ${rawtestname} : ${reason} >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + return 0 + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + # Run mysql tests + pushd "${TESTDIR}" > /dev/null || die + + touch "${T}/disabled.def" + # These are failing in MariaDB 5.5 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test, main.mysql_client_test_nonblock: + # segfaults at random under Portage only, suspect resource limits. + # + # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # fails due to bad cleanup of previous tests when run in parallel + # The tool is deprecated anyway + # Bug 532288 + + local t + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help \ + archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do + _disable_test "$t" "False positives in Gentoo" + done + + if ! use client-libs ; then + _disable_test main.plugin_auth "Needs client libraries built" + fi + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd > /dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1` + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_config() { + _getoptval() { + local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" + } + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n 1)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n 1)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n 1)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" + fi + if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" + fi + if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now" + einfo "or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see https://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + + # Filling timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) + einfo "Command: ${cmd[*]}" + su -s /bin/sh -c "${cmd[*]}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + use prefix || options="${options} --user=mysql" + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${pidfile} \ + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -e "${sql}" + eend $? + + if [[ -n "${sqltmp}" ]] ; then + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + "--socket=${socket}" \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + fi + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} diff --git a/dev-perl/Class-Adapter/Class-Adapter-1.90.0.ebuild b/dev-perl/Class-Adapter/Class-Adapter-1.90.0.ebuild new file mode 100644 index 000000000000..64e42b1d6de8 --- /dev/null +++ b/dev-perl/Class-Adapter/Class-Adapter-1.90.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=ETHER +DIST_VERSION=1.09 +inherit perl-module + +DESCRIPTION="Implementation of the 'Adapter' Design Pattern" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + virtual/perl-Carp + >=virtual/perl-Scalar-List-Utils-1.100.0 +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-File-Spec + virtual/perl-Test-Simple + ) +" diff --git a/dev-perl/Class-Adapter/Manifest b/dev-perl/Class-Adapter/Manifest index 962600a02829..60ae7d255cd4 100644 --- a/dev-perl/Class-Adapter/Manifest +++ b/dev-perl/Class-Adapter/Manifest @@ -1 +1,2 @@ DIST Class-Adapter-1.08.tar.gz 35843 BLAKE2B fcd7d556ea249b10a1aeb94de7c291c7d07c3144f93b726bf19c7d0f33549074bf2ea8794370ddae23889f467cae7a67362e5e58bde32a7423c2fcb3fb222bb5 SHA512 84053834561d058a38744e556d3573dfc91b5972a6329f3e7660cb422e4b680c76502c3ee3a2c80b6a135d67713502428a541a9e7b2c22991df8d7aab3de0408 +DIST Class-Adapter-1.09.tar.gz 33256 BLAKE2B 894e33a673747aee6e37e48868e72faf6dd5adf0ce223ed179ebf0b7b59108fd9dffb7798fb76bb8918d40ee650c6704302663ce7e87e9dded68dae6f268d5be SHA512 e6b7bde685683fa733e3002cf815aca6e298b2200a3fedbef93345284507023cdeed0cda4232c53d4dfd89239271a871db44616606d88ff5d03ac7c3e33a992a diff --git a/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild b/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild new file mode 100644 index 000000000000..5d651e9d9090 --- /dev/null +++ b/dev-perl/Class-Autouse/Class-Autouse-2.10.0-r3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=ADAMK +DIST_VERSION=2.01 +inherit perl-module + +DESCRIPTION="Runtime aspect loading of one or more classes" + +SLOT="0" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=virtual/perl-File-Spec-0.800.0 + >=virtual/perl-Scalar-List-Utils-1.180.0 +" +BDEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.620.0 + test? ( + >=virtual/perl-File-Temp-0.170.0 + >=virtual/perl-Test-Simple-0.470.0 + ) +" +PATCHES=( + "${FILESDIR}/${PN}-2.01-no-dot-inc.patch" +) diff --git a/dev-perl/Class-Autouse/files/Class-Autouse-2.01-no-dot-inc.patch b/dev-perl/Class-Autouse/files/Class-Autouse-2.01-no-dot-inc.patch new file mode 100644 index 000000000000..4fa0ab244361 --- /dev/null +++ b/dev-perl/Class-Autouse/files/Class-Autouse-2.01-no-dot-inc.patch @@ -0,0 +1,21 @@ +From 1527dbac07ae3b1ec157aed01ea568cea9f1f52e Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Sun, 24 May 2020 00:00:53 +1200 +Subject: Include '.' in @INC on perl 5.26+ + +--- + Makefile.PL | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.PL b/Makefile.PL +index 9a4a412..f17b280 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -1,3 +1,4 @@ ++use lib '.'; + use inc::Module::Install::DSL 1.04; + + all_from lib/Class/Autouse.pm +-- +2.26.2 + diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz index d95e81cf0b4b..f5f5a9e85e04 100644 Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 43e7ec551bbe..56de5d3d604b 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/PyDbLite/Manifest b/dev-python/PyDbLite/Manifest deleted file mode 100644 index e0f21c538f48..000000000000 --- a/dev-python/PyDbLite/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PyDbLite-3.0.4.tar.gz 510241 BLAKE2B 948858df8653a74872a7a017ecdfee2d078edd441671e4b0fd2a6e4ea73d9b885899fd8d35209c96e72bcbae48cc7c9db940e4add8ba9afeb55a6da1b49664a7 SHA512 7708d6cf391f18dbc644cfe6af34868d2eb59aae47ffb67cdb77d468d605b14c0dccfb159229035984d0dd9dbaa5ce706068ed23a09a5ece2f58565afdfad69f diff --git a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild deleted file mode 100644 index 2fcacb0e5387..000000000000 --- a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 pypy3) - -inherit distutils-r1 - -DESCRIPTION="A fast, pure-Python in-memory database" -HOMEPAGE="https://pypi.org/project/PyDbLite/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/PyDbLite/metadata.xml b/dev-python/PyDbLite/metadata.xml deleted file mode 100644 index cec6d63f5886..000000000000 --- a/dev-python/PyDbLite/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - klausman@gentoo.org - Tobias Klausmann - - - PyDbLite - - diff --git a/dev-python/URLObject/Manifest b/dev-python/URLObject/Manifest deleted file mode 100644 index 794fc953cab7..000000000000 --- a/dev-python/URLObject/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST urlobject-2.4.3.tar.gz 26325 BLAKE2B 6c73bab1768d8676ccd7411175877a17a8b64e2498345443bfd8e28873c1ba9aacf158cfcac739d8ae1abf7d7845bc5fa5f478441d6d99530a9395b236b118f0 SHA512 2bd08ba5695c8277eeed154d7f414939e8b471e83f1fc6b9db93931f8e49dea4583036b0b7fb8d820e0b214bdc4bf2fe78987eb6a5c63ba70611aea6365c2972 diff --git a/dev-python/URLObject/URLObject-2.4.3.ebuild b/dev-python/URLObject/URLObject-2.4.3.ebuild deleted file mode 100644 index 5796b3cf392f..000000000000 --- a/dev-python/URLObject/URLObject-2.4.3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -GITHUB_P=${P,,} -DESCRIPTION="A utility class for manipulating URLs" -HOMEPAGE="https://pypi.org/project/URLObject/" -# note: pypi tarball lacks tests -# https://github.com/zacharyvoase/urlobject/issues/39 -SRC_URI="https://github.com/zacharyvoase/urlobject/archive/v${PV}.tar.gz -> ${GITHUB_P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/six[${PYTHON_USEDEP}]" -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" - -S=${WORKDIR}/${GITHUB_P} - -python_prepare_all() { - rm "${S}/urlobject/six.py" || die - find "${S}/urlobject" -type f -name \*.py \ - -exec sed -e 's/from \.six import/from six import/g' -i "{}" \; || die - distutils-r1_python_prepare_all -} - -python_test() { - nosetests -v || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/URLObject/metadata.xml b/dev-python/URLObject/metadata.xml deleted file mode 100644 index b2ca80a2d7a8..000000000000 --- a/dev-python/URLObject/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - URLObject - zacharyvoase/urlobject - - diff --git a/dev-python/cligj/Manifest b/dev-python/cligj/Manifest deleted file mode 100644 index ad8f2d6593b5..000000000000 --- a/dev-python/cligj/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cligj-0.4.0.tar.gz 7281 BLAKE2B 7795f28bdef6ce5823bbf0b346d900e95cca4655cce985823318b8fd9854fcf245b523f3ecb06b44d6810f268b658ed4e4276d7f022a9085bbfa623914b68a2f SHA512 35c075192f39c7c756a5abce2cc706818a5c40ed91d25a5763483b01acfffa29b50ce58e758b0ca42431978e436ad45a93049e05c6dd0a98da40d74c4a329669 diff --git a/dev-python/cligj/cligj-0.4.0.ebuild b/dev-python/cligj/cligj-0.4.0.ebuild deleted file mode 100644 index fb5249de17db..000000000000 --- a/dev-python/cligj/cligj-0.4.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Click-based argument and option decorators for Python GIS command line programs" -HOMEPAGE="https://github.com/mapbox/cligj" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-python/click[${PYTHON_USEDEP}] -" -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" diff --git a/dev-python/cligj/metadata.xml b/dev-python/cligj/metadata.xml deleted file mode 100644 index 436332904367..000000000000 --- a/dev-python/cligj/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - cligj - mapbox/cligj - - diff --git a/dev-python/demjson/Manifest b/dev-python/demjson/Manifest deleted file mode 100644 index ec159a2a520b..000000000000 --- a/dev-python/demjson/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST demjson-2.2.4.tar.gz 131457 BLAKE2B 2bd38a922d68c1a415e7258d7e1cc8b852c703df5cfcd2dbffb3936fb5b93950f2af56c0a8eb961868c1e478520bf8fc33855ecc704cd5f95e6e5b310ddb3b3d SHA512 d8a1cde062d0b062bdae29b6d79ad69fb9cc185428718a0009ccbed544ed37bd354fbb86edadb56bd98183ac8636b2edae322ed19aa5f07a7b6df668c7aa0029 diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild deleted file mode 100644 index 55bc5cc57392..000000000000 --- a/dev-python/demjson/demjson-2.2.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Encoder, decoder, and lint/validator for JSON compliant with RFC 4627" -HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.org/project/demjson/" -SRC_URI="http://deron.meranda.us/python/${PN}/dist/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="doc" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -python_test() { - cd test - if python_is_python3; then - 2to3 -w --no-diffs test_demjson.py - fi - "${PYTHON}" test_demjson.py -} - -python_install_all() { - distutils-r1_python_install_all - # Docs are .txt files - if use doc; then - dodoc docs/*.txt - fi -} diff --git a/dev-python/demjson/metadata.xml b/dev-python/demjson/metadata.xml deleted file mode 100644 index 9e5274c5b4ae..000000000000 --- a/dev-python/demjson/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - python@gentoo.org - Python - - diff --git a/dev-python/dexml/Manifest b/dev-python/dexml/Manifest deleted file mode 100644 index d1182d6e7acb..000000000000 --- a/dev-python/dexml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dexml-0.5.1.tar.gz 24359 BLAKE2B 98f315a331fc1d2b69250a088bc491d6e425106dea0025a26c044951b164f61880cd772a88eaee688ccb550050981c5fe489dd9e8d74bda2c351e183b15bb5e9 SHA512 b8ac2b9f875ac7cf699eb9ee17adb8678ed8d4a796130bbb60f05431207adb68f490b7a7a41600acbc16a3cc08d55f22d91a13e53fe3d835a322709ee3446c9f diff --git a/dev-python/dexml/dexml-0.5.1.ebuild b/dev-python/dexml/dexml-0.5.1.ebuild deleted file mode 100644 index 52ba616d513a..000000000000 --- a/dev-python/dexml/dexml-0.5.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_6} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Dead-simple Object-XML mapper for Python" -HOMEPAGE="https://pypi.org/project/dexml/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" - -python_test() { - esetup.py test -} diff --git a/dev-python/dexml/metadata.xml b/dev-python/dexml/metadata.xml deleted file mode 100644 index 513b30532c29..000000000000 --- a/dev-python/dexml/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - python@gentoo.org - Python - - - dexml - http://pythonhosted.org/dexml/ - - ryan@rfk.id.au - Ryan Kelly - - - diff --git a/dev-python/django-durationfield/Manifest b/dev-python/django-durationfield/Manifest deleted file mode 100644 index 252bc61fa79c..000000000000 --- a/dev-python/django-durationfield/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST django-durationfield-0.5.4.tar.gz 4728 BLAKE2B 446a5b361cc54bcc2ae375caebfe2eda64114e3e326e7d60fc8d4ebe5c6acf59d80e12e246ecf5ca7edf44a1f1068bc3b17d841b4d39c7317211c87fc03aacd5 SHA512 84885ab7bb07ed3c5a64094a2beb7d4adcf8b0f9f2933ad2c1d4654789bd71aa7d2efd5c84931f22f81a51e8aaeb3ed9415a12c69dfd7354c2317ea912fdc610 diff --git a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild deleted file mode 100644 index 2e15cf09d7f0..000000000000 --- a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Reusable app for adding a DurationField to Django" -HOMEPAGE="https://pypi.org/project/django-durationfield/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -RDEPEND=" - >=dev-python/django-1.4[${PYTHON_USEDEP}] -" - -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" diff --git a/dev-python/django-durationfield/metadata.xml b/dev-python/django-durationfield/metadata.xml deleted file mode 100644 index 9243c707fbe9..000000000000 --- a/dev-python/django-durationfield/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - django-durationfield - - diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest deleted file mode 100644 index d4d646d31011..000000000000 --- a/dev-python/django-setuptest/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST django-setuptest-0.2.1.tar.gz 7131 BLAKE2B 5afd3106c9f02da2b8d63a21e90c68db97a38f67ca36feafa6e798f9f3106f81cedc94a3155d777f78f43e549fb5656245518d5a812fb30513c59cb24d8da98b SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d diff --git a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild deleted file mode 100644 index 522ae886fd4a..000000000000 --- a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Simple test suite enabling Django app testing via setup.py" -HOMEPAGE="https://github.com/praekelt/django-setuptest" -SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/pep8[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/django[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/django-setuptest/metadata.xml b/dev-python/django-setuptest/metadata.xml deleted file mode 100644 index d8675acbf521..000000000000 --- a/dev-python/django-setuptest/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - python@gentoo.org - Python - - - praekelt/django-setuptest - - diff --git a/dev-python/django-spurl/Manifest b/dev-python/django-spurl/Manifest deleted file mode 100644 index 81bf9e0f45a8..000000000000 --- a/dev-python/django-spurl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST django-spurl-0.6.4.tar.gz 15076 BLAKE2B e576d6b309c0ff03cbc095363083c7a71c9ae764bc3f92d0f8790d458e2173f5df8a4e89d6999c672180408b443b0d4f84617719cc4ff06cec24156c472c2584 SHA512 8bf7c4d4e7e624280f87584f70e73504a11973a44294591d9dd58dd563d63dd1deb395e42bb1110e0a534ac16b59280d3b29f4293865cc465ee1fce20987d267 diff --git a/dev-python/django-spurl/django-spurl-0.6.4.ebuild b/dev-python/django-spurl/django-spurl-0.6.4.ebuild deleted file mode 100644 index 6c7b862a090a..000000000000 --- a/dev-python/django-spurl/django-spurl-0.6.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="A Django template library for manipulating URLs" -HOMEPAGE="https://pypi.org/project/django-spurl/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -RDEPEND=" - >=dev-python/django-1.4 - dev-python/six - dev-python/nose - dev-python/URLObject -" -DEPEND=" - ${RDEPEND} - dev-python/setuptools -" diff --git a/dev-python/django-spurl/metadata.xml b/dev-python/django-spurl/metadata.xml deleted file mode 100644 index 1115e8e9a3f3..000000000000 --- a/dev-python/django-spurl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - django-spurl - - diff --git a/dev-python/filemagic/Manifest b/dev-python/filemagic/Manifest deleted file mode 100644 index a6b0540cbbeb..000000000000 --- a/dev-python/filemagic/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST filemagic-1.6.tar.gz 16754 BLAKE2B 248de7f4c900f693d56197828b96bcdbfae451e17948abc1f59105b5dd78bdcb662e5d7751927128e7ae2b4cea086b5c095f34ba0fbbd73d8acce569e77e943a SHA512 2b33b55467d14697ddcee2b1cb69eb41dd51474d2d8d095873f6f6609d77efa295a91bc9b976c9af22983a7cc801e1ea1e55163c18c5b6a41c4e1ff9cf73bb47 diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild deleted file mode 100644 index 277d2dbb6430..000000000000 --- a/dev-python/filemagic/filemagic-1.6.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 - -DESCRIPTION="A Python API for libmagic, the library behind the Unix file command" -HOMEPAGE="https://pypi.org/project/filemagic/ https://github.com/aliles/filemagic" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - sys-apps/file" -RDEPEND="" diff --git a/dev-python/filemagic/metadata.xml b/dev-python/filemagic/metadata.xml deleted file mode 100644 index c9027b1e8295..000000000000 --- a/dev-python/filemagic/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - A Python API for libmagic, the library behind the Unix file command - - - aliles/filemagic - filemagic - - diff --git a/dev-python/flask-bootstrap/Manifest b/dev-python/flask-bootstrap/Manifest deleted file mode 100644 index a12ffb71dee7..000000000000 --- a/dev-python/flask-bootstrap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flask-bootstrap-3.3.7.1.tar.gz 490821 BLAKE2B 48773fa1632a9b34284af90924d0d7c6bbe06e43c30b09e72747072d4cdead88a08a1d95a661548709cc46cb9d9c9c017835cd6537ec1a23993fe79cfef31662 SHA512 010c71f69a95cb51afb449d1b43cb345ad23815ea89b368281f721a2af13cf2c143d67b586114898450d8e7fec413f45ff042cfca3dc1183cb0f50566e39fdc3 diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild deleted file mode 100644 index 253b8637e985..000000000000 --- a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code" -HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/" -# PyPI tarballs don't include tests -# https://github.com/mbr/flask-bootstrap/pull/134 -SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/dominate[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/visitor[${PYTHON_USEDEP}] - dev-python/wtforms[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/flask-appconfig[${PYTHON_USEDEP}] - dev-python/flask-debug[${PYTHON_USEDEP}] - dev-python/flask-nav[${PYTHON_USEDEP}] - dev-python/flask-wtf[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ${RDEPEND} - ) - doc? ( - dev-python/alabaster[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ) -" - -python_prepare_all() { - sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - sphinx-build docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - -python_test() { - # Skip one test which requires network access - py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/flask-bootstrap/metadata.xml b/dev-python/flask-bootstrap/metadata.xml deleted file mode 100644 index b3dc8b3897d7..000000000000 --- a/dev-python/flask-bootstrap/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - sbraz@gentoo.org - Louis Sautier - - - flask-bootstrap - mbr/flask-bootstrap - https://github.com/mbr/flask-bootstrap/issues - - diff --git a/dev-python/ipdbplugin/Manifest b/dev-python/ipdbplugin/Manifest deleted file mode 100644 index b4a33910a804..000000000000 --- a/dev-python/ipdbplugin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ipdbplugin-1.4.tar.gz 2473 BLAKE2B d69c6f2a45738bf10a18e9db194530efa21f8d32bd69d5ccd279eb50f07bd5c8b369bcdde92dc2e9b8b417864a49c308c83649bb66bcaf8ec380101284363c7d SHA512 5831d1e9aceb2fe4db272975d4d792622822049813ba76bdc0ee48dee001339084efddf534882775922ec178c1bcd52954bc2df1ce42181cbfdd1c3c4b944365 diff --git a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild deleted file mode 100644 index f7201a9866fb..000000000000 --- a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail" -HOMEPAGE="https://pypi.org/project/ipdbplugin/" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/flavioamieiro/nose-ipdb.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="" - -RDEPEND="dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipdb - dev-python/nose" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild deleted file mode 100644 index f7201a9866fb..000000000000 --- a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail" -HOMEPAGE="https://pypi.org/project/ipdbplugin/" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/flavioamieiro/nose-ipdb.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="" - -RDEPEND="dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipdb - dev-python/nose" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/ipdbplugin/metadata.xml b/dev-python/ipdbplugin/metadata.xml deleted file mode 100644 index ed2f4d2799c6..000000000000 --- a/dev-python/ipdbplugin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - ipdbplugin - - diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest deleted file mode 100644 index 9a4f99955e33..000000000000 --- a/dev-python/junit-xml/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST junit-xml-1.8.tar.gz 9995 BLAKE2B 29dcd9053e3d02dffce537318458f9924aff78df2f465ffb1a92affcf84734c81cd9a951523fa8b6edf09e871acaa426d7a755ae167279c9954660737a44062c SHA512 8fcef94ea73a77ad597bb3280578f0fea86573b779eb4aea1e458e55f1866637a7b43aa04502a65ecb1f2a7403cc61a76ccd35feb4b69eeb6fdc8352914d61a4 diff --git a/dev-python/junit-xml/junit-xml-1.8.ebuild b/dev-python/junit-xml/junit-xml-1.8.ebuild deleted file mode 100644 index 0241c4f5563e..000000000000 --- a/dev-python/junit-xml/junit-xml-1.8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Python module for creating JUnit XML test result documents" -HOMEPAGE="https://pypi.org/project/junit-xml https://github.com/kyrus/python-junit-xml" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - )" - -python_test() { - py.test -v || die "testing failed with ${EPYTHON}" -} diff --git a/dev-python/junit-xml/metadata.xml b/dev-python/junit-xml/metadata.xml deleted file mode 100644 index aafb5d5d972c..000000000000 --- a/dev-python/junit-xml/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - python@gentoo.org - Python Project - - - junit-xml - kyrus/python-junit-xml - - diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest deleted file mode 100644 index 6311028f288d..000000000000 --- a/dev-python/kivy-garden/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kivy-garden-0.1.4.tar.gz 6849 BLAKE2B 944d84ce9057db64c1435d9e4f5e4b8d7e812cac39a7ef536974f5b4a4e525d2ed7dc8c214db75d20cf87bdd1effa9e1312d979e264bb93a5edaf4cf43c7441d SHA512 69b8fa2e2e80cc215eaad0eca78e1e207726ef2f611ba328863191580c19e77de970347b206c82927d92fbc821811956f8c45ac3613dafb2db706a491c50585f diff --git a/dev-python/kivy-garden/files/remove_bat-0.1.4.patch b/dev-python/kivy-garden/files/remove_bat-0.1.4.patch deleted file mode 100644 index 5c116608aa79..000000000000 --- a/dev-python/kivy-garden/files/remove_bat-0.1.4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.py.orig 2014-04-02 08:48:05.906881843 +0200 -+++ b/setup.py 2014-04-02 08:48:16.650214908 +0200 -@@ -8,6 +8,6 @@ - version='0.1.1', - license='MIT', - packages=['garden'], -- scripts=['bin/garden', 'bin/garden.bat'], -+ scripts=['bin/kivy-garden'], - install_requires=['requests'], - ) diff --git a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild deleted file mode 100644 index 6a757ae94999..000000000000 --- a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Kivys Garden tool to manage flowers" -HOMEPAGE="http://kivy-garden.github.io/" -SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - " -RDEPEND="${DEPEND}" - -S="${WORKDIR}/garden-${PV}" - -PATCHES=( "${FILESDIR}/remove_bat-${PV}.patch" ) - -src_prepare() { - distutils-r1_src_prepare - mv "${S}/bin/garden" "${S}/bin/kivy-garden" || die -} - -pkg_postinst() { - einfo "Kivy's garden tool is installed as kivy-garden" -} diff --git a/dev-python/kivy-garden/metadata.xml b/dev-python/kivy-garden/metadata.xml deleted file mode 100644 index d34379f1b682..000000000000 --- a/dev-python/kivy-garden/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Tool to manage the installation, removal of flowers at https://github.com/kivy-garden/ - They are a set of user maintained widgets, extensions, tools for kivy(http://kivy.org) framework. - - - kivy-garden - - diff --git a/dev-python/rarfile/rarfile-3.0-r1.ebuild b/dev-python/rarfile/rarfile-3.0-r1.ebuild new file mode 100644 index 000000000000..3b2be61a9fb4 --- /dev/null +++ b/dev-python/rarfile/rarfile-3.0-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="Module for RAR archive reading" +HOMEPAGE="https://github.com/markokr/rarfile" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+compressed" + +RDEPEND="compressed? ( || ( app-arch/unrar app-arch/rar ) )" + +distutils_enable_tests nose diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest deleted file mode 100644 index f3a1da36d682..000000000000 --- a/dev-python/rst2pdf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rst2pdf-0.93.tar.gz 1216483 BLAKE2B 478b5e704a2c8a85474e728472807909f70e24ade78f2aba986308919e6716c4b0d576556b3509a358f36be03508f837e3b680a16b8c01e2ee51e522931d9237 SHA512 dfdc6adeb06f4ef3d5fc52b91be1939e9cab25a1979685512f9a05e3da1ee65b84e47478613148401175a06fbfdccf5494918de6281419a0981987d398e836ee diff --git a/dev-python/rst2pdf/files/rst2pdf-0.93-fix-logging.patch b/dev-python/rst2pdf/files/rst2pdf-0.93-fix-logging.patch deleted file mode 100644 index 52acf04171d8..000000000000 --- a/dev-python/rst2pdf/files/rst2pdf-0.93-fix-logging.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- rst2pdf/log.py -+++ rst2pdf/log.py -@@ -4,11 +4,12 @@ - import logging - import sys - --logging.basicConfig( -- format='[%(levelname)s] %(filename)s:%(lineno)d %(message)s', -- level=logging.WARNING) -- - log = logging.getLogger('rst2pdf') -+_fmt = logging.Formatter('[%(levelname)s] %(filename)s:%(lineno)d %(message)s') -+_hdlr = logging.StreamHandler() -+_hdlr.setFormatter(_fmt) -+log.addHandler(_hdlr) -+log.setLevel(logging.WARNING) - - def nodeid(node): - """Given a node, tries to return a way to see where it was in the -@@ -23,4 +24,4 @@ - if node.source: fname=str(node.source) - except: - pass -- return 'near line %s in file %s'%(line,fname) -\ No newline at end of file -+ return 'near line %s in file %s'%(line,fname) diff --git a/dev-python/rst2pdf/metadata.xml b/dev-python/rst2pdf/metadata.xml deleted file mode 100644 index 3673286b4be4..000000000000 --- a/dev-python/rst2pdf/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - rst2pdf - rst2pdf/rst2pdf - - diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild deleted file mode 100644 index 4316b719167d..000000000000 --- a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab" -HOMEPAGE="http://rst2pdf.ralsina.me/ https://pypi.org/project/rst2pdf/" -SRC_URI="https://github.com/rst2pdf/rst2pdf/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86" -IUSE="svg" - -DEPEND="dev-python/docutils[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pdfrw[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/reportlab-2.6[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - svg? ( media-gfx/svg2rlg )" -RDEPEND="${DEPEND}" -# >=reportlab-2.6: https://code.google.com/p/rst2pdf/issues/detail?id=474 - -PATCHES=( "${FILESDIR}/${P}-fix-logging.patch" ) - -python_install_all() { - dodoc doc/*.pdf - doman doc/rst2pdf.1 - distutils-r1_python_install_all -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "rst2pdf can work with the following packages for additional functionality:" - elog " dev-python/sphinx - versatile documentation creation" - elog " dev-python/pythonmagick - image processing with ImageMagick" - elog " dev-python/matplotlib - mathematical formulae" - elog "It can also use wordaxe for hyphenation, but this package is not" - elog "available in the portage tree yet. Please refer to the manual" - elog "installed in /usr/share/doc/${PF}/ for more information." - fi -} diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index c2a94169e85f..a716e1490f49 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/bumpversion/Manifest b/dev-util/bumpversion/Manifest deleted file mode 100644 index 67804235aa6a..000000000000 --- a/dev-util/bumpversion/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bumpversion-0.5.3.tar.gz 16596 BLAKE2B ecd9e999241d0d77161529344d9f83859ab1083c323524f91f84802ff74aa8e9d4d95126b65c685e04183cf7907732f2ad734938db7aa03dfb9e334a1d24222c SHA512 2dc507be98838e4a389502cbdae08d23bad465b171923e15c40ae16da2cc9529c71dfc40213c47d23da363257b363fd5786a5661a4a6d6b568b5f8b2cf8af959 diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild deleted file mode 100644 index 268568a0626e..000000000000 --- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Version-bump your software with a single command" -HOMEPAGE="https://pypi.org/project/bumpversion/ https://github.com/peritus/bumpversion" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ) -" - -# Not included -# https://github.com/peritus/bumpversion/issues/108 -RESTRICT=test - -python_test() { - py.test || die -} diff --git a/dev-util/bumpversion/metadata.xml b/dev-util/bumpversion/metadata.xml deleted file mode 100644 index 71a774b004dd..000000000000 --- a/dev-util/bumpversion/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - bumpversion - peritus/bumpversion - - diff --git a/dev-util/radare2/files/radare2-4.4.0-AR.patch b/dev-util/radare2/files/radare2-4.4.0-AR.patch new file mode 100644 index 000000000000..406bd7ab0046 --- /dev/null +++ b/dev-util/radare2/files/radare2-4.4.0-AR.patch @@ -0,0 +1,25 @@ + +--- a/mk/clang.mk ++++ b/mk/clang.mk +@@ -3,7 +3,8 @@ _INCLUDE_MK_CLANG_=1 + CC?=clang + RANLIB=ranlib + ONELIB=0 +-CC_AR=ar q ${LIBAR} ++AR?=ar ++CC_AR=$(AR) q ${LIBAR} + CFLAGS+=-MD + CFLAGS_INCLUDE=-I + LDFLAGS_LINK=-l +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -4,7 +4,8 @@ CC?=gcc + OBJCOPY=objcopy + RANLIB=ranlib + ONELIB=0 +-CC_AR=ar q ${LIBAR} ++AR?=ar ++CC_AR=$(AR) q ${LIBAR} + CFLAGS+=-MD + CFLAGS_INCLUDE=-I + LDFLAGS_LINK=-l diff --git a/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch b/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch new file mode 100644 index 000000000000..6ce007a5278f --- /dev/null +++ b/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch @@ -0,0 +1,24 @@ +--- a/mk/clang.mk ++++ b/mk/clang.mk +@@ -1,7 +1,7 @@ + ifeq (${_INCLUDE_MK_CLANG_},) + _INCLUDE_MK_CLANG_=1 + CC?=clang +-RANLIB=ranlib ++RANLIB?=ranlib + ONELIB=0 + AR?=ar + CC_AR=$(AR) q ${LIBAR} +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -1,8 +1,8 @@ + ifeq (${_INCLUDE_MK_GCC_},) + _INCLUDE_MK_GCC_=1 + CC?=gcc +-OBJCOPY=objcopy +-RANLIB=ranlib ++OBJCOPY?=objcopy ++RANLIB?=ranlib + ONELIB=0 + AR?=ar + CC_AR=$(AR) q ${LIBAR} diff --git a/dev-util/radare2/radare2-4.4.0-r1.ebuild b/dev-util/radare2/radare2-4.4.0-r1.ebuild new file mode 100644 index 000000000000..376d0a9f5210 --- /dev/null +++ b/dev-util/radare2/radare2-4.4.0-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 eutils toolchain-funcs + +DESCRIPTION="unix-like reverse engineering framework and commandline tools" +HOMEPAGE="http://www.radare.org" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/radareorg/radare2" +else + SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="ssl libressl" + +RDEPEND=" + dev-libs/capstone:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4.0-AR.patch + "${FILESDIR}"/${PN}-4.4.0-RANLIB.patch +) + +src_configure() { + # Ideally these should be set by ./configure + tc-export CC AR LD OBJCOPY RANLIB + export HOST_CC=${CC} + + econf \ + --without-libuv \ + --with-syscapstone \ + $(use_with ssl openssl) +} + +src_install() { + default + + insinto /usr/share/zsh/site-functions + doins doc/zsh/_* + + newbashcomp doc/bash_autocompletion.sh "${PN}" + bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2 + + # a workaround for unstable $(INSTALL) call, bug #574866 + local d + for d in doc/*; do + if [[ -d $d ]]; then + rm -rfv "$d" || die "failed to delete '$d'" + fi + done +} diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest index 91732a057bf1..8ea095c9a1c1 100644 --- a/dev-util/shards/Manifest +++ b/dev-util/shards/Manifest @@ -1 +1,3 @@ +DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5 +DIST shards-0.10.0.tar.gz 39507 BLAKE2B f6b6034a626500d0459e01be73de28506dc2efe116a5f662b27edb6cbe363cf4bb3184fcce83838e02dec4db18355a85737b4783560b7d94b643145d08581174 SHA512 8d41a2553fd99bd44a3e8a9aacbd17f2a1e9f8730f90c4682091e8d2a4f2388818bdfc4e4bf654c3cbebd617a74474fb63f1fb86a62998cf79409d4778649757 DIST shards-0.9.0.tar.gz 41280 BLAKE2B a74ab96489c804da3017dc683295d1fc16ba30248015af9deccdcf52a09301f665d4848822419d263d2301969c484fae288eff63e281bd4841b1fd101c5d5383 SHA512 a06579f1a96cea1fb1ba97c17ae4529439fb7c54572e74b4969921b1a987a1e1be9c9eb8569db94fd4cb4adc098b3085abfd2a6f7015da7f39611a1774d30022 diff --git a/dev-util/shards/shards-0.10.0.ebuild b/dev-util/shards/shards-0.10.0.ebuild new file mode 100644 index 000000000000..c36571a58c8e --- /dev/null +++ b/dev-util/shards/shards-0.10.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +CRYSTAL_MOLINILLO_PV=0.1.0 +CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV} + +DESCRIPTION="Dependency manager for the Crystal language" +HOMEPAGE="https://github.com/crystal-lang/shards" +SRC_URI=" + https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >dev-lang/crystal-0.11.1[yaml] +" +RDEPEND="${DEPEND}" + +RESTRICT=test # missing files in tarball + +src_prepare() { + default + + # bundle crystal-molinillo to bootstrap 'shards' + mkdir -p lib || die + ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die + + tc-export CC +} + +src_install() { + dobin bin/${PN} + dodoc README.md +} diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest deleted file mode 100644 index bc30ac4e2f21..000000000000 --- a/dev-util/spec-cleaner/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7 diff --git a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch deleted file mode 100644 index b280cce28bf4..000000000000 --- a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py 2018-03-19 15:23:46.128000000 +0000 -+++ b/setup.py 2018-03-19 15:24:26.920000000 +0000 -@@ -43,7 +43,6 @@ - platforms=['Linux'], - keywords=['SUSE', 'RPM', '.spec', 'cleaner'], - -- setup_requires=['pytest-runner'], -- tests_require=['pytest', 'pytest-cov'], -+ tests_require=['pytest'], - - packages=['spec_cleaner'], diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml deleted file mode 100644 index 03f0990dceec..000000000000 --- a/dev-util/spec-cleaner/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - openSUSE/spec-cleaner - - diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild deleted file mode 100644 index 1a01126a84cc..000000000000 --- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" -inherit distutils-r1 -[[ ${PV} == 9999 ]] && inherit git-r3 - -DESCRIPTION="SUSE spec file cleaner and formatter" -HOMEPAGE="https://github.com/openSUSE/spec-cleaner" -[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -[[ ${PV} != 9999 ]] && -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - ${PYTHON_DEPS} - >=app-arch/rpm-4.11.0.1 -" - -PATCHES=( - # pytest-runner is only needed in test scenario - "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" -) - -[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" - -src_prepare() { - # we have libexec - sed -i \ - -e 's:lib/obs:libexec/obs:g' \ - setup.py || die - distutils-r1_src_prepare -} - -python_test() { - esetup.py test -} diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild deleted file mode 100644 index 1a01126a84cc..000000000000 --- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git" -inherit distutils-r1 -[[ ${PV} == 9999 ]] && inherit git-r3 - -DESCRIPTION="SUSE spec file cleaner and formatter" -HOMEPAGE="https://github.com/openSUSE/spec-cleaner" -[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -[[ ${PV} != 9999 ]] && -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - ${PYTHON_DEPS} - >=app-arch/rpm-4.11.0.1 -" - -PATCHES=( - # pytest-runner is only needed in test scenario - "${FILESDIR}/${PN}-1.0.6-pytest-runner.patch" -) - -[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}" - -src_prepare() { - # we have libexec - sed -i \ - -e 's:lib/obs:libexec/obs:g' \ - setup.py || die - distutils-r1_src_prepare -} - -python_test() { - esetup.py test -} diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 684de2c9d7fe..4a5c1ea39af1 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/ghp-import/Manifest b/dev-vcs/ghp-import/Manifest deleted file mode 100644 index 5d0b11ce15a9..000000000000 --- a/dev-vcs/ghp-import/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ghp-import-0.4.1.tar.gz 5002 BLAKE2B 667a40c0d852799e97d295df76d17d50017880afc9b2daa27d49444da84c791af619dea06b282e15c4d627a9584a23c2aa9fafcf45d9e0e924f9a6a966d071b6 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda diff --git a/dev-vcs/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-vcs/ghp-import/ghp-import-0.4.1-r1.ebuild deleted file mode 100644 index c6fb4d58de59..000000000000 --- a/dev-vcs/ghp-import/ghp-import-0.4.1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Copy your docs directly to the gh-pages branch" -HOMEPAGE="https://github.com/davisp/ghp-import" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="tumbolia" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -python_prepare_all() { - ebegin 'patching setup.py' - sed \ - -e '4ifrom codecs import open\n' \ - -e '/LONG_DESC/s/))/), encoding = "utf-8")/' \ - -i setup.py - STATUS=${?} - eend ${STATUS} - [[ ${STATUS} -gt 0 ]] && die - - distutils-r1_python_prepare_all -} diff --git a/dev-vcs/ghp-import/metadata.xml b/dev-vcs/ghp-import/metadata.xml deleted file mode 100644 index 9bba96f1e08f..000000000000 --- a/dev-vcs/ghp-import/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - ghp-import - davisp/ghp-import - - diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest deleted file mode 100644 index edbfa2819616..000000000000 --- a/dev-vcs/git-imerge/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST git-imerge-1.0.0.tar.gz 58736 BLAKE2B 16665436d10d07058eeadab5d53a2325d68174f6fcf1748948d0fc4fbe11ab4fca87853bb557e167b0f485351aedd72889fcedaa70f09439d7e66b75a61d318b SHA512 919b80f157d635e3a3eb2b05cfaf8f6a7034fe6f43529c829fef0152007bce3bf5b296cc00f6db0c0a711bfb9e118c4adb0f5a2641ff841c973ff12610473e9b diff --git a/dev-vcs/git-imerge/files/git-imerge.bashcomplete b/dev-vcs/git-imerge/files/git-imerge.bashcomplete deleted file mode 100644 index 0fe8e04f64de..000000000000 --- a/dev-vcs/git-imerge/files/git-imerge.bashcomplete +++ /dev/null @@ -1,267 +0,0 @@ -__git_imerge_branches () { - git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null | - sed -e 's!^refs/heads/!!' -e 's!^refs/remotes/!!' -} - -__git_imerge_names () { - git for-each-ref --format='%(refname)' refs/imerge/ 2>/dev/null | - sed -e 's/^refs\/imerge\/\(.*\)\/.*/\1/' -e '/manual/d' -e '/auto/d' -} - -__git_imerge_goals="\ -merge -rebase -rebase-with-history -full -" - -__git_imerge_commands="\ -start -merge -rebase -continue -finish -diagram -list -init -record -autofill -simplify -remove -reparent -" - -__git_imerge_start_options="\ ---help ---manual ---name ---branch ---goal ---first-parent -" - -__git_imerge_init_options=$__git_imerge_start_options - -__git_imerge_continue_options="\ ---help ---name ---edit ---no-edit -" - -__git_imerge_finish_options="\ ---help ---name ---goal ---branch ---force -" - -__git_imerge_simplify_options=$__git_imerge_finish_options - -__git_imerge_merge_options="\ ---help ---name ---goal ---branch ---manual -" - -__git_imerge_list_options="\ ---help -" - -__git_imerge_reparent_options=$__git_imerge_list_options - -__git_imerge_record_options="\ ---help ---name ---edit ---no-edit -" - -__git_imerge_autofill_options="\ ---help ---name -" - -__git_imerge_diagram_options="\ ---help ---name ---commits ---frontier ---html ---color ---no-color -" - -__git_imerge_remove_options=$__git_imerge_autofill_options - -__git_imerge_rebase_options=$__git_imerge_merge_options - -__git-imerge_start_completion() { - case "$1_$cur" in - --help_|--branch_|_--branch=|--name_|_--name=) - return - ;; - --goal_*|*_--goal=*) - __gitcomp "$__git_imerge_goals" "" "${cur##--goal=}" - return - ;; - *-|*_-*?) - __gitcomp "$__git_imerge_start_options" - return - ;; - esac - __gitcomp "$(__git_imerge_branches)" -} - -__git-imerge_init_completion() { - __git-imerge_start_completion $1 -} - -__git-imerge_continue_completion() { - case "$1_$cur" in - --help_) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_continue_options" -} - -__git-imerge_finish_completion() { - case "$1_$cur" in - --help_) - return - ;; - --goal_*|*_--goal=*) - __gitcomp "$__git_imerge_goals" "" "${cur##--goal=}" - return - ;; - --branch_*|*_--branch=*) - __gitcomp "$(__git_imerge_branches)" "" "${cur##--branch=}" - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_finish_options" -} - -__git-imerge_simplify_completion() { - __git-imerge_finish_completion $1 -} - -__git-imerge_merge_completion() { - case "$1_$cur" in - --help_|--branch_|_--branch=|--name_|_--name=) - return - ;; - --goal_*|*_--goal=*) - __gitcomp "$__git_imerge_goals" "" "${cur##--goal=}" - return - ;; - *-|*_-*?) - __gitcomp "$__git_imerge_merge_options" - return - ;; - esac - __gitcomp "$(__git_imerge_branches)" -} - -__git-imerge_rebase_completion() { - __git-imerge_merge_completion $1 -} - -__git-imerge_list_completion() { - case "$1" in - --help) - return - ;; - esac - __gitcomp "$__git_imerge_list_options" -} - -__git-imerge_reparent_completion() { - __git-imerge_list_completion $1 -} - -__git-imerge_record_completion() { - case "$1_$cur" in - --help_) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_record_options" -} - -__git-imerge_autofill_completion() { - case "$1_$cur" in - --help_) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_autofill_options" -} - -__git-imerge_remove_completion() { - __git-imerge_autofill_completion $1 -} - -__git-imerge_diagram_completion() { - case "$1_$cur" in - --help_|--html_|_--html=) - return - ;; - --name_*|*_--name=*) - __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}" - return - ;; - esac - __gitcomp "$__git_imerge_diagram_options" -} - -_git_imerge () { - # Disable default filename completion. Note that "compopt" is only - # available in Bash 4 and newer, so we check for existence before - # trying to use it. - type compopt >/dev/null 2>&1 && compopt +o default +o bashdefault - - local i command cur_opt - for ((i=0; i <= ${cword}; i++)); do - if [ -n "$command" ] && [ "${words[i]}" != "$cur" ]; then - cur_opt="${words[i]}" - fi - if [ -z "$command" ] && \ - [ "$i" -lt "${cword}" ] && \ - [[ "${words[i-1]}" == *"imerge"* ]] - then - command="${words[i]}" - fi - done - - if test -z "$command"; then - __gitcomp "$__git_imerge_commands" - return - fi - - if [ -z `type -t __git-imerge_"$command"_completion "$cur_opt"` ]; then - return - fi - - __git-imerge_"$command"_completion "$cur_opt" -} diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild deleted file mode 100644 index 424d661ab002..000000000000 --- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit bash-completion-r1 python-r1 - -DESCRIPTION="Incremental merge for git" -HOMEPAGE="https://github.com/mhagger/git-imerge" -SRC_URI="https://github.com/mhagger/git-imerge/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-vcs/git" -DEPEND="dev-python/docutils" - -src_compile() { - for doc in *.rst; do - rst2html.py "${doc}" > "${T}/${doc/.rst/.html}" \ - || die "failed to convert ${doc} to ${T}/${doc/.rst/.html}" - done - - rst2s5.py \ - --theme=small-white \ - --current-slide \ - doc/presentations/GitMerge-2013/talk.rst \ - "${T}/talk.html" \ - || die 'failed to convert talk.rst to ${T}/talk.html' -} - -src_install() { - python_foreach_impl python_doscript "${PN}" - newbashcomp "${FILESDIR}/git-imerge.bashcomplete" git-imerge - dodoc *.rst "${T}"/*.html - - # Don't forget the CSS for the presentation. - dodoc -r "${T}/ui" -} diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml deleted file mode 100644 index 33aa1137112c..000000000000 --- a/dev-vcs/git-imerge/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - mhagger/git-imerge - - diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index c2d14a44ecb8..5092657f6344 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild index 933325eeb279..710cb6b5ffbf 100644 --- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild +++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild index d18119056732..b606dc264603 100644 --- a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild +++ b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+" SLOT="0" -IUSE="ayatana +introspection +gcr +modemmanager selinux teamd" +IUSE="appindicator +introspection +gcr +modemmanager selinux teamd" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" RDEPEND=" @@ -30,7 +30,7 @@ RDEPEND=" >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info - ayatana? ( + appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) @@ -54,7 +54,7 @@ PATCHES=( src_configure() { local myconf=( - --with-appindicator=$(usex ayatana ubuntu no) + --with-appindicator=$(usex appindicator ubuntu no) --without-libnm-gtk --without-libnma-gtk4 --disable-lto diff --git a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild index 94ff1ec2fb9c..c43ccd0ecaca 100644 --- a/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild +++ b/gnome-extra/nm-applet/nm-applet-1.8.25.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/${PV}-d LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ayatana doc introspection lto modemmanager selinux teamd test wwan" +IUSE="appindicator doc introspection lto modemmanager selinux teamd test wwan" DEPEND=" app-crypt/libsecret @@ -22,7 +22,7 @@ DEPEND=" net-misc/networkmanager x11-libs/gtk+:3[introspection?] x11-libs/libnotify - ayatana? ( + appindicator? ( dev-libs/libappindicator:3 dev-libs/libdbusmenu ) @@ -44,7 +44,7 @@ src_configure() { local emesonargs=( -Dlibnm_gtk=false -Dlibnma_gtk4=false - -Dappindicator=$(usex ayatana yes no) + $(meson_use appindicator) $(meson_use wwan) $(meson_use selinux) $(meson_use teamd team) diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 5129ba4c20e2..14764bc95573 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index ed9c292193e0..424227ceba59 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,2 +1 @@ -DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1 diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch deleted file mode 100644 index e22023f3998e..000000000000 --- a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix build against exiv2-0.27.1 by using upstream recommended catchall header. - ---- a/src/hugin_base/panodata/SrcPanoImage.cpp 2019-02-16 09:18:55.000000000 +0100 -+++ b/src/hugin_base/panodata/SrcPanoImage.cpp 2019-05-21 14:26:23.470193305 +0200 -@@ -40,9 +40,7 @@ - #include - #include - #include --#include --#include --#include -+#include - #include - #include "Exiv2Helper.h" - ---- a/src/hugin1/hugin/RawImport.cpp 2019-02-02 11:11:01.000000000 +0100 -+++ b/src/hugin1/hugin/RawImport.cpp 2019-05-21 14:33:00.522541182 +0200 -@@ -35,10 +35,7 @@ - // workaround for a conflict between exiv2 and wxWidgets/CMake built - #define HAVE_PID_T 1 - #endif --#include --#include --#include --#include -+#include - #ifdef __WXMSW__ - #include - #endif diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild deleted file mode 100644 index 1217aa9474d5..000000000000 --- a/media-gfx/hugin/hugin-2019.0.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0" -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg - -DESCRIPTION="GUI for the creation & processing of panoramic images" -HOMEPAGE="http://hugin.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" -SLOT="0" -KEYWORDS="amd64 arm64 x86" - -LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" -IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" - -CDEPEND=" - !!dev-util/cocom - dev-db/sqlite:3 - dev-libs/boost:= - dev-libs/zthread - >=media-gfx/enblend-4.0 - media-gfx/exiv2:= - media-libs/freeglut - media-libs/glew:= - >=media-libs/libpano13-2.9.19_beta1:0= - media-libs/libpng:0= - media-libs/openexr:= - media-libs/tiff:0 - >=media-libs/vigra-1.11.0[openexr] - sci-libs/fftw:3.0= - sci-libs/flann - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl - x11-libs/wxGTK:3.0=[X,opengl] - lapack? ( virtual/blas virtual/lapack ) - python? ( ${PYTHON_DEPS} ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool - raw? ( media-gfx/dcraw )" -DEPEND="${CDEPEND} - dev-cpp/tclap - sys-devel/gettext - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.4 )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( authors.txt README TODO ) - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366 - -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - -pkg_setup() { - use python && python-single-r1_pkg_setup - setup-wxwidgets -} - -src_prepare() { - sed -i \ - -e "/COMMAND.*GZIP/d" \ - -e "s/\.gz//g" \ - "${S}"/doc/CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HSI=$(usex python) - -DENABLE_LAPACK=$(usex lapack) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - use python && python_optimize - - local lang - for lang in ${LANGS} ; do - case ${lang} in - ca) dir=ca_ES;; - ca-valencia) dir=ca_ES@valencia;; - cs) dir=cs_CZ;; - *) dir=${lang/-/_};; - esac - if ! use l10n_${lang} ; then - rm -r "${ED%/}"/usr/share/locale/${dir} || die - fi - done -} diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest deleted file mode 100644 index 02a7f12a7c9e..000000000000 --- a/media-gfx/qrencode-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qrencode-python-1.02_pre140921.tar.gz 2084 BLAKE2B 19cecad794718a56bb0ac756b322fbeb9a748792bc9683a3c0784c5d2e2638b100fe523b4ab34be5563bd10e5773cc6925dbfbabba48d9487ed2d8e4e86dae57 SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa diff --git a/media-gfx/qrencode-python/metadata.xml b/media-gfx/qrencode-python/metadata.xml deleted file mode 100644 index 8236bfa16a59..000000000000 --- a/media-gfx/qrencode-python/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - qrencode - Arachnid/pyqrencode - - diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild deleted file mode 100644 index 84b7e240314d..000000000000 --- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="A simple wrapper for the C qrencode library" -HOMEPAGE="https://pypi.org/project/qrencode/ https://github.com/Arachnid/pyqrencode/" -#SRC_URI="mirror://pypi/q/qrencode/qrencode-${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="https://github.com/Arachnid/pyqrencode/tarball/486bb7b64e3ce5483f65e375a67da0fa6d02ca92 -> ${P}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="Apache-2.0" -IUSE="" - -RDEPEND=" - dev-python/pillow[${PYTHON_USEDEP}] - media-gfx/qrencode" -DEPEND="${RDEPEND}" diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest deleted file mode 100644 index 6bdc5c97fd57..000000000000 --- a/media-gfx/svg2rlg/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST svg2rlg-0.3.tar.gz 490908 BLAKE2B a3383326d1d503965f93ff3b7b9f144835d5c7ba1613b0bf215ce31cc968eee76c826a170f62a5c4f173c8326dbe4a9f47a9f6f1a1345d2ed9ffd5350077e2e9 SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723 diff --git a/media-gfx/svg2rlg/files/svg2rlg-issue-3.patch b/media-gfx/svg2rlg/files/svg2rlg-issue-3.patch deleted file mode 100644 index df70bf345aa8..000000000000 --- a/media-gfx/svg2rlg/files/svg2rlg-issue-3.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e5aa6784a10717641bc5b6d9d77a5029f815654a -Author: yac -Date: Wed May 8 04:59:17 2013 +0200 - - fix #3 - - remove windows only function which is useless anyway - -diff --git a/svg2rlg.py b/svg2rlg.py -index 1c5f80c..2b35c62 100644 ---- a/svg2rlg.py -+++ b/svg2rlg.py -@@ -1574,5 +1574,3 @@ if __name__ == "__main__": - - drawing = svg2rlg(source) - drawing.save(formats=['pdf'],outDir='.',fnRoot=name) -- -- os.startfile(name + '.pdf') -\ No newline at end of file diff --git a/media-gfx/svg2rlg/files/svg2rlg-issue-6.patch b/media-gfx/svg2rlg/files/svg2rlg-issue-6.patch deleted file mode 100644 index 6ca750e79193..000000000000 --- a/media-gfx/svg2rlg/files/svg2rlg-issue-6.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit e42661b9cd6d7b71ce5e7674ac8eff25c74db07a -Author: yac -Date: Wed May 8 05:00:32 2013 +0200 - - use entry_point fixes #6 - -diff --git a/setup.py b/setup.py -index 9e00fba..512fa79 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,6 +1,6 @@ - #!/usr/bin/python - # -*- coding: utf-8 -*- --from distutils.core import setup -+from setuptools import setup - - setup( - name = 'svg2rlg', -@@ -12,6 +12,8 @@ setup( - url = 'http://code.google.com/p/svg2rlg/', - download_url = 'http://pypi.python.org/pypi/svg2rlg/', - requires = ['reportlab'], -+ entry_points = { -+ 'console_scripts': ['svg2rlg = svg2rlg:main']}, - - classifiers=[ - 'Environment :: Console', -@@ -30,4 +32,4 @@ The authors motivation was to have a more robust handling of - SVG files in the **rst2pdf** tool. Specific to be able to handle - the quirks needed to include SVG export from matplotlib. - ''' --) -\ No newline at end of file -+) -diff --git a/svg2rlg.py b/svg2rlg.py -index 2b35c62..cc812b2 100644 ---- a/svg2rlg.py -+++ b/svg2rlg.py -@@ -1562,7 +1562,7 @@ def svg2rlg(filename): - - return renderer.render(xml) - --if __name__ == "__main__": -+def main(): - import sys - import os - diff --git a/media-gfx/svg2rlg/files/svg2rlg-issue-7.patch b/media-gfx/svg2rlg/files/svg2rlg-issue-7.patch deleted file mode 100644 index 8145f416f804..000000000000 --- a/media-gfx/svg2rlg/files/svg2rlg-issue-7.patch +++ /dev/null @@ -1,16 +0,0 @@ -commit c30b4f90cac69934761e44bf59a8ba8a3827d647 -Author: yac -Date: Wed May 8 05:44:00 2013 +0200 - - fix #7 - -diff --git a/svg2rlg.py b/svg2rlg.py -index cc812b2..80d72de 100644 ---- a/svg2rlg.py -+++ b/svg2rlg.py -@@ -1573,4 +1573,4 @@ def main(): - name, ext = os.path.splitext(filename) - - drawing = svg2rlg(source) -- drawing.save(formats=['pdf'],outDir='.',fnRoot=name) -+ drawing.save(formats=['pdf'],outDir=os.getcwd(),fnRoot=name) diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml deleted file mode 100644 index bba039ed4aed..000000000000 --- a/media-gfx/svg2rlg/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - The tool can be used as a console application to convert SVG to PDF files. - - - svg2rlg - - diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild deleted file mode 100644 index 45e19a443916..000000000000 --- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="python tool to convert SVG files to reportlab graphics" -HOMEPAGE="https://code.google.com/p/svg2rlg/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - dev-python/reportlab[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-issue-3.patch" - "${FILESDIR}/${PN}-issue-6.patch" - "${FILESDIR}/${PN}-issue-7.patch" -) - -python_test() { - ${EPYTHON} test_svg2rlg.py -} - -python_prepare_all() { - find -name '*.py' -exec sed -i 's:\r::' {} + || die - - distutils-r1_python_prepare_all -} diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 3a65b0e4d8eb..f88e8f8ca49e 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest index 5c9c31d072c4..610d57b524cc 100644 --- a/media-libs/faad2/Manifest +++ b/media-libs/faad2/Manifest @@ -1,2 +1 @@ -DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild deleted file mode 100644 index 986d9c873828..000000000000 --- a/media-libs/faad2/faad2-2.8.8.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="AAC audio decoding library" -HOMEPAGE="https://www.audiocoding.com/faad2.html" -SRC_URI="mirror://sourceforge/faac/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="digitalradio static-libs" - -RDEPEND="" -DEPEND="" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -PATCHES=( "${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch ) - -src_prepare() { - default - - sed -i -e 's:iquote :I:' libfaad/Makefile.am || die - - # bug 466986 - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - - eautoreconf -} - -multilib_src_configure() { - local myconf=( - --without-xmms - $(use_with digitalradio drm) - $(use_enable static-libs static) - ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - # do not build the frontend for non default abis - if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then - sed -i -e 's/frontend//' Makefile || die - fi -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - einstalldocs -} diff --git a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch deleted file mode 100644 index 68b21a966be3..000000000000 --- a/media-libs/faad2/files/faad2-2.8.5-libmp4ff-shared-lib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- faad2-2.8.5/common/mp4ff/Makefile.am -+++ faad2-2.8.5/common/mp4ff/Makefile.am -@@ -1,7 +1,8 @@ --noinst_LIBRARIES = libmp4ff.a --noinst_HEADERS = mp4ff.h mp4ffint.h -+lib_LTLIBRARIES = libmp4ff.la -+include_HEADERS = mp4ff.h mp4ffint.h - --libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 -+AM_CFLAGS = -DUSE_TAGGING=1 - --libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ -+libmp4ff_la_LDFLAGS = -version-info 0:0:0 -+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ - mp4tagupdate.c mp4ff.h mp4ffint.h diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 38574fa2feff..ce21f1f3af7a 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/lyvi/Manifest b/media-sound/lyvi/Manifest deleted file mode 100644 index 5777a58027bc..000000000000 --- a/media-sound/lyvi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lyvi-2.0.0.tar.gz 19307 BLAKE2B 009af146f917ed7867c737a78c50261b688b4b78e104518338462b3f1372656298bcda5ef0b70f8a84db800488a57ba4c665884ff5fa2f992d53d3940e204f47 SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045 diff --git a/media-sound/lyvi/lyvi-2.0.0.ebuild b/media-sound/lyvi/lyvi-2.0.0.ebuild deleted file mode 100644 index 8ce633a5a346..000000000000 --- a/media-sound/lyvi/lyvi-2.0.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="A simple command-line lyrics viewer" -HOMEPAGE="http://ok100.github.io/lyvi/" -SRC_URI="https://github.com/ok100/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="WTFPL-2" -KEYWORDS="amd64" -SLOT="0" -IUSE="mpris" - -RDEPEND=" - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/plyr[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/urwid[${PYTHON_USEDEP}] - mpris? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ) -" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -python_prepare_all() { - # Remove pip dependency - sed -e '/require/d' --in-place setup.py || die - distutils-r1_python_prepare_all -} diff --git a/media-sound/lyvi/metadata.xml b/media-sound/lyvi/metadata.xml deleted file mode 100644 index f3d45549a2d9..000000000000 --- a/media-sound/lyvi/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Lyvi is a lyrics, artist info and guitar tabs - viewer. On supported terminals, Lyvi can also show artist photos and - cover images. - - - Enable MPRIS support - - - ok100/lyvi - - diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index f478e885a7c9..9a1118720b2a 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest deleted file mode 100644 index 181187ce8620..000000000000 --- a/media-video/griffith/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed -DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734 diff --git a/media-video/griffith/files/0.10-fix_lib_path.patch b/media-video/griffith/files/0.10-fix_lib_path.patch deleted file mode 100644 index 9c918b25f487..000000000000 --- a/media-video/griffith/files/0.10-fix_lib_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/initialize.py -=================================================================== ---- a/lib/initialize.py -+++ b/lib/initialize.py -@@ -73,7 +73,7 @@ def locations(self, home_dir): - os.environ['LANG'] = lang - - elif os.name == 'posix': -- locations['share'] = os.path.abspath(os.path.join(locations['lib'], '..')) -+ locations['share'] = os.path.abspath(os.path.join(locations['lib'], '../../share/griffith/')) - locations['glade'] = os.path.join(locations['share'], 'glade') - locations['i18n'] = os.path.abspath(os.path.join(locations['share'], '..', 'locale')) - if not os.path.isdir(locations['i18n']): diff --git a/media-video/griffith/files/griffith-0.13-validators.patch b/media-video/griffith/files/griffith-0.13-validators.patch deleted file mode 100644 index 9c39feec0095..000000000000 --- a/media-video/griffith/files/griffith-0.13-validators.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- griffith-0.13/lib/db/validators.py -+++ griffith-0.13/lib/db/validators.py -@@ -23,7 +23,13 @@ - - import logging - --from sqlalchemy.orm.interfaces import AttributeExtension, InstrumentationManager -+from sqlalchemy.orm.interfaces import AttributeExtension -+try: -+ # sql alchemy 0.8 (and above) -+ from sqlalchemy.ext.instrumentation import InstrumentationManager -+except: -+ # sql alchemy 0.7 -+ from sqlalchemy.orm.interfaces import InstrumentationManager - from sqlalchemy.orm import ColumnProperty - from sqlalchemy.types import String - diff --git a/media-video/griffith/griffith-0.13-r3.ebuild b/media-video/griffith/griffith-0.13-r3.ebuild deleted file mode 100644 index d606fd887aac..000000000000 --- a/media-video/griffith/griffith-0.13-r3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='sqlite' - -inherit python-single-r1 - -ARTWORK_PV="0.9.4" - -DESCRIPTION="Movie collection manager" -HOMEPAGE="http://www.griffith.cc/" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz - https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - gnome-base/libglade[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygtk-2.6.1:2[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlalchemy-0.5.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/reportlab-1.19[${PYTHON_MULTI_USEDEP}] - ')" -DEPEND="${RDEPEND} - doc? ( app-text/docbook2X )" - -PATCHES=( - "${FILESDIR}/0.10-fix_lib_path.patch" - "${FILESDIR}/griffith-0.13-validators.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - use doc || { sed -i -e '/docs/d' Makefile || die ; } - sed -i \ - -e 's#/pl/#/pl.UTF-8/#' \ - "${S}"/docs/pl/Makefile || die "sed failed" - - sed -i \ - -e 's/ISO-8859-1/UTF-8/' \ - "${S}"/lib/gconsole.py || die "sed failed" - - default -} - -src_compile() { - # Nothing to compile and default `emake` spews an error message - true -} - -src_install() { - if ! use doc ; then - sed -i -e '/docs/d' Makefile || die - fi - - emake \ - LIBDIR="${D}/usr/$(get_libdir)/griffith" \ - DESTDIR="${D}" DOC2MAN=docbook2man.pl install - dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS - - cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die - emake DESTDIR="${D}" install - # This carries over from -0.13 but appears to have no effect. - python_optimize "${ED}"/usr/share/${PN} -} - -pkg_postinst() { - einfo - einfo "${PN} can make use of the following optional dependencies" - einfo "dev-python/chardet: CSV file encoding detections" - einfo "dev-python/mysql-python: Python interface for MySQL connectivity" - einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity" - einfo -} diff --git a/media-video/griffith/metadata.xml b/media-video/griffith/metadata.xml deleted file mode 100644 index ec78ebbf0801..000000000000 --- a/media-video/griffith/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - media-video@gentoo.org - Gentoo Video project - - - griffith - - diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 39ca8d3e6109..70dab8d3bfb4 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,2 +1,3 @@ DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d +DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a diff --git a/media-video/handbrake/handbrake-1.3.2.ebuild b/media-video/handbrake/handbrake-1.3.2.ebuild new file mode 100644 index 000000000000..e5a5b3021946 --- /dev/null +++ b/media-video/handbrake/handbrake-1.3.2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools eutils gnome2-utils python-any-r1 xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" + inherit git-r3 + KEYWORDS="" +else + MY_P="HandBrake-${PV}" + SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${MY_P}" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" +HOMEPAGE="http://handbrake.fr/" +LICENSE="GPL-2" + +SLOT="0" +IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265" + +REQUIRED_USE="^^ ( fdk libav-aac )" + +RDEPEND=" + app-arch/xz-utils + media-libs/speex + dev-libs/jansson + dev-libs/libxml2 + media-libs/a52dec + media-libs/libass:= + >=media-libs/libbluray-1.0 + >=media-libs/dav1d-0.5.1 + media-libs/libdvdnav + media-libs/libdvdread:= + media-libs/libsamplerate + media-libs/libtheora + media-libs/libvorbis + >=media-libs/libvpx-1.8 + nvenc? ( media-libs/nv-codec-headers ) + media-libs/opus + media-libs/x264:= + media-sound/lame + sys-libs/zlib + >=media-video/ffmpeg-4.2.1:0=[fdk?] + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-ugly:1.0 + media-plugins/gst-plugins-a52dec:1.0 + media-plugins/gst-plugins-libav:1.0 + media-plugins/gst-plugins-x264:1.0 + media-plugins/gst-plugins-gdkpixbuf:1.0 + ) + gtk? ( + >=x11-libs/gtk+-3.10 + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libgudev:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/libnotify + x11-libs/pango + ) + fdk? ( media-libs/fdk-aac ) + x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) + " + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/yasm + dev-util/intltool + sys-devel/automake" + +PATCHES=( + # Remove libdvdnav duplication and call it on the original instead. + # It may work this way; if not, we should try to mimic the duplication. + "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" + + # Remove faac dependency; TODO: figure out if we need to do this at all. + "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" + + # Use whichever python is set by portage + "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch" +) + +src_prepare() { + # Get rid of leftover bundled library build definitions, + sed -i 's:.*\(/contrib\|contrib/\).*::g' \ + "${S}"/make/include/main.defs \ + || die "Contrib removal failed." + + default + + cd "${S}/gtk" + # Don't run autogen.sh. + sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed" + eautoreconf +} + +src_configure() { + # Libav was replaced in 1.2 with ffmpeg by default + # but I've elected to not make people change their use flags for AAC + # as its the same code anyway + ./configure \ + --force \ + --verbose \ + --prefix="${EPREFIX}/usr" \ + --disable-gtk-update-checks \ + --disable-flatpak \ + --disable-gtk4 \ + $(use_enable libav-aac ffmpeg-aac) \ + $(use_enable fdk fdk-aac) \ + $(usex !gtk --disable-gtk) \ + $(usex !gstreamer --disable-gst) \ + $(use_enable numa) \ + $(use_enable nvenc) \ + $(use_enable x265) || die "Configure failed." +} + +src_compile() { + emake -C build + + # TODO: Documentation building is currently broken, try to fix it. + # + # if use doc ; then + # emake -C build doc + # fi +} + +src_install() { + emake -C build DESTDIR="${D}" install + + dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown +} + +pkg_postinst() { + einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they" + einfo "do not use the bundled (and often patched) upstream libraries." + einfo "" + einfo "Please do not raise bugs with upstream because of these ebuilds," + einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead." + + einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." + if use gtk ; then + einfo "For the GTK+ version of HandBrake, you can run \`ghb\`." + fi + + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz index 2ec44cb101d2..80bafbc084b6 100644 Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 496402f9c8ac..bdf6807a19df 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Sat, 23 May 2020 09:38:16 +0000 +Sat, 23 May 2020 13:38:15 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 496402f9c8ac..bdf6807a19df 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Sat, 23 May 2020 09:38:16 +0000 +Sat, 23 May 2020 13:38:15 +0000 diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz index 1e9170f0f63a..d352833ad029 100644 Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz index 4445024c0154..4386cd6fa82c 100644 Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ diff --git a/metadata/md5-cache/app-backup/bup-0.29.2 b/metadata/md5-cache/app-backup/bup-0.29.2 deleted file mode 100644 index 1495e9b56225..000000000000 --- a/metadata/md5-cache/app-backup/bup-0.29.2 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=configure install setup test -DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/par2cmdline sys-libs/readline:0 dev-vcs/git python_single_target_python2_7? ( dev-python/fuse-python[python_targets_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)] web? ( www-servers/tornado[python_targets_python2_7(-)] ) ) test? ( dev-lang/perl net-misc/rsync ) doc? ( app-text/pandoc ) -DESCRIPTION=A highly efficient backup system based on the git packfile format -EAPI=6 -HOMEPAGE=https://bup.github.io/ https://github.com/bup/bup -IUSE=+doc test web +python_single_target_python2_7 -KEYWORDS=~amd64 ~x86 -LICENSE=LGPL-2 -RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/par2cmdline sys-libs/readline:0 dev-vcs/git python_single_target_python2_7? ( dev-python/fuse-python[python_targets_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)] web? ( www-servers/tornado[python_targets_python2_7(-)] ) ) -REQUIRED_USE=^^ ( python_single_target_python2_7 ) -RESTRICT=test -SLOT=0 -SRC_URI=https://github.com/bup/bup/archive/0.29.2.tar.gz -> bup-0.29.2.tar.gz -_eclasses_=multilib 797cda3549becfe50afdfa35192ca137 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=d4be65f0019be5549015031f94443d58 diff --git a/metadata/md5-cache/app-backup/kup-0.7.3 b/metadata/md5-cache/app-backup/kup-0.7.3 deleted file mode 100644 index 22f5c087f389..000000000000 --- a/metadata/md5-cache/app-backup/kup-0.7.3 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 -DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack -DEPEND=dev-libs/libgit2:= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5 -DESCRIPTION=Backup scheduler for KDE's Plasma desktop -EAPI=7 -HOMEPAGE=https://www.linux-apps.com/p/1127689 -IUSE=debug +handbook -KEYWORDS=~amd64 -LICENSE=GPL-2 -RDEPEND=dev-libs/libgit2:= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 app-backup/bup >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 net-misc/rsync || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 -SLOT=5 -SRC_URI=https://github.com/spersson/Kup/archive/kup-0.7.3.tar.gz -_eclasses_=cmake 19b0421555865baefd505831dd4303e3 ecm e341cb3583b4219b5c207e24915b0264 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 kde.org 596b871a241e5fd1e87395541c8831a9 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=96af66505805a0fe385c3bdef619c993 diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz index b586fde2895a..0ff02eff9a60 100644 Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ diff --git a/metadata/md5-cache/app-misc/openastro-1.1.56 b/metadata/md5-cache/app-misc/openastro-1.1.56 deleted file mode 100644 index 7758d678ebc5..000000000000 --- a/metadata/md5-cache/app-misc/openastro-1.1.56 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=app-misc/openastro-data[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[svg(+),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyswisseph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/librsvg:2[introspection] x11-libs/gtk+:3[introspection] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A fully-featured Open Source Astrology Program -EAPI=6 -HOMEPAGE=https://www.openastro.org -IUSE=jpeg png python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3+ -RDEPEND=app-misc/openastro-data[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[svg(+),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyswisseph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/librsvg:2[introspection] x11-libs/gtk+:3[introspection] jpeg? ( media-gfx/imagemagick[jpeg,svg] ) png? ( media-gfx/imagemagick[png,svg] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org/openastro.org_1.1.56.orig.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=d6668f37b032fd15a5cb7179af66164e diff --git a/metadata/md5-cache/app-misc/openastro-data-1.8 b/metadata/md5-cache/app-misc/openastro-data-1.8 deleted file mode 100644 index 98451a91a951..000000000000 --- a/metadata/md5-cache/app-misc/openastro-data-1.8 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=OpenAstro data files, ephemeris, famous people database, geo database -EAPI=6 -HOMEPAGE=https://www.openastro.org -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3+ -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.8.orig.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=b9f69c8d8d78287890899beb1dfde549 diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz index 2540bb862507..d0e7de186036 100644 Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ diff --git a/metadata/md5-cache/app-text/doconce-1.4.4 b/metadata/md5-cache/app-text/doconce-1.4.4 deleted file mode 100644 index f00dcc264bd8..000000000000 --- a/metadata/md5-cache/app-text/doconce-1.4.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A markdown-like langauge to generate docs in html, LaTeX, and many other formats -EAPI=6 -HOMEPAGE=https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/ -IUSE=doc python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.4.4.tar.bz2 -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=2879d931f84b826344b3991920cdd256 diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz index 769409e3c1ce..c87513ec85bc 100644 Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.45 b/metadata/md5-cache/dev-db/mariadb-10.1.45 new file mode 100644 index 000000000000..876c4c4fa78d --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-10.1.45 @@ -0,0 +1,16 @@ +DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack +DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=An enhanced, drop-in replacement for MySQL +EAPI=6 +HOMEPAGE=https://mariadb.org/ +IUSE=+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup systemd systemtap static static-libs tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) ) +RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) +REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam ) +RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.45/source/mariadb-10.1.45.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.1.45-patches-01.tar.xz +_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multilib-build dfda7934df092a96e439c05b4aeac519 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=c026299748988146f9c92f11ccdb3ac5 diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.32 b/metadata/md5-cache/dev-db/mariadb-10.2.32 new file mode 100644 index 000000000000..613eb3a48deb --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-10.2.32 @@ -0,0 +1,16 @@ +DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack +DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=An enhanced, drop-in replacement for MySQL +EAPI=6 +HOMEPAGE=https://mariadb.org/ +IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=GPL-2 LGPL-2.1+ +PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[static=] galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) ) +RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) +REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam ) +RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.32/source/mariadb-10.2.32.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.32-patches-01.tar.xz +_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=ff04d0c97b1f1d5890649c8d392c9d71 diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.23 b/metadata/md5-cache/dev-db/mariadb-10.3.23 new file mode 100644 index 000000000000..35b701a14401 --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-10.3.23 @@ -0,0 +1,16 @@ +DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack +DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=An enhanced, drop-in replacement for MySQL +EAPI=6 +HOMEPAGE=https://mariadb.org/ +IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=GPL-2 LGPL-2.1+ +PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[static=] ) +RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) +REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam ) +RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.23/source/mariadb-10.3.23.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.23-patches-01.tar.xz +_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=a63b4a12aa320043b318f64c4306aed3 diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.13 b/metadata/md5-cache/dev-db/mariadb-10.4.13 new file mode 100644 index 000000000000..e511dbf4b5af --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-10.4.13 @@ -0,0 +1,17 @@ +BDEPEND=virtual/yacc || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig dev-util/ninja dev-util/cmake +DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack +DEPEND=static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) +DESCRIPTION=An enhanced, drop-in replacement for MySQL +EAPI=7 +HOMEPAGE=https://mariadb.org/ +IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=GPL-2 LGPL-2.1+ +PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[static=] ) +RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) +REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam ) +RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.13/source/mariadb-10.4.13.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.13-patches-01.tar.xz +_eclasses_=cmake 19b0421555865baefd505831dd4303e3 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=2d1cc9c53b0d1863b73fadcca72d068a diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.68 b/metadata/md5-cache/dev-db/mariadb-5.5.68 new file mode 100644 index 000000000000..35df86e19106 --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-5.5.68 @@ -0,0 +1,16 @@ +DEFINED_PHASES=compile config configure install postinst prepare setup test unpack +DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( =sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=An enhanced, drop-in replacement for MySQL +EAPI=6 +HOMEPAGE=https://mariadb.org/ +IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl oqgraph pam +perl profiling selinux +server sphinx static static-libs systemtap tcmalloc test tokudb yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) +RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( =sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam ) +RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-5.5.68/source/mariadb-5.5.68.tar.gz mirror://gentoo/mysql-extras-20200523-1221Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200523-1221Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20200523-1221Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20200523-1221Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20200523-1221Z.tar.bz2 +_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multilib-build dfda7934df092a96e439c05b4aeac519 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=5a93aa4d7969ec5caf0df952cd7a27fd diff --git a/metadata/md5-cache/dev-perl/Class-Adapter-1.90.0 b/metadata/md5-cache/dev-perl/Class-Adapter-1.90.0 new file mode 100644 index 000000000000..0e3e3cef2cf9 --- /dev/null +++ b/metadata/md5-cache/dev-perl/Class-Adapter-1.90.0 @@ -0,0 +1,15 @@ +BDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.100.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-Test-Simple ) dev-lang/perl +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-lang/perl +DESCRIPTION=Implementation of the 'Adapter' Design Pattern +EAPI=7 +HOMEPAGE=https://metacpan.org/release/Class-Adapter +IUSE=test +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.100.0 dev-lang/perl:= +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Adapter-1.09.tar.gz +_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 +_md5_=1c7210d5401d2e869a2c5c3d1470dbf8 diff --git a/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r3 b/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r3 new file mode 100644 index 000000000000..66f70c9d9f31 --- /dev/null +++ b/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r3 @@ -0,0 +1,15 @@ +BDEPEND=>=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Scalar-List-Utils-1.180.0 >=virtual/perl-ExtUtils-MakeMaker-6.620.0 test? ( >=virtual/perl-File-Temp-0.170.0 >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-lang/perl +DESCRIPTION=Runtime aspect loading of one or more classes +EAPI=7 +HOMEPAGE=https://metacpan.org/release/Class-Autouse +IUSE=test +KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Scalar-List-Utils-1.180.0 dev-lang/perl:= +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz +_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 +_md5_=2b441ce6a2ec2c3208e94e8281d88dd0 diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz index d07804f9e1cb..f72600b5b0e6 100644 Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz index 1e1351bf6925..5beffb3e811f 100644 Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ diff --git a/metadata/md5-cache/dev-python/PyDbLite-3.0.4 b/metadata/md5-cache/dev-python/PyDbLite-3.0.4 deleted file mode 100644 index ba7a74778f62..000000000000 --- a/metadata/md5-cache/dev-python/PyDbLite-3.0.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] -DESCRIPTION=A fast, pure-Python in-memory database -EAPI=5 -HOMEPAGE=https://pypi.org/project/PyDbLite/ -IUSE=python_targets_pypy3 python_targets_python3_6 -KEYWORDS=~amd64 -LICENSE=BSD -RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/P/PyDbLite/PyDbLite-3.0.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=318a93d7f6aab193390ff62715c2b4f5 diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.3 b/metadata/md5-cache/dev-python/URLObject-2.4.3 deleted file mode 100644 index abdab5832522..000000000000 --- a/metadata/md5-cache/dev-python/URLObject-2.4.3 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A utility class for manipulating URLs -EAPI=6 -HOMEPAGE=https://pypi.org/project/URLObject/ -IUSE=test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/zacharyvoase/urlobject/archive/v2.4.3.tar.gz -> urlobject-2.4.3.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=a6353bdcba538c72ca07f1e20c011609 diff --git a/metadata/md5-cache/dev-python/cligj-0.4.0 b/metadata/md5-cache/dev-python/cligj-0.4.0 deleted file mode 100644 index d7ba883e1a22..000000000000 --- a/metadata/md5-cache/dev-python/cligj-0.4.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Click-based argument and option decorators for Python GIS command line programs -EAPI=6 -HOMEPAGE=https://github.com/mapbox/cligj -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/c/cligj/cligj-0.4.0.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=39fcb3daeb6d41366b05f716b20efc67 diff --git a/metadata/md5-cache/dev-python/demjson-2.2.4 b/metadata/md5-cache/dev-python/demjson-2.2.4 deleted file mode 100644 index 2a45ab046ed1..000000000000 --- a/metadata/md5-cache/dev-python/demjson-2.2.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] -DESCRIPTION=Encoder, decoder, and lint/validator for JSON compliant with RFC 4627 -EAPI=5 -HOMEPAGE=http://deron.meranda.us/python/demjson/ https://pypi.org/project/demjson/ -IUSE=doc python_targets_pypy3 python_targets_python3_6 -KEYWORDS=amd64 ~arm x86 -LICENSE=LGPL-3 -RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 ) -SLOT=0 -SRC_URI=http://deron.meranda.us/python/demjson/dist/demjson-2.2.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=e159cc21192c8e40dc4647a7af99c25d diff --git a/metadata/md5-cache/dev-python/dexml-0.5.1 b/metadata/md5-cache/dev-python/dexml-0.5.1 deleted file mode 100644 index 18ede73b244c..000000000000 --- a/metadata/md5-cache/dev-python/dexml-0.5.1 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] -DESCRIPTION=Dead-simple Object-XML mapper for Python -EAPI=6 -HOMEPAGE=https://pypi.org/project/dexml/ -IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 -KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux -LICENSE=MIT -RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=mirror://pypi/d/dexml/dexml-0.5.1.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=32788369768ed33fcd970b00404b01a6 diff --git a/metadata/md5-cache/dev-python/django-durationfield-0.5.4 b/metadata/md5-cache/dev-python/django-durationfield-0.5.4 deleted file mode 100644 index dde2d4bdd6a4..000000000000 --- a/metadata/md5-cache/dev-python/django-durationfield-0.5.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=>=dev-python/django-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Reusable app for adding a DurationField to Django -EAPI=5 -HOMEPAGE=https://pypi.org/project/django-durationfield/ -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=>=dev-python/django-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/d/django-durationfield/django-durationfield-0.5.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=56653f8469eac792e62aedd84219b978 diff --git a/metadata/md5-cache/dev-python/django-setuptest-0.2.1 b/metadata/md5-cache/dev-python/django-setuptest-0.2.1 deleted file mode 100644 index f9299cd674fc..000000000000 --- a/metadata/md5-cache/dev-python/django-setuptest-0.2.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Simple test suite enabling Django app testing via setup.py -EAPI=5 -HOMEPAGE=https://github.com/praekelt/django-setuptest -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=MIT -RDEPEND=dev-python/pep8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/django[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/praekelt/django-setuptest/archive/0.2.1.tar.gz -> django-setuptest-0.2.1.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=c770b5dfcf18d9e3e35c85f68ccd114d diff --git a/metadata/md5-cache/dev-python/django-spurl-0.6.4 b/metadata/md5-cache/dev-python/django-spurl-0.6.4 deleted file mode 100644 index 755c36cb2ec7..000000000000 --- a/metadata/md5-cache/dev-python/django-spurl-0.6.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=>=dev-python/django-1.4 dev-python/six dev-python/nose dev-python/URLObject dev-python/setuptools python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A Django template library for manipulating URLs -EAPI=5 -HOMEPAGE=https://pypi.org/project/django-spurl/ -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=>=dev-python/django-1.4 dev-python/six dev-python/nose dev-python/URLObject python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/d/django-spurl/django-spurl-0.6.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=7bd94229219317852b2e19c3b8c3a562 diff --git a/metadata/md5-cache/dev-python/filemagic-1.6 b/metadata/md5-cache/dev-python/filemagic-1.6 deleted file mode 100644 index f89ef55e0079..000000000000 --- a/metadata/md5-cache/dev-python/filemagic-1.6 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/file python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A Python API for libmagic, the library behind the Unix file command -EAPI=6 -HOMEPAGE=https://pypi.org/project/filemagic/ https://github.com/aliles/filemagic -IUSE=python_targets_python3_6 -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -LICENSE=Apache-2.0 -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/f/filemagic/filemagic-1.6.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=65caa0d1ec78fd0adf7b37264e9c99fc diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1 deleted file mode 100644 index 824d1aa0f730..000000000000 --- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/flask-appconfig[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask-debug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask-nav[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask-wtf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dominate[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/visitor[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wtforms[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) doc? ( dev-python/alabaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) -DESCRIPTION=An extension that includes Bootstrap in your project, without boilerplate code -EAPI=7 -HOMEPAGE=https://pythonhosted.org/Flask-Bootstrap/ -IUSE=doc test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=dev-python/dominate[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/visitor[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wtforms[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.7.1.tar.gz -> flask-bootstrap-3.3.7.1.tar.gz -_eclasses_=distutils-r1 054fa5f0442c7ccb4d4a05410d92123b multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=3f1d1d30fb9d89cf4f7181f05503ef9c diff --git a/metadata/md5-cache/dev-python/ipdbplugin-1.4 b/metadata/md5-cache/dev-python/ipdbplugin-1.4 deleted file mode 100644 index 1841005653df..000000000000 --- a/metadata/md5-cache/dev-python/ipdbplugin-1.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/ipython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipdb dev-python/nose dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Nose plugin to use iPdb instead of Pdb when tests fail -EAPI=5 -HOMEPAGE=https://pypi.org/project/ipdbplugin/ -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=LGPL-2 -RDEPEND=dev-python/ipython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipdb dev-python/nose python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/i/ipdbplugin/ipdbplugin-1.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=e6e2d871b83bb1ed39d76d7b3d4ee9b4 diff --git a/metadata/md5-cache/dev-python/ipdbplugin-9999 b/metadata/md5-cache/dev-python/ipdbplugin-9999 deleted file mode 100644 index f12a3a616b23..000000000000 --- a/metadata/md5-cache/dev-python/ipdbplugin-9999 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-python/ipython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipdb dev-python/nose dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] -DESCRIPTION=Nose plugin to use iPdb instead of Pdb when tests fail -EAPI=5 -HOMEPAGE=https://pypi.org/project/ipdbplugin/ -IUSE=python_targets_python3_6 -LICENSE=LGPL-2 -PROPERTIES=live -RDEPEND=dev-python/ipython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipdb dev-python/nose python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=e6e2d871b83bb1ed39d76d7b3d4ee9b4 diff --git a/metadata/md5-cache/dev-python/junit-xml-1.8 b/metadata/md5-cache/dev-python/junit-xml-1.8 deleted file mode 100644 index 18b5fbb7a765..000000000000 --- a/metadata/md5-cache/dev-python/junit-xml-1.8 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Python module for creating JUnit XML test result documents -EAPI=6 -HOMEPAGE=https://pypi.org/project/junit-xml https://github.com/kyrus/python-junit-xml -IUSE=test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=MIT -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=mirror://pypi/j/junit-xml/junit-xml-1.8.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=f10106e6db8b588d6b66c1702e87e86a diff --git a/metadata/md5-cache/dev-python/kivy-garden-0.1.4 b/metadata/md5-cache/dev-python/kivy-garden-0.1.4 deleted file mode 100644 index 02eb09dec6a3..000000000000 --- a/metadata/md5-cache/dev-python/kivy-garden-0.1.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test -DEPEND=dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Kivys Garden tool to manage flowers -EAPI=6 -HOMEPAGE=http://kivy-garden.github.io/ -IUSE=python_targets_python3_6 -KEYWORDS=amd64 x86 -LICENSE=MIT -RDEPEND=dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://pypi.io/packages/source/k/kivy-garden/kivy-garden-0.1.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=c29aa5a2f6c6104cee3b72172aa8e7ef diff --git a/metadata/md5-cache/dev-python/rarfile-3.0-r1 b/metadata/md5-cache/dev-python/rarfile-3.0-r1 new file mode 100644 index 000000000000..86e564bd3447 --- /dev/null +++ b/metadata/md5-cache/dev-python/rarfile-3.0-r1 @@ -0,0 +1,15 @@ +BDEPEND=test? ( compressed? ( || ( app-arch/unrar app-arch/rar ) ) dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=Module for RAR archive reading +EAPI=7 +HOMEPAGE=https://github.com/markokr/rarfile +IUSE=+compressed test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +KEYWORDS=~amd64 ~x86 +LICENSE=ISC +RDEPEND=compressed? ( || ( app-arch/unrar app-arch/rar ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] +REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://pypi/r/rarfile/rarfile-3.0.tar.gz +_eclasses_=distutils-r1 054fa5f0442c7ccb4d4a05410d92123b multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=ddc04c0448b4796dcafc015a42369e96 diff --git a/metadata/md5-cache/dev-python/rst2pdf-0.93-r3 b/metadata/md5-cache/dev-python/rst2pdf-0.93-r3 deleted file mode 100644 index 0465c8652763..000000000000 --- a/metadata/md5-cache/dev-python/rst2pdf-0.93-r3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test -DEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pdfrw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] svg? ( media-gfx/svg2rlg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=Tool for transforming reStructuredText to PDF using ReportLab -EAPI=5 -HOMEPAGE=http://rst2pdf.ralsina.me/ https://pypi.org/project/rst2pdf/ -IUSE=svg python_targets_python2_7 -KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 -LICENSE=MIT -RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pdfrw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] svg? ( media-gfx/svg2rlg ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=https://github.com/rst2pdf/rst2pdf/archive/0.93.tar.gz -> rst2pdf-0.93.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=539436e1410d4b2b573fca8fef022290 diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz index 7a6ba341f353..2aca1eeca64c 100644 Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ diff --git a/metadata/md5-cache/dev-util/bumpversion-0.5.3 b/metadata/md5-cache/dev-util/bumpversion-0.5.3 deleted file mode 100644 index bb0c84eff6c2..000000000000 --- a/metadata/md5-cache/dev-util/bumpversion-0.5.3 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Version-bump your software with a single command -EAPI=5 -HOMEPAGE=https://pypi.org/project/bumpversion/ https://github.com/peritus/bumpversion -IUSE=test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux -LICENSE=MIT -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://pypi/b/bumpversion/bumpversion-0.5.3.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=651856d8c0b01f612b6b836e67b4767d diff --git a/metadata/md5-cache/dev-util/radare2-4.4.0-r1 b/metadata/md5-cache/dev-util/radare2-4.4.0-r1 new file mode 100644 index 000000000000..bd7324131b59 --- /dev/null +++ b/metadata/md5-cache/dev-util/radare2-4.4.0-r1 @@ -0,0 +1,14 @@ +BDEPEND=virtual/pkgconfig +DEFINED_PHASES=configure install +DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) +DESCRIPTION=unix-like reverse engineering framework and commandline tools +EAPI=7 +HOMEPAGE=http://www.radare.org +IUSE=ssl libressl +KEYWORDS=~amd64 ~arm ~arm64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) +SLOT=0 +SRC_URI=https://github.com/radareorg/radare2/archive/4.4.0.tar.gz -> radare2-4.4.0.tar.gz +_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=621b289e2d32387393fb278d450d19e1 diff --git a/metadata/md5-cache/dev-util/shards-0.10.0 b/metadata/md5-cache/dev-util/shards-0.10.0 new file mode 100644 index 000000000000..1816ecf6352e --- /dev/null +++ b/metadata/md5-cache/dev-util/shards-0.10.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install prepare +DEPEND=>dev-lang/crystal-0.11.1[yaml] +DESCRIPTION=Dependency manager for the Crystal language +EAPI=7 +HOMEPAGE=https://github.com/crystal-lang/shards +KEYWORDS=~amd64 +LICENSE=Apache-2.0 +RDEPEND=>dev-lang/crystal-0.11.1[yaml] +RESTRICT=test +SLOT=0 +SRC_URI=https://github.com/crystal-lang/shards/archive/v0.10.0.tar.gz -> shards-0.10.0.tar.gz https://github.com/crystal-lang/crystal-molinillo/archive/v0.1.0.tar.gz -> crystal-molinillo-0.1.0.tar.gz +_eclasses_=multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=c579e4793b4391d1a97ce08b38295ca2 diff --git a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7 b/metadata/md5-cache/dev-util/spec-cleaner-1.0.7 deleted file mode 100644 index 5a5153bedd5c..000000000000 --- a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=SUSE spec file cleaner and formatter -EAPI=6 -HOMEPAGE=https://github.com/openSUSE/spec-cleaner -IUSE=test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=app-arch/rpm-4.11.0.1 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.7.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=80f894c8da528177683ff7d9c44d4f3b diff --git a/metadata/md5-cache/dev-util/spec-cleaner-9999 b/metadata/md5-cache/dev-util/spec-cleaner-9999 deleted file mode 100644 index 368331e29bd4..000000000000 --- a/metadata/md5-cache/dev-util/spec-cleaner-9999 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] -DESCRIPTION=SUSE spec file cleaner and formatter -EAPI=6 -HOMEPAGE=https://github.com/openSUSE/spec-cleaner -IUSE=test python_targets_python3_6 -LICENSE=BSD -PROPERTIES=live -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=app-arch/rpm-4.11.0.1 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=80f894c8da528177683ff7d9c44d4f3b diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz index 4266b9af91bd..4de13da9c7f3 100644 Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ diff --git a/metadata/md5-cache/dev-vcs/ghp-import-0.4.1-r1 b/metadata/md5-cache/dev-vcs/ghp-import-0.4.1-r1 deleted file mode 100644 index f70fbbe544fd..000000000000 --- a/metadata/md5-cache/dev-vcs/ghp-import-0.4.1-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Copy your docs directly to the gh-pages branch -EAPI=5 -HOMEPAGE=https://github.com/davisp/ghp-import -IUSE=python_targets_python3_6 -KEYWORDS=amd64 -LICENSE=tumbolia -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://pypi/g/ghp-import/ghp-import-0.4.1.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=b317c3cba8f65eaa23f6c9ed43409d41 diff --git a/metadata/md5-cache/dev-vcs/git-imerge-1.0.0 b/metadata/md5-cache/dev-vcs/git-imerge-1.0.0 deleted file mode 100644 index dae62f783fa4..000000000000 --- a/metadata/md5-cache/dev-vcs/git-imerge-1.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=dev-python/docutils -DESCRIPTION=Incremental merge for git -EAPI=6 -HOMEPAGE=https://github.com/mhagger/git-imerge -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2+ -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-vcs/git -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/mhagger/git-imerge/archive/v1.0.0.tar.gz -> git-imerge-1.0.0.tar.gz -_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=9914a3cf237e7cfdc7ba9b2ed4839770 diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz index 6ff06211c067..4ef0becfde7e 100644 Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-33 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-33 index be207ed8e890..9b7f2a96c444 100644 --- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-33 +++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-33 @@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst DESCRIPTION=Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome EAPI=7 HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=GPL-2 RDEPEND=app-eselect/eselect-gnome-shell-extensions dev-libs/libappindicator:3 >=gnome-base/gnome-shell-3.34 SLOT=0 SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v33.tar.gz -> gnome-shell-extension-appindicator-33.tar.gz -_md5_=1494c0662409e38cec8f863114528280 +_md5_=e97db1e4959f186c88054a01daacbbaf diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.24-r1 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.24-r1 index 58f7c319edd4..44d30e5912bf 100644 --- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.24-r1 +++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.24-r1 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare -DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 dev-libs/libgudev:= >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=sys-devel/gettext-0.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info +DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 dev-libs/libgudev:= >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=sys-devel/gettext-0.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info DESCRIPTION=GNOME applet for NetworkManager EAPI=6 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager -IUSE=ayatana +introspection +gcr +modemmanager selinux teamd +IUSE=appindicator +introspection +gcr +modemmanager selinux teamd KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 LICENSE=GPL-2+ PDEPEND=virtual/notification-daemon -RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 dev-libs/libgudev:= >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) +RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 dev-libs/libgudev:= >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) SLOT=0 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.24.tar.xz _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 797cda3549becfe50afdfa35192ca137 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=0361ae344b0bdee5c586b665cb0d592d +_md5_=8411353f540c514cbe9a17e86ae252d7 diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.25 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.25 index be54a3877f38..4abbc5b88b11 100644 --- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.25 +++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.25 @@ -1,15 +1,15 @@ BDEPEND=doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 DEFINED_PHASES=compile configure install postinst postrm test -DEPEND=app-crypt/libsecret app-text/iso-codes dev-libs/glib:2[dbus] dev-libs/libgudev:= net-misc/networkmanager x11-libs/gtk+:3[introspection?] x11-libs/libnotify ayatana? ( dev-libs/libappindicator:3 dev-libs/libdbusmenu ) introspection? ( dev-libs/gobject-introspection:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( dev-libs/jansson ) wwan? ( ~net-misc/networkmanager-1.18.4 ) +DEPEND=app-crypt/libsecret app-text/iso-codes dev-libs/glib:2[dbus] dev-libs/libgudev:= net-misc/networkmanager x11-libs/gtk+:3[introspection?] x11-libs/libnotify appindicator? ( dev-libs/libappindicator:3 dev-libs/libdbusmenu ) introspection? ( dev-libs/gobject-introspection:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( dev-libs/jansson ) wwan? ( ~net-misc/networkmanager-1.18.4 ) DESCRIPTION=GNOME applet for NetworkManager EAPI=7 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/network-manager-applet -IUSE=ayatana doc introspection lto modemmanager selinux teamd test wwan +IUSE=appindicator doc introspection lto modemmanager selinux teamd test wwan KEYWORDS=~amd64 ~x86 LICENSE=GPL-2+ -RDEPEND=app-crypt/libsecret app-text/iso-codes dev-libs/glib:2[dbus] dev-libs/libgudev:= net-misc/networkmanager x11-libs/gtk+:3[introspection?] x11-libs/libnotify ayatana? ( dev-libs/libappindicator:3 dev-libs/libdbusmenu ) introspection? ( dev-libs/gobject-introspection:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( dev-libs/jansson ) wwan? ( ~net-misc/networkmanager-1.18.4 ) +RDEPEND=app-crypt/libsecret app-text/iso-codes dev-libs/glib:2[dbus] dev-libs/libgudev:= net-misc/networkmanager x11-libs/gtk+:3[introspection?] x11-libs/libnotify appindicator? ( dev-libs/libappindicator:3 dev-libs/libdbusmenu ) introspection? ( dev-libs/gobject-introspection:= ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( dev-libs/jansson ) wwan? ( ~net-misc/networkmanager-1.18.4 ) RESTRICT=test SLOT=0 SRC_URI=https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/1.8.25-dev/network-manager-applet-1.8.25-dev.tar.bz2 _eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 991e544bbaf3120073ededbdc1d8bf93 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=0b1064f9c4c5accc67c633a8d43c5944 +_md5_=37fb76f6ec3032a646c8d774d7648cef diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz index 37a327262213..390152095d96 100644 Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ diff --git a/metadata/md5-cache/media-gfx/hugin-2019.0.0 b/metadata/md5-cache/media-gfx/hugin-2019.0.0 deleted file mode 100644 index 755cc15893a4..000000000000 --- a/metadata/md5-cache/media-gfx/hugin-2019.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info -DESCRIPTION=GUI for the creation & processing of panoramic images -EAPI=6 -HOMEPAGE=http://hugin.sf.net -IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 -KEYWORDS=amd64 arm64 x86 -LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2 -RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw ) -REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) -SLOT=0 -SRC_URI=mirror://sourceforge/hugin/hugin-2019.0.0.tar.bz2 -_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=e609de286b5dc77487d59c463be73e44 diff --git a/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921 b/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921 deleted file mode 100644 index 8f67567674a1..000000000000 --- a/metadata/md5-cache/media-gfx/qrencode-python-1.02_pre140921 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-gfx/qrencode python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A simple wrapper for the C qrencode library -EAPI=5 -HOMEPAGE=https://pypi.org/project/qrencode/ https://github.com/Arachnid/pyqrencode/ -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux -LICENSE=Apache-2.0 -RDEPEND=dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-gfx/qrencode python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/Arachnid/pyqrencode/tarball/486bb7b64e3ce5483f65e375a67da0fa6d02ca92 -> qrencode-python-1.02_pre140921.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=c178af797a7e4718f34e483fa634a558 diff --git a/metadata/md5-cache/media-gfx/svg2rlg-0.3 b/metadata/md5-cache/media-gfx/svg2rlg-0.3 deleted file mode 100644 index f03ec3a02f7c..000000000000 --- a/metadata/md5-cache/media-gfx/svg2rlg-0.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -DESCRIPTION=python tool to convert SVG files to reportlab graphics -EAPI=5 -HOMEPAGE=https://code.google.com/p/svg2rlg/ -IUSE=python_targets_python2_7 -KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 -LICENSE=BSD -RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] -REQUIRED_USE=|| ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://pypi/s/svg2rlg/svg2rlg-0.3.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=7cb2382b3cd7b561a1ba567270bdf2a5 diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz index 8f1996089785..18551dc87136 100644 Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ diff --git a/metadata/md5-cache/media-libs/faad2-2.8.8 b/metadata/md5-cache/media-libs/faad2-2.8.8 deleted file mode 100644 index 69d482e448a8..000000000000 --- a/metadata/md5-cache/media-libs/faad2-2.8.8 +++ /dev/null @@ -1,12 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=compile configure install prepare test -DESCRIPTION=AAC audio decoding library -EAPI=7 -HOMEPAGE=https://www.audiocoding.com/faad2.html -IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris -LICENSE=GPL-2+ -SLOT=0 -SRC_URI=mirror://sourceforge/faac/faad2-2.8.8.tar.gz -_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=a38e12355001e1a57856898d07891213 diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz index 99a2dfc643fb..3e60568b29d6 100644 Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ diff --git a/metadata/md5-cache/media-sound/lyvi-2.0.0 b/metadata/md5-cache/media-sound/lyvi-2.0.0 deleted file mode 100644 index 209d193a8975..000000000000 --- a/metadata/md5-cache/media-sound/lyvi-2.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=A simple command-line lyrics viewer -EAPI=5 -HOMEPAGE=http://ok100.github.io/lyvi/ -IUSE=mpris python_targets_python3_6 -KEYWORDS=amd64 -LICENSE=WTFPL-2 -RDEPEND=dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/plyr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] mpris? ( dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/ok100/lyvi/archive/v2.0.0.tar.gz -> lyvi-2.0.0.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=12261eee5afe802fd40b72e8b2b33ff7 diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz index c5a88d028b53..f1cc1d2ae616 100644 Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ diff --git a/metadata/md5-cache/media-video/griffith-0.13-r3 b/metadata/md5-cache/media-video/griffith-0.13-r3 deleted file mode 100644 index 72b679b935ea..000000000000 --- a/metadata/md5-cache/media-video/griffith-0.13-r3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install postinst prepare setup -DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gnome-base/libglade[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] >=dev-python/pygtk-2.6.1:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/sqlalchemy-0.5.2[python_targets_python2_7(-)] >=dev-python/reportlab-1.19[python_targets_python2_7(-)] ) doc? ( app-text/docbook2X ) -DESCRIPTION=Movie collection manager -EAPI=7 -HOMEPAGE=http://www.griffith.cc/ -IUSE=doc +python_single_target_python2_7 -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gnome-base/libglade[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] >=dev-python/pygtk-2.6.1:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/sqlalchemy-0.5.2[python_targets_python2_7(-)] >=dev-python/reportlab-1.19[python_targets_python2_7(-)] ) -REQUIRED_USE=^^ ( python_single_target_python2_7 ) -SLOT=0 -SRC_URI=https://launchpad.net/griffith/trunk/0.13/+download/griffith-0.13.tar.gz https://dev.gentoo.org/~hwoarang/distfiles/griffith-extra-artwork-0.9.4.tar.gz -_eclasses_=multilib 797cda3549becfe50afdfa35192ca137 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=efc9ebf85093dc29efe3363d67cf730f diff --git a/metadata/md5-cache/media-video/handbrake-1.3.2 b/metadata/md5-cache/media-video/handbrake-1.3.2 new file mode 100644 index 000000000000..01008f0afa5e --- /dev/null +++ b/metadata/md5-cache/media-video/handbrake-1.3.2 @@ -0,0 +1,15 @@ +BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=compile configure install postinst postrm prepare setup +DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/yasm dev-util/intltool sys-devel/automake +DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder +EAPI=7 +HOMEPAGE=http://handbrake.fr/ +IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265 +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) +REQUIRED_USE=^^ ( fdk libav-aac ) +SLOT=0 +SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.3.2/HandBrake-1.3.2-source.tar.bz2 -> handbrake-1.3.2.tar.bz2 +_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 multilib 797cda3549becfe50afdfa35192ca137 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=ea7ea6aaa3f4e65568ffbcb66da6cb49 diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz index ac55f469f50e..cbcdf3d02d82 100644 Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ diff --git a/metadata/md5-cache/net-misc/trackma-0.7.4-r1 b/metadata/md5-cache/net-misc/trackma-0.7.4-r1 deleted file mode 100644 index bd27563eea6b..000000000000 --- a/metadata/md5-cache/net-misc/trackma-0.7.4-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Open multi-site list manager for media tracking sites -EAPI=6 -HOMEPAGE=https://github.com/z411/trackma -IUSE=+ncurses cli gtk inotify qt5 python_targets_python3_6 -KEYWORDS=~amd64 -LICENSE=GPL-3 -RDEPEND=sys-process/lsof inotify? ( dev-python/pyinotify ) ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/z411/trackma/archive/v0.7.4.tar.gz -> trackma-0.7.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=23e340d15cfdaa605ee1bc16ce99a0bc diff --git a/metadata/md5-cache/net-misc/trackma-0.8.2 b/metadata/md5-cache/net-misc/trackma-0.8.2 deleted file mode 100644 index c94c84db5866..000000000000 --- a/metadata/md5-cache/net-misc/trackma-0.8.2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Open multi-site list manager for media tracking sites -EAPI=6 -HOMEPAGE=https://github.com/z411/trackma -IUSE=+ncurses cli gtk inotify qt5 python_targets_python3_6 -KEYWORDS=~amd64 -LICENSE=GPL-3 -RDEPEND=sys-process/lsof inotify? ( dev-python/pyinotify ) ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/z411/trackma/archive/v0.8.2.tar.gz -> trackma-0.8.2.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=bb4d2acc9f1dc0462819d8bf3b0efff2 diff --git a/metadata/md5-cache/net-misc/trackma-9999 b/metadata/md5-cache/net-misc/trackma-9999 deleted file mode 100644 index d00148325438..000000000000 --- a/metadata/md5-cache/net-misc/trackma-9999 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] -DESCRIPTION=Open multi-site list manager for media tracking sites -EAPI=6 -HOMEPAGE=https://github.com/z411/trackma -IUSE=+ncurses cli gtk inotify qt5 python_targets_python3_6 -LICENSE=GPL-3 -PROPERTIES=live -RDEPEND=sys-process/lsof inotify? ( dev-python/pyinotify ) ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_6 ) -SLOT=0 -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=7ed27c886791e89795807a79f12941f9 diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz index 08d10d3a0038..ada8e67c5318 100644 Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.7 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.7 index 02ea089e6ce8..cca9fc26ea90 100644 --- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.7 +++ b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.7 @@ -8,4 +8,4 @@ LICENSE=GPL-2 RDEPEND=net-print/cups SLOT=0 SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6d9cb64872f817bce1920b8/epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz -_md5_=ef5c41e5698dc9abca7684a68625e239 +_md5_=ed4c52d7504ee814ae8a389540ca3117 diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz index d60c203e0ee1..03f4cf867a3e 100644 Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ diff --git a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6 b/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6 deleted file mode 100644 index 09e4960bcf34..000000000000 --- a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=python GPX parser -EAPI=5 -HOMEPAGE=https://github.com/tkrajina/gpxpy -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 -LICENSE=Apache-2.0 -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -SRC_URI=https://github.com/tkrajina/gpxpy/tarball/85c3477b -> gpxpy-0.8.6.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=c08dbdab0f3a66b72446867bcedc590f diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.4 b/metadata/md5-cache/sci-geosciences/seawater-3.3.4 deleted file mode 100644 index c4f276515fac..000000000000 --- a/metadata/md5-cache/sci-geosciences/seawater-3.3.4 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/oct2py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB -EAPI=5 -HOMEPAGE=https://pypi.org/project/seawater/ -IUSE=test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=MIT -RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://pypi/s/seawater/seawater-3.3.4.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=6edae09b392842473f787ffde6a7bd9a diff --git a/metadata/md5-cache/sci-libs/Fiona-1.7.6 b/metadata/md5-cache/sci-libs/Fiona-1.7.6 deleted file mode 100644 index 5470045ffd2e..000000000000 --- a/metadata/md5-cache/sci-libs/Fiona-1.7.6 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cligj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/munch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=OGR's neat, nimble, no-nonsense API -EAPI=5 -HOMEPAGE=https://pypi.org/project/Fiona/ -IUSE=test python_targets_python3_6 -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=mirror://pypi/F/Fiona/Fiona-1.7.6.tar.gz -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=bc34af74cbf964732fb5e31edec87868 diff --git a/metadata/md5-cache/sci-libs/Fiona-9999 b/metadata/md5-cache/sci-libs/Fiona-9999 deleted file mode 100644 index 100c614e6c07..000000000000 --- a/metadata/md5-cache/sci-libs/Fiona-9999 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] -DESCRIPTION=OGR's neat, nimble, no-nonsense API -EAPI=5 -HOMEPAGE=https://pypi.org/project/Fiona/ -IUSE=test python_targets_python3_6 -LICENSE=BSD -PROPERTIES=live -RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -RESTRICT=!test? ( test ) -SLOT=0 -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=fc136fca635f8c57cbbbde88cb39358c diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz index 58acd4b81730..3e1f948b0d0c 100644 Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1-r2 b/metadata/md5-cache/sci-libs/flann-1.9.1-r2 deleted file mode 100644 index 04d3541b92a8..000000000000 --- a/metadata/md5-cache/sci-libs/flann-1.9.1-r2 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=app-arch/unzip doc? ( dev-tex/latex2html ) dev-util/ninja >=dev-util/cmake-3.9.6 -DEFINED_PHASES=compile configure install prepare pretend setup test -DEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) -DESCRIPTION=Fast approximate nearest neighbor searches in high dimensional spaces -EAPI=7 -HOMEPAGE=https://www.cs.ubc.ca/research/flann/ -IUSE=cuda doc examples mpi openmp octave static-libs -KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux -LICENSE=BSD -RDEPEND=cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) -SLOT=0 -SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz -_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b cuda bb861e5221b7272ac90c2f12791c1e66 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=b29cb1b363684a05344d7c249e86f727 diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1-r3 b/metadata/md5-cache/sci-libs/flann-1.9.1-r3 new file mode 100644 index 000000000000..832a1839a2e2 --- /dev/null +++ b/metadata/md5-cache/sci-libs/flann-1.9.1-r3 @@ -0,0 +1,14 @@ +BDEPEND=app-arch/unzip doc? ( dev-tex/latex2html ) dev-util/ninja dev-util/cmake +DEFINED_PHASES=compile configure install prepare pretend setup test +DEPEND=app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] sci-libs/hdf5[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +DESCRIPTION=Fast approximate nearest neighbor searches in high dimensional spaces +EAPI=7 +HOMEPAGE=https://github.com/mariusmuja/flann +IUSE=cuda doc examples mpi octave openmp +KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] sci-libs/hdf5[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +SLOT=0 +SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz +_eclasses_=cmake 19b0421555865baefd505831dd4303e3 cuda bb861e5221b7272ac90c2f12791c1e66 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=5136eae2df1c5da1ed4419a1cf9604ee diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz index a197ed762125..928054624c20 100644 Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1 deleted file mode 100644 index 9991086a1c0d..000000000000 --- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig >=dev-java/java-config-2.2.0-r3 -DESCRIPTION=IDE for the R language -EAPI=7 -HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/ -IUSE=dedicated libressl server elibc_FreeBSD -KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux -LICENSE=AGPL-3 -RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-java/java-config-2.2.0-r3 -SLOT=0 -SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.463.tar.gz -> rstudio-1.1.463.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz -_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 16d46032afaca1d6d0621f82084880cb multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam a1771fc1e5831c201eaf18451747d94b pax-utils a41d1fd1c111289ffa04490de6ee79d7 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=90333ffbe15bc0728bdc815a2edd5cab diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335 b/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335 deleted file mode 100644 index 18681734e353..000000000000 --- a/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebengine-5.4:5[widgets] >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig >=dev-java/java-config-2.2.0-r3 -DESCRIPTION=IDE for the R language -EAPI=7 -HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/ -IUSE=dedicated libressl server elibc_FreeBSD -KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux -LICENSE=AGPL-3 -RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebengine-5.4:5[widgets] >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-java/java-config-2.2.0-r3 -SLOT=0 -SRC_URI=https://github.com/rstudio/rstudio/archive/v1.2.1335.tar.gz -> rstudio-1.2.1335.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz -_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 16d46032afaca1d6d0621f82084880cb multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam a1771fc1e5831c201eaf18451747d94b pax-utils a41d1fd1c111289ffa04490de6ee79d7 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=322d0b16a0a624b85aee20c70fa9473c diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.2.5033 b/metadata/md5-cache/sci-mathematics/rstudio-1.2.5033 index 87d72abe4c9d..8039f12404ae 100644 --- a/metadata/md5-cache/sci-mathematics/rstudio-1.2.5033 +++ b/metadata/md5-cache/sci-mathematics/rstudio-1.2.5033 @@ -11,4 +11,4 @@ RDEPEND=>=app-text/pandoc-1.19.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-j SLOT=0 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.2.5033.tar.gz -> rstudio-1.2.5033.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip _eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-ant-2 8d9cb415f1ca9fc7ebc5a74bacec300c java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 16d46032afaca1d6d0621f82084880cb multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam a1771fc1e5831c201eaf18451747d94b pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=2bc92f6105879e42aae457ccc2137aeb +_md5_=c6d608287b0e680070b46abcf5c0f6a4 diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.2.5042 b/metadata/md5-cache/sci-mathematics/rstudio-1.2.5042 index 6f25540bcc2a..83965fd6d274 100644 --- a/metadata/md5-cache/sci-mathematics/rstudio-1.2.5042 +++ b/metadata/md5-cache/sci-mathematics/rstudio-1.2.5042 @@ -11,4 +11,4 @@ RDEPEND=>=app-text/pandoc-1.19.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-j SLOT=0 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.2.5042.tar.gz -> rstudio-1.2.5042.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip _eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-ant-2 8d9cb415f1ca9fc7ebc5a74bacec300c java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 16d46032afaca1d6d0621f82084880cb multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam a1771fc1e5831c201eaf18451747d94b pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix c2993e4c430c1ee24f278983d6189501 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=769742756cd47a9506084cdad82709f7 +_md5_=2cc392b3a52f88b9198d94bf7c30c1e2 diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz index 8cde1fc5e8e8..8d90e1d64988 100644 Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ diff --git a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201 b/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201 deleted file mode 100644 index 22b2cff16a6d..000000000000 --- a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -DESCRIPTION=Raspberry Pi kernel mangling tool mkimage/imagetool-uncompressed.py -EAPI=6 -HOMEPAGE=https://github.com/raspberrypi/tools/ -IUSE=python_targets_python3_6 -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=GPL-2 -RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_6 ) -SLOT=0 -_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 054fa5f0442c7ccb4d4a05410d92123b epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=80bfa8ebfa275e78699dd6cfdac2d68b diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz index 43d32984ca21..5ad7eb1ce19c 100644 Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.83 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84 similarity index 91% rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.16.83 rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84 index 77c507664e06..7af6730b9b3a 100644 --- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.83 +++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.84 @@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 LICENSE=GPL-2 linux-firmware RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf ) RESTRICT=binchecks strip -SLOT=3.16.83 -SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.16.83.xz https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.tar.xz +SLOT=3.16.84 +SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.16.84.xz https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.tar.xz _eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 686eaab303305a908fd57b2fd7617800 kernel-2 51166f4011c40ba947ae50ae7184139f multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582 diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz index 7821bb622a14..a07ea78dc7b2 100644 Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 index b9a171fc273d..2b7676f7eb6e 100644 --- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 +++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 @@ -1,13 +1,13 @@ DEFINED_PHASES=configure install postinst postrm prepare -DEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 dev-util/intltool sys-devel/gettext xfce-base/exo >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 dev-util/intltool sys-devel/gettext xfce-base/exo >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=LightDM GTK+ Greeter EAPI=6 HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter -IUSE=ayatana branding +IUSE=appindicator branding KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 ) -RDEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1 +RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1 SLOT=0 SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.6/+download/lightdm-gtk-greeter-2.0.6.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz ) _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 797cda3549becfe50afdfa35192ca137 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=fb0fc9d3710e8dde68f4d22cdde7e1de +_md5_=1b4c082dc3512626a06aba6120ef6887 diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1 index d3048ec283f3..9f7022044ca3 100644 --- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1 +++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1 @@ -1,14 +1,14 @@ BDEPEND=dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DEFINED_PHASES=configure install postinst postrm prepare -DEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 xfce-base/exo +DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 xfce-base/exo DESCRIPTION=LightDM GTK+ Greeter EAPI=7 HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter -IUSE=ayatana branding +IUSE=appindicator branding KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~x86 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 ) -RDEPEND=ayatana? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1 +RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1 SLOT=0 SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.7/+download/lightdm-gtk-greeter-2.0.7.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz ) _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=8890eee234135ba92252a26e118746e9 +_md5_=78dbf27c168d09690b8ba7f3c4776e88 diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.10 b/metadata/md5-cache/x11-misc/shared-mime-info-1.10 deleted file mode 100644 index e02ff5dc8d34..000000000000 --- a/metadata/md5-cache/x11-misc/shared-mime-info-1.10 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst -DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig -DESCRIPTION=The Shared MIME-info Database specification -EAPI=6 -HOMEPAGE=https://freedesktop.org/wiki/Software/shared-mime-info -IUSE=test -KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2 -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz -_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=ab70bd2e69dee92913b3479fa5348054 diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz index 34b19f8a603c..7d488495191a 100644 Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ diff --git a/metadata/md5-cache/x11-themes/greybird-3.20.1-r2 b/metadata/md5-cache/x11-themes/greybird-3.20.1-r2 index 8e97cfa1c5cb..9ac88640ff2d 100644 --- a/metadata/md5-cache/x11-themes/greybird-3.20.1-r2 +++ b/metadata/md5-cache/x11-themes/greybird-3.20.1-r2 @@ -3,11 +3,11 @@ DEPEND=>=x11-themes/gtk-engines-murrine-0.90 >=x11-libs/gtk+-3.20.0:3 dev-ruby/s DESCRIPTION=The default theme from Xubuntu EAPI=6 HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird -IUSE=ayatana gnome +IUSE=appindicator gnome KEYWORDS=amd64 ~ppc ~ppc64 x86 LICENSE=CC-BY-SA-3.0 GPL-2+ RDEPEND=>=x11-themes/gtk-engines-murrine-0.90 >=x11-libs/gtk+-3.20.0:3 SLOT=0 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.20.1.tar.gz -> greybird-3.20.1.tar.gz _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=3b792cfe9ebaf53826006d4353017797 +_md5_=3b70f5d5f79dee522f1e5fdc0efd0e91 diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.10 b/metadata/md5-cache/x11-themes/greybird-3.22.10 index ee58e1b41183..9b3edfdbfc77 100644 --- a/metadata/md5-cache/x11-themes/greybird-3.22.10 +++ b/metadata/md5-cache/x11-themes/greybird-3.22.10 @@ -4,11 +4,11 @@ DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sas DESCRIPTION=The default theme from Xubuntu EAPI=7 HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird -IUSE=ayatana gnome xfce +IUSE=appindicator gnome xfce KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 LICENSE=CC-BY-SA-3.0 GPL-2+ RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 SLOT=0 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.10.tar.gz -> greybird-3.22.10.tar.gz _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=c3c5e6cb0cf554515f24ad3eee3e1a73 +_md5_=c25871d329aea747966f5926d7cc6a57 diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.11 b/metadata/md5-cache/x11-themes/greybird-3.22.11 index 298803b7ed22..fdf0f9c9392f 100644 --- a/metadata/md5-cache/x11-themes/greybird-3.22.11 +++ b/metadata/md5-cache/x11-themes/greybird-3.22.11 @@ -4,12 +4,12 @@ DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sas DESCRIPTION=The default theme from Xubuntu EAPI=7 HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird -IUSE=ayatana gnome gtk2 gtk3 xfce +IUSE=appindicator gnome gtk2 gtk3 xfce KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 LICENSE=CC-BY-SA-3.0 GPL-2+ RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 -REQUIRED_USE=|| ( ayatana gnome gtk2 gtk3 xfce ) +REQUIRED_USE=|| ( appindicator gnome gtk2 gtk3 xfce ) SLOT=0 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.11.tar.gz -> greybird-3.22.11.tar.gz _eclasses_=meson 991e544bbaf3120073ededbdc1d8bf93 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=eab7d534259cc62c6a5b8a5b1f664a5e +_md5_=c59fe3a618acee5e810f2e5be0a29a50 diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.9 b/metadata/md5-cache/x11-themes/greybird-3.22.9 index de197b85ac90..bfce8fed5f24 100644 --- a/metadata/md5-cache/x11-themes/greybird-3.22.9 +++ b/metadata/md5-cache/x11-themes/greybird-3.22.9 @@ -4,11 +4,11 @@ DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sas DESCRIPTION=The default theme from Xubuntu EAPI=7 HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird -IUSE=ayatana gnome xfce +IUSE=appindicator gnome xfce KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 LICENSE=CC-BY-SA-3.0 GPL-2+ RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 SLOT=0 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.9.tar.gz -> greybird-3.22.9.tar.gz _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 797cda3549becfe50afdfa35192ca137 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=c3c5e6cb0cf554515f24ad3eee3e1a73 +_md5_=c25871d329aea747966f5926d7cc6a57 diff --git a/metadata/md5-cache/x11-themes/greybird-9999 b/metadata/md5-cache/x11-themes/greybird-9999 index b6981193232b..09e8f51aed6d 100644 --- a/metadata/md5-cache/x11-themes/greybird-9999 +++ b/metadata/md5-cache/x11-themes/greybird-9999 @@ -4,11 +4,11 @@ DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sas DESCRIPTION=The default theme from Xubuntu EAPI=7 HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird -IUSE=ayatana gnome gtk2 gtk3 xfce +IUSE=appindicator gnome gtk2 gtk3 xfce LICENSE=CC-BY-SA-3.0 GPL-2+ PROPERTIES=live RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 -REQUIRED_USE=|| ( ayatana gnome gtk2 gtk3 xfce ) +REQUIRED_USE=|| ( appindicator gnome gtk2 gtk3 xfce ) SLOT=0 _eclasses_=git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 meson 991e544bbaf3120073ededbdc1d8bf93 multilib 797cda3549becfe50afdfa35192ca137 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 dd532a387632f19bfc5523fc2289a9a0 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c -_md5_=dc0c00d33ba254216d4d075ecdb2a1cd +_md5_=0d9499881a32dbbe8b0216d6e1e4ff7f diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 496402f9c8ac..bdf6807a19df 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Sat, 23 May 2020 09:38:16 +0000 +Sat, 23 May 2020 13:38:15 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index ff30b73ca94b..92f387fbbb43 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Sat 23 May 2020 09:38:16 AM UTC +Sat 23 May 2020 01:38:15 PM UTC diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index d82a286cc6ce..b7923fcab62e 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Sat, 23 May 2020 10:00:01 +0000 +Sat, 23 May 2020 14:00:01 +0000 diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index 31aaf924a952..afc18db2aa53 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1 +1 @@ -8b110924d6f46eeb6c85fecb84917d9fbd524749 1590226291 2020-05-23T09:31:31+00:00 +2dbd6f87e9a3e4ceb8941456bda510b377a62839 1590239162 2020-05-23T13:06:02+00:00 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 1e527c442856..99951791e806 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1590226501 Sat 23 May 2020 09:35:01 AM UTC +1590240901 Sat 23 May 2020 01:35:01 PM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 496402f9c8ac..bdf6807a19df 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Sat, 23 May 2020 09:38:16 +0000 +Sat, 23 May 2020 13:38:15 +0000 diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 37e4d8fadb56..e2f7dd84de0d 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest deleted file mode 100644 index b4953e07ac78..000000000000 --- a/net-misc/trackma/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364 -DIST trackma-0.8.2.tar.gz 171917 BLAKE2B 9fedd04036d55ef8fa748e64a18a2d471cab61b71030840baf18252cb81d2ad3df72eba6d417484c2772cb81d3e0e6e2311440c77040a899152681e427408a7a SHA512 6063f65fa70ee65f3b30cd2750bc1f501a6a94dc796195f11d89f4430cdae830fc5987bf6d261c77603c9cc5d32f80286aeecc05d44f766ca705e932997d46f1 diff --git a/net-misc/trackma/metadata.xml b/net-misc/trackma/metadata.xml deleted file mode 100644 index 4412ee5ffa5d..000000000000 --- a/net-misc/trackma/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Trackma aims to be a lightweight and simple but feature-rich program for Unix based systems for fetching, updating and using data from personal lists hosted in several media tracking websites. - - - Enable cli version - Enable curses version - - - - z411/trackma - - diff --git a/net-misc/trackma/trackma-0.7.4-r1.ebuild b/net-misc/trackma/trackma-0.7.4-r1.ebuild deleted file mode 100644 index 3cf1a43582fb..000000000000 --- a/net-misc/trackma/trackma-0.7.4-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 eutils - -DESCRIPTION="Open multi-site list manager for media tracking sites" -HOMEPAGE="https://github.com/z411/trackma" -SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ncurses cli gtk inotify qt5" -REQUIRED_USE="|| ( cli gtk ncurses qt5 )" - -DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] ) - gtk? ( - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - ) - qt5? ( - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/pillow[${PYTHON_USEDEP}] - )" -RDEPEND="sys-process/lsof - inotify? ( dev-python/pyinotify ) - ${DEPEND}" - -python_configure_all() { - sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/qt4ui.py" || die - if ! use qt5; then - sed -i -e '/trackma-qt/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/qtui.py" || die - fi - if ! use gtk; then - sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/gtkui.py" || die - fi - if ! use ncurses; then - sed -i -e '/trackma-curses/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/curses.py" || die - fi - if ! use cli; then - sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/cli.py" || die - fi -} - -python_install_all() { - distutils-r1_python_install_all - newicon "${S}/trackma/data/icon.png" trackma.png - use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true" - use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true" - use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3" - use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5" -} diff --git a/net-misc/trackma/trackma-0.8.2.ebuild b/net-misc/trackma/trackma-0.8.2.ebuild deleted file mode 100644 index e632d4103918..000000000000 --- a/net-misc/trackma/trackma-0.8.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 eutils - -DESCRIPTION="Open multi-site list manager for media tracking sites" -HOMEPAGE="https://github.com/z411/trackma" -SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ncurses cli gtk inotify qt5" -REQUIRED_USE="|| ( cli gtk ncurses qt5 )" - -DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] ) - gtk? ( - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - ) - qt5? ( - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/pillow[${PYTHON_USEDEP}] - )" -RDEPEND="sys-process/lsof - inotify? ( dev-python/pyinotify ) - ${DEPEND}" - -python_configure_all() { - sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/qt/qt4ui.py" || die - if ! use qt5; then - sed -i -e '/trackma-qt/d' "${S}/setup.py" || die - rm -r "${S}/trackma/ui/qt" || die - fi - if ! use gtk; then - sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die - rm -r "${S}/trackma/ui/gtk" || die - fi - if ! use ncurses; then - sed -i -e '/trackma-curses/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/curses.py" || die - fi - if ! use cli; then - sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/cli.py" || die - fi -} - -python_install_all() { - distutils-r1_python_install_all - newicon "${S}/trackma/data/icon.png" trackma.png - use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true" - use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true" - use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3" - use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5" -} diff --git a/net-misc/trackma/trackma-9999.ebuild b/net-misc/trackma/trackma-9999.ebuild deleted file mode 100644 index 6d746c2385f4..000000000000 --- a/net-misc/trackma/trackma-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 eutils git-r3 - -DESCRIPTION="Open multi-site list manager for media tracking sites" -HOMEPAGE="https://github.com/z411/trackma" -EGIT_REPO_URI="https://github.com/z411/${PN}" -LICENSE="GPL-3" -SLOT="0" -IUSE="+ncurses cli gtk inotify qt5" -REQUIRED_USE="|| ( cli gtk ncurses qt5 )" - -DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] ) - gtk? ( - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - ) - qt5? ( - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/pillow[${PYTHON_USEDEP}] - )" -RDEPEND="sys-process/lsof - inotify? ( dev-python/pyinotify ) - ${DEPEND}" - -python_configure_all() { - sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/qt4ui.py" || die - if ! use qt5; then - sed -i -e '/trackma-qt/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/qtui.py" || die - fi - if ! use gtk; then - sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/gtkui.py" || die - fi - if ! use ncurses; then - sed -i -e '/trackma-curses/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/curses.py" || die - fi - if ! use cli; then - sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die - rm "${S}/trackma/ui/cli.py" || die - fi -} - -python_install_all() { - distutils-r1_python_install_all - newicon "${S}/trackma/data/icon.png" trackma.png - use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true" - use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true" - use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3" - use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5" -} diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 98b50c4355d7..a659dfe8a70e 100644 Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild index 1e0db2c8f85a..5407e22e9813 100644 --- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild +++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild @@ -14,7 +14,10 @@ KEYWORDS="amd64 ~ppc64" DEPEND="net-print/cups" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/1.6.5-warnings.patch" ) +PATCHES=( + "${FILESDIR}/1.6.5-warnings.patch" + "${FILESDIR}/${P}-fnocommon.patch" +) src_configure() { econf --disable-shared diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch new file mode 100644 index 000000000000..e2e35719ca8f --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch @@ -0,0 +1,11 @@ +--- a/src/filter.c 2020-05-23 13:50:19.064756474 +0200 ++++ b/src/filter.c 2020-05-23 13:53:01.936647646 +0200 +@@ -68,7 +68,7 @@ + extern EPS_UINT8* tmpLineBuf; + + extern EPS_CMN_FUNC epsCmnFnc; +-EPS_JOB_FUNCS jobFnc; ++extern EPS_JOB_FUNCS jobFnc; + + extern EPS_INT32 tonerSave; + extern EPS_INT32 back_type; diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index 9c886a4a5455..5457a6ba7a04 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index a626c92c4796..a885706f6a9e 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -75,10 +75,6 @@ dev-util/buildbot doc # Requires deprecated python2 and pygtk mail-client/claws-mail python -# Michał Górny (2020-03-25) -# Requires www-servers/tornado with py2. -app-backup/bup web - # Michał Górny (2020-03-24) # Require dev-python/recommonmark with py2. (2020-04-23) -# Unmaintained. Stuck on Python 3.6. No revdeps. -# Removal in 30 days. Bug #719040. -dev-python/kivy-garden - -# Michał Górny (2020-04-23) -# Unmaintained. Stuck on Python 3.6. No revdeps. -# Removal in 30 days. Bug #718848. -dev-python/PyDbLite - -# Michał Górny (2020-04-23) -# Unmaintained. Stuck on Python 2. -# Removal in 30 days. Bug #713366. -app-backup/bup -app-backup/kup - -# Michał Górny (2020-04-23) -# Effectively unmaintained. Stuck on Python 3.6, broken with 3.8. -# The only revdep is masked for removal. -# Removal in 30 days. Bug #719008. -dev-python/junit-xml - -# Michał Górny (2020-04-23) -# Unmaintained. Stuck on Python 3.6. Nose plugin with no revdeps. -# Removal in 30 days. Bug #719000. -dev-python/ipdbplugin - -# Michał Górny (2020-04-22) -# Unmaintained. Stuck at Python 3.6. The only revdep last rited. -# Removal in 30 days. Bug #718896. -dev-python/cligj - -# Michał Górny (2020-04-22) -# Unmaintained. Stuck at Python 3.6. The only revdep was last rited -# already. -# Removal in 30 days. Bug #718854. -dev-python/URLObject - # Michał Górny (2020-04-22) # Effectively unmaintained and stuck on Python 3.6. # @@ -458,59 +420,6 @@ dev-python/URLObject dev-python/bokeh dev-python/flexx -# Michał Górny (2020-04-22) -# Unmaintained. After adding tests, it turns out it's completely -# broken (can't find magic file). -# Removal in 30 days. Bug #718822. -dev-python/filemagic - -# Michał Górny (2020-04-21) -# Unmaintained. Stuck on Python 3.6. Missing tests. Bad quality -# package. No revdeps. -# Removal in 30 days. Bug #718744. -dev-python/django-spurl - -# Michał Górny (2020-04-21) -# Unmaintained. Last commit in 2016. Upstream bugtracker indicates it -# doesn't support current dev-python/django versions. No revdeps. -# Removal in 30 days. Bug #718734. -dev-python/django-setuptest - -# Michał Górny (2020-04-21) -# Django has a native DurationField since 1.8. No revdeps. -# Removal in 30 days. Bug #718724. -dev-python/django-durationfield - -# Michał Górny (2020-04-20) -# Stuck on Python 3.6. Last release in 2012. No revdeps. -# dev-python/lxml is the recommended XML handling package. -# Removal in 30 days. Bug #718646. -dev-python/dexml - -# Michał Górny (2020-04-20) -# Stuck on Python 3.6. Relies on 2to3. Last release in 2015. -# No revdeps. 'json' is built-in in all modern Python versions. -# Removal in 30 days. Bug #718638. -dev-python/demjson - -# Louis Sautier (2020-04-20) -# No revdeps, no release in 3 years, doesn't support Bootstrap 4. -# Removal in 30 days. Bug #718832 -dev-python/flask-bootstrap - -# Michał Górny (2020-04-20) -# Effectively unmaintained. Stuck on Python 2 and pygtk. Last bumped -# in 2014. -# Removal in 30 days. Bug #708168. -media-video/griffith - -# Michał Górny (2020-04-20) -# Unmaintained. Stuck on Python 2. rst2pdf depends on dev-python/pdfrw -# that is dead and broken with py3.7+. svg2rlg is only used by pdfrw. -# Removal in 30 days. Bug #718572. -dev-python/rst2pdf -media-gfx/svg2rlg - # Michael Orlitzky (2020-04-19) # Stuck on Python 3.6, support for which already required # backporting patches to a release from 2014. Upstream's git @@ -518,36 +427,11 @@ media-gfx/svg2rlg # release. Bug 718326. Removal whenever it becomes an issue. mail-filter/pyzor -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. -# Removal in 30 days. Bug #718530. -sys-boot/raspberrypi-mkimage - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. Some releases behind. -# Removal in 30 days. Bug #718498. -sci-libs/Fiona - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. -# Removal in 30 days. Bug #718488. -sci-geosciences/seawater - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. Numerous releases behind. -# Removal in 30 days. Bug #718486. -sci-geosciences/gpxpy - # Michał Górny (2020-04-19) # Unmaintained. Stuck on Python 3.6. Needs version bump. # Removal in 30 days. Bug #718458. net-proxy/mitmproxy -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. -# Removal in 30 days. Bug #718452. -net-misc/trackma - # Michał Górny (2020-04-19) # Unmaintained. Stuck on Python 3.6. In need of bump since 2016. # Removal in 30 days. Bug #718426. @@ -560,54 +444,12 @@ www-client/ripe-atlas-cousteau # Removal in 30 days. Bug #718410. media-video/subliminal -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. Last release in 2014. -# Removal in 30 days. Bug #718402. -media-sound/lyvi - # Michał Górny (2020-04-19) # Unmaintained. Stuck on Python 3.6. Has a few bugs reported, # including indication of poor ebuild state. # Removal in 30 days. Bug #718398. media-sound/beets -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. No revdeps. Last release -# in 2016. -# Removal in 30 days. Bug #718340. -media-gfx/qrencode-python - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. -# Removal in 30 days. Bug #718308. -dev-vcs/git-imerge - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck at Python 3.6. Many versions behind upstream. -# Removal in 30 days. Bug #718300. -dev-vcs/ghp-import - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. A few releases behind upstream. -# Removal in 30 days. Bug #718296. -dev-util/spec-cleaner - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. Missing tests. No revdeps. -# Removal in 30 days. Bug #718288. -dev-util/bumpversion - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. A few releases behind upstream. -# Removal in 30 days. Bug #718268. -app-text/doconce - -# Michał Górny (2020-04-19) -# Unmaintained. Stuck on Python 3.6. -# Removal in 30 days. Bug #718238. -app-misc/openastro -app-misc/openastro-data - # Georgy Yakovlev (2020-04-18) # Unmaintained, vulnerable oracle java ebuilds, even fetching distfiles # requires agreement to restrictive license diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015 index 9a0514d76812..25811ee168da 100644 --- a/profiles/updates/1Q-2015 +++ b/profiles/updates/1Q-2015 @@ -1,5 +1,3 @@ -slotmove sci-libs/Fiona 1.1 0 -slotmove sci-libs/Fiona 1.4 0 slotmove sys-firmware/iwl3160-ucode 0 7 slotmove sys-firmware/iwl3160-ucode 1 8 slotmove sys-firmware/iwl3160-ucode 2 9 diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020 index f08a8319dd1f..7d48f8803caa 100644 --- a/profiles/updates/1Q-2020 +++ b/profiles/updates/1Q-2020 @@ -5,8 +5,6 @@ move dev-python/matplotlib2tikz dev-python/tikzplotlib move dev-python/pep257 dev-python/pydocstyle move dev-python/pyzor mail-filter/pyzor move dev-python/python-sqlparse dev-python/sqlparse -move dev-python/ghp-import dev-vcs/ghp-import -move app-doc/ghp-import dev-vcs/ghp-import move dev-python/git-python dev-python/GitPython move www-servers/automx2 net-mail/automx2 move dev-python/pysnmp-apps net-analyzer/snmpclitools diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 3f285c271ec3..3facf1602bdb 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -263,7 +263,6 @@ app-backup/bareos:sql-pooling - Enable SQL pooling support app-backup/bareos:storage-daemon - Install storage daemon (bareos-sd) app-backup/btrbk:mbuffer - Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality app-backup/btrbk:pv - Use sys-apps/pv to enable progress bar functionality -app-backup/bup:web - Support browsing backups via a web interface app-backup/dar:dar32 - Enables --enable-mode=32 option, which replace infinite by 32 bit integers app-backup/dar:dar64 - Enables --enable-mode=64 option, which replace infinite by 64 bit integers app-backup/dar:gcrypt - Enables strong encryption support @@ -974,8 +973,6 @@ app-misc/muttprint:doc - Builds documentation app-misc/neofetch:X - Enable support for detecting DEs, WMs, screen resolutions, and showing images from an X terminal app-misc/note:general - Add support for ascii flatfile backend app-misc/note:text - Add support for text backend -app-misc/openastro:jpeg - Enable exporting Astrological Charts to jpeg -app-misc/openastro:png - Enable exporting Astrological Charts to png app-misc/pax-utils:python - Install a more powerful/faster version of lddtree app-misc/recoll:camelcase - Enable indexing for camelCase sentences and words app-misc/recoll:chm - Enable CHM file support via dev-python/pychm @@ -4648,7 +4645,6 @@ media-sound/lmms:vst - Enables the VeSTige plugin to run VST plugins through Win media-sound/loudness-scanner:mpg123 - build the mpg123 plugin media-sound/loudness-scanner:musepack - build the musepack plugin media-sound/loudness-scanner:sndfile - build the sndfile plugin -media-sound/lyvi:mpris - Enable MPRIS support media-sound/mangler:espeak - Text to speech engine media-sound/mangler:g15 - Logitech g15 lcd support media-sound/mixxx:hid - Enable HID controller support @@ -6686,8 +6682,6 @@ net-misc/tigervnc:dri3 - Build with DRI3 support net-misc/tigervnc:drm - Build with DRM support net-misc/tigervnc:server - Build TigerVNC server net-misc/tigervnc:xorgmodule - Build the Xorg module -net-misc/trackma:cli - Enable cli version -net-misc/trackma:ncurses - Enable curses version net-misc/uftp:server - Install uftp server daemon net-misc/vde:pcap - Enable the pcap-based plugin that allows creating a switch against a real interface. net-misc/vde:ssl - Enable the cryptcab plugin that allows creating an encrypted virtual cable. diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz index 474f6372dcf1..0e8e97bb89c6 100644 Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ diff --git a/sci-geosciences/gpxpy/Manifest b/sci-geosciences/gpxpy/Manifest deleted file mode 100644 index a2d85130b002..000000000000 --- a/sci-geosciences/gpxpy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gpxpy-0.8.6.tar.gz 65569 BLAKE2B d0a2673fc4a9adc7b15f45239091f823d6aa5191f7a07bf70d78cc38ca2cbef603e599b08fdcf221805bb81e61ac27d8e41402df77c998d826cdd4d74e376b4b SHA512 3c180436210689724f88fdac43576a9a11b3f8717fb6f8acd7c8ce0afc1219714b4c83f1ba4f64487d35d0189d65a311d77f7778e7d84f315b251d1098f8989c diff --git a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild deleted file mode 100644 index 88de25432a1b..000000000000 --- a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="python GPX parser" -HOMEPAGE="https://github.com/tkrajina/gpxpy" -SRC_URI="https://github.com/tkrajina/${PN}/tarball/85c3477b -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="" - -DOCS=( NOTICE.txt README.md ) - -python_test() { - ${PYTHON} -m unittest test -} diff --git a/sci-geosciences/gpxpy/metadata.xml b/sci-geosciences/gpxpy/metadata.xml deleted file mode 100644 index de597e19e44e..000000000000 --- a/sci-geosciences/gpxpy/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - tkrajina/gpxpy - - diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest deleted file mode 100644 index 640b6becb65b..000000000000 --- a/sci-geosciences/seawater/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST seawater-3.3.4.tar.gz 22899 BLAKE2B 1f3af9e1d592b2c7075711f0431dc9198c41047e46cefcbc2466eaad92bad1e9894e63e6d3846d08df00ad21df8dc773cd1822915896658fe06e298ed36b83ef SHA512 1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af diff --git a/sci-geosciences/seawater/metadata.xml b/sci-geosciences/seawater/metadata.xml deleted file mode 100644 index d505d3a8646a..000000000000 --- a/sci-geosciences/seawater/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - seawater - - diff --git a/sci-geosciences/seawater/seawater-3.3.4.ebuild b/sci-geosciences/seawater/seawater-3.3.4.ebuild deleted file mode 100644 index 4854b288d0c0..000000000000 --- a/sci-geosciences/seawater/seawater-3.3.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 - -DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB" -HOMEPAGE="https://pypi.org/project/seawater/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="test" # seems there are files missing - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/oct2py[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - )" - -python_test() { - esetup.py test -} diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild deleted file mode 100644 index 738754fc605a..000000000000 --- a/sci-libs/Fiona/Fiona-1.7.6.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="OGR's neat, nimble, no-nonsense API" -HOMEPAGE="https://pypi.org/project/Fiona/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=sci-libs/gdal-1.8 - dev-python/click[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/cligj[${PYTHON_USEDEP}] - dev-python/munch[${PYTHON_USEDEP}] - dev-python/click-plugins[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}"/scriptname-${PV}.patch ) - -python_test() { - esetup.py test -} diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild deleted file mode 100644 index b8c6c34d180c..000000000000 --- a/sci-libs/Fiona/Fiona-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 git-r3 - -DESCRIPTION="OGR's neat, nimble, no-nonsense API" -HOMEPAGE="https://pypi.org/project/Fiona/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=sci-libs/gdal-1.8 - dev-python/click[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}"/scriptname.patch ) - -python_test() { - esetup.py test -} diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest deleted file mode 100644 index 3a12db34e6cf..000000000000 --- a/sci-libs/Fiona/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Fiona-1.7.6.tar.gz 641013 BLAKE2B f8cadfaad300306f2d6c5f306d842366807c23db59e96309911f05608a956bb088700da88b9a22e27af0af3decc396b1fe66815007945a39aa193c31c4769155 SHA512 a988772cd8d9cf7ee6862b87c91d18d5caf78f81c35c018e815dfb0000502a0768d9ce6c580a8ef9a9a652c64c4b6027685d597766f851563a70db07db0de4f3 diff --git a/sci-libs/Fiona/files/scriptname-1.7.6.patch b/sci-libs/Fiona/files/scriptname-1.7.6.patch deleted file mode 100644 index 410caf39da55..000000000000 --- a/sci-libs/Fiona/files/scriptname-1.7.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2017-05-30 10:51:33.369935784 +0200 -+++ setup.py 2017-05-30 10:51:45.793269042 +0200 -@@ -251,7 +251,7 @@ - packages=['fiona', 'fiona.fio'], - entry_points=''' - [console_scripts] -- fio=fiona.fio.main:main_group -+ Fiona=fiona.fio.main:main_group - - [fiona.fio_commands] - bounds=fiona.fio.bounds:bounds diff --git a/sci-libs/Fiona/files/scriptname.patch b/sci-libs/Fiona/files/scriptname.patch deleted file mode 100644 index 227e644f0759..000000000000 --- a/sci-libs/Fiona/files/scriptname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2015-03-27 21:34:22.790592037 +0100 -+++ setup.py 2015-03-27 21:34:54.247259049 +0100 -@@ -150,7 +150,7 @@ - packages=['fiona', 'fiona.fio'], - entry_points=''' - [console_scripts] -- fio=fiona.fio.fio:cli -+ Fiona=fiona.fio.fio:cli - ''', - install_requires=requirements, - tests_require=['nose'], diff --git a/sci-libs/Fiona/metadata.xml b/sci-libs/Fiona/metadata.xml deleted file mode 100644 index 51838a08fe1f..000000000000 --- a/sci-libs/Fiona/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - Fiona - - diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 66f586546e41..28d472eb50a5 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch new file mode 100644 index 000000000000..dcc9fedd4a97 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch @@ -0,0 +1,125 @@ +From: Jochen Sprickerhof +Date: Sun, 14 Oct 2018 00:25:05 +0200 +Subject: Use system version of liblz4 + +Also make sure that flann_cpp is linked against LZ4. +--- + CMakeLists.txt | 3 +++ + cmake/flann.pc.in | 2 +- + examples/CMakeLists.txt | 3 +++ + src/cpp/CMakeLists.txt | 8 ++++++-- + src/cpp/flann/util/serialization.h | 4 ++-- + 5 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a01fb7a..995e54e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB) + endif(CUDA_FOUND) + endif(BUILD_CUDA_LIB) + ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LZ4 REQUIRED liblz4) ++ + #set the C/C++ include path to the "include" directory + include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) + +diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in +index 82eee5e..07b8d64 100644 +--- a/cmake/flann.pc.in ++++ b/cmake/flann.pc.in +@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@ + Description: @PKG_DESC@ + Version: @FLANN_VERSION@ + Requires: @PKG_EXTERNAL_DEPS@ +-Libs: -L${libdir} -lflann -lflann_cpp ++Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp + Cflags: -I${includedir} + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index e9fef04..2b2bb9d 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -3,6 +3,7 @@ add_custom_target(examples ALL) + + if (BUILD_C_BINDINGS) + add_executable(flann_example_c flann_example.c) ++ target_link_libraries(flann_example_c -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_example_c flann) + set_target_properties(flann_example_c PROPERTIES COMPILE_FLAGS -std=c99) + +@@ -14,6 +15,7 @@ if (HDF5_FOUND) + include_directories(${HDF5_INCLUDE_DIRS}) + + add_executable(flann_example_cpp flann_example.cpp) ++ target_link_libraries(flann_example_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp) + if (HDF5_IS_PARALLEL) + target_link_libraries(flann_example_cpp ${MPI_LIBRARIES}) +@@ -25,6 +27,7 @@ if (HDF5_FOUND) + + if (USE_MPI AND HDF5_IS_PARALLEL) + add_executable(flann_example_mpi flann_example_mpi.cpp) ++ target_link_libraries(flann_example_mpi -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) + + add_dependencies(examples flann_example_mpi) +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index b453b27..5c4f693 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION}) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h) + +-file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c) +-file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c) ++file(GLOB_RECURSE C_SOURCES flann.cpp) ++file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp) + file(GLOB_RECURSE CU_SOURCES *.cu) + + add_library(flann_cpp_s STATIC ${CPP_SOURCES}) ++target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES}) + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) + endif() +@@ -42,6 +43,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) + endif() + else() + add_library(flann_cpp SHARED ${CPP_SOURCES}) ++ target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + if (BUILD_CUDA_LIB) + cuda_add_library(flann_cuda SHARED ${CPP_SOURCES}) + set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) +@@ -77,6 +79,7 @@ endif() + + if (BUILD_C_BINDINGS) + add_library(flann_s STATIC ${C_SOURCES}) ++ target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC) + endif() +@@ -88,6 +91,7 @@ if (BUILD_C_BINDINGS) + target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) + else() + add_library(flann SHARED ${C_SOURCES}) ++ target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + + if(MINGW AND OPENMP_FOUND) + target_link_libraries(flann gomp) +diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h +index d731021..cdc2e5e 100644 +--- a/src/cpp/flann/util/serialization.h ++++ b/src/cpp/flann/util/serialization.h +@@ -6,8 +6,8 @@ + #include + #include + #include +-#include "flann/ext/lz4.h" +-#include "flann/ext/lz4hc.h" ++#include ++#include + + + namespace flann diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r3.ebuild similarity index 82% rename from sci-libs/flann/flann-1.9.1-r2.ebuild rename to sci-libs/flann/flann-1.9.1-r3.ebuild index f6ffdd259b22..e53d428ee73c 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r3.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils cuda flag-o-matic toolchain-funcs +inherit cmake cuda flag-o-matic toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="https://www.cs.ubc.ca/research/flann/" +HOMEPAGE="https://github.com/mariusmuja/flann" SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs" +IUSE="cuda doc examples mpi octave openmp" BDEPEND=" app-arch/unzip doc? ( dev-tex/latex2html ) " DEPEND=" + app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( - sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] + sci-libs/hdf5[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 ) @@ -35,6 +36,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 "${FILESDIR}"/${P}-cuda-9.patch + "${FILESDIR}"/${P}-system-lz4.patch # bug 681898 ) pkg_pretend() { @@ -59,14 +61,13 @@ src_prepare() { src/matlab/CMakeLists.txt || die use cuda && cuda_src_prepare - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { append-cxxflags -std=c++11 - # python bindings are split - # off into dev-python/pyflann + # python bindings are split off into dev-python/pyflann local mycmakeargs=( -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF @@ -84,12 +85,10 @@ src_configure() { ) use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi + cmake_src_install + find "${D}" -name 'lib*.a' -delete || die } diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index bfadad9f9c8f..c0640eae596c 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 314a334a3e7a..6821cacc59bc 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -1,16 +1,3 @@ -DIST chromedriver-linux 19303552 BLAKE2B 610396fd74f2adc4c249ca971a53a6dd4ab06145d0b37d59adf66180dfada52192b20203bf3d992c270bd4f787df5c85511ca325aed06cbd9318add3eccfde30 SHA512 18774ede961dec222058dd0e3f128d63732cd444ee310136b44d5bf508a4f2f2c164a2c8d195d80bce8b5fb6303559e167f82f384e4a58e30f48b151a4206ee8 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9 -DIST gin-1.5.zip 1055663 BLAKE2B 11b86245d54967f0c76f22f7460fb752c410db3c59a019bb538a48fd0de7e87552f2f5bb9ce604e6ed508136a6a2b0814f061161579429daae8ca55b1a448114 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897 -DIST gin-2.1.2.zip 1341053 BLAKE2B 515338ba50ba2183c101b42183e42ebf15613aae8751a0dcedb4b047de4ca8fab85eb240f5f0c92955441dbb87e80b3edbdae8d83f1e74f74c7de067d18cf108 SHA512 03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb -DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5ff054ab0a59cad751590a1b4ae8d7fabc8a50e3b0e5d7eb9b2896c485d929421f75e6a2f6513480438a31 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499 -DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e51652483e5c7e9d711daa213e1341c71765b4a3fb061b58f90d49420245963a0480db8b71fe7aed6cd43782c14 SHA512 feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae -DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 -DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 -DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade -DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b -DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9 -DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 -DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 -DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch deleted file mode 100644 index a336fccbc981..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch +++ /dev/null @@ -1,18 +0,0 @@ -Some gcc hardening options were added, however since we add -"-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which -leads to linker errors about unknown options, if we make it so the -as-needed option is the last option on the line, everything is fine. - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 0589ca0..fe5bd5f 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -57,7 +57,7 @@ if(UNIX) - add_definitions(-D_FORTIFY_SOURCE=2) - add_definitions(-fstack-protector --param ssp-buffer-size=4) - add_definitions(-pie -fPIE) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now") -+ set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}") - endif() - - # Win32 specific global directives diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch deleted file mode 100644 index bf66bd236788..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- rstudio-0.99.473-orig/src/cpp/desktop/CMakeLists.txt 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/desktop/CMakeLists.txt 2015-08-30 23:16:11.396175587 +1000 -@@ -93,7 +93,12 @@ - find_package(Qt5DBus REQUIRED) - endif() - -- -+find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication -+ PATH_SUFFIXES QtSolutions -+ PATHS -+ /usr/include/qt5) -+find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6 -+ libQt5Solutions_SingleApplication-2.6) - - # disable clang warnings for qt sources - if(APPLE) -@@ -113,7 +118,6 @@ - - set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) - list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES -- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h - ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp -@@ -175,8 +179,6 @@ - DesktopSubMenu.cpp - DesktopSynctex.cpp - DesktopNetworkAccessManager.cpp -- 3rdparty/qtsingleapplication/qtsingleapplication.cpp -- 3rdparty/qtsingleapplication/qtlocalpeer.cpp - ) - - if(WIN32) -@@ -219,6 +221,7 @@ - ${CORE_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -+ ${QTSINGLEAPPLIB_INCLUDE_DIR} - ${TESTS_INCLUDE_DIR} - ) - -@@ -332,6 +335,7 @@ - - # set link dependencies - target_link_libraries(rstudio -+ ${QTSINGLEAPPLIB} - ${QT_LIBRARIES} - rstudio-core - ${LINK_FLAGS} ---- rstudio-0.99.473-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-30 21:41:21.616934106 +1000 -@@ -16,7 +16,7 @@ - #ifndef DESKTOP_POSIX_APPLICATION_HPP - #define DESKTOP_POSIX_APPLICATION_HPP - --#include "3rdparty/qtsingleapplication/QtSingleApplication" -+#include - - namespace rstudio { - namespace desktop { diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch deleted file mode 100644 index 483613cc5c09..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- rstudio-0.99.879-orig/src/gwt/build.xml 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/src/gwt/build.xml 2016-02-20 00:25:39.458756693 +1100 -@@ -25,6 +25,7 @@ - - - -+ - - - -@@ -101,8 +102,10 @@ - - - -+ - - -+ - - - -@@ -142,6 +145,7 @@ - - - -+ - - - -@@ -163,6 +167,7 @@ - - - -+ - - - -@@ -194,6 +199,7 @@ - - - -+ - - - diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch deleted file mode 100644 index b2a1a33b44c2..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- rstudio-1.0.44-orig/CMakeGlobals.txt 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/CMakeGlobals.txt 2016-12-01 23:33:04.149326324 +1100 -@@ -123,7 +123,7 @@ - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate ---- rstudio-1.0.44-orig/src/cpp/server/CMakeLists.txt 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt 2016-12-01 23:35:51.634862018 +1100 -@@ -155,7 +155,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -163,7 +163,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -171,13 +171,13 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -185,9 +185,9 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -195,12 +195,12 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - # install configured systemd profile - set(RSERVER_SYSTEMD_DIR "extras/systemd") ---- rstudio-1.0.44-orig/src/cpp/server/ServerOptions.cpp 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/server/ServerOptions.cpp 2016-12-01 23:33:04.151326331 +1100 -@@ -386,8 +386,8 @@ - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); ---- rstudio-1.0.44-orig/src/cpp/session/SessionOptions.cpp 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/session/SessionOptions.cpp 2016-12-01 23:33:04.151326331 +1100 -@@ -49,7 +49,7 @@ - namespace session { - - namespace { --const char* const kDefaultPandocPath = "bin/pandoc"; -+const char* const kDefaultPandocPath = "bin"; - const char* const kDefaultPostbackPath = "bin/postback/rpostback"; - const char* const kDefaultRsclangPath = "bin/rsclang"; - -@@ -481,14 +481,14 @@ - } - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath_, &rResourcesPath_); -- resolvePath(resourcePath_, &agreementFilePath_); -- resolvePath(resourcePath_, &wwwLocalPath_); -- resolvePath(resourcePath_, &wwwSymbolMapsPath_); -- resolvePath(resourcePath_, &coreRSourcePath_); -- resolvePath(resourcePath_, &modulesRSourcePath_); -- resolvePath(resourcePath_, &sessionLibraryPath_); -- resolvePath(resourcePath_, &sessionPackageArchivesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); - resolvePostbackPath(resourcePath_, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath_, &consoleIoPath_); -@@ -498,7 +498,7 @@ - resolvePath(resourcePath_, &sumatraPath_); - resolvePath(resourcePath_, &winutilsPath_); - #endif -- resolvePath(resourcePath_, &hunspellDictionariesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); - resolvePath(resourcePath_, &mathjaxPath_); - resolvePath(resourcePath_, &libclangHeadersPath_); - resolvePandocPath(resourcePath_, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch deleted file mode 100644 index 28b0220912a0..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: rstudio-1.1.357/src/cpp/session/CMakeLists.txt -=================================================================== ---- rstudio-1.1.357.orig/src/cpp/session/CMakeLists.txt -+++ rstudio-1.1.357/src/cpp/session/CMakeLists.txt -@@ -25,9 +25,6 @@ endif() - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") - message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - - # we often install embedded versions of these packages but don't do so currently - -@@ -38,22 +35,6 @@ endif() - # message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") - # endif() - --# verify libclang is installed --if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") --endif() --set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") --if(NOT EXISTS "${LIBCLANG_DIR}") -- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") --endif() --set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") --if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") --endif() -- -- - # include files - file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") - -@@ -465,13 +446,6 @@ if (NOT RSTUDIO_SESSION_WIN64) - install(DIRECTORY "resources/connections" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install pandoc -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rmarkdown package - # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") - # install(FILES ${RMARKDOWN_PACKAGE} -@@ -502,24 +476,6 @@ if (NOT RSTUDIO_SESSION_WIN64) - install(DIRECTORY "resources/profiler" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install libclang -- if(WIN32) -- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") -- install(PROGRAMS ${LIBCLANG_32_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") -- install(PROGRAMS ${LIBCLANG_64_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- else() -- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") -- install(PROGRAMS ${LIBCLANG_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) -- endif() -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -- - # install winpty on windows - if(WIN32) - install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll" diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch deleted file mode 100644 index 760c9b561055..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp 2018-05-15 04:19:30.000000000 +1000 -+++ rstudio-1.1.453/src/cpp/core/DateTime.cpp 2018-07-02 16:19:21.335703471 +1000 -@@ -65,7 +65,7 @@ - using namespace boost::posix_time; - - ptime time_t_epoch(date(1970,1,1)); -- return time_t_epoch + seconds(sec); -+ return time_t_epoch + seconds(static_cast(sec)); - } - - boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms) ---- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp 2018-05-15 04:19:30.000000000 +1000 -+++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp 2018-07-02 17:00:35.915695201 +1000 -@@ -133,11 +133,11 @@ - - // timeout interval - double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval); -- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval); -+ FileLock::s_timeoutInterval = boost::posix_time::seconds(static_cast(timeoutInterval)); - - // refresh rate - double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate); -- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate); -+ FileLock::s_refreshRate = boost::posix_time::seconds(static_cast(refreshRate)); - - // logging - bool loggingEnabled = settings.getBool("enable-logging", false); -@@ -212,8 +212,8 @@ - - // default values for static members - FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED); --boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval); --boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate); -+boost::posix_time::seconds FileLock::s_timeoutInterval(static_cast(kDefaultTimeoutInterval)); -+boost::posix_time::seconds FileLock::s_refreshRate(static_cast(kDefaultRefreshRate)); - bool FileLock::s_loggingEnabled(false); - bool FileLock::s_isLoadBalanced(false); - FilePath FileLock::s_logFile; diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch deleted file mode 100644 index 641f7710167a..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- rstudio-1.1.453-orig/src/cpp/session/SessionClientInit.cpp 2018-05-15 04:19:30.000000000 +1000 -+++ rstudio-1.1.453/src/cpp/session/SessionClientInit.cpp 2018-07-02 20:21:41.595654877 +1000 -@@ -105,7 +105,7 @@ - } - - // prepare session info -- json::Object sessionInfo ; -+ core::json::Object sessionInfo ; - sessionInfo["clientId"] = clientId; - sessionInfo["mode"] = options.programMode(); - -@@ -119,8 +119,8 @@ - } - - // temp dir -- FilePath tempDir = rstudio::r::session::utils::tempDir(); -- Error error = tempDir.ensureDirectory(); -+ core::FilePath tempDir = rstudio::r::session::utils::tempDir(); -+ core::Error error = tempDir.ensureDirectory(); - if (error) - LOG_ERROR(error); - sessionInfo["temp_dir"] = tempDir.absolutePath(); -@@ -132,12 +132,12 @@ - sessionInfo["prompt"] = rstudio::r::options::getOption("prompt"); - - // client state -- json::Object clientStateObject; -+ core::json::Object clientStateObject; - rstudio::r::session::clientState().currentState(&clientStateObject); - sessionInfo["client_state"] = clientStateObject; - - // source documents -- json::Array jsonDocs; -+ core::json::Array jsonDocs; - error = modules::source::clientInitDocuments(&jsonDocs); - if (error) - LOG_ERROR(error); -@@ -159,7 +159,7 @@ - if (resumed) - { - // console actions -- json::Object actionsObject; -+ core::json::Object actionsObject; - consoleActions.asJson(&actionsObject); - sessionInfo["console_actions"] = actionsObject; - } -@@ -211,12 +211,12 @@ - } - else - { -- sessionInfo["active_project_file"] = json::Value(); -- sessionInfo["project_ui_prefs"] = json::Value(); -- sessionInfo["project_open_docs"] = json::Value(); -+ sessionInfo["active_project_file"] = core::json::Value(); -+ sessionInfo["project_ui_prefs"] = core::json::Value(); -+ sessionInfo["project_open_docs"] = core::json::Value(); - sessionInfo["project_supports_sharing"] = false; - sessionInfo["project_owned_by_user"] = false; -- sessionInfo["project_user_data_directory"] = json::Value(); -+ sessionInfo["project_user_data_directory"] = core::json::Value(); - } - - sessionInfo["system_encoding"] = std::string(::locale2charset(NULL)); -@@ -253,20 +253,20 @@ - sessionInfo["build_tools_bookdown_website"] = - module_context::isBookdownWebsite(); - -- FilePath buildTargetDir = projects::projectContext().buildTargetPath(); -+ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath(); - if (!buildTargetDir.empty()) - { - sessionInfo["build_target_dir"] = module_context::createAliasedPath( - buildTargetDir); -- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) && -+ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) && - buildTargetDir.childPath("src").exists(); - sessionInfo["has_pkg_vig"] = -- (type == r_util::kBuildTypePackage) && -+ (type == core::r_util::kBuildTypePackage) && - buildTargetDir.childPath("vignettes").exists(); - } - else - { -- sessionInfo["build_target_dir"] = json::Value(); -+ sessionInfo["build_target_dir"] = core::json::Value(); - sessionInfo["has_pkg_src"] = false; - sessionInfo["has_pkg_vig"] = false; - } -@@ -274,9 +274,9 @@ - } - else - { -- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone; -+ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone; - sessionInfo["build_tools_bookdown_website"] = false; -- sessionInfo["build_target_dir"] = json::Value(); -+ sessionInfo["build_target_dir"] = core::json::Value(); - sessionInfo["has_pkg_src"] = false; - sessionInfo["has_pkg_vig"] = false; - } -@@ -285,7 +285,7 @@ - sessionInfo["presentation_commands"] = options.allowPresentationCommands(); - - sessionInfo["tutorial_api_available"] = false; -- sessionInfo["tutorial_api_client_origin"] = json::Value(); -+ sessionInfo["tutorial_api_client_origin"] = core::json::Value(); - - sessionInfo["build_state"] = modules::build::buildStateAsJson(); - sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled(); -@@ -296,7 +296,7 @@ - - // console history -- we do this at the end because - // restoreBuildRestartContext may have reset it -- json::Array historyArray; -+ core::json::Array historyArray; - rstudio::r::session::consoleHistory().asJson(&historyArray); - sessionInfo["console_history"] = historyArray; - sessionInfo["console_history_capacity"] = -@@ -364,13 +364,13 @@ - - sessionInfo["multi_session"] = options.multiSession(); - -- json::Object rVersionsJson; -+ core::json::Object rVersionsJson; - rVersionsJson["r_version"] = module_context::rVersion(); - rVersionsJson["r_home_dir"] = module_context::rHomeDir(); - sessionInfo["r_versions_info"] = rVersionsJson; - - sessionInfo["show_user_home_page"] = options.showUserHomePage(); -- sessionInfo["user_home_page_url"] = json::Value(); -+ sessionInfo["user_home_page_url"] = core::json::Value(); - - sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson(); - sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload(); -@@ -394,7 +394,7 @@ - - // send response (we always set kEventsPending to false so that the client - // won't poll for events until it is ready) -- json::JsonRpcResponse jsonRpcResponse ; -+ core::json::JsonRpcResponse jsonRpcResponse ; - jsonRpcResponse.setField(kEventsPending, "false"); - jsonRpcResponse.setResult(sessionInfo) ; - ptrConnection->sendJsonRpcResponse(jsonRpcResponse); diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch deleted file mode 100644 index a7a48572de30..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch +++ /dev/null @@ -1,460 +0,0 @@ ---- /dev/null 2019-03-19 11:03:33.121000004 +1100 -+++ rstudio-1.1.463/src/cpp/core/include/core/BoostSignals.hpp 2018-11-17 21:24:35.285976284 +1100 -@@ -0,0 +1,40 @@ -+/* -+ * BoostSignals.hpp -+ * -+ * Copyright (C) 2009-18 by RStudio, Inc. -+ * -+ * Unless you have received this program directly from RStudio pursuant -+ * to the terms of a commercial license agreement with RStudio, then -+ * this program is licensed to you under the terms of version 3 of the -+ * GNU Affero General Public License. This program is distributed WITHOUT -+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT, -+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the -+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details. -+ * -+ */ -+ -+#ifndef CORE_RSTUDIO_BOOST_SIGNALS_HPP -+#define CORE_RSTUDIO_BOOST_SIGNALS_HPP -+ -+#if RSTUDIO_BOOST_SIGNALS_VERSION == 1 -+ -+# include -+# define RSTUDIO_BOOST_SIGNAL boost::signal -+# define RSTUDIO_BOOST_CONNECTION boost::signals::connection -+# define RSTUDIO_BOOST_SCOPED_CONNECTION boost::signals::scoped_connection -+# define RSTUDIO_BOOST_LAST_VALUE boost::last_value -+ -+#elif RSTUDIO_BOOST_SIGNALS_VERSION == 2 -+ -+# include -+# define RSTUDIO_BOOST_SIGNAL boost::signals2::signal -+# define RSTUDIO_BOOST_CONNECTION boost::signals2::connection -+# define RSTUDIO_BOOST_SCOPED_CONNECTION boost::signals2::scoped_connection -+# define RSTUDIO_BOOST_LAST_VALUE boost::signals2::last_value -+ -+#else -+# error "Unrecognized RSTUDIO_BOOST_SIGNALS_VERSION" -+#endif -+ -+#endif // CORE_RSTUDIO_BOOST_SIGNALS_HPP -+ ---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100 -@@ -208,6 +208,18 @@ - message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}") - endif() - -+# allow opt-in to using Boost.Signals2 -+# TODO: remove this in RStudio v1.3 and port to signals2 -+if(NOT RSTUDIO_BOOST_SIGNALS_VERSION) -+ if (BOOST_VERSION VERSION_LESS 1.69.0) -+ set(RSTUDIO_BOOST_SIGNALS_VERSION 1) -+ else() -+ set(RSTUDIO_BOOST_SIGNALS_VERSION 2) -+ endif() -+endif() -+ -+message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}") -+add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION}) - - # add boost as system include directory - include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ---- rstudio-1.1.463-orig/src/cpp/r/include/r/session/RConsoleHistory.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/r/include/r/session/RConsoleHistory.hpp 2018-11-17 21:24:35.285976284 +1100 -@@ -20,8 +20,8 @@ - - #include - #include --#include - -+#include - #include - - namespace rstudio { -@@ -44,7 +44,7 @@ - public: - typedef boost::circular_buffer::value_type value_type; - typedef boost::circular_buffer::const_iterator const_iterator; -- typedef boost::signal AddSignal; -+ typedef RSTUDIO_BOOST_SIGNAL AddSignal; - - private: - ConsoleHistory(); -@@ -86,8 +86,7 @@ - core::Error loadFromFile(const core::FilePath& filePath, bool verifyFile); - core::Error saveToFile(const core::FilePath& filePath) const; - -- boost::signals::connection connectOnAdd( -- const AddSignal::slot_function_type& slot) -+ RSTUDIO_BOOST_CONNECTION connectOnAdd(const AddSignal::slot_function_type& slot) - { - return onAdd_.connect(slot); - } ---- rstudio-1.1.463-orig/src/cpp/r/include/r/session/RGraphics.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/r/include/r/session/RGraphics.hpp 2018-11-17 21:24:35.286976293 +1100 -@@ -19,6 +19,8 @@ - #include - #include - -+#include -+ - namespace rstudio { - namespace r { - namespace session { -@@ -56,8 +58,8 @@ - #include - - #include --#include - -+#include - #include - #include - -@@ -162,7 +164,7 @@ - virtual void clear() = 0; - - // subscribe to showManipulator event -- virtual boost::signal& onShowManipulator() = 0; -+ virtual RSTUDIO_BOOST_SIGNAL& onShowManipulator() = 0; - - // set manipulator values - virtual void setPlotManipulatorValues(const core::json::Object& values) = 0; ---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp 2018-11-17 21:24:35.286976293 +1100 -@@ -540,7 +540,7 @@ - - - --boost::signal& PlotManager::onShowManipulator() -+RSTUDIO_BOOST_SIGNAL& PlotManager::onShowManipulator() - { - return plotManipulatorManager().onShowManipulator(); - } ---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp 2018-11-17 21:24:35.287976303 +1100 -@@ -22,10 +22,10 @@ - #include - #include - #include --#include - #include - #include - -+#include - #include - #include - -@@ -45,10 +45,10 @@ - - struct GraphicsDeviceEvents - { -- boost::signal onNewPage; -- boost::signal onDrawing; -- boost::signal onResized; -- boost::signal onClosed; -+ RSTUDIO_BOOST_SIGNAL onNewPage; -+ RSTUDIO_BOOST_SIGNAL onDrawing; -+ RSTUDIO_BOOST_SIGNAL onResized; -+ RSTUDIO_BOOST_SIGNAL onClosed; - }; - - class PlotManipulatorManager; -@@ -110,7 +110,7 @@ - - virtual void clear(); - -- virtual boost::signal& onShowManipulator() ; -+ virtual RSTUDIO_BOOST_SIGNAL& onShowManipulator() ; - virtual void setPlotManipulatorValues(const core::json::Object& values); - virtual void manipulatorPlotClicked(int x, int y); - ---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp 2018-11-17 21:24:35.287976303 +1100 -@@ -184,7 +184,7 @@ - } - - --boost::signal& PlotManipulatorManager::onShowManipulator() -+RSTUDIO_BOOST_SIGNAL& PlotManipulatorManager::onShowManipulator() - { - return onShowManipulator_; - } ---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp 2018-11-17 21:24:35.287976303 +1100 -@@ -16,8 +16,7 @@ - #ifndef R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP - #define R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP - --#include -- -+#include - #include - #include - -@@ -53,7 +52,7 @@ - public: - core::Error initialize(const UnitConversionFunctions& convert); - -- boost::signal& onShowManipulator() ; -+ RSTUDIO_BOOST_SIGNAL& onShowManipulator() ; - void setPlotManipulatorValues(const core::json::Object& values); - void manipulatorPlotClicked(int x, int y); - -@@ -85,7 +84,7 @@ - bool replayingManipulator_; - - // manipulator event hook -- boost::signal onShowManipulator_; -+ RSTUDIO_BOOST_SIGNAL onShowManipulator_; - - // unit conversion function - UnitConversionFunctions convert_; ---- rstudio-1.1.463-orig/src/cpp/server/include/server/ServerSessionManager.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/server/include/server/ServerSessionManager.hpp 2018-11-17 21:27:05.255436316 +1100 -@@ -20,9 +20,9 @@ - #include - #include - --#include - #include - -+#include - #include - - #include ---- rstudio-1.1.463-orig/src/cpp/session/SessionMain.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/SessionMain.cpp 2018-11-17 21:24:35.288976313 +1100 -@@ -33,12 +33,12 @@ - #include - #include - --#include - #include - #include - #include - - #include -+#include - #include - #include - #include ---- rstudio-1.1.463-orig/src/cpp/session/SessionModuleContext.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/SessionModuleContext.cpp 2018-11-17 21:24:35.289976322 +1100 -@@ -19,10 +19,10 @@ - - #include - #include --#include - #include - #include - -+#include - #include - #include - #include -@@ -586,13 +586,13 @@ - - int nextGroup_; - -- boost::signal, -+ RSTUDIO_BOOST_SIGNAL, - int, - std::less > suspendSignal_; - -- boost::signal, -+ RSTUDIO_BOOST_SIGNAL, - int, - std::greater > resumeSignal_; - }; ---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionConsoleProcess.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/include/session/SessionConsoleProcess.hpp 2018-11-17 21:24:35.290976332 +1100 -@@ -20,10 +20,10 @@ - #include - - #include --#include - #include - #include - -+#include - #include - #include - -@@ -146,7 +146,7 @@ - void setPromptHandler( - const boost::function& onPrompt); - -- boost::signal& onExit() { return onExit_; } -+ RSTUDIO_BOOST_SIGNAL& onExit() { return onExit_; } - - std::string handle() const { return procInfo_->getHandle(); } - InteractionMode interactionMode() const { return procInfo_->getInteractionMode(); } -@@ -264,7 +264,7 @@ - boost::mutex inputOutputQueueMutex_; - - boost::function onPrompt_; -- boost::signal onExit_; -+ RSTUDIO_BOOST_SIGNAL onExit_; - - // regex for prompt detection - boost::regex controlCharsPattern_; ---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionModuleContext.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/include/session/SessionModuleContext.hpp 2018-11-17 21:28:25.019212857 +1100 -@@ -21,9 +21,9 @@ - - #include - #include --#include - #include - -+#include - #include - #include - #include -@@ -315,35 +315,35 @@ - // session events - struct Events : boost::noncopyable - { -- boost::signal onSessionInfo; -- boost::signal onClientInit; -- boost::signal onBeforeExecute; -- boost::signal onConsolePrompt; -- boost::signal onConsoleInput; -- boost::signal -+ RSTUDIO_BOOST_SIGNAL onSessionInfo; -+ RSTUDIO_BOOST_SIGNAL onClientInit; -+ RSTUDIO_BOOST_SIGNAL onBeforeExecute; -+ RSTUDIO_BOOST_SIGNAL onConsolePrompt; -+ RSTUDIO_BOOST_SIGNAL onConsoleInput; -+ RSTUDIO_BOOST_SIGNAL - onActiveConsoleChanged; -- boost::signal -+ RSTUDIO_BOOST_SIGNAL - onConsoleOutput; -- boost::signal onUserInterrupt; -- boost::signal onDetectChanges; -- boost::signal onSourceEditorFileSaved; -- boost::signal onDeferredInit; -- boost::signal afterSessionInitHook; -- boost::signal onBackgroundProcessing; -- boost::signal onShutdown; -- boost::signal onQuit; -- boost::signal onDestroyed; -- boost::signal&)> -+ RSTUDIO_BOOST_SIGNAL onUserInterrupt; -+ RSTUDIO_BOOST_SIGNAL onDetectChanges; -+ RSTUDIO_BOOST_SIGNAL onSourceEditorFileSaved; -+ RSTUDIO_BOOST_SIGNAL onDeferredInit; -+ RSTUDIO_BOOST_SIGNAL afterSessionInitHook; -+ RSTUDIO_BOOST_SIGNAL onBackgroundProcessing; -+ RSTUDIO_BOOST_SIGNAL onShutdown; -+ RSTUDIO_BOOST_SIGNAL onQuit; -+ RSTUDIO_BOOST_SIGNAL onDestroyed; -+ RSTUDIO_BOOST_SIGNAL&)> - onLibPathsChanged; -- boost::signal onPackageLoaded; -- boost::signal onPackageLibraryMutated; -- boost::signal onPreferencesSaved; -- boost::signal -+ RSTUDIO_BOOST_SIGNAL onPackageLoaded; -+ RSTUDIO_BOOST_SIGNAL onPackageLibraryMutated; -+ RSTUDIO_BOOST_SIGNAL onPreferencesSaved; -+ RSTUDIO_BOOST_SIGNAL - onDistributedEvent; -- boost::signal onPermissionsChanged; -+ RSTUDIO_BOOST_SIGNAL onPermissionsChanged; - - // signal for detecting extended type of documents -- boost::signal), -+ RSTUDIO_BOOST_SIGNAL), - firstNonEmpty > onDetectSourceExtendedType; - }; - ---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionSourceDatabase.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/include/session/SessionSourceDatabase.hpp 2018-11-17 21:24:35.291976342 +1100 -@@ -21,8 +21,8 @@ - - #include - #include --#include - -+#include - #include - #include - -@@ -204,14 +204,14 @@ - // source database events - struct Events : boost::noncopyable - { -- boost::signal)> onDocUpdated; -- boost::signal)> onDocUpdated; -+ RSTUDIO_BOOST_SIGNAL)> onDocRenamed; -- boost::signal onDocAdded; -- boost::signal onDocAdded; -+ RSTUDIO_BOOST_SIGNAL)> onDocPendingRemove; -- boost::signal onDocRemoved; -- boost::signal onRemoveAll; -+ RSTUDIO_BOOST_SIGNAL onDocRemoved; -+ RSTUDIO_BOOST_SIGNAL onRemoveAll; - }; - - Events& events(); ---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionUserSettings.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/include/session/SessionUserSettings.hpp 2018-11-17 21:24:35.291976342 +1100 -@@ -20,8 +20,8 @@ - - #include - #include --#include - -+#include - #include - #include - #include -@@ -62,7 +62,7 @@ - friend UserSettings& userSettings(); - - public: -- boost::signal onChanged; -+ RSTUDIO_BOOST_SIGNAL onChanged; - - public: - // COPYING: boost::noncopyable ---- rstudio-1.1.463-orig/src/cpp/session/include/session/projects/SessionProjects.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/include/session/projects/SessionProjects.hpp 2018-11-17 21:24:35.291976342 +1100 -@@ -22,8 +22,8 @@ - #include - #include - #include --#include - -+#include - #include - #include - #include -@@ -220,10 +220,10 @@ - - bool hasFileMonitor_; - std::vector monitorSubscribers_; -- boost::signal&)> onMonitoringEnabled_; -- boost::signal&)> -+ RSTUDIO_BOOST_SIGNAL&)> onMonitoringEnabled_; -+ RSTUDIO_BOOST_SIGNAL&)> - onFilesChanged_; -- boost::signal onMonitoringDisabled_; -+ RSTUDIO_BOOST_SIGNAL onMonitoringDisabled_; - }; - - ProjectContext& projectContext(); diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch deleted file mode 100644 index d90ce005a1a0..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch +++ /dev/null @@ -1,220 +0,0 @@ ---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp 2018-11-17 21:24:35.292976352 +1100 -@@ -16,7 +16,7 @@ - #ifndef SESSION_PLOTS_HPP - #define SESSION_PLOTS_HPP - --#include -+#include - - namespace rstudio { - namespace core { -@@ -35,9 +35,9 @@ - - struct Events : boost::noncopyable - { -- boost::signal onBeforeNewPlot; -- boost::signal onBeforeNewGridPage; -- boost::signal onNewPlot; -+ RSTUDIO_BOOST_SIGNAL onBeforeNewPlot; -+ RSTUDIO_BOOST_SIGNAL onBeforeNewGridPage; -+ RSTUDIO_BOOST_SIGNAL onNewPlot; - }; - - Events& events(); ---- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100 -@@ -15,11 +15,11 @@ - - #include "SessionSourceCpp.hpp" - --#include - #include - #include - #include - -+#include - #include - #include - #include ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100 -@@ -142,7 +142,7 @@ - LOG_ERROR(error); - - // capture console output, error -- boost::signals::scoped_connection consoleHandler = -+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler = - module_context::events().onConsoleOutput.connect( - boost::bind(chunkConsoleOutputHandler, - _1, -@@ -219,7 +219,7 @@ - LOG_ERROR(error); - - // capture console output, error -- boost::signals::scoped_connection consoleHandler = -+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler = - module_context::events().onConsoleOutput.connect( - boost::bind(chunkConsoleOutputHandler, - _1, -@@ -363,7 +363,7 @@ - LOG_ERROR(error); - - // capture console output, error -- boost::signals::scoped_connection consoleHandler = -+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler = - module_context::events().onConsoleOutput.connect( - boost::bind(chunkConsoleOutputHandler, - _1, ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-11-17 21:24:35.294976371 +1100 -@@ -16,6 +16,8 @@ - #include "SessionRmdNotebook.hpp" - #include "NotebookCapture.hpp" - -+#include -+ - namespace rstudio { - namespace session { - namespace modules { ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-11-17 21:24:35.295976381 +1100 -@@ -441,7 +441,7 @@ - } - - // unhook all our event handlers -- BOOST_FOREACH(const boost::signals::connection connection, connections_) -+ BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_) - { - connection.disconnect(); - } ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100 -@@ -18,8 +18,7 @@ - - #include - --#include -- -+#include - #include - - #include -@@ -99,7 +98,7 @@ - bool hasErrors_; - - std::vector > captures_; -- std::vector connections_; -+ std::vector connections_; - }; - - } // namespace notebook ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100 -@@ -20,11 +20,12 @@ - - #include - #include --#include - --#include --#include -+#include - #include -+#include -+ -+#include - - #include - ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-11-17 21:24:35.296976391 +1100 -@@ -18,8 +18,10 @@ - #define SESSION_NOTEBOOK_PLOTS_HPP - - #include --#include -+ -+#include - #include -+ - #include - - #include "NotebookCapture.hpp" -@@ -80,9 +82,9 @@ - - unsigned lastOrdinal_; - -- boost::signals::connection onBeforeNewPlot_; -- boost::signals::connection onBeforeNewGridPage_; -- boost::signals::connection onNewPlot_; -+ RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_; -+ RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_; -+ RSTUDIO_BOOST_CONNECTION onNewPlot_; - - double width_; - double height_; ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-11-17 21:24:35.296976391 +1100 -@@ -87,7 +87,7 @@ - pInput_->enque(kThreadQuitCommand); - - // unregister handlers -- BOOST_FOREACH(boost::signals::connection connection, handlers_) -+ BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_) - { - connection.disconnect(); - } -@@ -651,7 +651,7 @@ - boost::shared_ptr execContext_; - - // registered signal handlers -- std::vector handlers_; -+ std::vector handlers_; - - // the thread which submits console input, and the queue which feeds it - boost::thread console_; ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-11-17 21:24:35.296976391 +1100 -@@ -18,7 +18,8 @@ - #define SESSION_RMARKDOWN_NOTEBOOK_HPP - - #include --#include -+ -+#include - #include - - #define kChunkLibDir "lib" -@@ -76,24 +77,24 @@ - struct Events : boost::noncopyable - { - // Document {0}, chunk {1} from context id {3} execution completed -- boost::signal - onChunkExecCompleted; - - // Document {0}, chunk {1} had console output of type {2} and text {3} -- boost::signal - onChunkConsoleOutput; - -- boost::signal - onPlotOutput; -- boost::signal onHtmlOutput; -- boost::signal onErrorOutput; -- boost::signal onErrorOutput; -+ RSTUDIO_BOOST_SIGNAL onDataOutput; -- boost::signal -+ RSTUDIO_BOOST_SIGNAL - onCondition; - }; - diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch deleted file mode 100644 index 961723fd224f..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch +++ /dev/null @@ -1,167 +0,0 @@ ---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100 -+++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:41:02.712507842 +1100 -@@ -175,6 +175,9 @@ - set(Boost_USE_STATIC_LIBS ON) - set(BOOST_INCLUDEDIR ${RSTUDIO_TOOLS_BOOST}/include) - find_package(Boost ${BOOST_VERSION} REQUIRED) -+ if(NOT Boost_VERSION VERSION_LESS 1.69.0) -+ list(REMOVE_ITEM BOOST_LIBS signals) -+ endif() - - # define library list manually (find_package doesn't always pick them up) - set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib) -@@ -184,11 +187,15 @@ - message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}") - else() - add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost) -+ find_package(Boost ${BOOST_VERSION} REQUIRED) -+ if(NOT Boost_VERSION VERSION_LESS 1.69.0) -+ list(REMOVE_ITEM BOOST_LIBS signals) -+ endif() - find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS}) - message(STATUS "Using system Boost ${BOOST_VERSION}") - endif() - -- # WIN32 BOOST -+# WIN32 BOOST - else() - # hard-code to our own prebuilt boost libs - add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost) -@@ -211,14 +218,14 @@ - # allow opt-in to using Boost.Signals2 - # TODO: remove this in RStudio v1.3 and port to signals2 - if(NOT RSTUDIO_BOOST_SIGNALS_VERSION) -- if (BOOST_VERSION VERSION_LESS 1.69.0) -+ if (Boost_VERSION VERSION_LESS 1.69.0) - set(RSTUDIO_BOOST_SIGNALS_VERSION 1) - else() - set(RSTUDIO_BOOST_SIGNALS_VERSION 2) - endif() - endif() - --message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}") -+message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}") - add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION}) - - # add boost as system include directory ---- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-11-17 21:41:02.713507852 +1100 -@@ -75,9 +75,9 @@ - const std::string& name() const { return name_; } - const boost::optional& defaultValue() const { return defaultValue_; } - boost::tribool hasDefault() const { return hasDefault_; } -- bool isUsed() const { return isUsed_; } -+ bool isUsed() const { return bool(isUsed_); } - void setIsUsed(bool value) { isUsed_ = value; } -- bool isMissingnessHandled() const { return isMissingnessHandled_; } -+ bool isMissingnessHandled() const { return bool(isMissingnessHandled_); } - void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; } - - private: -@@ -130,7 +130,7 @@ - - bool isPrimitive() - { -- return isPrimitive_ == true; -+ return bool(isPrimitive_); - } - - void setIsPrimitive(bool isPrimitive) ---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp 2018-11-17 21:41:02.714507862 +1100 -@@ -390,7 +390,7 @@ - if (!failed) - { - DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding()); -- return fnInfo.performsNse(); -+ return bool(fnInfo.performsNse()); - } - - // Handle some special cases first. ---- rstudio-1.1.463-orig/src/tools/clang-ubsan-build 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/tools/clang-ubsan-build 2018-11-17 21:41:02.714507862 +1100 -@@ -10,19 +10,19 @@ - - : ${RSTUDIO_USE_LIBCXX="Yes"} - : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"} --: ${RSTUDIO_BOOST_VERSION="1.56.0"} -+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"} - - mkdir -p "${BUILD_DIR}" - cd "${BUILD_DIR}" --cmake ../cpp \ -- -DLIBR_HOME="${R_HOME}" \ -- -DCMAKE_C_COMPILER="${CC}" \ -- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -- -DCMAKE_CXX_COMPILER="${CXX}" \ -- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ -- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ -- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \ -+cmake ../cpp \ -+ -DLIBR_HOME="${R_HOME}" \ -+ -DCMAKE_C_COMPILER="${CC}" \ -+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -+ -DCMAKE_CXX_COMPILER="${CXX}" \ -+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ -+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ -+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \ - "$@" - cd .. - ---- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/tools/gcc-ubsan-build 2018-11-17 21:41:02.715507871 +1100 -@@ -19,19 +19,19 @@ - # NOTE: Boost 1.50.0 not compatible with gcc-6 - : ${RSTUDIO_USE_LIBCXX="No"} - : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"} --: ${RSTUDIO_BOOST_VERSION="1.54.0"} -+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"} - - mkdir -p "${BUILD_DIR}" - cd "${BUILD_DIR}" --cmake ../cpp \ -- -DLIBR_HOME="${R_HOME}" \ -- -DCMAKE_C_COMPILER="${CC}" \ -- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -- -DCMAKE_CXX_COMPILER="${CXX}" \ -- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ -- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ -- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \ -+cmake ../cpp \ -+ -DLIBR_HOME="${R_HOME}" \ -+ -DCMAKE_C_COMPILER="${CC}" \ -+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -+ -DCMAKE_CXX_COMPILER="${CXX}" \ -+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ -+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ -+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ -+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \ - "$@" - cd .. - ---- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/tools/xcode-ubsan-build 2018-11-17 21:41:02.715507871 +1100 -@@ -15,13 +15,13 @@ - # sanitizers released with newer versions of clang) - mkdir -p "${BUILD_DIR}" - cd "${BUILD_DIR}" --cmake ../cpp -GXcode \ -- -DLIBR_HOME="${R_HOME}" \ -- -DLIBR_INCLUDE_DIRS="${R_INCL}" \ -- -DLIBR_DOC_DIR="${R_DOCS}" \ -- -DRSTUDIO_USE_LIBCXX="Yes" \ -- -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \ -- -DRSTUDIO_BOOST_VERSION="1.56.0" \ -+cmake ../cpp -GXcode \ -+ -DLIBR_HOME="${R_HOME}" \ -+ -DLIBR_INCLUDE_DIRS="${R_INCL}" \ -+ -DLIBR_DOC_DIR="${R_DOCS}" \ -+ -DRSTUDIO_USE_LIBCXX="Yes" \ -+ -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \ -+ -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \ - "$@" - cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib" - cd .. diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch deleted file mode 100644 index 320b823355a3..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-30 20:14:40.634057634 +1100 -@@ -296,7 +296,11 @@ - */ - timer_ptr set_timer(long duration, timer_handler callback) { - timer_ptr new_timer = lib::make_shared( -+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 -+ *m_io_service, -+#else - lib::ref(*m_io_service), -+#endif - boost::posix_time::milliseconds(duration) - ); - ---- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-30 20:14:36.319021594 +1100 -@@ -184,7 +184,12 @@ - m_io_service = ptr; - m_external_io_service = true; - m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 -+ *m_io_service -+#else -+ lib::ref(*m_io_service) -+#endif -+ ); - - m_state = READY; - ec = lib::error_code(); ---- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-30 20:15:22.353406097 +1100 -@@ -167,7 +167,12 @@ - } - - m_socket = lib::make_shared( -- lib::ref(*service)); -+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 -+ *service -+#else -+ lib::ref(*service) -+#endif -+ ); - - m_state = READY; - diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch deleted file mode 100644 index 914cd942e8f4..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rstudio-1.1.463-orig/src/cpp/server/ServerSecureKeyFile.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/server/ServerSecureKeyFile.cpp 2018-11-17 22:17:18.110012955 +1100 -@@ -79,8 +79,8 @@ - return error; - - // change mode it so it is only readable and writeable by this user -- if (changeFileMode(secureKeyPath, -- core::system::UserReadWriteMode) < 0) -+ if (!!changeFileMode(secureKeyPath, -+ core::system::UserReadWriteMode)) - { - return systemError(errno, ERROR_LOCATION); - } diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch deleted file mode 100644 index b2c4d2392f6a..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001 -From: Kevin Ushey -Date: Fri, 15 Nov 2019 14:54:02 -0800 -Subject: [PATCH] avoid use of deprecated APIs - ---- - src/cpp/core/FilePath.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/cpp/shared_core/FilePath.cpp b/src/cpp/shared_core/FilePath.cpp -index 088366a9d6..495289e7fc 100644 ---- a/src/cpp/core/FilePath.cpp -+++ b/src/cpp/core/FilePath.cpp -@@ -22,8 +22,6 @@ - #include - #endif - --#define BOOST_FILESYSTEM_NO_DEPRECATED -- - #define BOOST_NO_CXX11_SCOPED_ENUMS - #include - #undef BOOST_NO_CXX11_SCOPED_ENUMS -@@ -1032,7 +1030,7 @@ - { - // NOTE: The path gets round-tripped through toString/fromString, would - // be nice to have a direct constructor -- if (!iterationFunction(itr.level(), -+ if (!iterationFunction(itr.depth(), - FilePath(BOOST_FS_PATH2STR(itr->path())))) - { - // end the iteration if requested diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch deleted file mode 100644 index e38f5e0c4448..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rstudio-1.2.1335-orig/src/cpp/server_core/SecureKeyFile.cpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/server_core/SecureKeyFile.cpp 2019-04-09 20:47:57.943317208 +1000 -@@ -68,8 +68,8 @@ - return error; - - // change mode it so it is only readable and writeable by this user -- if (changeFileMode(secureKeyPath, -- core::system::UserReadWriteMode) < 0) -+ if (!!changeFileMode(secureKeyPath, -+ core::system::UserReadWriteMode)) - { - return systemError(errno, ERROR_LOCATION); - } diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch deleted file mode 100644 index e2fe83867bcd..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- rstudio-1.2.1335-orig/src/cpp/session/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/session/CMakeLists.txt 2019-04-09 17:22:59.210201624 +1000 -@@ -25,9 +25,6 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") - message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() - - # we often install embedded versions of these packages but don't do so currently - -@@ -479,19 +476,6 @@ - install(DIRECTORY "resources/connections" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - --# install pandoc --if(WIN32) -- set(PANDOC_VERSION "2.6" CACHE INTERNAL "Pandoc version") --else() -- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") --endif() -- --set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") --file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") --install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install rmarkdown package - # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") - # install(FILES ${RMARKDOWN_PACKAGE} diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch deleted file mode 100644 index ba66ef9f0ea1..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- rstudio-1.2.1335-orig/CMakeGlobals.txt 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/CMakeGlobals.txt 2019-04-09 17:10:07.680657631 +1000 -@@ -161,7 +161,7 @@ - set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources) - else() - set(RSTUDIO_INSTALL_BIN bin) -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate ---- rstudio-1.2.1335-orig/src/cpp/server/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/server/CMakeLists.txt 2019-04-09 16:54:34.740739744 +1000 -@@ -194,7 +194,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} -- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -202,7 +202,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} -- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -210,13 +210,13 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} -- DESTINATION ${RSERVER_INITD_SUSE_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) - - # install pam profile - set(RSERVER_PAM_DIR "extras/pam") - set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} -- DESTINATION ${RSERVER_PAM_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -224,12 +224,12 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} -- DESTINATION ${RSERVER_UPSTART_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - # install configured systemd profile - set(RSERVER_SYSTEMD_DIR "extras/systemd") ---- rstudio-1.2.1335-orig/src/cpp/server/ServerOptions.cpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/server/ServerOptions.cpp 2019-04-09 16:54:34.740739744 +1000 -@@ -389,8 +389,8 @@ - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &wwwSymbolMapsPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); - resolvePath(binaryPath, &authPamHelperPath_); - resolvePath(binaryPath, &rsessionPath_); - resolvePath(binaryPath, &rldpathPath_); ---- rstudio-1.2.1335-orig/src/cpp/session/SessionOptions.cpp 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/cpp/session/SessionOptions.cpp 2019-04-09 17:17:06.035206050 +1000 -@@ -53,7 +53,7 @@ - namespace session { - - namespace { --const char* const kDefaultPandocPath = "bin/pandoc"; -+const char* const kDefaultPandocPath = "bin"; - const char* const kDefaultPostbackPath = "bin/postback/rpostback"; - const char* const kDefaultRsclangPath = "bin/rsclang"; - -@@ -569,14 +569,14 @@ - } - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath_, &rResourcesPath_); -- resolvePath(resourcePath_, &agreementFilePath_); -- resolvePath(resourcePath_, &wwwLocalPath_); -- resolvePath(resourcePath_, &wwwSymbolMapsPath_); -- resolvePath(resourcePath_, &coreRSourcePath_); -- resolvePath(resourcePath_, &modulesRSourcePath_); -- resolvePath(resourcePath_, &sessionLibraryPath_); -- resolvePath(resourcePath_, &sessionPackageArchivesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); - resolvePostbackPath(resourcePath_, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath_, &consoleIoPath_); -@@ -601,7 +601,7 @@ - } - winptyPath_ = pty.complete(completion).absolutePath(); - #endif // _WIN32 -- resolvePath(resourcePath_, &hunspellDictionariesPath_); -+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); - resolvePath(resourcePath_, &mathjaxPath_); - resolvePath(resourcePath_, &libclangHeadersPath_); - resolvePandocPath(resourcePath_, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch deleted file mode 100644 index e72df553eeb6..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- rstudio-1.2.1335-orig/src/gwt/build.xml 2019-03-28 16:08:20.000000000 +1100 -+++ rstudio-1.2.1335/src/gwt/build.xml 2019-04-09 16:44:15.089471934 +1000 -@@ -34,6 +34,7 @@ - - - -+ - - - -@@ -112,8 +113,10 @@ - - - -+ - - -+ - - - -@@ -154,6 +157,7 @@ - - - -+ - - - -@@ -176,6 +180,7 @@ - - - -+ - - - -@@ -202,6 +207,7 @@ - - - -+ - - - -@@ -237,6 +243,7 @@ - - - -+ - - - diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild deleted file mode 100644 index 8b60b2efe5b7..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils vcs-clean - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.7.0 -GIN_VER=1.5 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -PANDOC_VER=1.19.2.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated libressl server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.63:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}/${PN}-0.99.879-prefs.patch" - "${FILESDIR}/${PN}-1.0.44-paths.patch" - "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch" - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-1.0.44-systemd.patch" - "${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch" - "${FILESDIR}/${PN}-1.1.453-core.patch" - "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch" - "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch" - "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch" - "${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch" - "${FILESDIR}/${PN}-1.1.463-boost-1.70.0.patch" -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - cmake-utils_src_prepare - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v${PV} - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) - export RSTUDIO_VERSION_MINOR=$(ver_cut 2) - export RSTUDIO_VERSION_PATCH=$(ver_cut 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild deleted file mode 100644 index 2ba27bd51487..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils vcs-clean - -# TODO -# * package gin and gwt -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -# update from scripts in dependencies/common -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt -GWT_VER=2.8.1 -GIN_VER=2.1.2 -SELENIUM_VER=2.37.0 -CHROMEDRIVER_VER=2.7 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage -PANDOC_VER=1.19.2.1 -# ls dependencies/common/*.tar.gz -PACKRAT_VER=0.98.1000 -RMARKDOWN_VER=0.98.1000 -SHINYAPPS_VER=0.98.1000 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 - -DESCRIPTION="IDE for the R language" -HOMEPAGE=" - http://www.rstudio.org - https://github.com/rstudio/rstudio/" -SRC_URI=" - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated libressl server" - -QT_VER=5.4 -QT_SLOT=5 -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-haskell/pandoc-citeproc - >=dev-lang/R-2.11.1 - >=dev-libs/boost-1.63:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - >=sys-devel/clang-3.5.0:* - sys-libs/zlib - >=virtual/jre-1.8:= - x11-libs/pango - !dedicated? ( - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} - >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-java/ant-core - >=virtual/jdk-1.8:= - virtual/pkgconfig" -# test? ( dev-java/junit:4 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.1335-prefs.patch - "${FILESDIR}"/${PN}-1.2.1335-paths.patch - "${FILESDIR}"/${PN}-1.2.1335-pandoc.patch - "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch - "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch - "${FILESDIR}"/${PN}-1.0.44-systemd.patch - "${FILESDIR}"/${PN}-1.2.1335-core.patch - "${FILESDIR}"/${PN}-1.2.1335-fix-ptr-int-compare.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch - "${FILESDIR}"/${PN}-1.2.1335-boost-1.72-filesystem.patch -) - -src_unpack() { - unpack ${P}.tar.gz gwt-${GWT_VER}.zip - cd "${S}" || die - mkdir -p src/gwt/lib/{gin,gwt} \ - dependencies/common/dictionaries \ - src/gwt/lib/selenium/${SELENIUM_VER} \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die - unzip -qd src/gwt/lib/gin/${GIN_VER} \ - "${DISTDIR}"/gin-${GIN_VER}.zip || die - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ - src/gwt/lib/selenium/${SELENIUM_VER}/ || die - cp "${DISTDIR}"/chromedriver-linux \ - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die - cd dependencies/common || die - unpack packrat-${PACKRAT_VER}.tar.gz - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz - unpack shinyapps-${SHINYAPPS_VER}.tar.gz - unpack rsconnect_${RSCONNECT_VER}.tar.gz - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ - . || die - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ - . || die -} - -src_prepare() { - cmake-utils_src_prepare - java-pkg-2_src_prepare - egit_clean - - # Enable CMake to install our .service file for systemd usage - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die - - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using - # this sed hack for now. ~RMH - sed -i \ - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ - src/cpp/server/ServerOptions.cpp \ - src/cpp/session/SessionOptions.cpp || die - - # use mathjax from system - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die - - # make sure icons and mime stuff are with prefix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die - - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ - -i src/cpp/server/ServerOptions.cpp \ - || die - - # Set the rsession.conf file location for Gentoo prefix - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ - -i src/cpp/session/SessionOptions.cpp \ - || die - - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. - # It provides a library that has its version number appended to the end, - # which is difficult to handle in cmake, as find_library does not support - # searching for wildcard library names. So I find the library name from the - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. - rm -rf "${S}"/src/cpp/desktop/3rdparty || die - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ - -e 's@LIBS \*= -l@@') - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ - -i "${S}"/src/cpp/desktop/CMakeLists.txt \ - || die - - # The git commit for tag: git rev-list -n 1 v${PV} - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die -} - -src_configure() { - export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) - export RSTUDIO_VERSION_MINOR=$(ver_cut 2) - export RSTUDIO_VERSION_PATCH=$(ver_cut 3) - - local mycmakeargs=( - -DDISTRO_SHARE=share/${PN} - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - -DRSTUDIO_VERIFY_R_VERSION=FALSE - ) - - cmake-utils_src_configure -} - -src_compile() { - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny - # P: /root/.oracle_jre_usage. - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake-utils_src_install - pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf - if use dedicated || use server; then - dopamd src/cpp/server/extras/pam/rstudio - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server - fi -} - -pkg_preinst() { - use dedicated || gnome2_icon_savelist - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update ;} - - if use dedicated || use server; then - enewgroup rstudio-server - enewuser rstudio-server -1 -1 -1 rstudio-server - fi -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update ;} -} diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild index 88b8f9d905b8..77f9349a116e 100644 --- a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild +++ b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild @@ -99,6 +99,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.2.1335-core.patch "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch + "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch ) src_unpack() { @@ -208,7 +209,6 @@ src_install() { cmake-utils_src_install use dedicated || pax-mark m "${ED}/usr/bin/rstudio" doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio insinto /etc/rstudio doins "${FILESDIR}"/rsession.conf dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf diff --git a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild index 2de83f6f633f..4fadf59d2d1e 100644 --- a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild +++ b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild @@ -209,7 +209,6 @@ src_install() { cmake-utils_src_install use dedicated || pax-mark m "${ED}/usr/bin/rstudio" doconfd "${FILESDIR}"/rstudio-server.conf - dodir /etc/rstudio insinto /etc/rstudio doins "${FILESDIR}"/rsession.conf dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index be858da623ac..a9c98af3261d 100644 Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ diff --git a/sys-boot/raspberrypi-mkimage/Manifest b/sys-boot/raspberrypi-mkimage/Manifest deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-args-uncompressed.txt b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-args-uncompressed.txt deleted file mode 100644 index 09398b47eee8..000000000000 --- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-args-uncompressed.txt +++ /dev/null @@ -1,12 +0,0 @@ -; kernel args (place at 0x00000100) -0x00000005 -0x54410001 -0x00000001 -0x00001000 -0x00000000 -0x00000004 -0x54410002 -0x08000000 -0x00000000 -0x00000000 -0x00000000 diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt deleted file mode 100644 index 1cf5888278af..000000000000 --- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt +++ /dev/null @@ -1,17 +0,0 @@ -; bootloader (place at 0x00000000) -0xea000006 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 - -0xe3a00000 -0xe3a01042 -0xe3811c0c -0xe59f2000 -0xe59ff000 -0x00000100 -0x00008000 diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch deleted file mode 100644 index 28b8a6f3170f..000000000000 --- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/imagetool-uncompressed.py -+++ b/imagetool-uncompressed.py -@@ -46,7 +47,7 @@ - f = open(args.bootimage, "wb") - - for m in mem: -- f.write(chr(m)) -+ f.write(chr(m).encode('latin1')) - - f.write(kernel_image) - f.close() diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch deleted file mode 100644 index adba8bbcdbbf..000000000000 --- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/imagetool-uncompressed.py -+++ b/imagetool-uncompressed.py -@@ -3,15 +3,23 @@ - import os - import re - import sys -+import argparse - --try: -- kernel_image = sys.argv[1] --except: -- kernel_image = "" -- --if kernel_image == "": -- print("usage : imagetool-uncompressed.py "); -- sys.exit(0) -+parser = argparse.ArgumentParser(description='Prepare kernel files for Raspberry Pi bootloader') -+parser.add_argument('--force', '-f', action='store_true', default=False, -+ help='overwrite target file') -+parser.add_argument('kernel', -+ help='kernel file from /usr/src/linux*/arch/arm/boot/Image') -+parser.add_argument('bootimage', -+ help='file to be placed in /boot/kernel.img') -+args = parser.parse_args() -+if os.path.exists(args.bootimage) and not args.force: -+ print('Target file exists, use --force to override') -+ sys.exit(1) -+ -+f = open(args.kernel, 'rb') -+kernel_image = f.read() -+f.close() - - re_line = re.compile(r"0x(?P[0-9a-f]{8})") - -@@ -35,11 +43,10 @@ - load_to_mem("boot-uncompressed.txt", 0x00000000) - load_to_mem("args-uncompressed.txt", 0x00000100) - --f = open("first32k.bin", "wb") -+f = open(args.bootimage, "wb") - - for m in mem: - f.write(chr(m)) - -+f.write(kernel_image) - f.close() -- --os.system("cat first32k.bin " + kernel_image + " > kernel.img") diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py deleted file mode 100644 index 46ff4fc8ea6b..000000000000 --- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python2 - -import os -import re -import sys - -try: - kernel_image = sys.argv[1] -except: - kernel_image = "" - -if kernel_image == "": - print("usage : imagetool-uncompressed.py "); - sys.exit(0) - -re_line = re.compile(r"0x(?P[0-9a-f]{8})") - -mem = [0 for i in range(32768)] - -def load_to_mem(name, addr): - f = open(name) - - for l in f.readlines(): - m = re_line.match(l) - - if m: - value = int(m.group("value"), 16) - - for i in range(4): - mem[addr] = int(value >> i * 8 & 0xff) - addr += 1 - - f.close() - -load_to_mem("boot-uncompressed.txt", 0x00000000) -load_to_mem("args-uncompressed.txt", 0x00000100) - -f = open("first32k.bin", "wb") - -for m in mem: - f.write(chr(m)) - -f.close() - -os.system("cat first32k.bin " + kernel_image + " > kernel.img") diff --git a/sys-boot/raspberrypi-mkimage/metadata.xml b/sys-boot/raspberrypi-mkimage/metadata.xml deleted file mode 100644 index 03d6b306d326..000000000000 --- a/sys-boot/raspberrypi-mkimage/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - raspberrypi/tools - - diff --git a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild deleted file mode 100644 index ed0353e2b3c3..000000000000 --- a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_IN_SOURCE_BUILD=1 - -inherit distutils-r1 - -DESCRIPTION="Raspberry Pi kernel mangling tool mkimage/imagetool-uncompressed.py" -HOMEPAGE="https://github.com/raspberrypi/tools/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -PATCHES=( "${FILESDIR}"/${P}-imagetool-uncompressed.patch ) - -src_unpack() { - mkdir "${S}" || die - cp {"${FILESDIR}"/${P}-,"${S}"/}imagetool-uncompressed.py || die -} - -python_prepare_all() { - sed -e '/^load_to_mem("/s:(":("'${EPREFIX}'/usr/share/'${PN}'/:' \ - -e '1s:python2:python:' \ - -i imagetool-uncompressed.py || die - - distutils-r1_python_prepare_all -} - -python_prepare() { - if python_is_python3; then - eapply "${FILESDIR}"/${P}-imagetool-uncompressed-python3.patch - fi -} - -python_compile() { :; } - -python_install() { - python_doscript imagetool-uncompressed.py -} - -python_install_all() { - insinto /usr/share/${PN} - newins {"${FILESDIR}"/${P}-,}args-uncompressed.txt - newins {"${FILESDIR}"/${P}-,}boot-uncompressed.txt - - distutils-r1_python_install_all -} diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index 905a093790ab..891000d71856 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 0676eb47ec0c..f9380840782c 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -5,7 +5,7 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9 -DIST patch-3.16.83.xz 2681736 BLAKE2B dda3a24456fa0fa8a1797e5fdc552efd47b40df823167845587d07cebb6d38028c7ae59ac52b77a631895a8c454897a239253fe22cc30d4f1ec0335ac9f1b60f SHA512 d98b055c5d17e61a21469c77a974a8fa0c091268dea4f332a029eab0f0298047bb686c7022ae43c13b3f3e7d1cc09e1f5faaf5aeb2cbb2ac6434031de6bb7ab5 +DIST patch-3.16.84.xz 2698736 BLAKE2B 036578909feb041d075b2f3952b58c7b7ac6e9cea04a965452ab792f5abe397e450360a29a720f43ff9b634427e512699385d4eac36ba15d2bbe0aaf17aa8de9 SHA512 10a9570408901b66ea2f914dab0f2e05dff772d19cab07c476118a3393f95a67331765f461331bb77ed2083d8ee7f185f6ae012b693e4772d8803bde1cea8a61 DIST patch-4.14.181.xz 3647440 BLAKE2B c8ab8c0e5c58f734f17223768dbd7cc79fa25fe92575ddced0c35f82c2ecdac8572117a0c6b2943b65895866f62371e30bac9e4682a41b459732b8a5625ee80d SHA512 6269f5d03e7c33af4d6bac95077fcaca042c96a99ea0b6526061d20359e8b0eec724e15674ea5e90896ea49358192f3b937394ff734efcea29c453e45e526ae6 DIST patch-4.19.124.xz 3067304 BLAKE2B 55767a7c8c2e98e24245c28f759f2cf91e40a845826599f185c83c7cbfa3b58f62deaa7b34b3fdc2ddaadf6314db4c36e7e4af4ee39e720aa1b00cc974016254 SHA512 b28b5bdad2073cf2923d6b54dc2acbae8fe4740677fd758963c8005068711edd0dce37d3e88eb6402111949d97cc0d778c4f5389ae5a9c21462a48c2626039ba DIST patch-4.4.224.xz 3164740 BLAKE2B 0b5edc439f708d68a2430dcd2bb269a33bb0d3f6932fda2d31a752f9761fb842e224e29e0a77e090204ddfe41c8d7233656d8c4ae5a0658473134317b2147c6a SHA512 50e62b9a23b97757fd49c26e43b2686bcc19bd4a8709d1a4f638a05f8cad978e72af9c82ca15937e75a3c5c785a5ed1b18e4840fa14aa629f5e3bdf5b8b8f613 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.83.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.84.ebuild similarity index 100% rename from sys-kernel/vanilla-sources/vanilla-sources-3.16.83.ebuild rename to sys-kernel/vanilla-sources/vanilla-sources-3.16.84.ebuild diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index 9ad84787529a..5b0e3dc5fc2f 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild index fd4f5e0bfe13..47ae408d0447 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,9 +14,9 @@ LICENSE="GPL-3 LGPL-3 branding? ( CC-BY-3.0 )" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" -IUSE="ayatana branding" +IUSE="appindicator branding" -COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 ) +COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" @@ -56,7 +56,7 @@ src_configure() { local myeconfargs=( --enable-kill-on-sigterm --enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" - $(use_enable ayatana libindicator) + $(use_enable appindicator libindicator) ) econf "${myeconfargs[@]}" } diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild index f8a8dd980ea4..389baa1ee3b2 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild @@ -14,9 +14,9 @@ LICENSE="GPL-3 LGPL-3 branding? ( CC-BY-3.0 )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~x86" -IUSE="ayatana branding" +IUSE="appindicator branding" -COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 ) +COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" @@ -60,7 +60,7 @@ src_configure() { local myeconfargs=( --enable-kill-on-sigterm --enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" - $(use_enable ayatana libindicator) + $(use_enable appindicator libindicator) ) econf "${myeconfargs[@]}" } diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild deleted file mode 100644 index 8ee394b44734..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit xdg-utils - -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info" -SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/glib-2 - dev-libs/libxml2" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -DOCS=( ChangeLog HACKING NEWS README ) - -src_configure() { - export ac_cv_func_fdatasync=no #487504 - - local myeconfargs=( - $(use_enable test default-make-check) - --disable-update-mimedb - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # FIXME: 0.91 fails with -j9 every second time like: - # update_mime_database-update-mime-database.o: file not recognized: File truncated - # collect2: ld returned 1 exit status - emake -j1 -} - -src_install() { - default - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz index 56b58e67c60a..bef8e8b13666 100644 Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ diff --git a/x11-themes/greybird/greybird-3.20.1-r2.ebuild b/x11-themes/greybird/greybird-3.20.1-r2.ebuild index acfe638f60da..2f0155ff830f 100644 --- a/x11-themes/greybird/greybird-3.20.1-r2.ebuild +++ b/x11-themes/greybird/greybird-3.20.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P LICENSE="CC-BY-SA-3.0 GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="ayatana gnome" +IUSE="appindicator gnome" RDEPEND=" >=x11-themes/gtk-engines-murrine-0.90 @@ -37,7 +37,7 @@ src_install() { emake DESTDIR="${D}" install pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die - use ayatana || rm -rf unity + use appindicator || rm -rf unity use gnome || rm -rf metacity-1 popd > /dev/null || die } diff --git a/x11-themes/greybird/greybird-3.22.10.ebuild b/x11-themes/greybird/greybird-3.22.10.ebuild index 7d775459b57c..93f614fd5e18 100644 --- a/x11-themes/greybird/greybird-3.22.10.ebuild +++ b/x11-themes/greybird/greybird-3.22.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P LICENSE="CC-BY-SA-3.0 GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="ayatana gnome xfce" +IUSE="appindicator gnome xfce" RDEPEND=" >=x11-libs/gtk+-3.22:3 @@ -37,7 +37,7 @@ src_install() { default pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die - use ayatana || rm -rf unity + use appindicator || rm -rf unity use gnome || rm -rf metacity-1 use xfce || rm -rf xfce* xfwm4* popd > /dev/null || die diff --git a/x11-themes/greybird/greybird-3.22.11.ebuild b/x11-themes/greybird/greybird-3.22.11.ebuild index e1e28aa5a99d..a3e918760a91 100644 --- a/x11-themes/greybird/greybird-3.22.11.ebuild +++ b/x11-themes/greybird/greybird-3.22.11.ebuild @@ -12,9 +12,9 @@ SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}. LICENSE="CC-BY-SA-3.0 GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="ayatana gnome gtk2 gtk3 xfce" +IUSE="appindicator gnome gtk2 gtk3 xfce" REQUIRED_USE=" - || ( ayatana gnome gtk2 gtk3 xfce ) + || ( appindicator gnome gtk2 gtk3 xfce ) " RDEPEND=" @@ -33,7 +33,7 @@ src_install() { meson_src_install pushd "${ED}"/usr/share/themes > /dev/null || die - use ayatana || { rm -r ${PN^}*/unity || die; } + use appindicator || { rm -r ${PN^}*/unity || die; } use gnome || { rm -r ${PN^}*/metacity-1 || die; } use gtk2 || { rm -r ${PN^}*/gtk-2.0 || die; } use gtk3 || { rm -r ${PN^}*/gtk-3.0 || die; } diff --git a/x11-themes/greybird/greybird-3.22.9.ebuild b/x11-themes/greybird/greybird-3.22.9.ebuild index 7d775459b57c..93f614fd5e18 100644 --- a/x11-themes/greybird/greybird-3.22.9.ebuild +++ b/x11-themes/greybird/greybird-3.22.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P LICENSE="CC-BY-SA-3.0 GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="ayatana gnome xfce" +IUSE="appindicator gnome xfce" RDEPEND=" >=x11-libs/gtk+-3.22:3 @@ -37,7 +37,7 @@ src_install() { default pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die - use ayatana || rm -rf unity + use appindicator || rm -rf unity use gnome || rm -rf metacity-1 use xfce || rm -rf xfce* xfwm4* popd > /dev/null || die diff --git a/x11-themes/greybird/greybird-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild index 683dbdd3528e..c97399187421 100644 --- a/x11-themes/greybird/greybird-9999.ebuild +++ b/x11-themes/greybird/greybird-9999.ebuild @@ -12,9 +12,9 @@ EGIT_REPO_URI="https://github.com/shimmerproject/${PN^}" LICENSE="CC-BY-SA-3.0 GPL-2+" SLOT="0" KEYWORDS="" -IUSE="ayatana gnome gtk2 gtk3 xfce" +IUSE="appindicator gnome gtk2 gtk3 xfce" REQUIRED_USE=" - || ( ayatana gnome gtk2 gtk3 xfce ) + || ( appindicator gnome gtk2 gtk3 xfce ) " RDEPEND=" @@ -32,7 +32,7 @@ src_install() { meson_src_install pushd "${ED}"/usr/share/themes > /dev/null || die - use ayatana || { rm -r ${PN^}*/unity || die; } + use appindicator || { rm -r ${PN^}*/unity || die; } use gnome || { rm -r ${PN^}*/metacity-1 || die; } use gtk2 || { rm -r ${PN^}*/gtk-2.0 || die; } use gtk3 || { rm -r ${PN^}*/gtk-3.0 || die; }