| 1 |
commit: c88cde53e2061a53127dba4307ce54f265546e6b |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 24 21:15:50 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 24 21:15:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88cde53 |
| 7 |
|
| 8 |
dev-libs/marisa: drop 0.2.5 |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-libs/marisa/Manifest | 1 - |
| 13 |
.../files/marisa-0.2.5-cpu_features_check.patch | 157 --------------------- |
| 14 |
dev-libs/marisa/marisa-0.2.5.ebuild | 108 -------------- |
| 15 |
3 files changed, 266 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest |
| 18 |
index 7b524798645e..e6b7e3213805 100644 |
| 19 |
--- a/dev-libs/marisa/Manifest |
| 20 |
+++ b/dev-libs/marisa/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547 |
| 23 |
DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d |
| 24 |
|
| 25 |
diff --git a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch |
| 26 |
deleted file mode 100644 |
| 27 |
index dba677221a19..000000000000 |
| 28 |
--- a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,157 +0,0 @@ |
| 31 |
-https://github.com/s-yata/marisa-trie/commit/d93f1b67f3aaa2d56bf20089c0ce9ef216da6cb7 |
| 32 |
- |
| 33 |
---- /configure.ac |
| 34 |
-+++ /configure.ac |
| 35 |
-@@ -13,6 +13,56 @@ |
| 36 |
- |
| 37 |
- AC_CONFIG_MACRO_DIR([m4]) |
| 38 |
- |
| 39 |
-+# Macros for SSE availability check. |
| 40 |
-+AC_DEFUN([MARISA_ENABLE_SSE2], |
| 41 |
-+ [AC_EGREP_CPP([yes], [ |
| 42 |
-+#ifdef __SSE2__ |
| 43 |
-+yes |
| 44 |
-+#endif |
| 45 |
-+ ], [enable_sse2="yes"], [enable_sse2="no"])]) |
| 46 |
-+AC_DEFUN([MARISA_ENABLE_SSE3], |
| 47 |
-+ [AC_EGREP_CPP([yes], [ |
| 48 |
-+#ifdef __SSE3__ |
| 49 |
-+yes |
| 50 |
-+#endif |
| 51 |
-+ ], [enable_sse3="yes"], [enable_sse3="no"])]) |
| 52 |
-+AC_DEFUN([MARISA_ENABLE_SSSE3], |
| 53 |
-+ [AC_EGREP_CPP([yes], [ |
| 54 |
-+#ifdef __SSSE3__ |
| 55 |
-+yes |
| 56 |
-+#endif |
| 57 |
-+ ], [enable_ssse3="yes"], [enable_ssse3="no"])]) |
| 58 |
-+AC_DEFUN([MARISA_ENABLE_SSE4_1], |
| 59 |
-+ [AC_EGREP_CPP([yes], [ |
| 60 |
-+#ifdef __SSE4_1__ |
| 61 |
-+yes |
| 62 |
-+#endif |
| 63 |
-+ ], [enable_sse4_1="yes"], [enable_sse4_1="no"])]) |
| 64 |
-+AC_DEFUN([MARISA_ENABLE_SSE4_2], |
| 65 |
-+ [AC_EGREP_CPP([yes], [ |
| 66 |
-+#ifdef __SSE4_2__ |
| 67 |
-+yes |
| 68 |
-+#endif |
| 69 |
-+ ], [enable_sse4_2="yes"], [enable_sse4_2="no"])]) |
| 70 |
-+AC_DEFUN([MARISA_ENABLE_SSE4], |
| 71 |
-+ [AC_EGREP_CPP([yes], [ |
| 72 |
-+#if defined(__POPCNT__) && defined(__SSE4_2__) |
| 73 |
-+yes |
| 74 |
-+#endif |
| 75 |
-+ ], [enable_sse4="yes"], [enable_sse4="no"])]) |
| 76 |
-+AC_DEFUN([MARISA_ENABLE_SSE4A], |
| 77 |
-+ [AC_EGREP_CPP([yes], [ |
| 78 |
-+#ifdef __SSE4A__ |
| 79 |
-+yes |
| 80 |
-+#endif |
| 81 |
-+ ], [enable_sse4a="yes"], [enable_sse4a="no"])]) |
| 82 |
-+AC_DEFUN([MARISA_ENABLE_POPCNT], |
| 83 |
-+ [AC_EGREP_CPP([yes], [ |
| 84 |
-+#ifdef __POPCNT__ |
| 85 |
-+yes |
| 86 |
-+#endif |
| 87 |
-+ ], [enable_popcnt="yes"], [enable_popcnt="no"])]) |
| 88 |
-+ |
| 89 |
- # Checks for SSE availability. |
| 90 |
- AC_MSG_CHECKING([whether to use SSE2]) |
| 91 |
- AC_ARG_ENABLE([sse2], |
| 92 |
-@@ -20,9 +70,7 @@ |
| 93 |
- [use SSE2 [default=no]])], |
| 94 |
- [], |
| 95 |
- [enable_sse2="no"]) |
| 96 |
--AS_IF([test "x${enable_sse2}" != "xno"], [ |
| 97 |
-- enable_sse2="yes" |
| 98 |
--]) |
| 99 |
-+AS_IF([test "x${enable_sse2}" != "xno"], [MARISA_ENABLE_SSE2]) |
| 100 |
- AC_MSG_RESULT([${enable_sse2}]) |
| 101 |
- |
| 102 |
- AC_MSG_CHECKING([whether to use SSE3]) |
| 103 |
-@@ -31,9 +79,7 @@ |
| 104 |
- [use SSE3 [default=no]])], |
| 105 |
- [], |
| 106 |
- [enable_sse3="no"]) |
| 107 |
--AS_IF([test "x${enable_sse3}" != "xno"], [ |
| 108 |
-- enable_sse3="yes" |
| 109 |
--]) |
| 110 |
-+AS_IF([test "x${enable_sse3}" != "xno"], [MARISA_ENABLE_SSE3]) |
| 111 |
- AC_MSG_RESULT([${enable_sse3}]) |
| 112 |
- |
| 113 |
- AC_MSG_CHECKING([whether to use SSSE3]) |
| 114 |
-@@ -42,9 +88,7 @@ |
| 115 |
- [use SSSE3 [default=no]])], |
| 116 |
- [], |
| 117 |
- [enable_ssse3="no"]) |
| 118 |
--AS_IF([test "x${enable_ssse3}" != "xno"], [ |
| 119 |
-- enable_ssse3="yes" |
| 120 |
--]) |
| 121 |
-+AS_IF([test "x${enable_ssse3}" != "xno"], [MARISA_ENABLE_SSSE3]) |
| 122 |
- AC_MSG_RESULT([${enable_ssse3}]) |
| 123 |
- |
| 124 |
- AC_MSG_CHECKING([whether to use SSE4.1]) |
| 125 |
-@@ -53,9 +97,7 @@ |
| 126 |
- [use SSE4.1 [default=no]])], |
| 127 |
- [], |
| 128 |
- [enable_sse4_1="no"]) |
| 129 |
--AS_IF([test "x${enable_sse4_1}" != "xno"], [ |
| 130 |
-- enable_sse4_1="yes" |
| 131 |
--]) |
| 132 |
-+AS_IF([test "x${enable_sse4_1}" != "xno"], [MARISA_ENABLE_SSE4_1]) |
| 133 |
- AC_MSG_RESULT([${enable_sse4_1}]) |
| 134 |
- |
| 135 |
- AC_MSG_CHECKING([whether to use SSE4.2]) |
| 136 |
-@@ -64,9 +106,7 @@ |
| 137 |
- [use SSE4.2 [default=no]])], |
| 138 |
- [], |
| 139 |
- [enable_sse4_2="no"]) |
| 140 |
--AS_IF([test "x${enable_sse4_2}" != "xno"], [ |
| 141 |
-- enable_sse4_2="yes" |
| 142 |
--]) |
| 143 |
-+AS_IF([test "x${enable_sse4_2}" != "xno"], [MARISA_ENABLE_SSE4_2]) |
| 144 |
- AC_MSG_RESULT([${enable_sse4_2}]) |
| 145 |
- |
| 146 |
- AC_MSG_CHECKING([whether to use SSE4]) |
| 147 |
-@@ -75,9 +115,7 @@ |
| 148 |
- [use SSE4 [default=no]])], |
| 149 |
- [], |
| 150 |
- [enable_sse4="no"]) |
| 151 |
--AS_IF([test "x${enable_sse4}" != "xno"], [ |
| 152 |
-- enable_sse4="yes" |
| 153 |
--]) |
| 154 |
-+AS_IF([test "x${enable_sse4}" != "xno"], [MARISA_ENABLE_SSE4]) |
| 155 |
- AC_MSG_RESULT([${enable_sse4}]) |
| 156 |
- |
| 157 |
- AC_MSG_CHECKING([whether to use SSE4a]) |
| 158 |
-@@ -86,9 +124,7 @@ |
| 159 |
- [use SSE4a [default=no]])], |
| 160 |
- [], |
| 161 |
- [enable_sse4a="no"]) |
| 162 |
--AS_IF([test "x${enable_sse4a}" != "xno"], [ |
| 163 |
-- enable_sse4a="yes" |
| 164 |
--]) |
| 165 |
-+AS_IF([test "x${enable_sse4a}" != "xno"], [MARISA_ENABLE_SSE4A]) |
| 166 |
- AC_MSG_RESULT([${enable_sse4a}]) |
| 167 |
- |
| 168 |
- AC_MSG_CHECKING([whether to use popcnt]) |
| 169 |
-@@ -97,9 +133,7 @@ |
| 170 |
- [use POPCNT [default=no]])], |
| 171 |
- [], |
| 172 |
- [enable_popcnt="no"]) |
| 173 |
--AS_IF([test "x${enable_popcnt}" != "xno"], [ |
| 174 |
-- enable_popcnt="yes" |
| 175 |
--]) |
| 176 |
-+AS_IF([test "x${enable_popcnt}" != "xno"], [MARISA_ENABLE_POPCNT]) |
| 177 |
- AC_MSG_RESULT([${enable_popcnt}]) |
| 178 |
- |
| 179 |
- AS_IF([test "x${enable_popcnt}" != "xno"], [ |
| 180 |
-@@ -170,6 +204,7 @@ |
| 181 |
- AS_ECHO([" LDFLAGS: ${LDFLAGS}"]) |
| 182 |
- AS_ECHO([" PREFIX: ${prefix}"]) |
| 183 |
- AS_ECHO([]) |
| 184 |
-+AS_ECHO([" NATIVE: ${enable_native_code}"]) |
| 185 |
- AS_ECHO([" SSE2: ${enable_sse2}"]) |
| 186 |
- AS_ECHO([" SSE3: ${enable_sse3}"]) |
| 187 |
- AS_ECHO([" SSSE3: ${enable_ssse3}"]) |
| 188 |
|
| 189 |
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild |
| 190 |
deleted file mode 100644 |
| 191 |
index af6c3b508d46..000000000000 |
| 192 |
--- a/dev-libs/marisa/marisa-0.2.5.ebuild |
| 193 |
+++ /dev/null |
| 194 |
@@ -1,108 +0,0 @@ |
| 195 |
-# Copyright 2014-2022 Gentoo Authors |
| 196 |
-# Distributed under the terms of the GNU General Public License v2 |
| 197 |
- |
| 198 |
-EAPI="7" |
| 199 |
-PYTHON_COMPAT=( python{3_7,3_8,3_9} ) |
| 200 |
-DISTUTILS_OPTIONAL="1" |
| 201 |
- |
| 202 |
-inherit autotools distutils-r1 |
| 203 |
- |
| 204 |
-if [[ "${PV}" == "9999" ]]; then |
| 205 |
- inherit git-r3 |
| 206 |
- |
| 207 |
- EGIT_REPO_URI="https://github.com/s-yata/marisa-trie" |
| 208 |
-fi |
| 209 |
- |
| 210 |
-DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge" |
| 211 |
-HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/" |
| 212 |
-if [[ "${PV}" == "9999" ]]; then |
| 213 |
- SRC_URI="" |
| 214 |
-else |
| 215 |
- SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 216 |
-fi |
| 217 |
- |
| 218 |
-LICENSE="|| ( BSD-2 LGPL-2.1+ )" |
| 219 |
-SLOT="0" |
| 220 |
-KEYWORDS="amd64 arm64 ppc ppc64 sparc x86" |
| 221 |
-IUSE="python static-libs" |
| 222 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 223 |
- |
| 224 |
-BDEPEND="python? ( |
| 225 |
- ${PYTHON_DEPS} |
| 226 |
- dev-lang/swig |
| 227 |
- )" |
| 228 |
-DEPEND="python? ( ${PYTHON_DEPS} )" |
| 229 |
-RDEPEND="${DEPEND}" |
| 230 |
- |
| 231 |
-if [[ "${PV}" != "9999" ]]; then |
| 232 |
- S="${WORKDIR}/marisa-trie-${PV}" |
| 233 |
-fi |
| 234 |
- |
| 235 |
-PATCHES=( |
| 236 |
- "${FILESDIR}/${P}-cpu_features_check.patch" |
| 237 |
-) |
| 238 |
- |
| 239 |
-src_prepare() { |
| 240 |
- default |
| 241 |
- eautoreconf |
| 242 |
- |
| 243 |
- sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die |
| 244 |
- |
| 245 |
- if use python; then |
| 246 |
- pushd bindings/python > /dev/null || die |
| 247 |
- distutils-r1_src_prepare |
| 248 |
- popd > /dev/null || die |
| 249 |
- fi |
| 250 |
-} |
| 251 |
- |
| 252 |
-src_configure() { |
| 253 |
- local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}" |
| 254 |
- |
| 255 |
- local options=( |
| 256 |
- # Preprocessor macros dependent on CPPFLAGS are checked. |
| 257 |
- --enable-sse2 |
| 258 |
- --enable-sse3 |
| 259 |
- --enable-ssse3 |
| 260 |
- --enable-sse4.1 |
| 261 |
- --enable-sse4.2 |
| 262 |
- --enable-sse4 |
| 263 |
- --enable-sse4a |
| 264 |
- --enable-popcnt |
| 265 |
- $(use_enable static-libs static) |
| 266 |
- ) |
| 267 |
- |
| 268 |
- econf "${options[@]}" |
| 269 |
- |
| 270 |
- if use python; then |
| 271 |
- pushd bindings/python > /dev/null || die |
| 272 |
- distutils-r1_src_configure |
| 273 |
- popd > /dev/null || die |
| 274 |
- fi |
| 275 |
-} |
| 276 |
- |
| 277 |
-src_compile() { |
| 278 |
- default |
| 279 |
- |
| 280 |
- if use python; then |
| 281 |
- emake -C bindings swig-python |
| 282 |
- pushd bindings/python > /dev/null || die |
| 283 |
- distutils-r1_src_compile |
| 284 |
- popd > /dev/null || die |
| 285 |
- fi |
| 286 |
-} |
| 287 |
- |
| 288 |
-src_install() { |
| 289 |
- default |
| 290 |
- find "${D}" -name "*.la" -type f -delete || die |
| 291 |
- |
| 292 |
- ( |
| 293 |
- docinto html |
| 294 |
- dodoc docs/* |
| 295 |
- ) |
| 296 |
- |
| 297 |
- if use python; then |
| 298 |
- pushd bindings/python > /dev/null || die |
| 299 |
- distutils-r1_src_install |
| 300 |
- popd > /dev/null || die |
| 301 |
- fi |
| 302 |
-} |
Archives