Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-db/lib_mysqludf_stem/, dev-db/lib_mysqludf_stem/files/
Date: Wed, 13 Mar 2019 09:34:39
Message-Id: 1552469661.e7b47a6ae233513a969f00f455d824b559b453db.mgorny@gentoo
1 commit: e7b47a6ae233513a969f00f455d824b559b453db
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 09:33:24 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 09:34:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b47a6a
7
8 dev-db/lib_mysqludf_stem: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/677450
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-db/lib_mysqludf_stem/Manifest | 1 -
14 .../files/lib_mysqludf_stem-mysql_m4.patch | 71 ----------------------
15 .../lib_mysqludf_stem-0.9.1.ebuild | 68 ---------------------
16 dev-db/lib_mysqludf_stem/metadata.xml | 5 --
17 profiles/package.mask | 1 -
18 5 files changed, 146 deletions(-)
19
20 diff --git a/dev-db/lib_mysqludf_stem/Manifest b/dev-db/lib_mysqludf_stem/Manifest
21 deleted file mode 100644
22 index 6417f51ca4f..00000000000
23 --- a/dev-db/lib_mysqludf_stem/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST lib_mysqludf_stem-0.9.1.tar.gz 953171 BLAKE2B 6cd6aeb2a5e856acffafa883f203bc74e11b2929bf760c9de2d7956816372afd961307642369c9653ce75c71044455b88972442318ea22b85dcde7b7bdc705d0 SHA512 d15736da91dc5a6f2b0289694efeb531337ff6a001d39aafca02c9f165ba5901163855b8f03d13a50c2ab9bee58e7fc03d19e893d086ec0022de9dd6921f93b7
27
28 diff --git a/dev-db/lib_mysqludf_stem/files/lib_mysqludf_stem-mysql_m4.patch b/dev-db/lib_mysqludf_stem/files/lib_mysqludf_stem-mysql_m4.patch
29 deleted file mode 100644
30 index c12d1f7d39a..00000000000
31 --- a/dev-db/lib_mysqludf_stem/files/lib_mysqludf_stem-mysql_m4.patch
32 +++ /dev/null
33 @@ -1,71 +0,0 @@
34 ---- config/ax_lib_mysql.m4.orig 2008-05-28 17:31:47.000000000 +0200
35 -+++ config/ax_lib_mysql.m4 2008-11-26 22:43:48.000000000 +0100
36 -@@ -87,10 +87,9 @@
37 - MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
38 -
39 - MYSQL_VERSION=`$MYSQL_CONFIG --version`
40 --
41 -- if test `$MYSQL_CONFIG | /usr/bin/awk '{if ($1 == "--plugindir") print 1}'` == "1"; then
42 -- MYSQL_PLUGINDIR=`$MYSQL_CONFIG --plugindir`
43 -- fi
44 -+ if $MYSQL_CONFIG --plugindir > /dev/null; then
45 -+ MYSQL_PLUGINDIR=`$MYSQL_CONFIG --plugindir`
46 -+ fi
47 -
48 - AC_DEFINE([HAVE_MYSQL], [1],
49 - [Define to 1 if MySQL libraries are available])
50 ---- config/ax_mysql_bin.m4.orig 2007-08-15 02:22:37.000000000 +0200
51 -+++ config/ax_mysql_bin.m4 2008-11-26 22:55:40.000000000 +0100
52 -@@ -43,35 +43,36 @@
53 - fi
54 -
55 - if test -z "$withmysqlbin" -o "$withmysqlbin" = "yes"; then
56 -- for i in /usr/bin /usr/local/bin ; do
57 -- if test -f "$i/mysql" ; then
58 -- MYSQL="$i/mysql $MYSQL_ARGS"
59 -- fi
60 -- done
61 -+ MYSQL=`which mysql`;
62 -+ if test -n "$MYSQL"; then MYSQL="$MYSQL $MYSQL_ARGS"; fi
63 - elif test "$withmysqlbin" != "no"; then
64 - MYSQL="$withmysqlbin"
65 - fi
66 -
67 - if test -n "$MYSQL" ; then
68 -- MYSQLBIN_PATH = `dirname "$MYSQL"`
69 -+ MYSQLBIN_PATH=`dirname "$MYSQL"`
70 - fi
71 -
72 - if test -z "$withmysqladmin" -o "$withmysqladmin" = "yes"; then
73 -- for i in "$MYSQLBIN_PATH" /usr/bin /usr/local/bin ; do
74 -- if test -n "$i" -a -f "$i/mysqladmin" ; then
75 -- MYSQLADMIN="$i/mysqladmin $MYSQL_ARGS"
76 -- fi
77 -- done
78 -+ if test -n "$MYSQLBIN_PATH" -a -f "$MYSQLBIN_PATH/mysqladmin"; then
79 -+ MYSQLADMIN="$MYSQLBIN_PATH/mysqladmin";
80 -+ else
81 -+ MYSQLADMIN=`which mysqladmin`;
82 -+ fi
83 -+
84 -+ if test -n "$MYSQLADMIN"; then MYSQLADMIN="$MYSQLADMIN $MYSQL_ARGS"; fi
85 - elif test "$withmysqladmin" != "no"; then
86 - MYSQLADMIN="$withmysqladmin"
87 - fi
88 -
89 - if test -z "$withmysqltest" -o "$withmysqltest" = "yes"; then
90 -- for i in "$MYSQLBIN_PATH" /usr/bin /usr/local/bin ; do
91 -- if test -n "$i" -a -f "$i/mysqltest" ; then
92 -- MYSQLTEST="$i/mysqltest $MYSQL_ARGS"
93 -- fi
94 -- done
95 -+ if test -n "$MYSQLBIN_PATH" -a -f "$MYSQLBIN_PATH/mysqltest"; then
96 -+ MYSQLTEST="$MYSQLBIN_PATH/mysqltest";
97 -+ else
98 -+ MYSQLTEST=`which mysqltest`;
99 -+ fi
100 -+
101 -+ if test -n "$MYSQLTEST"; then MYSQLTEST="$MYSQLTEST $MYSQL_ARGS"; fi
102 - elif test "$withmysqltest" != "no"; then
103 - MYSQLTEST="$withmysqltest"
104 - fi
105
106 diff --git a/dev-db/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.ebuild b/dev-db/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.ebuild
107 deleted file mode 100644
108 index fdfa360a4be..00000000000
109 --- a/dev-db/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.ebuild
110 +++ /dev/null
111 @@ -1,68 +0,0 @@
112 -# Copyright 1999-2011 Gentoo Foundation
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=4
116 -
117 -inherit eutils toolchain-funcs autotools
118 -
119 -DESCRIPTION="MySQL UDFs which provides stemming capability for a variety of languages"
120 -HOMEPAGE="http://www.mysqludf.org/lib_mysqludf_stem/"
121 -SRC_URI="http://www.mysqludf.org/${PN}/${P}.tar.gz"
122 -
123 -LICENSE="LGPL-2.1"
124 -SLOT="0"
125 -KEYWORDS="~amd64 ~x86"
126 -IUSE=""
127 -
128 -DEPEND=">=virtual/mysql-5.1"
129 -RDEPEND="${DEPEND}"
130 -
131 -RESTRICT="test"
132 -
133 -pkg_setup() {
134 - MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
135 - MYSQL_INCLUDE="$(mysql_config --include)"
136 -}
137 -
138 -src_prepare() {
139 - # add AC_PROG_CXX to configure.ac
140 - sed -i -e 's|\(AC_PROG_CC\)|\1\nAC_PROG_CXX|g' configure.ac
141 -
142 - # fix ax_lib_mysql.m4 + ax_mysql_bin.m4
143 - epatch "${FILESDIR}/${PN}-mysql_m4.patch"
144 -
145 - # fix and clean libstemmer_c
146 - sed -i -e 's|^\(CFLAGS\)=|\1+=-fPIC |g' libstemmer_c/Makefile
147 - rm -f -- libstemmer_c/stemwords libstemmer_c/*.{o,a} libstemmer_c/*/*.o
148 -
149 - edos2unix installdb.sql
150 - eautoreconf
151 -}
152 -
153 -src_configure() {
154 - econf --with-pic --disable-static --libdir="${MYSQL_PLUGINDIR}"
155 -}
156 -
157 -src_install() {
158 - local X
159 - emake DESTDIR="${D}" install
160 - dodoc libstemmer_c/libstemmer/*.txt
161 - [ -f ${PN}.html ] && dohtml ${PN}.html
162 - [ -d doc/html ] && dohtml -r doc/html/.
163 - for X in API AUTHORS ChangeLog NEWS README *installdb.sql; do
164 - [ -s "${X}" ] && dodoc "${X}"
165 - done
166 -
167 - # remove obsolete *.la file
168 - rm -f -- "${D}${MYSQL_PLUGINDIR}"/*.la
169 -}
170 -
171 -pkg_postinst() {
172 - elog
173 - elog "Please have a look at the documentation, how to"
174 - elog "enable/disable the UDF functions of ${PN}."
175 - elog
176 - elog "The documentation is located here:"
177 - elog "/usr/share/doc/${PF}"
178 - elog
179 -}
180
181 diff --git a/dev-db/lib_mysqludf_stem/metadata.xml b/dev-db/lib_mysqludf_stem/metadata.xml
182 deleted file mode 100644
183 index 6f49eba8f49..00000000000
184 --- a/dev-db/lib_mysqludf_stem/metadata.xml
185 +++ /dev/null
186 @@ -1,5 +0,0 @@
187 -<?xml version="1.0" encoding="UTF-8"?>
188 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
189 -<pkgmetadata>
190 -<!-- maintainer-needed -->
191 -</pkgmetadata>
192
193 diff --git a/profiles/package.mask b/profiles/package.mask
194 index d1519b7cfd2..95dd030737b 100644
195 --- a/profiles/package.mask
196 +++ b/profiles/package.mask
197 @@ -130,7 +130,6 @@ app-arch/freeze
198 # Cannot verify if they work with modern database versions either.
199 # Removal in 30 days. Bug 677450
200 dev-db/lib_mysqludf_log
201 -dev-db/lib_mysqludf_stem
202
203 # Jeroen Roovers <jer@g.o> (31 Jan 2019)
204 # Depends on =dev-libs/openssl-1.1.1*