Revbump for bug 531334 and bug 531346

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

4 files changed, 29 insertions, 26 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/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