Version bump; also update init script to (re-)create run and log directories if missing, with the proper permissions.

Package-Manager: portage-2.2_rc82/cvs/Linux x86_64

4 files changed, 123 insertions, 7 deletions

diff --git a/sys-cluster/gearmand/ChangeLog b/sys-cluster/gearmand/ChangeLog
index 40cf499b7161..5b5d181b989d 100644
--- a/sys-cluster/gearmand/ChangeLog
+++ b/sys-cluster/gearmand/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/gearmand
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/ChangeLog,v 1.8 2010/09/06 20:23:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/ChangeLog,v 1.9 2010/09/16 19:43:07 flameeyes Exp $
+
+*gearmand-0.14 (16 Sep 2010)
+
+  16 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +gearmand-0.14.ebuild, files/gearmand.init.d:
+  Version bump; also update init script to (re-)create run and log
+  directories if missing, with the proper permissions.
 
   06 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   -gearmand-0.11-r2.ebuild, gearmand-0.12.ebuild:
diff --git a/sys-cluster/gearmand/Manifest b/sys-cluster/gearmand/Manifest
index da0528d07e05..9fbf5704114e 100644
--- a/sys-cluster/gearmand/Manifest
+++ b/sys-cluster/gearmand/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX gearmand.conf.d 1542 RMD160 b903adca1eacbe87b69fdfe9f7b076666578a0bc SHA1 b863fadd280f7371159a958b20ec7c52fecd25be SHA256 a99bd1672091da3d4c2776225dacc497a5a9fb36ff8b34a464cd984cf584a29e
-AUX gearmand.init.d 3219 RMD160 b1337b9cee9e1c7ef1644374772fbc82f54cba0a SHA1 f04a7aab1b3a270d292ab9795411f164d6d1fd6e SHA256 cf2cae57d028ea1405498238db0a63a577198dfcc2215b0c29eba0afb52b32f5
+AUX gearmand.init.d 3517 RMD160 f60730cb4378fb4856aeeae77f13232746efe390 SHA1 3d713da0239f33ee4f20b61e7b288f0d6efdb112 SHA256 07a8e9c1a8d4d859b9e4e3a6520989e7b690bf9dca1b630a2e171a8eee59ec6c
 DIST gearmand-0.12.tar.gz 562096 RMD160 bc55d2f84e3b2deaa71d491fd1ea157b45553802 SHA1 d6115c7041813f5816c0388ce510ff16be155d47 SHA256 c7b818293ade625f0ebaac6b84350e3f4b7e1b2f60b0f345f255064ce9f1d0ec
+DIST gearmand-0.14.tar.gz 559748 RMD160 6b1c305fc830fac8d0eb6493016295bed609a9fe SHA1 11d1a3d530963861e53504582fc17c5184d249b8 SHA256 8e060683dd4b2bfc25a68e22924597ae50bbfd4126966e4088b47c3caa64e25c
 EBUILD gearmand-0.12.ebuild 2844 RMD160 166f7fcf69e2677418b3ae0e6951650b64fa76bb SHA1 fdffc205d3cdd3a3fd7b0f06dc4dba394f1c8636 SHA256 a3855f4cf76912c244355ddc3b3c6e2e792d2d159fed0734c2725ae195a20887
-MISC ChangeLog 1909 RMD160 518c8966c469ae0a82739898699b91c36659b959 SHA1 c1aa79da4340f0a386711c30bd8a35ff1bed9e17 SHA256 dd05eb39dd8ce301ced2bd0dacbe423536f7a6608bea34a80fb11689a4e2f53f
+EBUILD gearmand-0.14.ebuild 2564 RMD160 98fdca666e8e2fad071f3befe21c3ead0bca54bb SHA1 3b9948db2d1e5170897cc09d9c769a807c6a8010 SHA256 4900240dbcec3661d5c33f090c570d6c625bc2bf824f2e566ca2051ac7df9e67
+MISC ChangeLog 2166 RMD160 da91ea70f99f3b4ee325ee7badb957f50ab0eac2 SHA1 e19943af1926240d830509393248192611419499 SHA256 ad1d07533cd0a288c907d844c241fb09c1b274f34ff8761b12ef3730240b5ab1
 MISC metadata.xml 973 RMD160 8a1b2219c57d0790974dca96a117aa875975363f SHA1 213542f7a03a8c8a62b1b442610f9299c28278c9 SHA256 e58659f80ca2946ad932cf81f1263e0d55f9daf1a52ed8d089c86a9659f42e30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyFTbQACgkQAiZjviIA2XgZOwCZAZ5CsTO2JoL3JVgQNPivP9aC
