Bump for #436250

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

5 files changed, 79 insertions, 84 deletions

diff --git a/app-misc/beanstalkd/ChangeLog b/app-misc/beanstalkd/ChangeLog
index b9cfb989bc66..9a0b6ad79efa 100644
--- a/app-misc/beanstalkd/ChangeLog
+++ b/app-misc/beanstalkd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/beanstalkd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/ChangeLog,v 1.28 2012/06/01 00:26:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/ChangeLog,v 1.29 2012/10/01 03:07:18 patrick Exp $
+
+*beanstalkd-1.7 (01 Oct 2012)
+
+  01 Oct 2012; Patrick Lauer <patrick@gentoo.org> +beanstalkd-1.7.ebuild,
+  +files/init-1.7, -beanstalkd-1.3.ebuild, -beanstalkd-1.4.6.ebuild:
+  Bump for #436250
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> beanstalkd-1.3.ebuild,
   beanstalkd-1.4.6-r1.ebuild, beanstalkd-1.4.6.ebuild, beanstalkd-1.5.ebuild,
@@ -120,4 +126,3 @@
   +files/Makefile.install.patch, +files/conf, +files/init, +metadata.xml,
   +beanstalkd-1.0.ebuild:
   Initial import, based on bug #208963
-
diff --git a/app-misc/beanstalkd/beanstalkd-1.3.ebuild b/app-misc/beanstalkd/beanstalkd-1.3.ebuild
deleted file mode 100644
index 1cd85382e781..000000000000
--- a/app-misc/beanstalkd/beanstalkd-1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.3.ebuild,v 1.8 2012/06/01 00:26:21 zmedico Exp $
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="A fast, distributed, in-memory workqueue service"
-HOMEPAGE="http://xph.us/software/beanstalkd/"
-SRC_URI="http://xph.us/dist/beanstalkd/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd"
-
-RDEPEND=">=dev-libs/libevent-1.4.7"
-DEPEND="${RDEPEND}"
-
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc README TODO doc/*.txt
-
-	newconfd "${FILESDIR}/conf" beanstalkd
-	newinitd "${FILESDIR}/init" beanstalkd
-}
-
-pkg_postinst() {
-	enewuser beanstalk -1 -1 /dev/null daemon
-}
diff --git a/app-misc/beanstalkd/beanstalkd-1.4.6.ebuild b/app-misc/beanstalkd/beanstalkd-1.4.6.ebuild
deleted file mode 100644
index 0b58cceb2ee0..000000000000
--- a/app-misc/beanstalkd/beanstalkd-1.4.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.4.6.ebuild,v 1.9 2012/06/01 00:26:21 zmedico Exp $
-
-EAPI="3"
-
-inherit eutils user
-
-DESCRIPTION="A fast, distributed, in-memory workqueue service"
-HOMEPAGE="http://xph.us/software/beanstalkd/"
-SRC_URI="http://xph.us/dist/beanstalkd/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
-
-RDEPEND="dev-libs/libevent"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/python )"
-
-IUSE="debug test"
-
-pkg_setup() {
-	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
-src_prepare() {
-	epatch "$FILESDIR/beanstalkd-werror-v2.patch"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/${PF} \
-		--with-event="${EPREFIX}"/usr \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	DATADIR=/var/lib/${PN}
-	dodir ${DATADIR} || die "Install failed"
-	fowners beanstalk:daemon ${DATADIR}
-
-	dodoc README TODO doc/*.txt
-
-	newconfd "${FILESDIR}/conf-1.4.2" beanstalkd
-	newinitd "${FILESDIR}/init-${PV}" beanstalkd
-}
diff --git a/app-misc/beanstalkd/beanstalkd-1.7.ebuild b/app-misc/beanstalkd/beanstalkd-1.7.ebuild
new file mode 100644
index 000000000000..a5198d859a42
--- /dev/null
+++ b/app-misc/beanstalkd/beanstalkd-1.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.7.ebuild,v 1.1 2012/10/01 03:07:18 patrick Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="test? 2"
+
+inherit eutils python user
+
+DESCRIPTION="A fast, distributed, in-memory workqueue service"
+HOMEPAGE="http://xph.us/software/beanstalkd/"
+SRC_URI="mirror://github/kr/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+
+RDEPEND=""
+DEPEND=""
+
+IUSE="test"
+
+pkg_setup() {
+	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
+	python_set_active_version 2
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "compile failed"
+}
+
+src_install() {
+	dobin beanstalkd
+
+	DATADIR=/var/lib/${PN}
+	dodir ${DATADIR}
+	fowners beanstalk:daemon ${DATADIR}
+
+	doman doc/"${PN}".1
+
+	dodoc README NEWS.md doc/*.txt
+
+	newconfd "${FILESDIR}/conf-1.4.2" beanstalkd
+	newinitd "${FILESDIR}/init-${PV}" beanstalkd
+}
\ No newline at end of file
diff --git a/app-misc/beanstalkd/files/init-1.7 b/app-misc/beanstalkd/files/init-1.7
new file mode 100644
index 000000000000..71230955968e
--- /dev/null
+++ b/app-misc/beanstalkd/files/init-1.7
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of MIT
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/files/init-1.7,v 1.1 2012/10/01 03:07:18 patrick Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting beanstalkd"
+	/sbin/start-stop-daemon --start \
+        --background \
+		--pidfile ${PIDFILE} --make-pidfile \
+		--exec ${BEANSTALKD_BINARY} \
+		-- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping beanstalkd"
+	start-stop-daemon --stop --quiet \
+		--pidfile ${PIDFILE} \
+		--exec ${BEANSTALKD_BINARY}
+	eend $?
+}
\ No newline at end of file