Revbump for bug 531334 and bug 531346

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

5 files changed, 40 insertions, 37 deletions

diff --git a/app-text/groonga/ChangeLog b/app-text/groonga/ChangeLog
index 4f0cf5badca6..f34453121633 100644
--- a/app-text/groonga/ChangeLog
+++ b/app-text/groonga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/groonga
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/ChangeLog,v 1.1 2014/11/29 02:30:24 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/ChangeLog,v 1.2 2014/12/02 03:20:57 grknight Exp $
+
+*groonga-4.0.7-r1 (02 Dec 2014)
+
+  02 Dec 2014; Brian Evans <grknight@gentoo.org> +groonga-4.0.7-r1.ebuild,
+  -groonga-4.0.7.ebuild, files/groonga.confd, files/groonga.initd:
+  Revbump for bug 531334 and bug 531346
 
 *groonga-4.0.7 (29 Nov 2014)
 
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index f2935b576709..77b8bb046154 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX groonga.confd 409 SHA256 ffa9f777d5a854a1c5953cc027cd2e3e59ccf383f9190133faaa3cd5d6b15179 SHA512 a15e490fa74f5095cff1eddf50aae40d1b186c243ca5407731a01afb2074727d1088dad37cb130697dd7667bd326f936567d06a1e51957a16f3c4db3e046bf36 WHIRLPOOL f25cffe104f89296e8d51d6cd9c5371251b9b14dbb230d73e6da40064fe3449a4c86d6790683b0dedd37a47b6540a08586bfc461408e41ba0c0fb7c52631a298
-AUX groonga.initd 578 SHA256 088c9b8713fd75822dd38a25997fb3447f90347ebfe0491aae66812a5b62afc1 SHA512 9727f5b954214a65bb58e3f066db562ca767a7f2d35a876eda7c49b39d6601ec49807f8f697d4ec2ce14f73823d492c82b198d2f5feb777ff95d00f1a264faef WHIRLPOOL d58659a792ab4ac3b007e962ddbae6aaf0e12f0de02089e40d1bf0d025bec158c2d629d8e9595046f7cbd781894582ff4886130e6d1daec6665ea9315ca72c23
+AUX groonga.confd 372 SHA256 579197b642ce084505119f228848d9f9aedc1fb860802ab94eaf91ca39c5efd3 SHA512 4f97a09824a2c6e3dc5c652960dd453cb031178ff3273315832769de8a90a246cc97c74a0f5874e9f668e90c8b4f2f88ad5ebc03272a83edbbce0aa21ef85def WHIRLPOOL 0051d53a16bc4fbc2a63e90530483e206c480275764a5d49d3430a98b3ed73019e48cb909bc80a4294203aa7c6766b4a6a2c9c00503e69414fbfa58de50f0521
+AUX groonga.initd 827 SHA256 1c372b1db5b35fb3a4eae5958f528986a4ca3a97a0669a05150bf9a9949afefa SHA512 e032e476046e792af4e3fa7b15abbb6112c82872929378bd47e85e65d531f4979265c87b07c2cd5776ee5864f447e35ce27b6098a7bb473359bee49983187484 WHIRLPOOL ab8106e97ea05f9fb426bb0e29de20afe9f47b9db6cfce6498dfed418bd5dd765b9df99a1dafe8d9d289c39824a97f0bc1beb31ff2571ed059e080bed579f423
 DIST groonga-4.0.7.tar.gz 10990151 SHA256 ec1d19b05c7a592a316e845ff4c5549c6236cc7ea83423c0fc7831c16161bbbf SHA512 942c28205ffb2c7d3ba767ff68b342ef5b7b9fef72131782635e86682c82a4ea3dad9d5263a42563ded22db573015c9859e49dc20c812f7a6534478b22d8b9a8 WHIRLPOOL 2473c14bcc50c87bfb925e73cc3c4cd2c02915ac498a5e40aeee312ac9873857406e38e8146fabe722250f2d258b6444813d4c47726c16ce4cfceea35f207d3a
