1 |
commit: d7f7628019d2ee6e30d698740d7e7ed0e11722c8 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 16 15:23:48 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 16 16:23:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f76280 |
7 |
|
8 |
dev-db/percona-server: small changes |
9 |
|
10 |
- Build system will always check for dev-libs/protobuf when USE=server |
11 |
|
12 |
- Make sure to subscribe to protobuf's subslot when USE=rocksdb |
13 |
|
14 |
- Don't install files in /usr/share/doc/${P}/scripts -- they are |
15 |
already installed in /usr/share/mysql |
16 |
|
17 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
18 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
19 |
|
20 |
...3.ebuild => percona-server-5.7.23.23-r1.ebuild} | 45 ++++++++-------------- |
21 |
1 file changed, 17 insertions(+), 28 deletions(-) |
22 |
|
23 |
diff --git a/dev-db/percona-server/percona-server-5.7.23.23.ebuild b/dev-db/percona-server/percona-server-5.7.23.23-r1.ebuild |
24 |
similarity index 98% |
25 |
rename from dev-db/percona-server/percona-server-5.7.23.23.ebuild |
26 |
rename to dev-db/percona-server/percona-server-5.7.23.23-r1.ebuild |
27 |
index d87397f9aea..bc88d79f260 100644 |
28 |
--- a/dev-db/percona-server/percona-server-5.7.23.23.ebuild |
29 |
+++ b/dev-db/percona-server/percona-server-5.7.23.23-r1.ebuild |
30 |
@@ -2,7 +2,7 @@ |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
EAPI="6" |
34 |
-MY_EXTRAS_VER="20181014-2320Z" |
35 |
+MY_EXTRAS_VER="20181016-1606Z" |
36 |
|
37 |
CMAKE_MAKEFILE_GENERATOR=emake |
38 |
|
39 |
@@ -92,14 +92,17 @@ COMMON_DEPEND="net-misc/curl:= |
40 |
server? ( |
41 |
>=app-arch/lz4-0_p131:= |
42 |
cjk? ( app-text/mecab:= ) |
43 |
- numa? ( sys-process/numactl ) |
44 |
- pam? ( virtual/pam:0= ) |
45 |
experimental? ( |
46 |
dev-libs/libevent:= |
47 |
dev-libs/protobuf:= |
48 |
net-libs/libtirpc:= |
49 |
) |
50 |
- rocksdb? ( app-arch/zstd:= ) |
51 |
+ numa? ( sys-process/numactl ) |
52 |
+ pam? ( virtual/pam:0= ) |
53 |
+ rocksdb? ( |
54 |
+ app-arch/zstd:= |
55 |
+ dev-libs/protobuf:= |
56 |
+ ) |
57 |
tokudb? ( |
58 |
app-arch/snappy:= |
59 |
app-arch/xz-utils:= |
60 |
@@ -121,8 +124,10 @@ COMMON_DEPEND="net-misc/curl:= |
61 |
" |
62 |
DEPEND="${COMMON_DEPEND} |
63 |
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
64 |
+ dev-libs/protobuf |
65 |
virtual/yacc |
66 |
server? ( |
67 |
+ dev-libs/libevent |
68 |
experimental? ( net-libs/rpcsvc-proto ) |
69 |
) |
70 |
static? ( sys-libs/ncurses[static-libs] ) |
71 |
@@ -279,9 +284,9 @@ pkg_postinst() { |
72 |
# Note about configuration change |
73 |
einfo |
74 |
elog "This version of ${PN} reorganizes the configuration from a single my.cnf" |
75 |
- elog "to several files in /etc/mysql/${PN}.d." |
76 |
+ elog "to several files in /etc/mysql/mysql.d." |
77 |
elog "Please backup any changes you made to /etc/mysql/my.cnf" |
78 |
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension." |
79 |
+ elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension." |
80 |
elog "You may have as many files as needed and they are read alphabetically." |
81 |
elog "Be sure the options have the appropriate section headers, i.e. [mysqld]." |
82 |
einfo |
83 |
@@ -323,11 +328,11 @@ src_prepare() { |
84 |
# Remove bundled libs so we cannot accidentally use them |
85 |
# We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394 |
86 |
rm -rv \ |
87 |
- "${S}"/libevent \ |
88 |
- "${S}"/zlib \ |
89 |
"${S}"/extra/protobuf \ |
90 |
+ "${S}"/libevent \ |
91 |
"${S}"/storage/rocksdb/third_party \ |
92 |
"${S}"/storage/tokudb/PerconaFT/third_party \ |
93 |
+ "${S}"/zlib \ |
94 |
|| die |
95 |
|
96 |
# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux |
97 |
@@ -773,31 +778,21 @@ multilib_src_install_all() { |
98 |
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ |
99 |
"${FILESDIR}/${mycnf_src}" \ |
100 |
> "${TMPDIR}/my.cnf.ok" || die |
101 |
+ |
102 |
if use prefix ; then |
103 |
sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ |
104 |
"${TMPDIR}/my.cnf.ok" || die |
105 |
fi |
106 |
+ |
107 |
if use latin1 ; then |
108 |
sed -i \ |
109 |
-e "/character-set/s|utf8|latin1|g" \ |
110 |
"${TMPDIR}/my.cnf.ok" || die |
111 |
fi |
112 |
- eprefixify "${TMPDIR}/my.cnf.ok" |
113 |
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf |
114 |
|
115 |
- einfo "Including support files and sample configurations" |
116 |
- docinto "support-files" |
117 |
- local script |
118 |
- for script in \ |
119 |
- "${S}"/support-files/magic |
120 |
- do |
121 |
- [[ -f "$script" ]] && dodoc "${script}" |
122 |
- done |
123 |
+ eprefixify "${TMPDIR}/my.cnf.ok" |
124 |
|
125 |
- docinto "scripts" |
126 |
- for script in "${S}"/scripts/mysql* ; do |
127 |
- [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" |
128 |
- done |
129 |
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf |
130 |
|
131 |
if use tokudb ; then |
132 |
# Remove some unwanted files |
133 |
@@ -810,12 +805,6 @@ multilib_src_install_all() { |
134 |
fi |
135 |
fi |
136 |
|
137 |
- if ! use client-libs ; then |
138 |
- rm -rv \ |
139 |
- "${ED%/}"/usr/$(get_libdir)/pkgconfig \ |
140 |
- || die |
141 |
- fi |
142 |
- |
143 |
#Remove mytop if perl is not selected |
144 |
[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" |
145 |
} |