summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/Manifest.gzbin48054 -> 48057 bytes
-rw-r--r--app-misc/detox/Manifest4
-rw-r--r--app-misc/detox/detox-1.4.5.ebuild (renamed from app-misc/detox/detox-1.4.3.ebuild)0
-rw-r--r--app-misc/khal/Manifest4
-rw-r--r--app-misc/khal/khal-0.10.1-r3.ebuild (renamed from app-misc/khal/khal-0.10.1-r2.ebuild)2
-rw-r--r--app-misc/khal/khal-0.10.2-r2.ebuild (renamed from app-misc/khal/khal-0.10.2-r1.ebuild)2
-rw-r--r--app-misc/rdfind/Manifest3
-rw-r--r--app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch25
-rw-r--r--app-misc/rdfind/rdfind-1.5.0.ebuild26
-rw-r--r--app-misc/sphinx/Manifest3
-rw-r--r--app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch10
-rw-r--r--app-misc/sphinx/sphinx-2.2.11-r3.ebuild (renamed from app-misc/sphinx/sphinx-2.2.11-r1.ebuild)24
12 files changed, 84 insertions, 19 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 81f60613d8d2..ecd91432b784 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index d7d92752f000..657fc91bf11a 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -1,5 +1,5 @@
DIST detox-1.4.2.tar.gz 106736 BLAKE2B a27f9d93bf6f6c1634517c0f193affe576b2eec6be4b8fc38e91ef75a6f1a01a4376684d5a9b109b3971d0e311b64faeba020a3b7660ff130086956a7ebe92bd SHA512 ca1327e127cf1ba1803d8931aa119c9d11fc5b998f45ad5f7c339cea7f7928a5a6a45f90db9a51a7ccf6d4ee268cd316461c621db62dcc7182cd0255e74a1481
-DIST detox-1.4.3.tar.gz 110351 BLAKE2B 96aa8b5cd99bb723034c2613c2d6aed7d8f95af063024806b3e9fae166de49b16420bce38811ca8bb77d74bbf272c32cee6d1c73275dbc8301ddcd98ed66cb63 SHA512 a5f903a050ada4a26c5c367632541821d32f92e33f0bf7302b193ccc5fd0c6fc5fc92d6e93378d22ce91c0360d15e10968b1808fb25334a0fa26192124459d0d
+DIST detox-1.4.5.tar.gz 111745 BLAKE2B 2da339ea0be836671d792bd2582815f9bcf4b6a0681d4a2b52062462fe2657c01c8adf378a53b2f758c138445c5acf6183c31047bd170bc21b088635768247e9 SHA512 f91ae893cf50a3f9d731a26218625f572c783406056c0accbd8253d6dc5de9013ffbe1497120af7be4b7054d65ebbe96b73df64a5d1cc3aaec40e6542e5c6208
EBUILD detox-1.4.2.ebuild 758 BLAKE2B 605cda9872bffe8755ece521b9bc7ecfc6ea3300a1cef8e93ff204da7d5da54f6a49e32a77864c54b036a0f571a5b52419d16733de28fa8874294d4e02948367 SHA512 8d083039907bcbb7f935f65b9129658a7b0071c90c6d03224a3d200ad3cf490f1575e77fefb08f66c32552c3db7fd06b0294045b7af091e629cfbc6789de488b
-EBUILD detox-1.4.3.ebuild 748 BLAKE2B b9807d72af6afb6f689b42e73ae1b4be9780c1b63a20ced55a367451702bc2d504c02edb130481140c3fb83f2f7ddfaacb853e4ab037e2900df01690fd685608 SHA512 4071a6f03d035ea12bb1e1228051609df8b1380c31e73a9c861ffb9d82b1b3c034de798f58c8a56c73d0fc4bca17f26bee54ce799c6282555a9364ef6596e69d
+EBUILD detox-1.4.5.ebuild 748 BLAKE2B b9807d72af6afb6f689b42e73ae1b4be9780c1b63a20ced55a367451702bc2d504c02edb130481140c3fb83f2f7ddfaacb853e4ab037e2900df01690fd685608 SHA512 4071a6f03d035ea12bb1e1228051609df8b1380c31e73a9c861ffb9d82b1b3c034de798f58c8a56c73d0fc4bca17f26bee54ce799c6282555a9364ef6596e69d
MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.4.3.ebuild b/app-misc/detox/detox-1.4.5.ebuild
index 8966cb7d4b6d..8966cb7d4b6d 100644
--- a/app-misc/detox/detox-1.4.3.ebuild
+++ b/app-misc/detox/detox-1.4.5.ebuild
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 881f4f16bfa1..5694779497d5 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,5 @@
DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
-EBUILD khal-0.10.1-r2.ebuild 1183 BLAKE2B 442bc8f5d6196c95b76b47452dd304c9ea829a4571ac4b8b4b65b7973de87433e4397807d91d064acfe18e9cb4e03ebcf9cda7afec642650d70a137c9785b302 SHA512 bafb6223c051b7ba8372990785eb843d9d8c57a0ef402173e888bfe1c9a98257a684ef75f76f598403788a0bba6b789d9c3f6f3422f7cc0a048f0bb1570dfdcc
-EBUILD khal-0.10.2-r1.ebuild 1182 BLAKE2B 98fc81a1109c0a5504c096c3a3e8c2c04a85752e0e656bed86e0296b0d61181cfb509f9dd7e55127565d133d349d0d54b07bc5b00e38bd063b0e211721d3f468 SHA512 e93945c3f242a6b11d7131f7fb771de8e52c7115659cd6e9a87502bfab048ccf87d86e092c321a898da30b7ffbd18ee798e01ce6b02c67d1a60f9fbcf595ce7e
+EBUILD khal-0.10.1-r3.ebuild 1180 BLAKE2B 95253a48aede5078a011d1b5e0dcaff0fad65385f5564aafb716361f63b38202851f2c4a501a4914dc5a91475fd35dc6a0a3be8cc8024dcdbe70de5b8c5049ce SHA512 3b2b621c7a1dd9b8a23c7da6e7b6fd9d1462ea89fc7b5b21a3e8317c6945f9f990539f82ba0a677b39211ec5074a3a5258d9ca5a17da6b0bca9c478c11bdd097
+EBUILD khal-0.10.2-r2.ebuild 1179 BLAKE2B 15c0fcc3659732e82666b08b8485de1606565dcfcc6adb2a844fb95ecb704274c6e3844dd77fcad7cf202ef0f3dadb05494fdfd816263e9e8315de97185b7a2a SHA512 6301a84de10eea4c296018a2f6545b9c2200f1f32c44ea72fa3cf792b7e66dc3439c26b9b83f7ed0cf4ccb9b6c0d55918f35eaae2950facfa185baf1ff77e554
MISC metadata.xml 284 BLAKE2B c98ae36013f5470384f56f63dc1cf49d8499e20d5062bd5adccbef7e84b9cc5caef1c76da113adfa81272b83099b71e8495282bf52ed2571a5cfe751fac88381 SHA512 0cc5d1286118b00aa801004d68df0c5cc780f4c2e4cec3f4652c5b1ea27cdbcef2fb6403482f56706239fae3dc4bbfe55eb5985da6ee9aaa9a286cdcd660eb50
diff --git a/app-misc/khal/khal-0.10.1-r2.ebuild b/app-misc/khal/khal-0.10.1-r3.ebuild
index a4bd58a90c09..008437f04e00 100644
--- a/app-misc/khal/khal-0.10.1-r2.ebuild
+++ b/app-misc/khal/khal-0.10.1-r3.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+ <dev-python/tzlocal-3[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]"
BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
dev-python/vdirsyncer[${PYTHON_USEDEP}]
diff --git a/app-misc/khal/khal-0.10.2-r1.ebuild b/app-misc/khal/khal-0.10.2-r2.ebuild
index 0348736d1e30..2a4acf15d531 100644
--- a/app-misc/khal/khal-0.10.2-r1.ebuild
+++ b/app-misc/khal/khal-0.10.2-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+ <dev-python/tzlocal-3[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]"
BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
dev-python/vdirsyncer[${PYTHON_USEDEP}]
diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index 9c2d01e61036..0706f532f957 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -1,3 +1,6 @@
+AUX rdfind-1.5.0_include-limits-header.patch 509 BLAKE2B 452f26f332850bcad3dbc6aa61cfcbc0c0fbde595330e12160572dd00b9bd4be3bf7f80bcf5b6eaef58adf211b1e5ad2e44c8ed46451a7d684e6b4dcce519150 SHA512 cfae0145b4b657060d465dbd841f3b5e3260cb4a63bfe4706038810b64020f4b8067fc3d5607a9c1480527378d45f4b7aa56a67178d720af318b584968ca17e6
DIST rdfind-1.4.1.tar.gz 53708 BLAKE2B 18778fa65f9c5fda18a59e4021b6346bc5722c19a3796f2b4a85e5c8d919c5f8beeeb8fed572fcce0016e2939568f5e3dc3d3e567178a54ad9ac4e89a1ea77ff SHA512 00d34f46e8534074577a0cd32f71dd8da0b9a7c9a175a612a4a858693ca679de3b77fca1796b543ead796c806a693e97611c0a9fdc743229d317136b32ce89dc
+DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495
EBUILD rdfind-1.4.1.ebuild 534 BLAKE2B c960258c2a59410b3d106cd24d699976615d2263d1177400bcee8ff9eceb44da319b8ffa11dc9002aa8bddcfc1ce50be46830fefe37fc5ad5e3b9dbacccb45a5 SHA512 8dfc23566939b930ea55daaf71f05f653167d5e4f7dd9ae9e543e77e6327545ddab10b304db267375112b800f35f3e2d8aa1ff4be05ad0433914009c54b78489
+EBUILD rdfind-1.5.0.ebuild 603 BLAKE2B 7be9d9badffce29dfeb657140cd510c8265ac25e8cd9cb517ae02e9f05528b05cd5fa1dd40ed045be869122d3f2285868ea87aeea0c889fd440921882e7d6e27 SHA512 946db1c360df01ec0563740c62df9da3bc9a8fc5ec281fcfdde2f2d7d2fe6a4d980a4cf6dff9704eae0c772dfa04bb66d46f4c3b3d553b09d888334a5913dd5d
MISC metadata.xml 840 BLAKE2B 626aa0ec88cfaab7fe289e824dd330fc415b4cd865c4cad195af8f0034bedd19b62114f787436038d18bd26b2f478c3fc78cf70f417a824d07e61b5bcb186ad6 SHA512 1b5b235d655e34d040860dc699da8e3ccc65e50fb14dbc0a65d42596f56cfaef24502c69198ade10f07482eaee3a5b03c1a4addbc035a2b8abe6247635f265d1
diff --git a/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch b/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch
new file mode 100644
index 000000000000..98eaa482d7df
--- /dev/null
+++ b/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch
@@ -0,0 +1,25 @@
+From 054eda51711cb2623bad022db613381fa8c183d0 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sun, 15 Aug 2021 16:50:44 +0200
+Subject: [PATCH] Include limits header.
+
+Needed for std::numeric_limits.
+---
+ rdfind.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rdfind.cc b/rdfind.cc
+index fbd6cb8..64dd8f6 100644
+--- a/rdfind.cc
++++ b/rdfind.cc
+@@ -9,6 +9,7 @@
+ // std
+ #include <algorithm>
+ #include <iostream>
++#include <limits>
+ #include <string>
+ #include <vector>
+
+--
+2.31.1
+
diff --git a/app-misc/rdfind/rdfind-1.5.0.ebuild b/app-misc/rdfind/rdfind-1.5.0.ebuild
new file mode 100644
index 000000000000..4754863e9be8
--- /dev/null
+++ b/app-misc/rdfind/rdfind-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Find duplicate files based on their content"
+HOMEPAGE="https://github.com/pauldreik/rdfind"
+SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-releases-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/nettle:="
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.0_include-limits-header.patch" )
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index c87eb411e44e..703a0b133746 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,7 +1,8 @@
AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
+AUX sphinx-2.2.11-automake-1.16.patch 402 BLAKE2B 0e0ea346acb11b4f0a469b76e0491eb0942d0a29b9c566f2ae247401e357062c9366d070bdbb89983884d68576848c58e474c3015651fee92c4ed7e2b6694b2b SHA512 8babc7470036c762cb1d930ffa446aa0280637f6bbbe6854346bd94a46cfa36e466e38a402c3ef141c7a76d58188fb33000e66633a81680a7fab26ca5cee2b62
DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.2.11-r1.ebuild 2638 BLAKE2B aef6a8d8e2edf129f40e2ed2aba6d312ae8ba0c739c4d259e09db0b275e9e7dbf0edf0b1720053baf38918212639e8682337d3fb5c9a3bf3b012d45a630da74a SHA512 be59d45ad13b7396597de13f4eae25e5d0156b4e5e198b87b745a5e8cda2ba6cefcc1555a6c60e8a52c85f2f06026bac680ad241da934da126a65bd357123495
EBUILD sphinx-2.2.11-r2.ebuild 2705 BLAKE2B 8a3d28f62d1c5a52bdd668b45fe7b8447c9bc5e6c852eb80becc91292d57b50c88a7b508f89135adb9da09f0e1601c1e96e4641e514aec5f160aaed264f01581 SHA512 730337c6df180d2215bbb402817d69c82603b2e07af7fb649ab4a9733728b9232ddfc4b5a4da0112ef2b752febf876f89ab87b9ccf2c561601c874efa1c32bb3
+EBUILD sphinx-2.2.11-r3.ebuild 2690 BLAKE2B 94493fc53ce70e21fbd6bc7a51692e334ac7e174b7899bb40b6e01768026e4d3d66818c7a90a218d18141523d15d49b751faf3906fc5cfdd564a5d3d1978fab3 SHA512 61174a1cbd1ebd92ab53bdcd1682b13984cb9453ddc2e967a25cccf208d05fcd76918b366ca4d0de722e0ed0cd4bda802a8db8093f4bc8dd7f16317874170b05
EBUILD sphinx-2.2.11.ebuild 2268 BLAKE2B 9d0c49eaf1019bd076664c214b22a7b49851deb055078cdd233e66f64e4ced68b2bc72d60fd611df95544c1ddefbd20d869a70d9536e1378714a84b38f74609a SHA512 362f2f8b50349540868744d1f1e20780b821a96b4fae954994b86a183e26541e276b826435264327a62b094055317b625005c781ee44616acff68f33398b1911
MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
new file mode 100644
index 000000000000..da556ef2ef64
--- /dev/null
+++ b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch
@@ -0,0 +1,10 @@
+diff --git a/api/libsphinxclient/Makefile.am b/api/libsphinxclient/Makefile.am
+index a4abfef..10d5914 100644
+--- a/api/libsphinxclient/Makefile.am
++++ b/api/libsphinxclient/Makefile.am
+@@ -10,4 +10,4 @@ libsphinxclient_la_LIBADD = @LTLIBOBJS@
+ libsphinxclient_la_LDFLAGS = -release @VERSION@
+
+ include_HEADERS = sphinxclient.h
+-test_LDADD = .libs/libsphinxclient.a
++test_LDADD = $(lib_LTLIBRARIES)
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
index ae063ea14f8f..5ee036e63750 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-WANT_AUTOMAKE=1.15
-
-inherit epatch autotools toolchain-funcs
+inherit autotools toolchain-funcs
#MY_P=${P/_/-}
MY_P=${P}-release
@@ -16,8 +14,8 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml"
REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
@@ -26,7 +24,6 @@ RDEPEND="
mariadb? ( dev-db/mariadb-connector-c )
postgres? ( dev-db/postgresql:* )
odbc? ( dev-db/unixODBC )
- re2? ( dev-libs/re2 )
stemmer? ( dev-libs/snowball-stemmer )
xml? ( dev-libs/expat )
virtual/libiconv"
@@ -34,7 +31,8 @@ RDEPEND="
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+ eapply -p0 "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+ eapply "${FILESDIR}"/${P}-automake-1.16.patch
# drop nasty hardcoded search path breaking Prefix
# We patch configure directly since otherwise we need to run
@@ -56,7 +54,7 @@ src_prepare() {
# Drop bundled code to ensure building against system versions. We
# cannot remove libstemmer_c since configure updates its Makefile.
- rm -rf libexpat libre2 || die
+ rm -rf libexpat || die
}
src_configure() {
@@ -77,7 +75,6 @@ src_configure() {
${mysql_with} \
$(use_with odbc unixodbc) \
$(use_with postgres pgsql) \
- $(use_with re2) \
$(use_with stemmer libstemmer) \
$(use_with syslog syslog) \
$(use_with xml libexpat )
@@ -102,10 +99,13 @@ src_install() {
emake DESTDIR="${D}" install
emake DESTDIR="${D}" -C api/libsphinxclient install
+ # Remove unneeded empty directories.
+ rmdir "${D}"/var/lib/{data,log}
+
dodoc doc/*
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
+ keepdir /var/lib/sphinx
+ keepdir /var/log/sphinx
newinitd "${FILESDIR}"/searchd.rc searchd
}