-dzAAoMPFQm3pSFJWdRwkF2yNOLfiDgCE
-=4hEN
+iEYEARECAAYFAkySc3AACgkQAiZjviIA2XjrggCgsn1GhXGWoj4iPsWuh+o8zStt
+Gg8AnjER6b/UeBJMwzpjyWFdC04U/I3n
+=IIKy
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/gearmand/files/gearmand.init.d b/sys-cluster/gearmand/files/gearmand.init.d
index 10ec883f8a35..50414a77d45b 100644
--- a/sys-cluster/gearmand/files/gearmand.init.d
+++ b/sys-cluster/gearmand/files/gearmand.init.d
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 2009 Pavel Stratil, senbonzakura.eu
+# Copyright 2009-2010 Pavel Stratil, senbonzakura.eu
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -63,6 +63,19 @@ start() {
 	    ;;
 	esac
 
+
+	if [ ! -d /var/run/gearmand ] ; then
+		mkdir -p /var/run/gearmand
+		chown gearmand:nogroup /var/run/gearmand
+		chmod 0755 /var/run/gearmand
+	fi
+
+	if [ ! -d /var/log/gearmand ] ; then
+		mkdir -p /var/log/gearmand
+		chown gearmand:nogroup /var/log/gearmand
+		chmod 0755 /var/log/gearmand
+	fi
+
 	ebegin "Starting ${SVCNAME}"
         start-stop-daemon --pidfile /var/run/gearmand/gearmand.pid --start \
 		--exec /usr/sbin/gearmand -- --pid-file=/var/run/gearmand/gearmand.pid \
diff --git a/sys-cluster/gearmand/gearmand-0.14.ebuild b/sys-cluster/gearmand/gearmand-0.14.ebuild
new file mode 100644
index 000000000000..000a567d0221
--- /dev/null
+++ b/sys-cluster/gearmand/gearmand-0.14.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $
+
+EAPI=2
+
+inherit flag-o-matic libtool
+
+DESCRIPTION="Generic framework to farm out work to other machines"
+HOMEPAGE="http://www.gearman.org/"
+SRC_URI="http://launchpad.net/gearmand/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tcmalloc +memcache drizzle sqlite tokyocabinet" # postgres
+# postgresql support is broken right now so keep it disabled
+RESTRICT="test"
+# restricting tests because of failures, package runs fine
+
+RDEPEND="dev-libs/libevent
+	|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
+	tcmalloc? ( dev-util/google-perftools )
+	memcache? ( dev-libs/libmemcached )
+	drizzle? ( >=dev-db/drizzle-2010.08.1742 )
+	sqlite? ( dev-db/sqlite:3 )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+	#postgres? ( dev-db/postgresql-base )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewuser gearmand -1 -1 /dev/null nogroup
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	# Don't ever use --enable-assert since configure.ac is broken, and
+	# only does --disable-assert correctly.
+	 if use debug; then
+		# Since --with-debug would turn off optimisations as well as
+		# enabling debug, we just enable debug through the
+		# preprocessor then.
+		append-flags -DDEBUG
+
+	else
+		myconf="${myconf} --disable-assert"
+	fi
+
+		#$(use_enable postgres libpq)
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		--disable-mtmalloc \
+		--disable-libpq \
+		$(use_enable tcmalloc) \
+		$(use_enable memcache libmemcached) \
+		$(use_enable drizzle libdrizzle) \
+		$(use_enable sqlite libsqlite3) \
+		$(use_enable tokyocabinet libtokyocabinet)
+}
+
+src_test() {
+	# Since libtool is stupid and doesn't discard /usr/lib64 from the
+	# load path, we'd end up testing against the installed copy of
+	# gearmand (bad).
+	#
+	# We thus cheat and "fix" the scripts by hand.
+	sed -i -e '/LD_LIBRARY_PATH=/s|/usr/lib64:||' "${S}"/tests/*_test \
+		|| die "test fixing failed"
+
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc README AUTHORS ChangeLog || die "dodoc failed"
+
+	newinitd "${FILESDIR}"/gearmand.init.d gearmand || die
+	newconfd "${FILESDIR}"/gearmand.conf.d gearmand || die
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Unless you set the PERSISTENT_TABLE option in"
+	elog "/etc/conf.d/gearmand, Gearmand will use table 'queue'."
+	elog "If such table doesn't exist, Gearmand will create it for you"
+	elog ""
+}