diff --git a/Manifest.files.gz b/Manifest.files.gz index 3d46d5ad9b51..2f441dba952e 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 94a4ecadf656..fc9dc8bda5e6 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 2d8618fe4c6f..735a99a99de7 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1,4 +1,4 @@ DIST qemu-2.11.1-patches-r1.tar.xz 2064 BLAKE2B 533c916b01c014bcfa6c733b76aa6da1f12cdf5f0d4ae33136453705a8aca9fdfeef998747cfdc72d19e08fa40ea97e2fd4c21412c030af314605059282f49ef SHA512 12de7b4777ec98871d0786291534f61b37534feef64b556caeab72e020ff14d61fe19d24cb151ebfdb912df2a7ba72c0d882566b368d88d02c9f1354c2adae4a DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354 -DIST qemu-2.12.0-patches-r2.tar.xz 3468 BLAKE2B 2ccb2aca3c3bf006fedd3a2954b6b0f613d3bb92ffdf74749172428b2e46216140a4c565bf4402a49ed15c370611b749fd0a9ff0fe73e781ed90c2b012e15c4d SHA512 75e7c8a8287790a799ff2d1ead28d75e4210359234f6d9e18e6ad1e75b845e03556c610874f15052fcef91c7c211004d9682507729b3ba46c518251a2c655e29 +DIST qemu-2.12.0-patches-r3.tar.xz 2936 BLAKE2B dd4d7e5d3f48df43d21a990129ff4a9bfb25a2e208166b0b8fc2d1d7d2e6c1b944178f2a6b724fba21c6f12e332ff135a0ab152d525a5141bf8b7a216a984074 SHA512 a2dd1c716c189ac8f98472f6a36d1494606ae6f09f0fd20818cf714ba058f526370f727a170592c3b029ce013de481b70e0ba6947bf2afb712340834d45aaff8 DIST qemu-2.12.0.tar.bz2 41196232 BLAKE2B f258e570558249ea647c3571908f90b8bacdcef9a1814009b98571cf0e96406194d44aa041fd0a97c9b673f39a9eaae8d873824745509778a6784cd85f8398b0 SHA512 91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346 diff --git a/app-emulation/qemu/qemu-2.12.0-r2.ebuild b/app-emulation/qemu/qemu-2.12.0-r2.ebuild index 59000aaa999c..0aa4e9242b2a 100644 --- a/app-emulation/qemu/qemu-2.12.0-r2.ebuild +++ b/app-emulation/qemu/qemu-2.12.0-r2.ebuild @@ -22,7 +22,7 @@ else KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" # Gentoo specific patchsets: - SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r3.tar.xz" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index f00eb70ea3fe..f327e1517a1e 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest index 3550a663a43f..a18e96cc4218 100644 --- a/app-misc/neofetch/Manifest +++ b/app-misc/neofetch/Manifest @@ -1,2 +1,2 @@ DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b -DIST neofetch-4.0.1.tar.gz 111631 BLAKE2B 457f8d4bb4b2d42bacab5891bd64c6f8b52ee94262258dc4b69b8ebcbae9f06bc7ffabd424a7cae5eee384d52259861f9f2e6b38f3e540b5b805eda48c2d1650 SHA512 b3d89e55d9c056a9e80295f4abcdee96866bcf685dc924f21a8b4c92ddb822b8dafef06d28ac14a3bed9da29bb61219a0d4b82cd7e8da18ce4989d847e4e920d +DIST neofetch-4.0.2.tar.gz 111792 BLAKE2B 865c45a366224915aeeff82c843c869685814ccb5f553d7da59ab51e26336500cb133b5c827dd6dccccef3e771b357852e86db166d88cda894515419e9eadbc8 SHA512 326b7a9fdf08aa10b790c281148946727dc6a10c5c073654fc0ce9cee9afe663de84ac13144cb3e1d2e33b5ca3ed5094d2cb83e78b7b5f6e1ced49d78e191ce4 diff --git a/app-misc/neofetch/neofetch-4.0.1.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild similarity index 100% rename from app-misc/neofetch/neofetch-4.0.1.ebuild rename to app-misc/neofetch/neofetch-4.0.2.ebuild diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 46ad7a077d03..3071409202e4 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mariadb/mariadb-10.0.35-r1.ebuild b/dev-db/mariadb/mariadb-10.0.35-r1.ebuild new file mode 100644 index 000000000000..a524cb674cbd --- /dev/null +++ b/dev-db/mariadb/mariadb-10.0.35-r1.ebuild @@ -0,0 +1,844 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +MY_EXTRAS_VER="20180515-1334Z" +SUBSLOT="18" + +JAVA_PKG_OPT_USE="jdbc" + +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils flag-o-matic prefix toolchain-funcs java-pkg-opt-2 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="http://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" +LICENSE="GPL-2" +SLOT="0/${SUBSLOT:-0}" +IUSE="bindist client-libs debug extraengine jdbc jemalloc latin1 libressl + numa odbc oqgraph pam +perl profiling selinux +server sphinx + static static-libs 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 )" + +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" + +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}/20006_all_cmake_elib-mariadb-10.0.33.patch" + "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" + "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-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? ( 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/readline-4.1:0= + ) + server? ( + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + numa? ( sys-process/numactl ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( virtual/pam:0= ) + 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 ) ) ) + ${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 ) + server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) +" +# 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 ) + !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )" + +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 + java-pkg-opt-2_pkg_setup + 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_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 +} + +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 + } + + java-pkg-opt-2_src_prepare + 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 + + 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 + + # Don't build Mroonga or example + _disable_engine mroonga + _disable_engine example + + if ! use oqgraph ; then # avoids extra library checks + _disable_engine oqgraph + fi + + 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')" + -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" + -DINSTALL_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) + -DWITH_PCRE=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 + -D$(usex extraengine WITH WITHOUT)_SEQUENCE_STORAGE_ENGINE=1 + -D$(usex extraengine WITH WITHOUT)_SPIDER_STORAGE_ENGINE=1 + -D$(usex extraengine WITH WITHOUT)_CONNECT_STORAGE_ENGINE=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 + -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.6" + 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 + 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 10.0 for now and are believed to be + # false positives: + # + # main.mysql_client_test, main.mysql_client_test_nonblock + # main.mysql_client_test_comp: + # segfaults at random under Portage only, suspect resource limits. + + local t + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \ + rpl.rpl_semi_sync_uninstall_plugin ; 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/bin/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)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" + 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 http://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 + # http://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.1.33-r1.ebuild b/dev-db/mariadb/mariadb-10.1.33-r1.ebuild new file mode 100644 index 000000000000..0a3a791d64b1 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.1.33-r1.ebuild @@ -0,0 +1,879 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +MY_EXTRAS_VER="20180515-1334Z" +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 java-pkg-opt-2 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="http://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 )" + +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 ~x86-fbsd ~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}"/20006_all_cmake_elib-mariadb-10.1.27.patch + "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch + "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch + "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch + "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch + "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch + "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.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? ( 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? ( virtual/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= +" +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 ) ) ) + ${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} + 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] ) + ) ) + perl? ( !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) + server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) +" +# 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 ) + !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] ) + server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" + +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 + java-pkg-opt-2_pkg_setup + 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_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 +} + +src_unpack() { + unpack ${A} + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack + + mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die +} + +src_prepare() { + _disable_engine() { + echo > "${S%/}/storage/${1}/CMakeLists.txt" || die + } + + _disable_plugin() { + echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die + } + + java-pkg-opt-2_src_prepare + 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 + + 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 + + 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')" + -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" + -DINSTALL_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) + ) + + 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) + -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 +} + +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" + 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 + 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 static-libs' \ +# 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 10.0 for now and are believed to be + # false positives: + # + # main.mysql_client_test, main.mysql_client_test_nonblock + # main.mysql_client_test_comp: + # segfaults at random under Portage only, suspect resource limits. + + local t + for t in plugins.cracklib_password_check plugins.two_password_validations ; do + _disable_test "$t" "False positive due to varying policies" + done + + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; 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/bin/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)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" + 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 http://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 + # http://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-libs/Manifest.gz b/dev-libs/Manifest.gz index cf1e4eea878a..9e4f7422ef9b 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild index fb393626069d..7ccfabeb38f0 100644 --- a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools +inherit autotools prefix DESCRIPTION="A validating XML parser written in a portable subset of C++" -HOMEPAGE="http://xerces.apache.org/xerces-c/" +HOMEPAGE="https://xerces.apache.org/xerces-c/" SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz" LICENSE="Apache-2.0" @@ -111,6 +111,6 @@ src_install () { # To make sure an appropriate NLS msg file is around when using # the iconv msgloader ICU has the messages compiled in. if use iconv && ! use icu; then - doenvd "${FILESDIR}/50xerces-c" + doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")" fi } diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 558ac7d08c6a..45e0b6a73faf 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/trine2/Manifest b/games-action/trine2/Manifest index 584187e0bfea..bcbdd62b6f92 100644 --- a/games-action/trine2/Manifest +++ b/games-action/trine2/Manifest @@ -1 +1 @@ -DIST trine2_linux_installer.run 1631149097 SHA256 39edf004fb4001360bb4b432cd365ab4b14350612e5632df789d568d682177e7 SHA512 d0c402f4f73f45290784c9414a5b59f89513b14bd09ade815d4456a77ae95909082e0a6a1afad198f6f58707a5d10eedbacd30d6cc5d063eabb702b03a7dc56e WHIRLPOOL 888073296772659c87d9955c14ac116c93bcf5da6ec2715e6a74b10520f2dcd94c5e50a794d0833f3242e3c47689f3f0042883b6673c6f8e0563fea829e06ad0 +DIST trine2_complete_story_v2_01_build_425_humble_linux_full.zip 3243286878 BLAKE2B a9032d6043ac9623a254c1ebe69c30e5f173de91e3cc0552c4ff60275c11601c7708c37d2d7b9eb789290e24569967fc82b56f143110306642b28d5e21cb62ee SHA512 e59aaa6da7d4cae96d361f7f80d857e4102b23fe9584b88af9163407d4f1a34b9e0e79a9337c133e9d60e31ac8ead3a7f9b02b47f9797df05f998666c9219c15 diff --git a/games-action/trine2/metadata.xml b/games-action/trine2/metadata.xml index cc071fac0574..b26a6baa4124 100644 --- a/games-action/trine2/metadata.xml +++ b/games-action/trine2/metadata.xml @@ -6,7 +6,6 @@ Gentoo Games Project - Use bundled libraries. - Install gtk+ launcher + Install GTK+ launcher diff --git a/games-action/trine2/trine2-1.16-r1.ebuild b/games-action/trine2/trine2-1.16-r1.ebuild deleted file mode 100644 index 83ead951316e..000000000000 --- a/games-action/trine2/trine2-1.16-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils unpacker gnome2-utils games - -MY_PN="Trine 2" -DESCRIPTION="A sidescrolling game of action, puzzles and platforming" -HOMEPAGE="http://www.trine2.com/" -SRC_URI="${PN}_linux_installer.run" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="bundled-libs +launcher" -RESTRICT="fetch bindist splitdebug" - -QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/${PN}* - ${GAMES_PREFIX_OPT}/${PN}/lib/*" - -# TODO: bundled-libs: no libsdl-1.3, no physx -RDEPEND=" - amd64? ( - >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] - >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] - >=virtual/glu-9.0-r1[abi_x86_32(-)] - >=virtual/opengl-7.0-r1[abi_x86_32(-)] - >=media-libs/openal-1.15.1[abi_x86_32(-)] - >=media-libs/libogg-1.3.0[abi_x86_32(-)] - >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - launcher? ( - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - >=media-libs/libpng-1.5.18:1.5[abi_x86_32(-)] - >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] - ) - !bundled-libs? ( - >=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)] - ) - ) - x86? ( - dev-libs/glib:2 - media-libs/freetype - media-libs/libogg - media-libs/libvorbis - media-libs/openal - sys-libs/zlib - virtual/glu - virtual/opengl - launcher? ( - media-libs/fontconfig - media-libs/libpng:1.5 - x11-libs/gtk+:2 - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXxf86vm - ) - !bundled-libs? ( media-gfx/nvidia-cg-toolkit ) - )" - -S=${WORKDIR} - -pkg_nofetch() { - einfo - einfo "Please buy & download \"${SRC_URI}\" from:" - einfo " ${HOMEPAGE}" - einfo "and move/link it to \"${DISTDIR}\"" - einfo -} - -src_unpack() { - local offset="$(( $(grep -a -h -n -m 1 -F -e THIS_IS_THE_LAST_SCRIPT_LINE_ARCHIVE_DATA_FOLLOWS "${DISTDIR}"/${A} | cut -d':' -f1) + 1 ))" - unpack_makeself ${A} "${offset}" "tail" -} - -src_install() { - local dir=${GAMES_PREFIX_OPT}/${PN} - - insinto "${dir}" - doins -r data* - - exeinto "${dir}" - newexe "bin/trine2_linux_32bit" ${PN} - - exeinto "${dir}/lib" - use bundled-libs || { find lib/lib32 -type f -name "libCg*.so*" -delete || die ;} - doexe lib/lib32/* - - games_make_wrapper ${PN} "./${PN}" "${dir}" "${dir}/lib" - doicon -s 64 ${PN}.png - make_desktop_entry ${PN} "${MY_PN}" - - if use launcher ; then - exeinto "${dir}" - newexe bin/trine2_linux_launcher_32bit ${PN}-launcher - - games_make_wrapper ${PN}-launcher "./${PN}-launcher" "${dir}" "${dir}/lib" - make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)" - - # launcher binary has hardcoded the script path - dodir "${dir}"/bin - dosym "${GAMES_BINDIR}"/trine2 "${dir}"/bin/trine2_bin_starter.sh - fi - - dodoc KNOWN_LINUX_ISSUES README - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - - einfo - elog "${MY_PN} savegames and configurations are stored in:" - elog " \${HOME}/.frozenbyte/${MY_PN//\ /}" - einfo - - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/trine2/trine2-2.01.425.ebuild b/games-action/trine2/trine2-2.01.425.ebuild new file mode 100644 index 000000000000..1b49131fab0c --- /dev/null +++ b/games-action/trine2/trine2-2.01.425.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop eutils gnome2-utils + +MY_P="${PV//./_}" +MY_P="${PN}_complete_story_v${MY_P%_*}_build_${MY_P##*_}" +MY_PN="Trine 2" + +DESCRIPTION="Sidescrolling game of action, puzzles and platforming, Complete Story edition" +HOMEPAGE="http://www.trine2.com/" +SRC_URI="${MY_P}_humble_linux_full.zip" +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+launcher" +RESTRICT="bindist fetch splitdebug" + +QA_PREBUILT="opt/${PN}/${PN}* + opt/${PN}/lib/*" + +DEPEND="app-arch/unzip" + +RDEPEND=" + media-gfx/nvidia-cg-toolkit[abi_x86_32] + media-libs/alsa-lib[abi_x86_32] + media-libs/freetype:2[abi_x86_32] + media-libs/libogg[abi_x86_32] + >=media-libs/libvorbis-1.3[abi_x86_32] + >=media-libs/openal-1.15[abi_x86_32] + >=sys-devel/gcc-4.6[cxx] + >=sys-libs/glibc-2.15 + sys-libs/zlib[abi_x86_32] + virtual/glu[abi_x86_32] + virtual/opengl[abi_x86_32] + launcher? ( + dev-libs/expat[abi_x86_32] + dev-libs/glib:2[abi_x86_32] + media-libs/libpng:1.2[abi_x86_32] + sys-apps/dbus[abi_x86_32] + sys-apps/util-linux[abi_x86_32] + x11-libs/gdk-pixbuf:2[abi_x86_32,X] + x11-libs/gtk+:2[abi_x86_32] + x11-libs/libX11[abi_x86_32] + x11-libs/pango[abi_x86_32,X] + )" + +S="${WORKDIR}" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " https://www.humblebundle.com/store/trine-2-complete-story" + einfo "and move it to your distfiles directory." +} + +src_prepare() { + default + + # SDL 1.3 is very special and crashes when fullscreen if + # /usr/bin/gnome-screensaver-command is missing. XD + sed -i 's:/usr/bin/gnome-screensaver-command:/bin/true\x0 :g' \ + lib/lib32/libSDL-1.3.so.0 || die +} + +src_install() { + local dir=/opt/${PN} + + insinto "${dir}" + doins -r *.fbq data + + exeinto "${dir}" + newexe bin/${PN}_linux_32bit ${PN} + + exeinto "${dir}"/lib + doexe lib/lib32/lib{{SDL-1.3,PhysXLoader}.so.*,PhysX{Cooking,Core}.so} # Avoid duplicates. + + make_wrapper ${PN} ./${PN} "${dir}" "${dir}"/lib + make_desktop_entry ${PN} "${MY_PN}" + + if use launcher ; then + exeinto "${dir}" + newexe bin/${PN}_linux_launcher_32bit ${PN}-launcher + + make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}" "${dir}"/lib + make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)" + + # Launcher binary has hardcoded the game path. + dosym ../${PN} "${dir}"/bin/${PN}_bin_starter.sh + fi + + doicon -s 64 ${PN}.png + dodoc readme_changelog.txt readme/{KNOWN_LINUX_ISSUES,README} +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz index 2e5a734fea4c..9943b59037ce 100644 Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ diff --git a/games-rpg/avadon/Manifest b/games-rpg/avadon/Manifest index dc8d0b5c6ffa..0f0df9a49eb2 100644 --- a/games-rpg/avadon/Manifest +++ b/games-rpg/avadon/Manifest @@ -1 +1 @@ -DIST avadon-black-fortress_1.0.4_all.run 109767395 SHA256 1619401aa42abe055b3eabf8b63d4ada3ce55affb054d0d6a6da09affe1c76fe SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7 WHIRLPOOL 751b5ce976a0dcb23065786d5078a32468c0f9a7a1df8eac6884923ad244996c43b7ad25044ee5fd7f680bcaa78982add53b9e248c5794f1c647309c5dbf2afc +DIST avadon-linux-1331768904-bin.txt 109767395 BLAKE2B ba89e4cc9d7374b4c140f36860bb3e2682bc8639503500d0371a7783c0ce7fc1b40ac2c552285f03d564ecae21d5f887f822e6785a30034fdeaba9d0837ee6eb SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7 diff --git a/games-rpg/avadon/avadon-1.0.4.ebuild b/games-rpg/avadon/avadon-1.0.4.ebuild deleted file mode 100644 index 02402a4db16b..000000000000 --- a/games-rpg/avadon/avadon-1.0.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils unpacker games - -DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world" -HOMEPAGE="http://www.spiderwebsoftware.com/avadon/index.html" -SRC_URI="avadon-black-fortress_${PV}_all.run" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="fetch bindist" - -QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/Avadon*" - -RDEPEND="media-libs/libsdl[X,opengl,video] - media-libs/openal" -DEPEND="app-arch/unzip" - -S=${WORKDIR}/data - -pkg_nofetch() { - einfo - einfo "Please buy & download \"${SRC_URI}\" from:" - einfo " ${HOMEPAGE}" - einfo "and move/link it to \"${DISTDIR}\"" - einfo -} - -src_unpack() { - unpack_zip ${A} -} - -src_install() { - local dir=${GAMES_PREFIX_OPT}/${PN} - local arch=$(usex amd64 "amd64" "x86") - - insinto "${dir}" - doins -r "avadon files" icon.bmp - - exeinto "${dir}" - doexe Avadon-${arch} - - newicon Avadon.png ${PN}.png - games_make_wrapper ${PN} "./Avadon-${arch}" "${dir}" - make_desktop_entry ${PN} "Avadon: The Black Fortress" - - dodoc README-linux.txt - - prepgamesdirs -} diff --git a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild new file mode 100644 index 000000000000..4a9ff4f3cecd --- /dev/null +++ b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop gnome2-utils unpacker + +DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world" +HOMEPAGE="https://www.spiderwebsoftware.com/avadon" +SRC_URI="avadon-linux-${PV#*_p}-bin.txt" # .txt is odd but that's what Humble Bundle sends. +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="fetch bindist" + +QA_PREBUILT="opt/${PN}/Avadon" + +RDEPEND="media-libs/libsdl[opengl,video] + media-libs/openal" + +DEPEND="app-arch/unzip" + +S="${WORKDIR}/data" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " ${HOMEPAGE}" + einfo "and move it to your distfiles directory." +} + +src_unpack() { + unpack_zip ${A} +} + +src_install() { + local dir=/opt/${PN} + + insinto "${dir}" + doins -r "avadon files" icon.bmp + + exeinto "${dir}" + newexe Avadon-$(usex amd64 amd64 x86) Avadon + dosym "../..${dir}"/Avadon /usr/bin/${PN} + + newicon -s 512 Avadon.png ${PN}.png + make_desktop_entry ${PN} "Avadon: The Black Fortress" + + dodoc README-linux.txt +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz index 1c51f787ecbe..2813fbcc754c 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 3e37b70f0019..b8c4ff2d4304 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Thu, 14 Jun 2018 20:38:29 +0000 +Fri, 15 Jun 2018 05:08:24 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 3e37b70f0019..3a9f89210cbf 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Thu, 14 Jun 2018 20:38:29 +0000 +Fri, 15 Jun 2018 05:08:25 +0000 diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz index 1d0f4db09668..8a5bfffe5322 100644 Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz index 50a40e15991b..406b5886b8a8 100644 Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.0-r2 b/metadata/md5-cache/app-emulation/qemu-2.12.0-r2 index ef4c7627c51c..8c76a27a3b34 100644 --- a/metadata/md5-cache/app-emulation/qemu-2.12.0-r2 +++ b/metadata/md5-cache/app-emulation/qemu-2.12.0-r2 @@ -9,6 +9,6 @@ LICENSE=GPL-2 LGPL-2 BSD-2 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu ) REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk ) SLOT=0 -SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.0-patches-r2.tar.xz +SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.0-patches-r3.tar.xz _eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 5128c4729303400bd8d4b0b966530955 l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 -_md5_=27e64a5d061dd7c4c0fa984fa1b34b11 +_md5_=1595d51b9bae66a15fec0d5a72cefed8 diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz index 82d7127e6490..06a55cb731fc 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/neofetch-4.0.1 b/metadata/md5-cache/app-misc/neofetch-4.0.2 similarity index 81% rename from metadata/md5-cache/app-misc/neofetch-4.0.1 rename to metadata/md5-cache/app-misc/neofetch-4.0.2 index 74e257316a90..396fce207d99 100644 --- a/metadata/md5-cache/app-misc/neofetch-4.0.1 +++ b/metadata/md5-cache/app-misc/neofetch-4.0.2 @@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-fbsd LICENSE=MIT-with-advertising RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo ) SLOT=0 -SRC_URI=https://github.com/dylanaraps/neofetch/archive/4.0.1/neofetch-4.0.1.tar.gz +SRC_URI=https://github.com/dylanaraps/neofetch/archive/4.0.2/neofetch-4.0.2.tar.gz _md5_=c10b4b1797c2fe8a9f0485f9f3f80067 diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz index 9ca8dde33b70..733a9ce9f66a 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.0.35-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.35-r1 new file mode 100644 index 000000000000..4b32ec643ac7 --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-10.0.35-r1 @@ -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 ) ) ) 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/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= 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=http://mariadb.org/ +IUSE=bindist client-libs debug extraengine jdbc jemalloc latin1 libressl numa odbc oqgraph pam +perl profiling selinux +server sphinx static static-libs systemtap 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_ppc_32 abi_ppc_64 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 ) !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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) +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? ( 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/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) 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 ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.35/source/mariadb-10.0.35.tar.gz mirror://gentoo/mysql-extras-20180515-1334Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180515-1334Z.tar.bz2 +_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=7c8e1b46ce41fdc0daafbe4cdd8bd04b diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.33-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.33-r1 new file mode 100644 index 000000000000..ccef9c9a89d2 --- /dev/null +++ b/metadata/md5-cache/dev-db/mariadb-10.1.33-r1 @@ -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 ) ) ) 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? ( virtual/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= 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=http://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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~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 ) !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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) 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 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? ( 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? ( virtual/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= 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] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) 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 ) +SLOT=0/18 +SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.33/source/mariadb-10.1.33.tar.gz mirror://gentoo/mysql-extras-20180515-1334Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180515-1334Z.tar.bz2 +_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=3c8e57bd08e9d939e8b76968fff178f7 diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz index e46724f1dcf1..3dcbd5ece66f 100644 Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1 index 404fabaa037e..452abb74e1c7 100644 --- a/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1 +++ b/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1 @@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup DEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv doc? ( app-doc/doxygen ) test? ( dev-lang/perl ) >=app-portage/elt-patches-20170422 !=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=A validating XML parser written in a portable subset of C++ EAPI=6 -HOMEPAGE=http://xerces.apache.org/xerces-c/ +HOMEPAGE=https://xerces.apache.org/xerces-c/ IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos LICENSE=Apache-2.0 RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv SLOT=0 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.1.4.tar.gz -_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 -_md5_=17a58cb5dc103b89e70ed895e2fc6c76 +_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e prefix e51c7882b7b721e54e684f7eb143cbfe toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 +_md5_=35dc416244886d87a23ac18f36f24184 diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz index c50b1278b277..66c7b0f3ae5c 100644 Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ diff --git a/metadata/md5-cache/games-action/trine2-1.16-r1 b/metadata/md5-cache/games-action/trine2-1.16-r1 deleted file mode 100644 index 5b01ea3b962d..000000000000 --- a/metadata/md5-cache/games-action/trine2-1.16-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=A sidescrolling game of action, puzzles and platforming -EAPI=5 -HOMEPAGE=http://www.trine2.com/ -IUSE=bundled-libs +launcher -KEYWORDS=-* ~amd64 ~x86 -LICENSE=all-rights-reserved -RDEPEND=amd64? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] launcher? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/libpng-1.5.18:1.5[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) !bundled-libs? ( >=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)] ) ) x86? ( dev-libs/glib:2 media-libs/freetype media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl launcher? ( media-libs/fontconfig media-libs/libpng:1.5 x11-libs/gtk+:2 x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm ) !bundled-libs? ( media-gfx/nvidia-cg-toolkit ) ) games-misc/games-envd -RESTRICT=fetch bindist splitdebug -SLOT=0 -SRC_URI=trine2_linux_installer.run -_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=c9c9d118fdea8810eb72c7a69a732881 diff --git a/metadata/md5-cache/games-action/trine2-2.01.425 b/metadata/md5-cache/games-action/trine2-2.01.425 new file mode 100644 index 000000000000..4dc4e54039e1 --- /dev/null +++ b/metadata/md5-cache/games-action/trine2-2.01.425 @@ -0,0 +1,14 @@ +DEFINED_PHASES=install nofetch postinst postrm preinst prepare +DEPEND=app-arch/unzip >=sys-apps/sed-4 +DESCRIPTION=Sidescrolling game of action, puzzles and platforming, Complete Story edition +EAPI=6 +HOMEPAGE=http://www.trine2.com/ +IUSE=+launcher +KEYWORDS=-* ~amd64 ~x86 +LICENSE=all-rights-reserved +RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/freetype:2[abi_x86_32] media-libs/libogg[abi_x86_32] >=media-libs/libvorbis-1.3[abi_x86_32] >=media-libs/openal-1.15[abi_x86_32] >=sys-devel/gcc-4.6[cxx] >=sys-libs/glibc-2.15 sys-libs/zlib[abi_x86_32] virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] launcher? ( dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] media-libs/libpng:1.2[abi_x86_32] sys-apps/dbus[abi_x86_32] sys-apps/util-linux[abi_x86_32] x11-libs/gdk-pixbuf:2[abi_x86_32,X] x11-libs/gtk+:2[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/pango[abi_x86_32,X] ) +RESTRICT=bindist fetch splitdebug +SLOT=0 +SRC_URI=trine2_complete_story_v2_01_build_425_humble_linux_full.zip +_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=ed3f3d5b32c95dae94599c9980880e01 diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz index 67940376ec36..d223c53cbd62 100644 Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ diff --git a/metadata/md5-cache/games-rpg/avadon-1.0.4 b/metadata/md5-cache/games-rpg/avadon-1.0.4 deleted file mode 100644 index 4301a72d57b5..000000000000 --- a/metadata/md5-cache/games-rpg/avadon-1.0.4 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack -DEPEND=app-arch/unzip -DESCRIPTION=Epic fantasy role-playing adventure in an enormous and unique world -EAPI=5 -HOMEPAGE=http://www.spiderwebsoftware.com/avadon/index.html -KEYWORDS=-* ~amd64 ~x86 -LICENSE=all-rights-reserved -RDEPEND=media-libs/libsdl[X,opengl,video] media-libs/openal games-misc/games-envd -RESTRICT=fetch bindist -SLOT=0 -SRC_URI=avadon-black-fortress_1.0.4_all.run -_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=c2cefe8c79bd91cffba198c816140fb8 diff --git a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904 b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904 new file mode 100644 index 000000000000..31eaece534a8 --- /dev/null +++ b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install nofetch postinst postrm preinst unpack +DEPEND=app-arch/unzip >=sys-apps/sed-4 +DESCRIPTION=Epic fantasy role-playing adventure in an enormous and unique world +EAPI=6 +HOMEPAGE=https://www.spiderwebsoftware.com/avadon +KEYWORDS=-* ~amd64 ~x86 +LICENSE=all-rights-reserved +RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal +RESTRICT=fetch bindist +SLOT=0 +SRC_URI=avadon-linux-1331768904-bin.txt +_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=44169fc12698c64934c3591e9094a3a3 diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz index 08705cfa7b9f..99d6e8165c1b 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/omnisync-1.0-r1 b/metadata/md5-cache/net-misc/omnisync-1.0-r1 index eaf21d5b591f..b2217faa9f9a 100644 --- a/metadata/md5-cache/net-misc/omnisync-1.0-r1 +++ b/metadata/md5-cache/net-misc/omnisync-1.0-r1 @@ -10,4 +10,4 @@ RDEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= SLOT=0 SRC_URI=https://www.vanheusden.com/time/omnisync/omnisync-1.0.tgz _eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 -_md5_=6240c81d764f1053ef2bdbe7714aca2c +_md5_=3a349cb4f8c1ba8e9c0fb2f6d3509163 diff --git a/metadata/md5-cache/net-misc/omnisync-1.0_p20180614 b/metadata/md5-cache/net-misc/omnisync-1.0_p20180614 new file mode 100644 index 000000000000..2b8e609ea463 --- /dev/null +++ b/metadata/md5-cache/net-misc/omnisync-1.0_p20180614 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst prepare test unpack +DEPEND=net-libs/gnutls:= net-analyzer/net-snmp:= sys-devel/make >=dev-util/cmake-3.9.6 +DESCRIPTION=A driver for NTPd for people who are firewall-challenged +EAPI=6 +HOMEPAGE=https://www.vanheusden.com/time/omnisync +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=net-libs/gnutls:= net-analyzer/net-snmp:= +SLOT=0 +SRC_URI=https://gitlab.com/grknight/omnisync/-/archive/b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5/omnisync-b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5.tar.bz2 -> omnisync-1.0_p20180614.tar.bz2 +_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=308c77e7eca7544d330b26a790cf3155 diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz index 95769e0f4265..f40c7c8ad790 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/snns-4.3-r2 b/metadata/md5-cache/sci-mathematics/snns-4.3-r2 index 5097e02ef69c..012e9f641d8f 100644 --- a/metadata/md5-cache/sci-mathematics/snns-4.3-r2 +++ b/metadata/md5-cache/sci-mathematics/snns-4.3-r2 @@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) SLOT=0 SRC_URI=http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.3.tar.gz doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf ) _eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=bb6f9c2bc2378c579d2c4262a7d39c74 +_md5_=faa7d06c5d3899ffa71296966bd1d633 diff --git a/metadata/md5-cache/sci-mathematics/snns-4.3-r3 b/metadata/md5-cache/sci-mathematics/snns-4.3-r3 index c2a3db2846ef..afe4379f4331 100644 --- a/metadata/md5-cache/sci-mathematics/snns-4.3-r3 +++ b/metadata/md5-cache/sci-mathematics/snns-4.3-r3 @@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) SLOT=0 SRC_URI=http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.3.tar.gz doc? ( http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf ) _eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=0e384ceef15f369a95b7c00379daaf11 +_md5_=abe23f5fac9654546a53c381e7ad96a8 diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz index 69fdf01cd096..f5805c551d31 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/polybar-3.1.0 b/metadata/md5-cache/x11-misc/polybar-3.1.0 index 1f62ed1d3770..c4e065cff61a 100644 --- a/metadata/md5-cache/x11-misc/polybar-3.1.0 +++ b/metadata/md5-cache/x11-misc/polybar-3.1.0 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test -DEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) sys-devel/make >=dev-util/cmake-3.9.6 +DEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) sys-devel/make >=dev-util/cmake-3.9.6 DESCRIPTION=A fast and easy-to-use tool for creating status bars EAPI=6 HOMEPAGE=https://github.com/jaagr/polybar IUSE=alsa curl i3wm ipc mpd network python_targets_python2_7 KEYWORDS=~amd64 ~x86 LICENSE=MIT -RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) +RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) REQUIRED_USE=python_targets_python2_7 SLOT=0 SRC_URI=https://github.com/jaagr/polybar/archive/3.1.0.tar.gz -> polybar-3.1.0.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz _eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=425d5d358062beabd566afcddec73b53 +_md5_=53a6cd3e42c9eb8af46afab21df957d2 diff --git a/metadata/md5-cache/x11-misc/polybar-9999 b/metadata/md5-cache/x11-misc/polybar-9999 index 13c226eec242..2507b8f04ace 100644 --- a/metadata/md5-cache/x11-misc/polybar-9999 +++ b/metadata/md5-cache/x11-misc/polybar-9999 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] +DEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] DESCRIPTION=A fast and easy-to-use tool for creating status bars EAPI=6 HOMEPAGE=https://github.com/jaagr/polybar IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python2_7 LICENSE=MIT -RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) +RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) REQUIRED_USE=python_targets_python2_7 SLOT=0 _eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=5b7561eb6156d6f4c1c2876a94ab4bb8 +_md5_=a33fe599a82c2e634077cbe109292372 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 3e37b70f0019..3a9f89210cbf 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Thu, 14 Jun 2018 20:38:29 +0000 +Fri, 15 Jun 2018 05:08:25 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 511ea3f33e21..a085400fd0a7 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Thu Jun 14 20:38:29 UTC 2018 +Fri Jun 15 05:08:24 UTC 2018 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 2e918a28e992..7c95fadef43d 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Thu, 14 Jun 2018 21:00:01 +0000 +Fri, 15 Jun 2018 05:30:01 +0000 diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index a96a4157ac09..bc9b850a66e8 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1 +1 @@ -4ce4350c77fc940670b74f69b9dbef5b076717f6 1529008505 2018-06-14T20:35:05+00:00 +6d9fc64ae023874e50e9feed87a797120515d95a 1529037740 2018-06-15T04:42:20+00:00 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 2dc3e4d76018..9831b03dfd9a 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1529008501 Thu 14 Jun 2018 08:35:01 PM UTC +1529039101 Fri 15 Jun 2018 05:05:01 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 3e37b70f0019..3a9f89210cbf 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Thu, 14 Jun 2018 20:38:29 +0000 +Fri, 15 Jun 2018 05:08:25 +0000 diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 83dd7cc70d8e..34270c5ab234 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml index 63f03907d2d1..14800d5d5ab6 100644 --- a/net-misc/cgminer/metadata.xml +++ b/net-misc/cgminer/metadata.xml @@ -1,18 +1,10 @@ - - ki@baka.bakka.su - In baka-bakka overlay. - blueness@gentoo.org Anthony G. Basile - - proxy-maint@gentoo.org - Proxy Maintainers - Enable support for Antminer S1 Bitmain Enable support for Antminer S2 Bitmain @@ -44,3 +36,4 @@ ckolivas/cgminer + diff --git a/net-misc/omnisync/Manifest b/net-misc/omnisync/Manifest index 176a959130c5..cae6a303707e 100644 --- a/net-misc/omnisync/Manifest +++ b/net-misc/omnisync/Manifest @@ -1 +1,2 @@ DIST omnisync-1.0.tgz 27725 BLAKE2B 00e546e3a04c8483f4a3995207fe6715e25526ca639f517220725c31d50d1c01fe0d15927e11e84143f3b2c8aa80ede1317c818945f0249147548bb03d27f744 SHA512 742ffc0a85bd923b99ae7e4f50a6aaa29107eaa987039e902797c78a9673e914e1fa61b2484c6777f62b0caf8b3110a071fd103c8b18456083883df534a1ef4d +DIST omnisync-1.0_p20180614.tar.bz2 26335 BLAKE2B fbb6e4d39f16e307b5355c1e25c656bfdd3b280888468e64bed692c52af28b35d813e3e5a19c6dd4c13bfa8c64b62f01826bdb8a4a40f358cc665e5050ccfbf1 SHA512 fd21907574abe9801999efa8dae6e19e80198536cd79a1261cd2c006b7beaa3637f5b9da578659baa9e14eca1756fa41551458f14bad44f9636d76634031f262 diff --git a/net-misc/omnisync/files/omnisync-1.0-openssl11.patch b/net-misc/omnisync/files/omnisync-1.0-openssl11.patch new file mode 100644 index 000000000000..8c0d9c243338 --- /dev/null +++ b/net-misc/omnisync/files/omnisync-1.0-openssl11.patch @@ -0,0 +1,24 @@ +diff -aurN a/mssl.c b/mssl.c +--- a/mssl.c 2009-01-02 04:03:20.000000000 -0500 ++++ b/mssl.c 2018-06-01 20:59:26.447052020 -0400 +@@ -136,14 +136,20 @@ + if (!bio_err) + { + SSL_library_init(); ++#if OPENSSL_API_COMPAT < 0x10100000L + SSL_load_error_strings(); ++#endif + + /* error write context */ + bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); + } + + /* create context */ ++#if OPENSSL_API_COMPAT < 0x10100000L + meth = SSLv23_method(); ++#else ++ meth = TLS_method(); ++#endif + + return SSL_CTX_new(meth); + } diff --git a/net-misc/omnisync/omnisync-1.0-r1.ebuild b/net-misc/omnisync/omnisync-1.0-r1.ebuild index 5875550ac80f..d82752e6f702 100644 --- a/net-misc/omnisync/omnisync-1.0-r1.ebuild +++ b/net-misc/omnisync/omnisync-1.0-r1.ebuild @@ -21,6 +21,7 @@ PATCHES=( "${FILESDIR}"/omnisync-1.0-help.patch "${FILESDIR}"/omnisync-1.0-maxshm.patch "${FILESDIR}"/omnisync-1.0-statfile.patch + "${FILESDIR}"/omnisync-1.0-openssl11.patch ) src_prepare() { diff --git a/net-misc/omnisync/omnisync-1.0_p20180614.ebuild b/net-misc/omnisync/omnisync-1.0_p20180614.ebuild new file mode 100644 index 000000000000..c074a15980df --- /dev/null +++ b/net-misc/omnisync/omnisync-1.0_p20180614.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils vcs-snapshot + +SNAPSHOT="b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5" + +DESCRIPTION="A driver for NTPd for people who are firewall-challenged" +HOMEPAGE="https://www.vanheusden.com/time/omnisync" +LICENSE="GPL-2" +SRC_URI="https://gitlab.com/grknight/omnisync/-/archive/${SNAPSHOT}/omnisync-${SNAPSHOT}.tar.bz2 -> ${P}.tar.bz2" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="net-libs/gnutls:= net-analyzer/net-snmp:=" +DEPEND="${RDEPEND}" +DOCS=( readme.txt Changes ) + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR%/}/${PN}.initd" ${PN} + newconfd "${FILESDIR%/}/${PN}.confd" ${PN} + einstalldocs +} + +pkg_postinst() { + local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}") + if [[ -n "${isConfigured}" ]] ; then + elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service" + fi +} diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index e4234324fad0..9ff0e17d4d84 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml index f70327221315..94ab0e40cd4e 100644 --- a/net-vpn/openfortivpn/metadata.xml +++ b/net-vpn/openfortivpn/metadata.xml @@ -1,15 +1,11 @@ - - mathy@vanvoorden.be - Mathy Vanvoorden - - - proxy-maint@gentoo.org - Proxy Maintainers - - - adrienverge/openfortivpn - + + johu@gentoo.de + Johannes Huber + + + adrienverge/openfortivpn + diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index c9b3762f71de..2fed3dc0b6b0 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/package.mask b/profiles/package.mask index d5abc5182d04..ff47f1b3a37a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -203,10 +203,8 @@ sci-libs/freesteam # Remaining fetch-restricted game packages missing BLAKE2B hashes. # Please provide updated hashes if you have the matching distfiles. # Bug #642876. Removal in 30 days. -games-action/trine2 games-misc/dont-starve games-puzzle/larry -games-rpg/avadon games-rpg/penumbra-collection # Hans de Graaff (7 May 2018) diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 6f0321d82b77..ac180bd40a27 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -3081,8 +3081,7 @@ games-action/supertuxkart:wiimote - Support for wiimote input devices games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries. games-action/trine:launcher - Install GTK+ launcher games-action/trine-enchanted-edition:launcher - Install GTK+ launcher -games-action/trine2:bundled-libs - Use bundled libraries. -games-action/trine2:launcher - Install gtk+ launcher +games-action/trine2:launcher - Install GTK+ launcher games-arcade/bomns:editor - enables building the level editor games-arcade/burgerspace:network - Enable client-server support games-arcade/commandergenius:tremor - Use media-libs/tremor as ogg decoder instead of media-libs/libvorbis diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index 900748f7652c..249186f05d4b 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/snns/snns-4.3-r2.ebuild b/sci-mathematics/snns/snns-4.3-r2.ebuild index 36386638dc3e..475bb92a24e5 100644 --- a/sci-mathematics/snns/snns-4.3-r2.ebuild +++ b/sci-mathematics/snns/snns-4.3-r2.ebuild @@ -114,7 +114,7 @@ src_install() { if use doc; then insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/${MY_P}.Manual.pdf + doins "${DISTDIR}"/SNNSv4.2.Manual.pdf fi insinto /usr/share/doc/${PF}/examples diff --git a/sci-mathematics/snns/snns-4.3-r3.ebuild b/sci-mathematics/snns/snns-4.3-r3.ebuild index 69a7d3eb026f..706463b27ba5 100644 --- a/sci-mathematics/snns/snns-4.3-r3.ebuild +++ b/sci-mathematics/snns/snns-4.3-r3.ebuild @@ -115,7 +115,7 @@ src_install() { if use doc; then insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/${MY_P}.Manual.pdf + doins "${DISTDIR}"/SNNSv4.2.Manual.pdf fi insinto /usr/share/doc/${PF}/examples diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index 52406ce8eddf..ca7497eb1c98 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild index f9be038f16c0..1d10b8eee8b4 100644 --- a/x11-misc/polybar/polybar-3.1.0.ebuild +++ b/x11-misc/polybar/polybar-3.1.0.ebuild @@ -27,7 +27,7 @@ DEPEND=" ${PYTHON_DEPS} x11-base/xcb-proto x11-libs/cairo - x11-libs/libxcb + x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild index 7a1abcf47ee7..7bc1f90e2291 100644 --- a/x11-misc/polybar/polybar-9999.ebuild +++ b/x11-misc/polybar/polybar-9999.ebuild @@ -22,7 +22,7 @@ DEPEND=" ${PYTHON_DEPS} x11-base/xcb-proto x11-libs/cairo - x11-libs/libxcb + x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm