* [gentoo-commits] repo/gentoo:master commit in: app-misc/beanstalkd/, app-misc/beanstalkd/files/
@ 2017-04-09 20:47 Andreas Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas Hüttel @ 2017-04-09 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 5bf2efb06f03987657cabe92e16b2a69e1ca6f74
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 20:42:13 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 20:47:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf2efb0
app-misc/beanstalkd: Remove old, bug 605728
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-misc/beanstalkd/Manifest | 2 -
app-misc/beanstalkd/beanstalkd-1.4.6-r1.ebuild | 49 ---------
app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild | 50 ----------
.../beanstalkd/files/beanstalkd-dbgprintf.patch | 110 ---------------------
.../beanstalkd/files/beanstalkd-werror-v2.patch | 14 ---
app-misc/beanstalkd/files/conf-1.4.2 | 17 ----
app-misc/beanstalkd/files/init-1.4.6 | 25 -----
7 files changed, 267 deletions(-)
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 20e2fc516e9..fbc7d50f913 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -1,3 +1 @@
DIST beanstalkd-1.10.tar.gz 66243 SHA256 923b1e195e168c2a91adcc75371231c26dcf23868ed3e0403cd4b1d662a52d59 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b WHIRLPOOL 3074fb2df0aa835d46d95a90a573bfe2afd1d316da6c9739d37d1eafb85b987ef12c3113f2bc51afed014e151e5eb064922b46c16a92e3113480b1c5ec8dc50c
-DIST beanstalkd-1.4.6.tar.gz 140858 SHA256 a03aca5ccd87c2a1bb6cdaf38d3463c9f987090f4eb6cd9c7f6e03d3d54d3ac9 SHA512 07cd77540367c25cdd16bea6f46a5e43162a13d59e96a6821465bfc950e6fbac2e28e0e1cb0f5b6d1483b493b59daad68c0d99672edeeb4f709d6b835d76eb64 WHIRLPOOL cd7f35ad0432000894a186803b01dbf963146fcb5473fc185dd918987a3235df98fbc743d6bcf80b7d364532b772fbde723e13c649d15fa40870c256e6ea542a
-DIST beanstalkd-1.9.tar.gz 63794 SHA256 158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb SHA512 0b8ba803b511bc4a3275d23f2076d8129107df3756d0c991460693a6999a895da4fe84c7931afe153ea17245d7c280f92df977cc35e715d7997e54a861b547f4 WHIRLPOOL 13517e18b2b1b4517eda6f57645c3d078f20c73d450f96803939b5dc43433364a5214a3a6b39568a0bb82a53fc92195cd28ecf1699e963b8579b121c94b7d667
diff --git a/app-misc/beanstalkd/beanstalkd-1.4.6-r1.ebuild b/app-misc/beanstalkd/beanstalkd-1.4.6-r1.ebuild
deleted file mode 100644
index f053a610817..00000000000
--- a/app-misc/beanstalkd/beanstalkd-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
- epatch "$FILESDIR/beanstalkd-dbgprintf.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.9-r1.ebuild b/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild
deleted file mode 100644
index 8a56c34f1b9..00000000000
--- a/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd toolchain-funcs user
-
-DESCRIPTION="A simple, fast work queue"
-HOMEPAGE="http://kr.github.io/beanstalkd/"
-SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
-
-RDEPEND=""
-DEPEND=""
-
-IUSE=""
-
-DOCS=( README News docs/protocol.txt )
-
-pkg_setup() {
- enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
-src_prepare() {
- sed -i -e "s/CFLAGS=/CFLAGS?=/" \
- -e "s/LDLIBS/LDFLAGS/" \
- -e "s/LDFLAGS=/LDFLAGS?=/" Makefile
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- dobin beanstalkd
-
- DATADIR=/var/lib/${PN}
- dodir ${DATADIR}
- fowners beanstalk:daemon ${DATADIR}
-
- doman doc/"${PN}".1
-
- newconfd "${FILESDIR}/conf-${PV}" beanstalkd
- newinitd "${FILESDIR}/init-${PV}" beanstalkd
-
- systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
-}
diff --git a/app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch b/app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch
deleted file mode 100644
index 91d418e5f1b..00000000000
--- a/app-misc/beanstalkd/files/beanstalkd-dbgprintf.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naur beanstalkd-1.4.6.orig/prot.c beanstalkd-1.4.6/prot.c
---- beanstalkd-1.4.6.orig/prot.c 2010-05-23 03:37:28.000000000 -0400
-+++ beanstalkd-1.4.6/prot.c 2011-01-10 19:44:05.000000000 -0500
-@@ -305,7 +305,7 @@
- c->reply_len = len;
- c->reply_sent = 0;
- c->state = state;
-- dprintf("sending reply: %.*s", len, line);
-+ dbgprintf("sending reply: %.*s", len, line);
- }
-
- #define reply_msg(c,m) reply((c),(m),CONSTSTRLEN(m),STATE_SENDWORD)
-@@ -382,10 +382,10 @@
- size_t i;
- job j = NULL, candidate;
-
-- dprintf("tubes.used = %zu\n", tubes.used);
-+ dbgprintf("tubes.used = %zu\n", tubes.used);
- for (i = 0; i < tubes.used; i++) {
- t = tubes.items[i];
-- dprintf("for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
-+ dbgprintf("for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
- t->name, t->waiting.used, t->ready.used, t->pause);
- if (t->pause) {
- if (t->deadline_at > now) continue;
-@@ -395,7 +395,7 @@
- candidate = pq_peek(&t->ready);
- if (!j || job_pri_cmp(candidate, j) < 0) j = candidate;
- }
-- dprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);
-+ dbgprintf("i = %zu, tubes.used = %zu\n", i, tubes.used);
- }
-
- return j;
-@@ -407,9 +407,9 @@
- job j;
- usec now = now_usec();
-
-- dprintf("processing queue\n");
-+ dbgprintf("processing queue\n");
- while ((j = next_eligible_job(now))) {
-- dprintf("got eligible job %llu in %s\n", j->id, j->tube->name);
-+ dbgprintf("got eligible job %llu in %s\n", j->id, j->tube->name);
- j = pq_take(&j->tube->ready);
- ready_ct--;
- if (j->pri < URGENT_THRESHOLD) {
-@@ -462,7 +462,7 @@
-
- if (j && (!deadline_at || j->deadline_at < deadline_at)) deadline_at = j->deadline_at;
-
-- dprintf("deadline_at=%" PRIu64 "\n", deadline_at);
-+ dbgprintf("deadline_at=%" PRIu64 "\n", deadline_at);
- set_main_timeout(deadline_at);
- }
-
-@@ -1178,7 +1178,7 @@
- }
-
- type = which_cmd(c);
-- dprintf("got %s command: \"%s\"\n", op_names[(int) type], c->cmd);
-+ dbgprintf("got %s command: \"%s\"\n", op_names[(int) type], c->cmd);
-
- switch (type) {
- case OP_PUT:
-@@ -1578,10 +1578,10 @@
- }
-
- if (should_timeout) {
-- dprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
-+ dbgprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
- return reply_msg(remove_waiting_conn(c), MSG_DEADLINE_SOON);
- } else if (conn_waiting(c) && c->pending_timeout >= 0) {
-- dprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
-+ dbgprintf("conn_waiting(%p) = %d\n", c, conn_waiting(c));
- c->pending_timeout = -1;
- return reply_msg(remove_waiting_conn(c), MSG_TIMED_OUT);
- }
-@@ -1773,7 +1773,7 @@
- for (i = 0; i < tubes.used; i++) {
- t = tubes.items[i];
-
-- dprintf("h_delay for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
-+ dbgprintf("h_delay for %s t->waiting.used=%zu t->ready.used=%d t->pause=%" PRIu64 "\n",
- t->name, t->waiting.used, t->ready.used, t->pause);
- if (t->pause && t->deadline_at <= now) {
- t->pause = 0;
-@@ -1811,7 +1811,7 @@
- c = make_conn(cfd, STATE_WANTCOMMAND, default_tube, default_tube);
- if (!c) return twarnx("make_conn() failed"), close(cfd), brake();
-
-- dprintf("accepted conn, fd=%d\n", cfd);
-+ dbgprintf("accepted conn, fd=%d\n", cfd);
- r = conn_set_evq(c, EV_READ | EV_PERSIST, (evh) h_conn);
- if (r == -1) return twarnx("conn_set_evq() failed"), close(cfd), brake();
- }
-diff -Naur beanstalkd-1.4.6.orig/util.h beanstalkd-1.4.6/util.h
---- beanstalkd-1.4.6.orig/util.h 2010-05-22 17:23:16.000000000 -0400
-+++ beanstalkd-1.4.6/util.h 2011-01-10 19:43:44.000000000 -0500
-@@ -43,9 +43,9 @@
- __FILE__, __LINE__, __func__, ##args)
-
- #ifdef DEBUG
--#define dprintf(fmt, args...) ((void) fprintf(stderr, fmt, ##args))
-+#define dbgprintf(fmt, args...) ((void) fprintf(stderr, fmt, ##args))
- #else
--#define dprintf(fmt, ...) ((void) 0)
-+#define dbgprintf(fmt, ...) ((void) 0)
- #endif
-
- typedef uint64_t usec;
diff --git a/app-misc/beanstalkd/files/beanstalkd-werror-v2.patch b/app-misc/beanstalkd/files/beanstalkd-werror-v2.patch
deleted file mode 100644
index 808e82b2136..00000000000
--- a/app-misc/beanstalkd/files/beanstalkd-werror-v2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure b/configure
-index 2f29879..50136fb 100755
---- a/configure
-+++ b/configure
-@@ -3569,7 +3569,7 @@ fi
-
-
-
-- list="-Wall -Werror"
-+ list="-Wall"
- flags_supported=""
- flags_unsupported=""
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5
-
diff --git a/app-misc/beanstalkd/files/conf-1.4.2 b/app-misc/beanstalkd/files/conf-1.4.2
deleted file mode 100644
index 0056259d43e..00000000000
--- a/app-misc/beanstalkd/files/conf-1.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BEANSTALKD_BINARY="/usr/bin/beanstalkd"
-PIDFILE="/var/run/beanstalkd.pid"
-
-# User to run as
-USER="beanstalk"
-
-# Port to listen on
-PORT="11300"
-
-# Address to listen on
-ADDR="127.0.0.1"
-
-# Datadir (where to store queue)
-DATADIR="/var/lib/beanstalkd"
diff --git a/app-misc/beanstalkd/files/init-1.4.6 b/app-misc/beanstalkd/files/init-1.4.6
deleted file mode 100644
index 0c04e9df8df..00000000000
--- a/app-misc/beanstalkd/files/init-1.4.6
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 $?
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-09 20:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-09 20:47 [gentoo-commits] repo/gentoo:master commit in: app-misc/beanstalkd/, app-misc/beanstalkd/files/ Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox