gentoo resync : 28.04.2021

3 files changed, 17 insertions, 112 deletions

diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index f3b18628a2f5..1d669054a387 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,7 +1,5 @@
 AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d488d516dce8beffce0e2ca03f5ca78a6aae02fa7bf238f0cf900e770ebfba04cfac581a13bd2381f SHA512 489feed6a4c22eb2ac02be070dd84ed3eb677b4f250b7eacd5619c1749b322b302bdff36fc3586e83125ac7ef02569054c4f267ddd7b26e5aa378af428cbc8ea
 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 2419 BLAKE2B bf0fd1932677a7542a6865794fe5c4decb70013b727bc6b9e320c4acdf9fa3000440b49bdd916b659dc20965017f29138c011877086af70546d83d2f7771743b SHA512 8c8cca7676eb0c8d3769a774ea87c019189d9ee3c2c098a60dca1da38cb34e245677afc64788dd2b2a46b676549f6913f5adb08c99faad46e2fc20702cfe82ed
-EBUILD groonga-8.0.2.ebuild 2643 BLAKE2B bdda1f1a9fac1df44ed2cf51897d87752a44b80313a621e3607bacbff659fe5e37a387b5da9933177701f93d1857cdbc4200cdab1748f1bcb2e296b2f2276950 SHA512 7615cf4c3bb5efd15dc45199f87615105b5fd5147ebe32374a6e2e4c10043556f4fceaf65e8104a80f06c53c69c4c1ae4760c94cb03d7889ac4ef3ab63e1a548
+EBUILD groonga-8.0.2-r1.ebuild 2584 BLAKE2B ad2382d7dce6b97fe39eea60f78fdbcb498b03186b88a58e543df78d41926440008854f8695563a0d695bafb0491e92dec646675510ffae6480083ce959db3f1 SHA512 c37fe43c619cf8f19884cf0d9323cd30b26afc344a795d0d6d9e397c6830952a1003eb31cd2349c33511cd4200118f785f7f4365b4252707e38c1b5f2c16d709
 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
deleted file mode 100644
index 436498af5536..000000000000
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool ltprune user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
-	libedit? ( >=dev-libs/libedit-3 )
-	libevent? ( dev-libs/libevent )
-	lzo? ( dev-libs/lzo )
-	mecab? ( >=app-text/mecab-0.80 )
-	msgpack? ( dev-libs/msgpack )
-	sphinx? ( >=dev-python/sphinx-1.0.1 )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
-	default_src_prepare
-	elibtoolize
-}
-
-src_configure() {
-	# httpd is a bundled copy of nginx; disabled for security reasons
-	# prce only is used with httpd
-	# kytea and libstemmer are not available in portage
-	# ruby is only used for an http test
-	econf \
-		--disable-groonga-httpd \
-		--without-pcre \
-		--without-kytea \
-		--without-libstemmer \
-		--with-log-path="${EPREFIX}"/var/log/${PN}.log \
-		--without-ruby \
-		$(use_enable abort) \
-		$(use_enable benchmark) \
-		$(use_enable debug memory-debug) \
-		$(use_enable doc document) \
-		$(use_enable dynamic-malloc-change) \
-		$(use_enable exact-alloc-count) \
-		$(use_enable fmalloc) \
-		$(use_enable futex) \
-		$(use_enable libedit) \
-		$(use_with libevent) \
-		$(use_with lzo) \
-		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EPREFIX}/usr") \
-		$(use_enable nfkc) \
-		$(use_with sphinx sphinx-build) \
-		$(use_enable static-libs static) \
-		$(use_enable uyield) \
-		$(use_enable zeromq) \
-		$(use_with zlib)
-}
-
-src_install() {
-	local DOCS=( README.md )
-
-	default
-
-	prune_libtool_files
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	keepdir /var/{log,lib}/${PN}
-	fowners groonga:groonga /var/{log,lib}/${PN}
-
-	use examples || rm -r "${D}usr/share/${PN}" || die
-	# Extra init script
-	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2-r1.ebuild
index 19c48773526c..34c3b85d328f 100644
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ b/app-text/groonga/groonga-8.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool user
+inherit libtool
 
 DESCRIPTION="An Embeddable Fulltext Search Engine"
 HOMEPAGE="https://groonga.org/"
@@ -13,8 +13,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd"
+REQUIRED_USE="
+	abort? ( dynamic-malloc-change )
+	fmalloc? ( dynamic-malloc-change )
+	sphinx? ( doc )
+"
 
-RDEPEND=">=dev-libs/onigmo-6.1.1:0=
+DEPEND="
+	>=dev-libs/onigmo-6.1.1:0=
 	benchmark? ( >=dev-libs/glib-2.8 )
 	jemalloc? ( dev-libs/jemalloc:0= )
 	libedit? ( >=dev-libs/libedit-3 )
@@ -25,24 +31,18 @@ RDEPEND=">=dev-libs/onigmo-6.1.1:0=
 	sphinx? ( >=dev-python/sphinx-1.0.1 )
 	zeromq? ( net-libs/zeromq:0= )
 	zlib? ( sys-libs/zlib:0= )
-	zstd? ( app-arch/zstd:0= )"
-DEPEND="${RDEPEND}"
+	zstd? ( app-arch/zstd:0= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/groonga
+	acct-user/groonga
+"
 BDEPEND="
 	virtual/pkgconfig
 	sphinx? ( dev-python/sphinx )
 "
 
-REQUIRED_USE="
-	abort? ( dynamic-malloc-change )
-	fmalloc? ( dynamic-malloc-change )
-	sphinx? ( doc )
-"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
 src_prepare() {
 	default
 
@@ -78,7 +78,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with mecab)
 		$(use_enable msgpack message-pack)
-		$(use_with msgpack message-pack "${EPREFIX}/usr")
+		$(use_with msgpack message-pack "${ESYSROOT}/usr")
 		$(use_enable nfkc)
 		$(use_with sphinx sphinx-build)
 		$(use_enable static-libs static)
@@ -92,8 +92,6 @@ src_configure() {
 }
 
 src_install() {
-	local DOCS=( README.md )
-
 	default
 
 	find "${ED}" -name '*.la' -delete || die