From 5a3c82c2abf8fa42c7e2b31b46dedec026aacf64 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Wed, 11 Jan 2017 10:43:03 +0100 Subject: dev-db/rethinkdb: version bump, fix #596318 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-db/rethinkdb/Manifest | 2 +- dev-db/rethinkdb/rethinkdb-2.3.4.ebuild | 134 ------------------------------- dev-db/rethinkdb/rethinkdb-2.3.5.ebuild | 135 ++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 135 deletions(-) delete mode 100644 dev-db/rethinkdb/rethinkdb-2.3.4.ebuild create mode 100644 dev-db/rethinkdb/rethinkdb-2.3.5.ebuild (limited to 'dev-db/rethinkdb') diff --git a/dev-db/rethinkdb/Manifest b/dev-db/rethinkdb/Manifest index ae41ede7360e..4073b59faa84 100644 --- a/dev-db/rethinkdb/Manifest +++ b/dev-db/rethinkdb/Manifest @@ -1 +1 @@ -DIST rethinkdb-2.3.4.tgz 76811758 SHA256 93a7927d1ed785d084be3b8bac3f9af2d89c86de16e003848acbe21a32a9e1a7 SHA512 47e62ef57de112129b7409027017882bc31bb2403287845253a0fe0f61d0977f2e37ba487506853ed3421ac57b2558cabde4f8aee4b9723e4c61300b447e1e19 WHIRLPOOL ce956ad5b7f5f6a38500e501b104571d819e0292cfd1a922ef4f6395ad4e48242456759dad399f5ed2048dee6680df645f54b8ef18e2eebc7f904abe5a2be91c +DIST rethinkdb-2.3.5.tgz 76829628 SHA256 dd8aeee169b177179bfe080725f0560443e0f26dae875b32ae25d90cf2f8ee10 SHA512 ac71656fd2451fd36432fa0f7d2c16c2be53888f748d88f0bfc2fb9ad7cd3c704b56551bc35eda72eb08fffdd799727a3cbe83830337cf71e17c159588d33c94 WHIRLPOOL 533a0a4db02672c4310ebd99a18517ff8a6e571e1c9a1c6b8f8ddc40e8b76c0506a56986857469a15ff74b6f80d2e5c830c0d606f67e4bf70eac4d59c7356652 diff --git a/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild deleted file mode 100644 index 62b1fbe8d199..000000000000 --- a/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit python-utils-r1 systemd user - -DESCRIPTION="The open-source database for the realtime web." -HOMEPAGE="http://www.rethinkdb.com" -LICENSE="AGPL-3" -SLOT="0" -SRC_URI="http://download.rethinkdb.com/dist/${P}.tgz" - -KEYWORDS="~amd64 ~x86" -IUSE="doc +jemalloc tcmalloc" - -# TODO: rly need some webui libs ? -DEPEND="dev-cpp/gtest - dev-libs/boost - dev-libs/protobuf-c - >=dev-libs/re2-0.2016.05.01 - sys-libs/libunwind - sys-libs/ncurses:= - jemalloc? ( >=dev-libs/jemalloc-4.0 ) - tcmalloc? ( dev-util/google-perftools )" -RDEPEND="${DEPEND}" -REQUIRED_USE="?? ( tcmalloc jemalloc )" - -pkg_setup() { - enewgroup rethinkdb - enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb -} - -src_prepare() { - eapply_user - - # don't use predefined configuration - rm configure.default - - # fix doc and init script auto installation - sed -e 's/ install-docs / /g' -e 's/ install-init / /g' -i mk/install.mk || die - - # default config for Gentoo - # fix default pid-file path - # fix default directory path - # fix default log-file path - sed -e 's@/var/run/@/run/@g' \ - -e 's@/var/lib/rethinkdb/@/var/lib/rethinkdb/instances.d/@g' \ - -e 's@/var/log/rethinkdb@/var/log/rethinkdb/default.log@g' \ - -i packaging/assets/config/default.conf.sample || die - - # proper CXX declaration - sed -e "s/CXX=\$(.*/CXX=$(tc-getCXX)/g" -i configure || die - - # respect user CXXFLAGS optimizations - sed -e 's/-O3//g' -i src/build.mk || die -} - -src_configure() { - local conf_opts=( - --prefix="/usr" - --sysconfdir="/etc" - --localstatedir="/var" - --static=none - --dynamic=gtest - --dynamic=re2 - ) - if use jemalloc; then - conf_opts+=(--with-jemalloc) - elif use tcmalloc; then - conf_opts+=(--with-tcmalloc) - else - conf_opts+=(--with-system-malloc) - fi - ./configure "${conf_opts[@]}" -} - -src_compile() { - python_export python2.7 EPYTHON - emake VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" VERBOSE=1 install - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners rethinkdb:rethinkdb "${x}" - done - - newconfd "${FILESDIR}/rethinkdb.confd" rethinkdb - newinitd "${FILESDIR}/rethinkdb.initd" rethinkdb - - systemd_newunit "${FILESDIR}/"${PN}.service "rethinkdb@.service" - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd "rethinkdb.conf" - - use doc && dodoc COPYRIGHT NOTES.md README.md -} - -pkg_config() { - einfo "This will prepare a new RethinkDB instance. Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_data="/var/lib/rethinkdb/instances.d/${instance_name}" - local instance_config="/etc/rethinkdb/instances.d/${instance_name}.conf" - if [[ -e "${instance_data}" || -e "${instance_config}" ]]; then - eerror "An instance with the same name already exists:" - eerror "Check ${instance_data} or ${instance_config}." - die "Instance already exists" - fi - - /usr/bin/rethinkdb create -d "${instance_data}" &>/dev/null \ - || die "Creating instance failed" - chown -R rethinkdb:rethinkdb "${instance_data}" \ - || die "Correcting permissions for instance failed" - cp /etc/rethinkdb/default.conf.sample "${instance_config}" \ - || die "Creating configuration file failed" - sed -e "s:^# \(directory=\).*$:\1${instance_data}:" \ - -i "${instance_config}" \ - || die "Modifying configuration file failed" - ln -s /etc/init.d/rethinkdb "/etc/init.d/rethinkdb.${instance_name}" \ - || die "Creating init script symlink failed" - - einfo "Successfully created the instance at ${instance_data}." - einfo "To change the default settings edit the configuration file:" - einfo "${instance_config}" - einfo " " - einfo "To start your instance, run:" - einfo "/etc/init.d/rethinkdb.${instance_name} start" -} diff --git a/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild new file mode 100644 index 000000000000..f76a637dab0b --- /dev/null +++ b/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit python-utils-r1 systemd user + +DESCRIPTION="The open-source database for the realtime web." +HOMEPAGE="http://www.rethinkdb.com" +LICENSE="AGPL-3" +SLOT="0" +SRC_URI="http://download.rethinkdb.com/dist/${P}.tgz" + +KEYWORDS="~amd64 ~x86" +IUSE="doc +jemalloc tcmalloc" + +# TODO: rly need some webui libs ? +DEPEND=">=dev-libs/re2-0.2016.05.01 + dev-cpp/gtest + dev-libs/boost + dev-libs/protobuf-c + net-misc/curl + sys-libs/libunwind + sys-libs/ncurses:= + jemalloc? ( >=dev-libs/jemalloc-4.0 ) + tcmalloc? ( dev-util/google-perftools )" +RDEPEND="${DEPEND}" +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +pkg_setup() { + enewgroup rethinkdb + enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb +} + +src_prepare() { + eapply_user + + # don't use predefined configuration + rm configure.default + + # fix doc and init script auto installation + sed -e 's/ install-docs / /g' -e 's/ install-init / /g' -i mk/install.mk || die + + # default config for Gentoo + # fix default pid-file path + # fix default directory path + # fix default log-file path + sed -e 's@/var/run/@/run/@g' \ + -e 's@/var/lib/rethinkdb/@/var/lib/rethinkdb/instances.d/@g' \ + -e 's@/var/log/rethinkdb@/var/log/rethinkdb/default.log@g' \ + -i packaging/assets/config/default.conf.sample || die + + # proper CXX declaration + sed -e "s/CXX=\$(.*/CXX=$(tc-getCXX)/g" -i configure || die + + # respect user CXXFLAGS optimizations + sed -e 's/-O3//g' -i src/build.mk || die +} + +src_configure() { + local conf_opts=( + --prefix="/usr" + --sysconfdir="/etc" + --localstatedir="/var" + --static=none + --dynamic=gtest + --dynamic=re2 + ) + if use jemalloc; then + conf_opts+=(--with-jemalloc) + elif use tcmalloc; then + conf_opts+=(--with-tcmalloc) + else + conf_opts+=(--with-system-malloc) + fi + ./configure "${conf_opts[@]}" +} + +src_compile() { + python_export python2.7 EPYTHON + emake VERBOSE=1 +} + +src_install() { + emake DESTDIR="${D}" VERBOSE=1 install + + for x in /var/{lib,log}/${PN}; do + keepdir "${x}" + fowners rethinkdb:rethinkdb "${x}" + done + + newconfd "${FILESDIR}/rethinkdb.confd" rethinkdb + newinitd "${FILESDIR}/rethinkdb.initd" rethinkdb + + systemd_newunit "${FILESDIR}/"${PN}.service "rethinkdb@.service" + systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd "rethinkdb.conf" + + use doc && dodoc COPYRIGHT NOTES.md README.md +} + +pkg_config() { + einfo "This will prepare a new RethinkDB instance. Press Control-C to abort." + + einfo "Enter the name for the new instance: " + read instance_name + [[ -z "${instance_name}" ]] && die "Invalid instance name" + + local instance_data="/var/lib/rethinkdb/instances.d/${instance_name}" + local instance_config="/etc/rethinkdb/instances.d/${instance_name}.conf" + if [[ -e "${instance_data}" || -e "${instance_config}" ]]; then + eerror "An instance with the same name already exists:" + eerror "Check ${instance_data} or ${instance_config}." + die "Instance already exists" + fi + + /usr/bin/rethinkdb create -d "${instance_data}" &>/dev/null \ + || die "Creating instance failed" + chown -R rethinkdb:rethinkdb "${instance_data}" \ + || die "Correcting permissions for instance failed" + cp /etc/rethinkdb/default.conf.sample "${instance_config}" \ + || die "Creating configuration file failed" + sed -e "s:^# \(directory=\).*$:\1${instance_data}:" \ + -i "${instance_config}" \ + || die "Modifying configuration file failed" + ln -s /etc/init.d/rethinkdb "/etc/init.d/rethinkdb.${instance_name}" \ + || die "Creating init script symlink failed" + + einfo "Successfully created the instance at ${instance_data}." + einfo "To change the default settings edit the configuration file:" + einfo "${instance_config}" + einfo " " + einfo "To start your instance, run:" + einfo "/etc/init.d/rethinkdb.${instance_name} start" +} -- cgit v1.2.3-65-gdbad