-EBUILD groonga-4.0.7.ebuild 2515 SHA256 e2985f9c8e22637f3b5f472d08b2a89630fc63ec09729286e83c74ef40b441cc SHA512 d7cdb573471b7be19814f4d994be1b0d0c29364e1cf35889346116f29ab14cfd8770aa9da57202c82939a7741120617cffe67452d8453479b4f1e4998bf81958 WHIRLPOOL bbbe28a04ba113946844ef5c267306dd73a99edcfcaa007ff3169934bf5cfa004e9350eac2efac25c798286d1d2758dda893dbaf732d287173ec54ebea881af3
-MISC ChangeLog 443 SHA256 cf9933ef787dbe29a0e62df71f8db8b8e1ebbb175f9d10f176b92c2c08a66cf0 SHA512 499276aacc7909f0c5e8c78fcbb8c11517f4d25d127a9e6ef06007371eec5895fd5096cb5a5d467ffe8102ffcdfccc1abed67fb17ad6e00f174973ec01cb4e99 WHIRLPOOL d6dac3eff481d50abcc3327b8d617777adfcc7de5324d6a9dd115fb6048437fbecf6e61aad28a89d8ac308201019f7bdbc88d67af0abda264466c31f259ebea0
+EBUILD groonga-4.0.7-r1.ebuild 2528 SHA256 b032c47539ff1727b89e7bafbca205f3af2c4710c756b70e799ced2b587a0ef0 SHA512 934f947a8a3d9fb392e999d0c884579b4e1b3b99543729f7a015ddd5401a495765c84f0120667748750bd3f6f8be75acf2bebf503c8ab04f741d0afb45533630 WHIRLPOOL dc0f0998124e204cf30ca755259256e6069ec0c294f8e01039df995f8403d53b9922b245c3ce87c5dc4c9e0723e93983f7dd6e476f043bdfa3047f3195ca97ea
+MISC ChangeLog 659 SHA256 728cc8ef4f29576319158a4a62b9fbcd6eea04d4e639a759577f2e3691237f1b SHA512 9d5774f6920e76bd7a6606aa72964888c7a1a60d64ae13aecefc63ff8572e95333002d1aa0495b3a32f6479e3aeac63b6c1ee92d2419d071463989cd09294385 WHIRLPOOL 93f34acefcbcb138e5173d9106e6bb48f01832602e32f0e47d4ffa7a4b34b72c6a73a52d4bff6d9404db3796f158ca34d84791d7f161a7d53ecc56b58bbe0147
 MISC metadata.xml 1192 SHA256 843308dfff5dd504955601f21930f93b516072a3cb7feda6472d3a70395e57c4 SHA512 91ddf13f0338aa1c9415ca03a162bf413973fdd32a06f26b226ac3712e5aef6e54650622dc3d1d07855fa72c5c84417a21affff65eabb45a82478b71329db1bf WHIRLPOOL f660f6759ea44b2ca7f8bcb8933e6285e516470b8ce454b178762cdbd6900b7f58652f4079678a42918e127cc52bfce6ddce4f9570436afa2ef5f95a76160c30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUeS/FAAoJEE4V4vFnx44dGCIH/jgu6F8q3igz8A0S9TM9O/nI
-5iY6E6uOxnxBFWbBKDQbfEPZaTj0uk5XfNFbegk/8q5ZF3hHSHhG44ZHgEvX/3tQ
-iUxwNLtFleyGjBwFQcLqH27rSKgmPzHjed7KT+TZRXv6gi42IwvGpLwSTPh8XfgU
-Qb+loUvwkjeaUS6iE8LUkj3Brf1Hn1o3Fm1Hcc9Te5gVEJJlGrvVEw/n3TksDF4K
-jvMtVJUdjJtIr740XjnFNQB43boad5Rr55wncVbFT1RcMSi7qYnWok0yRpkNGClw
-wXPUhI8CQhr9hqxbmE9occ8sjYrLGh6uxrqE369hOeQ1OeudsDrggfCR4hSfC5c=
-=rQuc
+iQEcBAEBCAAGBQJUfTAeAAoJEE4V4vFnx44dxbYH/RSDS5Kdqo8DIXv0z3PF82+1
+fXYoRRIqZCicRhW2RpOL48gungavXIjMpntfCTOyuLdqtgy4S1eB9tJekNm9kw/L
+HAewVu/fpawNJCDcrzg9wKWV94fXrAjWj5rKdsIzKHEIulsG1cEr564PJKWk3JoS
+oxkVh8lyp/GeWOUnMYCYGStmALhiC66AyGsSNOjrzvyrZrq2gjQnSxjRvrHpPtgV
+LaZ+0thDpOT4V62yXl2PBXYBn2TafBwypsnPwcIiXtcXXwmnk45bMYBOEDuyddaP
+OSOSMPJC3vwxh3gWR8Ds6oY8Xgn3NZCQ7wp8EJSryVq06mfkWQjSm9i7i4CaYvw=
+=TnYy
 -----END PGP SIGNATURE-----
