diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /app-text/groonga | |
parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) |
gentoo resync : 12.03.2021
Diffstat (limited to 'app-text/groonga')
-rw-r--r-- | app-text/groonga/Manifest | 4 | ||||
-rw-r--r-- | app-text/groonga/groonga-6.1.2.ebuild | 3 | ||||
-rw-r--r-- | app-text/groonga/groonga-8.0.2.ebuild | 29 |
3 files changed, 24 insertions, 12 deletions
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest index 9433ea61f9dc..f3b18628a2f5 100644 --- a/app-text/groonga/Manifest +++ b/app-text/groonga/Manifest @@ -2,6 +2,6 @@ AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d48 AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2 DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1 -EBUILD groonga-6.1.2.ebuild 2415 BLAKE2B e7e4765e5fecee4a93db394121c490bc86fed89eb3b52e17fdc474393f020f1a65eb8f7108289d2a8ff291d0f5cd96d5d0d1a9f8fda45b1bd7ec16fda39898e5 SHA512 55e1234b5465175f906dca409bcd47808250bbe87feada889ded367c0a768d2515b9178745b4f03c35052f06aeb6526e3a20b3e78e1cff3b581bf9d203ca0ea4 -EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea +EBUILD groonga-6.1.2.ebuild 2419 BLAKE2B bf0fd1932677a7542a6865794fe5c4decb70013b727bc6b9e320c4acdf9fa3000440b49bdd916b659dc20965017f29138c011877086af70546d83d2f7771743b SHA512 8c8cca7676eb0c8d3769a774ea87c019189d9ee3c2c098a60dca1da38cb34e245677afc64788dd2b2a46b676549f6913f5adb08c99faad46e2fc20702cfe82ed +EBUILD groonga-8.0.2.ebuild 2643 BLAKE2B bdda1f1a9fac1df44ed2cf51897d87752a44b80313a621e3607bacbff659fe5e37a387b5da9933177701f93d1857cdbc4200cdab1748f1bcb2e296b2f2276950 SHA512 7615cf4c3bb5efd15dc45199f87615105b5fd5147ebe32374a6e2e4c10043556f4fceaf65e8104a80f06c53c69c4c1ae4760c94cb03d7889ac4ef3ab63e1a548 MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079 diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild index f10e95ad95db..436498af5536 100644 --- a/app-text/groonga/groonga-6.1.2.ebuild +++ b/app-text/groonga/groonga-6.1.2.ebuild @@ -63,7 +63,7 @@ src_configure() { $(use_with libevent) \ $(use_with lzo) \ $(use_with mecab) \ - $(use_with msgpack message-pack "${EROOT}usr") \ + $(use_with msgpack message-pack "${EPREFIX}/usr") \ $(use_enable nfkc) \ $(use_with sphinx sphinx-build) \ $(use_enable static-libs static) \ @@ -74,6 +74,7 @@ src_configure() { src_install() { local DOCS=( README.md ) + default prune_libtool_files diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild index c429f681ca08..19c48773526c 100644 --- a/app-text/groonga/groonga-8.0.2.ebuild +++ b/app-text/groonga/groonga-8.0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit libtool user @@ -26,11 +26,17 @@ RDEPEND=">=dev-libs/onigmo-6.1.1:0= zeromq? ( net-libs/zeromq:0= ) zlib? ( sys-libs/zlib:0= ) zstd? ( app-arch/zstd:0= )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - sphinx? ( dev-python/sphinx )" + sphinx? ( dev-python/sphinx ) +" -REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )" +REQUIRED_USE=" + abort? ( dynamic-malloc-change ) + fmalloc? ( dynamic-malloc-change ) + sphinx? ( doc ) +" pkg_setup() { enewgroup groonga @@ -38,7 +44,8 @@ pkg_setup() { } src_prepare() { - default_src_prepare + default + elibtoolize } @@ -71,7 +78,7 @@ src_configure() { $(use_with lzo) $(use_with mecab) $(use_enable msgpack message-pack) - $(use_with msgpack message-pack "${EROOT%/}/usr") + $(use_with msgpack message-pack "${EPREFIX}/usr") $(use_enable nfkc) $(use_with sphinx sphinx-build) $(use_enable static-libs static) @@ -80,14 +87,16 @@ src_configure() { $(use_with zlib) $(use_with zstd) ) + econf "${econfopts[@]}" } src_install() { local DOCS=( README.md ) + default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die newinitd "${FILESDIR}/${PN}.initd" ${PN} newconfd "${FILESDIR}/${PN}.confd" ${PN} @@ -95,5 +104,7 @@ src_install() { keepdir /var/{log,lib}/${PN} fowners groonga:groonga /var/{log,lib}/${PN} - use examples || rm -r "${D%/}/usr/share/${PN}" || die + if ! use examples ; then + rm -r "${ED}/usr/share/${PN}" || die + fi } |