Commit 3b8a2433 authored by Liguros - Gitlab CI/CD [develop]'s avatar Liguros - Gitlab CI/CD [develop]
Browse files

updates

merged:

  xor: 3f5b4e94c98b0c173ed1ed4a8ec233b4aed8db60
  cinnamon: ba8d7a5a156d6f1d86eae56f851db2fc3d943fea
  mate-desktop: 674cbd1bc7d208585b59f2fc78dd735a332cb61d
  fusion809: d118717563dfc7a14397d5f49fdc3841780c7f15
  steam: d6b161d6c28b026cc993320d43797097fa668746
  go-overlay: 435b13dcc2cdc2dc5b5fee57005d8deb2caa114c
  stefantalpalaru: ecb7a8ff3e12533c67dee51d21a1ddc6488b9b28
  ports: 8b66cdd11e736f312f8394b85f95e58efdd51427
  gentoo-libressl: eea877be8b5f120e5ca67b3d0bf34acd908ae960
  gentoo-staging: 0d1467de5c9465b951f4fc782243fb8b911d4dcf
  calculatelinux: abae95cfa10da591faf95caa96682e7a370a3aef
  kit-fixups: 62fe30598e286a13a9f15deca190e3ce8094a784
parent 8e3b9703
......@@ -13,7 +13,7 @@ IUSE=""
DEPEND="dev-lua/luaposix
dev-lang/tcl
dev-lua/bit32
dev-lua/lua-bit32
>=dev-lua/luafilesystem-1.6.2"
RDEPEND="${DEPEND}"
......
......@@ -13,7 +13,7 @@ IUSE=""
DEPEND="dev-lua/luaposix
dev-lang/tcl
dev-lua/bit32
dev-lua/lua-bit32
>=dev-lua/luafilesystem-1.6.2"
RDEPEND="${DEPEND}"
......
......@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"
......
DIST v4.5.1.tar.gz 1025555 BLAKE2B 97894b87d74b4523444074559bcb9968853e3b7fd3fa2aa66eda05da2ebb54fa49ca14c808ea8c72de1fd6b9d5959f18763a16befa383eaa48e7a4529d368bd4 SHA512 5cfa61f58231a63953d087a4fb3c6ae2b79a7bfa2b68075a45d3575ecc0c1755b359ecb67f8fa5c60e8790879b2ae375fc5d585e00a565b09a78884239246055
DIST v4.5.2.tar.gz 1026454 BLAKE2B c25f86a3ae80e93424ece21b1ddd7a960ae8d8f07a39221db8a46966fbaafd46fd7627d82dcda9bfbe6ba951074df871790d9b45edf10b785938c3cb958b225b SHA512 717c2c84728989c674ed5932b35e52ac5e81e4f1bb45e0405539295515eb7c3ed95f4f5885e300242ed6c24e252ae9b98336298f415a46648adedd0506d54000
DIST v4.5.3.tar.gz 1030227 BLAKE2B 8cdae19f73651fef51f3a42832e5575a12f2131a76fe5c396311c4c670025df0ddb820692595e69c9a2c053e0e2f344b25eb76de4f847efead2a2971ca7f0c15 SHA512 35c8d0471fee7b1748a04bba945238f700c3844974bdc8aa60e7ecbb4591399d32bdb452ccdfb130ecd3ede40072544a0f92d01d43b2f07744e041c25210f19f
......@@ -21,9 +21,14 @@ LDIR="/etc/Modules"
MDIR="${LDIR}/modules"
src_configure() {
econf --with-modulepath=${MDIR} \
--etcdir=${LDIR} --with-initconf-in=etcdir \
--with-moduleshome=${MDIR}
./configure --prefix=/usr \
--mandir=/usr/share/man \
--docdir=/usr/share/doc/${P} \
--libdir=/usr/lib64 \
--with-modulepath=${MDIR} \
--etcdir=${LDIR} \
--with-initconf-in=etcdir \
--with-moduleshome=${MDIR}
}
src_install() {
......
This diff is collapsed.
This diff is collapsed.
diff --git a/syslog-summary b/syslog-summary
index abf6381..a658c14 100755
--- a/syslog-summary
+++ b/syslog-summary
@@ -35,6 +35,8 @@ Lars Wirzenius <liw@iki.fi>
Tommi Virtanen <tv@debian.org>
David Paleino <d.paleino@gmail.com>"""
+from __future__ import print_function
+
version = "1.14"
import sys, re, getopt, string
@@ -62,7 +64,7 @@ def io_error(err, filename, die=True):
if die:
traceback.print_exc(file=sys.stderr)
else:
- print "[E] %s [%s(%s) - %s]" % (os.strerror(num), errno.errorcode[num], num, filename)
+ print("[E] %s [%s(%s) - %s]" % (os.strerror(num), errno.errorcode[num], num, filename))
if die:
sys.exit(1)
@@ -72,7 +74,7 @@ def read_patterns(filename):
pats = []
try:
f = open(filename, "r")
- except IOError, e:
+ except IOError as e:
io_error(e, filename, False)
return []
for line in f:
@@ -91,7 +93,7 @@ def read_states(filename):
return states
try:
f = open(filename, "r")
- except IOError, e:
+ except IOError as e:
io_error(e, filename, False)
return states
for line in f:
@@ -105,9 +107,9 @@ def save_states(filename, states):
return
try:
f = open(filename, "w")
- except IOError, e:
+ except IOError as e:
io_error(e, filename, True)
- for filename in states.keys():
+ for filename in list(states.keys()):
value = states[filename]
f.write("%s %d %s\n" % (filename, value[0], value[1]))
f.close()
@@ -123,7 +125,7 @@ def split_date(line):
m = pat.match(line)
if m:
return line[:m.end()], line[m.end():]
- print "line has bad date", "<" + string.rstrip(line) + ">"
+ print("line has bad date", "<" + string.rstrip(line) + ">")
return None, line
def is_gzipped(filename):
@@ -152,7 +154,7 @@ def summarize(filename, states):
order = []
ignored_count = 0
if not QUIET:
- print "Summarizing %s" % filename
+ print("Summarizing %s" % filename)
# If the file is a gzipped log, open it
# using the proper function from the gzip
@@ -162,7 +164,7 @@ def summarize(filename, states):
file = gzopen(filename, "rb")
else:
file = open(filename, "r")
- except IOError, e:
+ except IOError as e:
io_error(e, filename, True)
linecount = 0
@@ -170,7 +172,7 @@ def summarize(filename, states):
shaobj = sha1()
if filename in states:
oldlines, oldsha = states[filename]
- for i in xrange(oldlines):
+ for i in range(oldlines):
line = file.readline()
shaobj.update(line)
# print "OLD-new: %s" % shaobj.hexdigest()
@@ -182,7 +184,7 @@ def summarize(filename, states):
else:
linecount = oldlines
if not QUIET:
- print "%8d Lines skipped (already processed)" % linecount
+ print("%8d Lines skipped (already processed)" % linecount)
line = file.readline()
previous = None
@@ -190,13 +192,13 @@ def summarize(filename, states):
foo=0
while line:
# foo+=1
- shaobj.update(line)
+ shaobj.update(line.encode())
linecount += 1
if should_be_ignored(line):
ignored_count += 1
if DEBUG:
- print "Ignoring: %s" % line
+ print("Ignoring: %s" % line)
line = file.readline()
date, rest = split_date(line)
@@ -213,7 +215,7 @@ def summarize(filename, states):
count = int(repeated.group(1))
rest = previous
- if counts.has_key(rest):
+ if rest in counts:
counts[rest] = counts[rest] + count
else:
assert count == 1
@@ -233,14 +235,14 @@ def summarize(filename, states):
# print states
if QUIET and order:
- print "Summarizing %s" % filename
+ print("Summarizing %s" % filename)
if not QUIET or order:
- print "%8d Patterns to ignore" % len(ignore_pats)
- print "%8d Ignored lines" % ignored_count
+ print("%8d Patterns to ignore" % len(ignore_pats))
+ print("%8d Ignored lines" % ignored_count)
for rest in order:
- print "%8d %s" % (counts[rest], rest),
+ print("%8d %s" % (counts[rest], rest), end='')
if not QUIET or order:
- print
+ print()
def main():
global ignore_pats, IGNORE_FILENAME, STATE_FILENAME, REPEAT, QUIET, DEBUG
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
inherit python-single-r1
DESCRIPTION="Summarizes the contents of a syslog log file"
HOMEPAGE="https://github.com/dpaleino/syslog-summary"
SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND=""
RDEPEND="${PYTHON_DEPS}"
PATCHES=( \
"${FILESDIR}/${P}-fix-ignore-code.patch" \
"${FILESDIR}/${P}-remove-file-magic.patch" \
"${FILESDIR}/${P}-py3.patch" \
)
src_prepare() {
python_fix_shebang -f syslog-summary
# Sadly, the makefile is useless for us.
rm Makefile || die
default
}
src_install() {
dobin syslog-summary
einstalldocs
doman syslog-summary.1
insinto /etc/syslog-summary
doins ignore.rules
}
......@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 x86"
IUSE="nls"
RDEPEND=">=dev-libs/iniparser-4.1:4
......
......@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
LICENSE="CPL-1.0 GPL-2"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 x86"
KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
IUSE="doc libressl selinux" # gtk
# gtk support presently does NOT compile.
......
diff -r ab1558b934ff configure
--- a/configure Sun Aug 30 22:05:05 2020 +0200
+++ b/configure Sun Aug 30 22:38:03 2020 +0200
@@ -11333,7 +11333,7 @@
fi
-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:11340: checking for $ac_func" >&5
diff -r ab1558b934ff configure.in
--- a/configure.in Sun Aug 30 22:05:05 2020 +0200
+++ b/configure.in Sun Aug 30 22:38:03 2020 +0200
@@ -4012,7 +4012,7 @@
dnl Check for POSIX functions.
dnl ----------------------------------------------------------------
-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
dnl getaddrinfo() is borked under hpux11
if test "$ac_cv_func_getaddrinfo" != "no" ; then
diff -r ab1558b934ff src/config.h.in
--- a/src/config.h.in Sun Aug 30 22:05:05 2020 +0200
+++ b/src/config.h.in Sun Aug 30 22:38:03 2020 +0200
@@ -346,6 +346,7 @@
#undef HAVE_SNPRINTF
#undef HAVE_STPCPY
#undef HAVE_STRERROR
+#undef HAVE_STRSIGNAL
#undef HAVE_TZSET
#undef HAVE_ULIMIT
#undef HAVE_USLEEP
diff -r ab1558b934ff src/process.c
--- a/src/process.c Sun Aug 30 22:05:05 2020 +0200
+++ b/src/process.c Sun Aug 30 22:38:03 2020 +0200
@@ -1311,7 +1311,11 @@
signal_name (int signum)
{
if (signum >= 0 && signum < NSIG)
+#ifdef HAVE_STRSIGNAL
+ return strsignal (signum);
+#else
return (const char *) sys_siglist[signum];
+#endif
return (const char *) GETTEXT ("unknown signal");
}
diff -r ab1558b934ff src/s/linux.h
--- a/src/s/linux.h Sun Aug 30 22:05:05 2020 +0200
+++ b/src/s/linux.h Sun Aug 30 22:38:03 2020 +0200
@@ -107,7 +107,6 @@
#define NO_SIOCTL_H /* don't have sioctl.h */
-#define HAVE_SYS_SIGLIST
#define HAVE_WAIT_HEADER
#define POSIX /* affects getpagesize.h and systty.h */
diff -r ab1558b934ff src/sysdep.c
--- a/src/sysdep.c Sun Aug 30 22:05:05 2020 +0200
+++ b/src/sysdep.c Sun Aug 30 22:38:03 2020 +0200
@@ -3526,7 +3526,7 @@
/* Strings corresponding to defined signals */
/************************************************************************/
-#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
+#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
#if defined(WIN32_NATIVE) || defined(CYGWIN)
const char *sys_siglist[] =
diff -r ab1558b934ff src/syssignal.h
--- a/src/syssignal.h Sun Aug 30 22:05:05 2020 +0200
+++ b/src/syssignal.h Sun Aug 30 22:38:03 2020 +0200
@@ -223,10 +223,8 @@
# define NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */
#endif
-/* SYS_SIGLIST_DECLARED is determined by configure. On Linux, it seems,
- configure incorrectly fails to find it, so s/linux.h defines
- HAVE_SYS_SIGLIST. */
-#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
+/* Systems that have sys_siglist but do not declare it. */
+#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
extern const char *sys_siglist[];
#endif
......@@ -65,6 +65,7 @@ src_prepare() {
eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
# see bug 615544
eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
# Convert to utf-8
iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
......
......@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
inherit golang-vcs-snapshot
fi
......
......@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
IUSE="btrfs +device-mapper selinux systemd"
COMMON_DEPEND="
......
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
......@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
else
EGIT_COMMIT="3eb39382bfa6a3c42f83674ab080ae13b0e34e5d"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
inherit golang-vcs-snapshot
fi
......
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit golang-vcs-snapshot systemd user
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
DESCRIPTION="An etcd backed network fabric for containers"
EGO_PN="github.com/coreos/flannel"
HOMEPAGE="https://github.com/coreos/flannel"
......
This diff is collapsed.
......@@ -14,7 +14,7 @@ else
# Change this when you update the ebuild
RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd
SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
inherit golang-build golang-vcs-snapshot
fi
......
DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools systemd
DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
HOMEPAGE="https://github.com/rpodgorny/uptimed/"
SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs"
RDEPEND="
acct-group/uptimed
acct-user/uptimed
"
DEPEND="${RDEPEND}"
BDEPEND="${RDEPEND}"
src_prepare() {
default
# fix configure.ac for >=automake-1.13 (bug #467582)
sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
eautoreconf
}
src_configure() {
econf $(use_enable static-libs static)
}
src_install() {
local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
default
find "${ED}" -type f -name '*.la' -delete || die
local spooldir="/var/spool/${PN}"
keepdir ${spooldir}
fowners uptimed:uptimed ${spooldir}
newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
systemd_dounit "${FILESDIR}/${PN}.service"
}
pkg_postinst() {
local spooldir="/var/spool/${PN}"
if [[ -d "${spooldir}" ]] ; then
einfo "Fixing permissions in ${spooldir}"
find ${spooldir} -type f -links 1 \
\( -name records -o -name records.old \) \
| xargs --no-run-if-empty chown uptimed:uptimed || die
fi
echo
elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
elog "or systemctl start uptimed (for systemd)"
elog "To view your uptime records, use the command 'uprecords'."
echo
}
......@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
......
......@@ -23,13 +23,12 @@ IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
test tokudb xml yassl"
test xml yassl"
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
REQUIRED_USE="jdbc? ( extraengine server !static )
server? ( tokudb? ( jemalloc !tcmalloc ) )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
......@@ -80,7 +79,6 @@ COMMON_DEPEND="
pam? ( sys-libs/pam:0= )
s3? ( net-misc/curl )
systemd? ( sys-apps/systemd:= )
tokudb? ( app-arch/snappy )
)
systemtap? ( >=dev-util/systemtap-1.3:0= )
tcmalloc? ( dev-util/google-perftools:0= )
......@@ -195,13 +193,6 @@ pkg_setup() {
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 || \
......@@ -249,11 +240,6 @@ src_prepare() {
echo "TARGET_LINK_LIBRARIES(mariadbd tcmalloc)" >> "${S}/sql/CMakeLists.txt"
fi
# Don't build bundled xz-utils for tokudb
echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
local plugin
local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
locale_info qc_info server_audit sql_errlog auth_ed25519 )
......@@ -400,7 +386,6 @@ src_configure() {
-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
......@@ -430,9 +415,6 @@ src_configure() {
-DWITH_NUMA=$(usex numa ON OFF)
)
# Workaround for MDEV-14524
use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
if use test ; then
# This is needed for the new client lib which tests a real, open server
mycmakeargs+=( -DSKIP_TESTS=ON )
......@@ -617,7 +599,7 @@ src_test() {
# run mysql-test tests
pushd "${TESTDIR}" &>/dev/null || die
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
retstatus_tests=$?
popd &>/dev/null || die
......