diff --git a/app-text/groonga/files/groonga.confd b/app-text/groonga/files/groonga.confd
index 42c4b6b13fa0..961cb2c5966b 100644
--- a/app-text/groonga/files/groonga.confd
+++ b/app-text/groonga/files/groonga.confd
@@ -1,12 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/files/groonga.confd,v 1.1 2014/11/29 02:30:24 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/files/groonga.confd,v 1.2 2014/12/02 03:20:57 grknight Exp $
 
-# Default
-#USER=groonga
-#GROUP=groonga
-#ADDRESS=127.0.0.1
-#DATABASE=/var/lib/groonga/db/db
-#LOG_PATH=/var/log/groonga/groonga.log
-#QUERY_LOG_PATH=/var/log/groonga/query.log
-#PROTOCOL=gqtp
+#GROONGA_USER=groonga
+#GROONGA_GROUP=groonga
+#GROONGA_PID=/run/groonga/groonga.pid
+#CONFIG_FILE=/etc/groonga/groonga.conf
+DATABASE=/var/lib/groonga/db
diff --git a/app-text/groonga/files/groonga.initd b/app-text/groonga/files/groonga.initd
index 9253ba34b32e..0d2671653774 100644
--- a/app-text/groonga/files/groonga.initd
+++ b/app-text/groonga/files/groonga.initd
@@ -1,21 +1,21 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/files/groonga.initd,v 1.1 2014/11/29 02:30:24 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/files/groonga.initd,v 1.2 2014/12/02 03:20:57 grknight Exp $
+
+command=/usr/bin/groonga
+command_args="-d --pid-path ${GROONGA_PID:-/run/groonga/groonga.pid} --config-path=${CONFIG_FILE:-/etc/groonga/groonga.conf} ${DATABASE}"
+pidfile="${GROONGA_PID:-/run/groonga/groonga.pid}"
+start_stop_daemon_args="--quiet --user ${GROONGA_USER:-groonga}:${GROONGA_GROUP:-groonga}"
 
 depend() {
 	use net
 }
 
-start() {
-	ebegin "Starting groonga"
-	checkpath -d /run/groonga -o ${USER:-groonga}:${GROUP:-groonnga}
-	start-stop-daemon --start --quiet --exec /usr/sbin/groonga -- ${GROONGA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping groonga"
-	start-stop-daemon --stop --quiet --pidfile /var/spool/groonga/groonga.pid
-	eend $?
+start_pre() {
+	checkpath -d /run/groonga -o ${GROONGA_USER:-groonga}:${GROONGA_GROUP:-groonga}
+	if  [ ! -e "${DATABASE}" ] ; then
+		einfo "Creating database ${DATABASE}"
+		su -s /bin/sh -c "/usr/bin/groonga -n ${DATABASE} quit" ${GROONGA_USER:-groonga}
+	fi
 }
diff --git a/app-text/groonga/groonga-4.0.7.ebuild b/app-text/groonga/groonga-4.0.7-r1.ebuild
index df3b15ec1593..a55a7948e059 100644
--- a/app-text/groonga/groonga-4.0.7.ebuild
+++ b/app-text/groonga/groonga-4.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/groonga-4.0.7.ebuild,v 1.1 2014/11/29 02:30:24 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/groonga-4.0.7-r1.ebuild,v 1.1 2014/12/02 03:20:57 grknight Exp $
 
 EAPI=5
 inherit eutils libtool user
@@ -62,7 +62,7 @@ src_configure() {
 		$(use_with libevent) \
 		$(use_with lzo) \
 		$(use_with mecab) \
-		$(use_with msgpack message-pack) \
+		$(use_with msgpack message-pack "${EROOT}usr") \
 		$(use_enable nfkc) \
 		$(use_with ruby) \
 		$(use_with sphinx sphinx-build) \
@@ -80,8 +80,8 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
-	keepdir /var/{log,spool}/${PN}
-	fowners groonga:groonga /var/{log,spool}/${PN}
+	keepdir /var/{log,lib}/${PN}
+	fowners groonga:groonga /var/{log,lib}/${PN}
 
 	dodoc README.md