diff options
Diffstat (limited to 'dev-db')
43 files changed, 337 insertions, 1482 deletions
diff --git a/dev-db/4store/4store-1.1.5.ebuild b/dev-db/4store/4store-1.1.5-r1.ebuild index 51f47be8b999..a55defb8f631 100644 --- a/dev-db/4store/4store-1.1.5.ebuild +++ b/dev-db/4store/4store-1.1.5-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="2" +EAPI="5" inherit eutils user @@ -20,6 +20,7 @@ IUSE="" # < http://4store.org/trac/wiki/Dependencies DEPEND="media-libs/raptor >=dev-libs/rasqal-0.9.18 + dev-libs/glib dev-libs/libxml2 dev-libs/libpcre sys-libs/readline diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild index c606fecbcc2c..73d13e65de4f 100644 --- a/dev-db/cdb/cdb-0.75-r4.ebuild +++ b/dev-db/cdb/cdb-0.75-r4.ebuild @@ -5,7 +5,7 @@ EAPI=5 inherit eutils multilib toolchain-funcs -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases" HOMEPAGE="http://cr.yp.to/cdb.html" diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest deleted file mode 100644 index 684b6fc0ca74..000000000000 --- a/dev-db/drizzle/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST drizzle-7.2.4-alpha.tar.gz 20075673 SHA256 dddc58949c28ccbdd8351b25540858235a7d98efb634e7bc98abd4f5ab034677 SHA512 1053c9b73588542b32398168fc4aae96a19479222571fb4ba35feb1fa6e99961366fc63a4141bf86bdba7f5db1960ed895b3a688789d05ee8d4bd46d0ab681cd WHIRLPOOL 4b2e97f7276eb447f27bc5b0244e31d47cba2acc0fde16d6e10dc0d47ba680885e035b9cf9dda8dff171279a76fbd24f34d2754ac1342b203d56316bb4d34233 diff --git a/dev-db/drizzle/drizzle-7.2.4.ebuild b/dev-db/drizzle/drizzle-7.2.4.ebuild deleted file mode 100644 index c066b0e0f587..000000000000 --- a/dev-db/drizzle/drizzle-7.2.4.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit python flag-o-matic libtool autotools eutils pam user versionator - -MY_P="${P}-alpha" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Database optimized for Cloud and Net applications" -HOMEPAGE="http://drizzle.org" -SRC_URI="https://launchpad.net/drizzle/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap v8" - -RDEPEND="tcmalloc? ( dev-util/google-perftools ) - sys-libs/readline - sys-apps/util-linux - dev-libs/libpcre - dev-libs/openssl - >=dev-libs/libevent-1.4 - >=dev-libs/protobuf-2.1.0 - dev-libs/libaio - >=dev-libs/boost-1.52.0-r1:=[threads] - gearman? ( >=sys-cluster/gearmand-0.12 ) - pam? ( sys-libs/pam ) - curl? ( net-misc/curl ) - memcache? ( >=dev-libs/libmemcached-0.39 ) - md5? ( >=dev-libs/libgcrypt-1.4.2:0 ) - ldap? ( net-nds/openldap ) - v8? ( dev-lang/v8 ) - !dev-db/libdrizzle" - -DEPEND="${RDEPEND} - =dev-lang/python-2* - sys-devel/gettext - dev-util/intltool - dev-util/gperf - sys-devel/flex - dev-python/sphinx - doc? ( app-doc/doxygen )" - -pkg_setup() { - enewuser drizzle -1 -1 /dev/null nogroup - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}/${PN}-7.2.3-libtool.patch" \ - "${FILESDIR}/${PN}-7.2.3+automake-1.12.patch" \ - "${FILESDIR}/${PN}-7.2.4+boost-1.50.patch" \ - "${FILESDIR}/${P}-fix-boost_thread-detection.patch" - - python_convert_shebangs -r 2 . - - epatch_user - eautoreconf -} - -src_configure() { - local myconf= - - if use debug; then - append-cppflags -DDEBUG - fi - - # while I applaud upstreams goal of 0 compiler warnings - # the 1412 release didn't achieve it. - append-flags -Wno-error - - # NOTE disable-all and without-all no longer recognized options - # NOTE using --enable on some plugins can cause test failures. - # --with should be used instead. A discussion about this here: - # https://bugs.launchpad.net/drizzle/+bug/598659 - # TODO (upstream) - # $(use_with memcache memcached-stats-plugin) \ - # $(use_with memcache memcached-functions-plugin) \ - - econf \ - --disable-static \ - --disable-dependency-tracking \ - --disable-mtmalloc \ - --without-hello-world-plugin \ - --disable-rabbitmq-plugin --without-rabbitmq-plugin \ - --disable-zeromq-plugin --without-zeromq-plugin \ - --with-auth-test-plugin \ - --with-auth-file-plugin \ - --with-simple-user-policy-plugin \ - --enable-logging-stats-plugin \ - --with-logging-stats-plugin \ - --enable-console-plugin \ - $(use_enable gearman libgearman) \ - $(use_enable ldap libldap) \ - $(use_enable memcache libmemcached) \ - $(use_enable tcmalloc) \ - $(use_with curl auth-http-plugin) \ - $(use_with gearman gearman-udf-plugin) \ - $(use_with gearman logging-gearman-plugin) \ - $(use_with ldap auth-ldap-plugin) \ - $(use_with md5 md5-plugin) \ - $(use_with pam auth-pam-plugin) \ - $(use_with v8 js-plugin) \ - ${myconf} -} - -src_compile() { - emake V=1 all $(use doc && echo doxygen) -} - -# currently not working as of 7.2.3 -RESTRICT=test - -src_test() { - if [[ ${EUID} == 0 ]]; then - eerror "You cannot run tests as root." - eerror "Please enable FEATURES=userpriv before proceeding." - return 1 - fi - - default -} - -DOCS=( AUTHORS NEWS README ) - -src_install() { - default - - find "${D}" -name '*.la' -delete || die - - if use doc; then - docinto apidoc - pushd docs/html - dohtml -r . - popd - fi - - newinitd "${FILESDIR}"/drizzle.init.d.2 drizzled - newconfd "${FILESDIR}"/drizzle.conf.d drizzled - - if ! use gearman; then - sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \ - || die "unable to sed init script (gearman)" - fi - - if ! use memcache; then - sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \ - || die "unable to sed init script (memcache)" - fi - - keepdir /var/log/drizzle - keepdir /var/lib/drizzle/drizzled - keepdir /etc/drizzle - - fperms 0755 /var/log/drizzle - fperms -R 0700 /var/lib/drizzle - - fowners drizzle:nogroup /var/log/drizzle - fowners -R drizzle:nogroup /var/lib/drizzle - - pamd_mimic system-auth drizzle auth account session -} diff --git a/dev-db/drizzle/files/drizzle-7.2.3+automake-1.12.patch b/dev-db/drizzle/files/drizzle-7.2.3+automake-1.12.patch deleted file mode 100644 index 4f33dc557a5a..000000000000 --- a/dev-db/drizzle/files/drizzle-7.2.3+automake-1.12.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: drizzle-7.2.3/m4/pandora_canonical.m4 -=================================================================== ---- drizzle-7.2.3.orig/m4/pandora_canonical.m4 -+++ drizzle-7.2.3/m4/pandora_canonical.m4 -@@ -98,9 +98,9 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ - AC_CANONICAL_TARGET - - m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[ -- AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar) -+ AM_INIT_AUTOMAKE(-Wall -Wno-portability subdir-objects foreign tar-ustar) - ],[ -- AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign tar-ustar) -+ AM_INIT_AUTOMAKE(-Wall -Wno-portability nostdinc subdir-objects foreign tar-ustar) - ]) - - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -Index: drizzle-7.2.3/tests/include.am -=================================================================== ---- drizzle-7.2.3.orig/tests/include.am -+++ drizzle-7.2.3/tests/include.am -@@ -101,10 +101,10 @@ EXTRA_DIST += \ - check-local: tests/var/drizzle test-drizzle - - tests/var: -- $(mkdir_p) tests/var -+ $(MKDIR_P) tests/var - - tests/var/drizzle: tests/var -- $(mkdir_p) tests/var/drizzle -+ $(MKDIR_P) tests/var/drizzle - - - # dtr - a shortcut for executing test-run.pl diff --git a/dev-db/drizzle/files/drizzle-7.2.3-libtool.patch b/dev-db/drizzle/files/drizzle-7.2.3-libtool.patch deleted file mode 100644 index 609b8adfd67e..000000000000 --- a/dev-db/drizzle/files/drizzle-7.2.3-libtool.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: drizzle-7.2.3/libdrizzle-1.0/include.am -=================================================================== ---- drizzle-7.2.3.orig/libdrizzle-1.0/include.am -+++ drizzle-7.2.3/libdrizzle-1.0/include.am -@@ -48,7 +48,7 @@ libdrizzle_1_0_libdrizzle_la_LDFLAGS= \ - -version-info \ - $(LIBDRIZZLE_LIBRARY_VERSION) - --libdrizzle_1_0_libdrizzle_la_LIBADD= $(LIBSSL) -+libdrizzle_1_0_libdrizzle_la_LIBADD= $(LTLIBSSL) - - libdrizzle_1_0_libdrizzle_la_SOURCES= \ - libdrizzle/column.cc \ diff --git a/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch b/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch deleted file mode 100644 index 0b10d74020cd..000000000000 --- a/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: drizzle-7.2.4-alpha/client/drizzleslap.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/client/drizzleslap.cc -+++ drizzle-7.2.4-alpha/client/drizzleslap.cc -@@ -1934,7 +1934,7 @@ static void timer_thread() - boost::mutex::scoped_lock scopedLock(timer_alarm_mutex); - - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += opt_timer_length; - - (void)timer_alarm_threshold.timed_wait(scopedLock, xt); -Index: drizzle-7.2.4-alpha/configure.ac -=================================================================== ---- drizzle-7.2.4-alpha.orig/configure.ac -+++ drizzle-7.2.4-alpha/configure.ac -@@ -111,7 +111,6 @@ PANDORA_DRIZZLE_BUILD - PANDORA_HAVE_BOOST_TEST - PANDORA_HAVE_LIBSQLITE3 - -- - ######################################################################### - - -Index: drizzle-7.2.4-alpha/drizzled/drizzled.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/drizzled.cc -+++ drizzle-7.2.4-alpha/drizzled/drizzled.cc -@@ -460,7 +460,7 @@ void close_connections() - while (select_thread_in_use) - { - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 2; - - for (uint32_t tmp=0 ; tmp < 10 && select_thread_in_use; tmp++) -Index: drizzle-7.2.4-alpha/drizzled/table/cache.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/table/cache.cc -+++ drizzle-7.2.4-alpha/drizzled/table/cache.cc -@@ -263,7 +263,7 @@ bool Cache::removeTable(Session& session - table::Cache::removeTable routine. - */ - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 10; - boost::mutex::scoped_lock scoped(table::Cache::mutex(), boost::adopt_lock_t()); - COND_refresh.timed_wait(scoped, xt); -Index: drizzle-7.2.4-alpha/drizzled/thr_lock.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/thr_lock.cc -+++ drizzle-7.2.4-alpha/drizzled/thr_lock.cc -@@ -170,7 +170,7 @@ static enum enum_thr_lock_result wait_fo - if (can_deadlock) - { - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += table_lock_wait_timeout; - if (not cond->timed_wait(scoped, xt)) - { -Index: drizzle-7.2.4-alpha/plugin/sleep/sleep.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/plugin/sleep/sleep.cc -+++ drizzle-7.2.4-alpha/plugin/sleep/sleep.cc -@@ -98,7 +98,7 @@ int64_t Item_func_sleep::val_int() - - try { - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.nsec += (uint64_t)(dtime * 1000000000ULL); - session.getThread()->sleep(xt); - } -Index: drizzle-7.2.4-alpha/drizzled/message/include.am -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/message/include.am -+++ drizzle-7.2.4-alpha/drizzled/message/include.am -@@ -40,7 +40,7 @@ lib_LTLIBRARIES += drizzled/message/libd - drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR} - - drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc --drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la -+drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) $(BOOST_LIBS) drizzled/libcharset.la - - nobase_dist_pkginclude_HEADERS+= \ - drizzled/message/statement_transform.h diff --git a/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch b/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch deleted file mode 100644 index e33e6e59afd1..000000000000 --- a/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- m4/pandora_have_libboost_thread.m4.orig 2014-02-12 13:52:43.580001598 +0400 -+++ m4/pandora_have_libboost_thread.m4 2014-02-12 13:53:24.288002974 +0400 -@@ -17,13 +17,13 @@ - CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}" - - AC_LANG_PUSH(C++) -- AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[ -+ AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,boost_system-mt,[ - #include <boost/thread.hpp> - ],[ - boost::thread id; - ]) - AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[ -- AC_LIB_HAVE_LINKFLAGS(boost_thread,,[ -+ AC_LIB_HAVE_LINKFLAGS(boost_thread,boost_system,[ - #include <boost/thread.hpp> - ],[ - boost::thread id; diff --git a/dev-db/drizzle/files/drizzle.conf.d b/dev-db/drizzle/files/drizzle.conf.d deleted file mode 100644 index c8a797897a56..000000000000 --- a/dev-db/drizzle/files/drizzle.conf.d +++ /dev/null @@ -1 +0,0 @@ -DRIZZLE_EXTRA="" diff --git a/dev-db/drizzle/files/drizzle.init.d b/dev-db/drizzle/files/drizzle.init.d deleted file mode 100644 index e3185ae0863b..000000000000 --- a/dev-db/drizzle/files/drizzle.init.d +++ /dev/null @@ -1,134 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Pavel Stratil, senbonzakura.eu -# Some functions were taken from debian init script. Licensed under GPL-2 -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -######################### -### Construct vars ###### -######################### - - -SUFFIX=".${SVCNAME#*.}" -[ "${SUFFIX}" == ".drizzled" ] && SUFFIX='' - -BASE_CNF="/etc/drizzle/drizzled" -BASE_PID="/var/run/drizzle/drizzled" -BASE_LOG="/var/log/drizzle/drizzled" -BASE_DIR="/var/lib/drizzle/drizzled" - -PIDFILE="${BASE_PID}${SUFFIX}.pid" -CNFFILE="${BASE_CNF}${SUFFIX}.cnf" -LOGFILE="${BASE_LOG}${SUFFIX}.log" -DATADIR="${BASE_DIR}${SUFFIX}" -DRIZZLE="/usr/bin/drizzle" -DRIZZLE_USER="drizzle" -DRIZZLE_DAEMON="/usr/sbin/drizzled" -DRIZZLE_EXTRA="" - -######################### -### Helper functions #### -######################### - - -# -# drizzle_status() checks if there is a server running and if it is accessible. -# "check_alive" insists on a pingable server, "check_dead" also fails -# if there is a lost drizzled in the process list -# Usage: boolean drizzle_status [check_alive|check_dead] [warn|nowarn] -# -drizzle_status() { - ping_output=`$DRIZZLE --ping 2>&1`; ping_alive=$(( ! $? )) - ps_alive=0 - if [ -f "$PIDFILE" ] && ps `cat $PIDFILE` >/dev/null 2>&1; then ps_alive=1; fi - - if [ "$1" = "check_alive" -a $ping_alive = 1 ] || - [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then - return 0 # EXIT_SUCCESS - else - if [ "$2" = "warn" ]; then - echo -e "$ps_alive processes alive and '$DRIZZLE --ping' resulted in\n$ping_output\n" - fi - return 1 # EXIT_FAILURE - fi -} - -######################### -### Main ################ -######################### - -checkconfig() { - # TODO: --print-defaults no longer a valid option. Needs to be rewritten. - #CNFDATADIR=`drizzle_get_param datadir` - #if [ -z "${CNFDATADIR}" ] ; then - # ewarn "Datadir not set in ${CNFFILE}." - # ewarn "Trying to use ${DATADIR}" - #else - DATADIR="${CNFDATADIR}" - #fi - - if [[ ! -d "${DATADIR}" ]] ; then - eerror "Drizzle datadir is empty or invalid." - eerror "Please check your configuration ${CNFFILE} and DRIZZLE_EXTRA" - return 1 - fi - - if [ ! -f "${CNFFILE}" ]; then - eerror "The configuration file $CNFFILE was not found!" - fi -} - -depend() { - use localmount - use gearmand - use memcached - - # TODO use drizzle_get_param() to decide if gearmand and memcached - # are needed. Then the useflag based sed-ing of this script - # can be removed from the ebuild. -} - - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --pidfile ${PIDFILE} --stop \ - --exec ${DRIZZLE_DAEMON} - eend $? - drizzle_status check_dead warn -} - -start() { - #checkconfig - ebegin "Starting ${SVCNAME}" - # Test if ${BASE_PID}, ${BASE_LOG} and ${LOG_FILE} exist, create if not. - [ ! -e ${BASE_PID} ] && mkdir -p ${BASE_PID} && chown ${DRIZZLE_USER}:nogroup ${BASE_PID} - [ ! -e ${BASE_LOG} ] && mkdir -p ${BASE_LOG} && chown ${DRIZZLE_USER}:nogroup ${BASE_LOG} - [ ! -e ${LOGFILE} ] && touch ${LOGFILE} && chown ${DRIZZLE_USER}:nogroup ${LOGFILE} - start-stop-daemon --background --pidfile ${PIDFILE} --stderr ${LOGFILE} \ - --user ${DRIZZLE_USER} --start --exec ${DRIZZLE_DAEMON} -- \ - --datadir=${DATADIR} --pid-file=${PIDFILE} --user=${DRIZZLE_USER} \ - ${DRIZZLE_EXTRA} - eend $? - - # TODO in order to have replication always working we should add the - # --server-id=# option. AFAIK only integers are allowed, though - # ${HOSTNAME}${SVCNAME}${SUFFIX} whould be much easier to handle. - - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do - sleep 1 - if drizzle_status check_alive nowarn ; then break ; fi - done - if drizzle_status check_alive warn ; then - einfo "${SVCNAME} is alive!" - else - eerror "${SVCNAME} died!" - fi -} - -status() { - if drizzle_status check_alive nowarn; then - einfo "status: started" - else - einfo "status: stopped" - fi -} diff --git a/dev-db/drizzle/files/drizzle.init.d.2 b/dev-db/drizzle/files/drizzle.init.d.2 deleted file mode 100644 index 4b44ec0d51e9..000000000000 --- a/dev-db/drizzle/files/drizzle.init.d.2 +++ /dev/null @@ -1,127 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Pavel Stratil, senbonzakura.eu -# Some functions were taken from debian init script. Licensed under GPL-2 -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -######################### -### Construct vars ###### -######################### - - -SUFFIX=".${SVCNAME#*.}" -[ "${SUFFIX}" == ".drizzled" ] && SUFFIX='' - -DIR_PID="/run/drizzle" -DIR_LOG="/var/log/drizzle" - -BASE_CNF="/etc/drizzle/drizzled" -BASE_PID="${DIR_PID}/drizzled" -BASE_LOG="${DIR_LOG}/drizzled" -BASE_DIR="/var/lib/drizzle/drizzled" - -CNFFILE="${BASE_CNF}${SUFFIX}.cnf" -LOGFILE="${BASE_LOG}${SUFFIX}.log" -DATADIR="${BASE_DIR}${SUFFIX}" -DRIZZLE="/usr/bin/drizzle" -DRIZZLE_USER="drizzle" - -pidfile="${BASE_PID}${SUFFIX}.pid" -command="/usr/sbin/drizzled" -command_args="--daemon --datadir=${DATADIR} --pid-file=${pidfile} --user=${DRIZZLE_USER} --syslog.errmsg-enable ${DRIZZLE_EXTRA}" - -start_stop_daemon_args="--user ${DRIZZLE_USER} --wait 5000" - -######################### -### Helper functions #### -######################### - - -# -# drizzle_status() checks if there is a server running and if it is accessible. -# "check_alive" insists on a pingable server, "check_dead" also fails -# if there is a lost drizzled in the process list -# Usage: boolean drizzle_status [check_alive|check_dead] [warn|nowarn] -# -drizzle_status() { - ping_output=`$DRIZZLE --ping 2>&1`; ping_alive=$(( ! $? )) - ps_alive=0 - if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi - - if [ "$1" = "check_alive" -a $ping_alive = 1 ] || - [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then - return 0 # EXIT_SUCCESS - else - if [ "$2" = "warn" ]; then - echo -e "$ps_alive processes alive and '$DRIZZLE --ping' resulted in\n$ping_output\n" - fi - return 1 # EXIT_FAILURE - fi -} - -######################### -### Main ################ -######################### - -checkconfig() { - # TODO: --print-defaults no longer a valid option. Needs to be rewritten. - #CNFDATADIR=`drizzle_get_param datadir` - #if [ -z "${CNFDATADIR}" ] ; then - # ewarn "Datadir not set in ${CNFFILE}." - # ewarn "Trying to use ${DATADIR}" - #else - DATADIR="${CNFDATADIR}" - #fi - - if [[ ! -d "${DATADIR}" ]] ; then - eerror "Drizzle datadir is empty or invalid." - eerror "Please check your configuration ${CNFFILE} and DRIZZLE_EXTRA" - return 1 - fi - - if [ ! -f "${CNFFILE}" ]; then - eerror "The configuration file $CNFFILE was not found!" - fi -} - -depend() { - use localmount - use logger - use gearmand - use memcached - - # TODO use drizzle_get_param() to decide if gearmand and memcached - # are needed. Then the useflag based sed-ing of this script - # can be removed from the ebuild. -} - -start_pre() { - checkpath -d -o ${DRIZZLE_USER}:nogroup ${DIR_PID} ${DIR_LOG} - checkpath -f -o ${DRIZZLE_USER}:nogroup ${LOGFILE} -} - -start_post() { - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do - sleep 1 - if drizzle_status check_alive nowarn ; then break ; fi - done - if drizzle_status check_alive warn ; then - einfo "${SVCNAME} is alive!" - else - eerror "${SVCNAME} died!" - fi -} - -stop_post() { - drizzle_status check_dead warn -} - -status() { - if drizzle_status check_alive nowarn; then - mark_service_started drizzled - einfo "status: started" - else - mark_service_stopped drizzled - einfo "status: stopped" - fi -} diff --git a/dev-db/drizzle/metadata.xml b/dev-db/drizzle/metadata.xml deleted file mode 100644 index e3f1ada9f01b..000000000000 --- a/dev-db/drizzle/metadata.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>pavel.stratil-jun@fenix.cz</email> - <description>Proxied co-maintainer, assign bugs to him</description> - </maintainer> - <maintainer type="person"> - <email>flameeyes@gentoo.org</email> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="doc"> - Build the API documentation for the package, using - <pkg>app-doc/doxygen</pkg>. Warning, this might take over an - hour on slower machines. - </flag> - <flag name="memcache"> - Enable the memcache plugin for user-defined functions and - statistics in I_S tables (using - <pkg>dev-libs/libmemcached</pkg>). - - Currently restricts tests because of an upstream testsuite bug. - </flag> - <flag name="gearman"> - Enable the gearman plugins for user-defined functions and - logging (using <pkg>sys-cluster/gearman</pkg>). - </flag> - <flag name="curl"> - Enable the HTTP authentication plugin (using - <pkg>net-misc/curl</pkg>). This is needed for the tests to apply - properly. - </flag> - <flag name="pam"> - Enable the PAM authentication plugin (using - <pkg>sys-libs/pam</pkg>). The configuration file created will be - /etc/pam.d/drizzle. - </flag> - <flag name="md5"> - Enable the MD5 plugin, using <pkg>dev-libs/libgcrypt</pkg>; this - replaces the older openssl and gnutls USE flags. - </flag> - <flag name="v8"> - Use <pkg>dev-lang/v8</pkg>. - </flag> - </use> - <upstream> - <remote-id type="launchpad">drizzle</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest index e5e094dc2a48..eaaa219de627 100644 --- a/dev-db/etcd/Manifest +++ b/dev-db/etcd/Manifest @@ -1,2 +1,3 @@ DIST etcd-2.0.10.tar.gz 450581 SHA256 6029113d9870e5c6f0d10adbd2b6670958a46575114a094b86b607771a0e5ff3 SHA512 825524ee4c435b8f369970cfe39158443b8e29f6fba5ab86ae8be2d91f6faa0674d15f311bc863092fb6c77b054b8f3b69e163610b546e3c5cf59a111b38a3ed WHIRLPOOL a2b4c160cbc9cde5ebf64fa2fe41f6bc6ac5dc851551778b681d658e511f0dbc7241a4c74a6b520d43fe8e9cee65fa28f94655d64caf6f3c99cbd4ba84a57b65 DIST etcd-2.2.1.tar.gz 1844265 SHA256 1c0ce63812ef951f79c0a544c91f9f1ba3c6b50cb3e8197de555732454864d05 SHA512 4a96ed12c1f23ac4c9ea7ffeb17853f10a5eb04365b0fdfa765fa9f3acf12d32f7b4bfaa05de78bc17620808ae97f61425d2956a0d1cd817e501106e39498950 WHIRLPOOL edcb6f837b83f83a658717ceaf79c7304f5d4df34d2a15bbf9d82d370612f31ee8e5e248e9b143ff15df666ce25ab8c47d7dc5c62a3d7365a8bde0153d5e79a7 +DIST etcd-2.2.5.tar.gz 2151517 SHA256 a7fb7998ada620fda74e517c100891d25a15a6fa20b627df52da7cd29328e6d5 SHA512 4436180c564ba2122cb346033ccf3de90e1f9cf17c12f62635c41cd0617c16e1a5705bbcfce64d74702ee378e89bc6663f208a99d64e819ddf449c3f442a38e0 WHIRLPOOL f5706c1eb25750fea89556d803bf8a9915569a197bf676c06c016652905d559e3ec60e7bcf682a341aa36115b91b892529a035f96b4a63e0403ee13e492c55a3 diff --git a/dev-db/etcd/etcd-2.2.5.ebuild b/dev-db/etcd/etcd-2.2.5.ebuild new file mode 100644 index 000000000000..2f47765d75b1 --- /dev/null +++ b/dev-db/etcd/etcd-2.2.5.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit user systemd + +KEYWORDS="~amd64" +DESCRIPTION="A highly-available key value store for shared configuration and service discovery" +HOMEPAGE="https://github.com/coreos/etcd/" +SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="doc" +DEPEND=">=dev-lang/go-1.4:=" +RDEPEND="!dev-db/etcdctl" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} +} + +src_prepare() { + sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\ + -e 's|-ldflags "-s.*"|-v -x|' \ + -e 's|-ldflags "-s|-v -x "|' \ + -i build || die + sed -e 's|go test|\0 -v|'\ + -i test || die +} + +src_compile() { + ./build || die +} + +src_install() { + insinto /etc/${PN} + doins "${FILESDIR}/${PN}.conf" + dobin bin/* + dodoc README.md + use doc && dodoc -r Documentation + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + dodir /var/lib/${PN} + fowners ${PN}:${PN} /var/lib/${PN} + fperms 755 /var/lib/${PN} + dodir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + fperms 755 /var/log/${PN} +} + +src_test() { + ./test || die +} diff --git a/dev-db/flamerobin/Manifest b/dev-db/flamerobin/Manifest deleted file mode 100644 index 83abf8e284c3..000000000000 --- a/dev-db/flamerobin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flamerobin-0.9.2-src.tar.gz 901908 SHA256 b674a1de1c632c834e904a17e576498850e7b81cc5c4d42e8cafd8a6dd020c90 SHA512 76eeecae759ab7aec817a4775fe185f982f6f50f5dec850b1fbb00b56239807867fe36568592e313315c0f02364c1986d9691e84d5fced2aedd85571d239f2be WHIRLPOOL 224481502e893be06236f685c71f15848f9aab372a6adbb91db9f95fc5978f76fe2879c823b3f6ff64cea4bff5269df34475978a7602a47a43bb5146f5182b9a diff --git a/dev-db/flamerobin/files/flamerobin-0.9.2-gcc46.patch b/dev-db/flamerobin/files/flamerobin-0.9.2-gcc46.patch deleted file mode 100644 index 0701a0fa5906..000000000000 --- a/dev-db/flamerobin/files/flamerobin-0.9.2-gcc46.patch +++ /dev/null @@ -1,503 +0,0 @@ -Index: src/databasehandler.cpp -=================================================================== ---- src/databasehandler.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/databasehandler.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -46,6 +46,7 @@ - class DatabaseInfoHandler: public URIHandler - { - public: -+ DatabaseInfoHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/gui/RestoreFrame.cpp -=================================================================== ---- src/gui/RestoreFrame.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/RestoreFrame.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -258,7 +258,7 @@ - sizerFilename->Add(styleguide().getBrowseButtonMargin(), 0); - sizerFilename->Add(button_browse, 0, wxALIGN_CENTER_VERTICAL); - -- wxGridSizer* sizerChecks = new wxGridSizer(2, 2, -+ wxGridSizer* sizerChecks = new wxGridSizer(3, 2, - styleguide().getCheckboxSpacing(), - styleguide().getUnrelatedControlMargin(wxHORIZONTAL)); - sizerChecks->Add(checkbox_replace, 0, wxEXPAND); -Index: src/gui/ReorderFieldsDialog.cpp -=================================================================== ---- src/gui/ReorderFieldsDialog.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/ReorderFieldsDialog.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -215,6 +215,7 @@ - class ReorderFieldsHandler: public URIHandler - { - public: -+ ReorderFieldsHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/gui/FieldPropertiesDialog.cpp -=================================================================== ---- src/gui/FieldPropertiesDialog.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/FieldPropertiesDialog.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -690,7 +690,7 @@ - + wxT(" IF (NEW.") + fNameSql + wxT(" IS NULL) THEN\n") - + wxT(" NEW.") + fNameSql + wxT(" = GEN_ID(") - + generator.getQuoted() + wxT(", 1);\n") -- + wxT(" ELSE\n BEGIN\n tmp = GEN_ID(") + -+ + wxT(" ELSE\n BEGIN\n tmp = GEN_ID(") - + generator.getQuoted() + wxT(", 0);\n if (tmp < new.") - + fNameSql + wxT(") then\n tmp = GEN_ID(") - + generator.getQuoted() + wxT(", new.") + fNameSql -@@ -816,6 +816,7 @@ - class ColumnPropertiesHandler: public URIHandler - { - public: -+ ColumnPropertiesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/gui/controls/DBHTreeControl.cpp -=================================================================== ---- src/gui/controls/DBHTreeControl.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/controls/DBHTreeControl.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -261,6 +261,8 @@ - id = ART_View; break; - case ntViews: - id = ART_Views; break; -+ default: -+ break; - } - return getImageIndex(id); - } -Index: src/gui/controls/TextControl.cpp -=================================================================== ---- src/gui/controls/TextControl.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/controls/TextControl.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -40,8 +40,8 @@ - - #include "gui/controls/TextControl.h" - //----------------------------------------------------------------------------- --TextControl::TextControl(wxWindow *parent, wxWindowID id, long style) -- : wxStyledTextCtrl(parent, id, wxDefaultPosition, wxDefaultSize, style) -+TextControl::TextControl(wxWindow *parent, wxWindowID id) -+ : wxStyledTextCtrl(parent, id) - { - SetWrapMode(wxSTC_WRAP_WORD); - // wxStyledTextCtrl uses black on white initially -> use system defaults -Index: src/gui/controls/LogTextControl.cpp -=================================================================== ---- src/gui/controls/LogTextControl.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/controls/LogTextControl.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -40,8 +40,8 @@ - - #include "gui/controls/LogTextControl.h" - //----------------------------------------------------------------------------- --LogTextControl::LogTextControl(wxWindow *parent, wxWindowID id, long style) -- : TextControl(parent, id, style) -+LogTextControl::LogTextControl(wxWindow *parent, wxWindowID id) -+ : TextControl(parent, id) - { - setDefaultStyles(); - } -Index: src/gui/controls/TextControl.h -=================================================================== ---- src/gui/controls/TextControl.h (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/controls/TextControl.h (.../rel_0_9_2-1/src) (révision 2085) -@@ -61,8 +61,7 @@ - - DECLARE_EVENT_TABLE() - public: -- TextControl(wxWindow *parent, wxWindowID id = wxID_ANY, -- long style = wxSUNKEN_BORDER); -+ TextControl(wxWindow *parent, wxWindowID id = wxID_ANY); - }; - //----------------------------------------------------------------------------- - #endif -Index: src/gui/controls/LogTextControl.h -=================================================================== ---- src/gui/controls/LogTextControl.h (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/controls/LogTextControl.h (.../rel_0_9_2-1/src) (révision 2085) -@@ -38,8 +38,7 @@ - enum LogStyle { logStyleDefault, logStyleImportant, logStyleError }; - void addStyledText(const wxString& message, LogStyle style); - public: -- LogTextControl(wxWindow *parent, wxWindowID id = wxID_ANY, -- long style = wxSUNKEN_BORDER); -+ LogTextControl(wxWindow *parent, wxWindowID id = wxID_ANY); - - void logErrorMsg(const wxString& message); - void logImportantMsg(const wxString& message); -Index: src/gui/UserDialog.cpp -=================================================================== ---- src/gui/UserDialog.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/UserDialog.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -222,6 +222,7 @@ - class UserPropertiesHandler: public URIHandler - { - public: -+ UserPropertiesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -300,6 +301,7 @@ - class DropUserHandler: public URIHandler - { - public: -+ DropUserHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/gui/CreateIndexDialog.cpp -=================================================================== ---- src/gui/CreateIndexDialog.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/CreateIndexDialog.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -209,6 +209,7 @@ - class TableIndicesHandler: public URIHandler - { - public: -+ TableIndicesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/gui/BackupFrame.cpp -=================================================================== ---- src/gui/BackupFrame.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/BackupFrame.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -241,7 +241,7 @@ - sizerFilename->Add(styleguide().getBrowseButtonMargin(), 0); - sizerFilename->Add(button_browse, 0, wxALIGN_CENTER_VERTICAL); - -- wxGridSizer* sizerChecks = new wxGridSizer(2, 2, -+ wxGridSizer* sizerChecks = new wxGridSizer(3, 2, - styleguide().getCheckboxSpacing(), - styleguide().getUnrelatedControlMargin(wxHORIZONTAL)); - sizerChecks->Add(checkbox_checksum, 0, wxEXPAND); -Index: src/gui/PrivilegesDialog.cpp -=================================================================== ---- src/gui/PrivilegesDialog.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/PrivilegesDialog.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -583,6 +583,7 @@ - class ManagePrivilegesHandler: public URIHandler - { - public: -+ ManagePrivilegesHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/gui/MainFrame.cpp -=================================================================== ---- src/gui/MainFrame.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/MainFrame.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -380,6 +380,7 @@ - EVT_MENU(Cmds::Menu_Reconnect, MainFrame::OnMenuReconnect) - EVT_UPDATE_UI(Cmds::Menu_Reconnect, MainFrame::OnMenuUpdateIfDatabaseConnected) - EVT_MENU(Cmds::Menu_RecreateDatabase, MainFrame::OnMenuRecreateDatabase) -+ EVT_UPDATE_UI(Cmds::Menu_RecreateDatabase, MainFrame::OnMenuUpdateIfDatabaseConnected) - EVT_MENU(Cmds::Menu_DropDatabase, MainFrame::OnMenuDropDatabase) - EVT_UPDATE_UI(Cmds::Menu_DropDatabase, MainFrame::OnMenuUpdateIfDatabaseConnected) - EVT_MENU(Cmds::Menu_Query, MainFrame::OnMenuQuery) -@@ -540,8 +541,10 @@ - } - //----------------------------------------------------------------------------- - //! handle double-click on item (or press Enter) --void MainFrame::OnTreeItemActivate(wxTreeEvent& WXUNUSED(event)) -+void MainFrame::OnTreeItemActivate(wxTreeEvent& event) - { -+ event.Skip(); -+ - wxTreeItemId item = treeMainM->GetSelection(); - if (!item.IsOk()) - return; -Index: src/gui/TriggerWizardDialog.cpp -=================================================================== ---- src/gui/TriggerWizardDialog.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/TriggerWizardDialog.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -178,6 +178,7 @@ - class CreateTriggerHandler: public URIHandler - { - public: -+ CreateTriggerHandler() {}; - bool handleURI(URI& uri); - private: - static const CreateTriggerHandler handlerInstance; -Index: src/gui/EventWatcherFrame.cpp -=================================================================== ---- src/gui/EventWatcherFrame.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/EventWatcherFrame.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -55,15 +55,13 @@ - class EventLogControl: public LogTextControl - { - public: -- EventLogControl(wxWindow* parent, wxWindowID id = wxID_ANY, -- long style = wxSUNKEN_BORDER); -+ EventLogControl(wxWindow* parent, wxWindowID id = wxID_ANY); - void logAction(const wxString& action); - void logEvent(const wxString& name, int count); - }; - //----------------------------------------------------------------------------- --EventLogControl::EventLogControl(wxWindow* parent, wxWindowID id, -- long style) -- : LogTextControl(parent, id, style) -+EventLogControl::EventLogControl(wxWindow* parent, wxWindowID id) -+ : LogTextControl(parent, id) - { - } - //----------------------------------------------------------------------------- -Index: src/gui/MetadataItemPropertiesFrame.cpp -=================================================================== ---- src/gui/MetadataItemPropertiesFrame.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/MetadataItemPropertiesFrame.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -360,6 +360,8 @@ - case ntDatabase: - case ntRole: - pages.push_back(wxT("DDL")); -+ default: -+ break; - }; - wxString page = loadEntireFile(config().getHtmlTemplatesPath() - + wxT("header.html")); -@@ -1290,6 +1292,7 @@ - class PageHandler: public URIHandler - { - public: -+ PageHandler() {}; - bool handleURI(URI& uri); - private: - static const PageHandler handlerInstance; // singleton; registers itself on creation. -@@ -1327,6 +1330,7 @@ - class PropertiesHandler: public URIHandler - { - public: -+ PropertiesHandler() {}; - bool handleURI(URI& uri); - private: - static const PropertiesHandler handlerInstance; // singleton; registers itself on creation. -Index: src/gui/ExecuteSqlFrame.cpp -=================================================================== ---- src/gui/ExecuteSqlFrame.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/gui/ExecuteSqlFrame.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -2749,6 +2749,7 @@ - class DropColumnHandler: public URIHandler - { - public: -+ DropColumnHandler() {}; - bool handleURI(URI& uri); - private: - static const DropColumnHandler handlerInstance; -@@ -2806,6 +2807,7 @@ - class DropColumnsHandler: public URIHandler - { - public: -+ DropColumnsHandler() {}; - bool handleURI(URI& uri); - private: - static const DropColumnsHandler handlerInstance; -@@ -2842,6 +2844,7 @@ - class DropObjectHandler: public URIHandler - { - public: -+ DropObjectHandler() {}; - bool handleURI(URI& uri); - private: - static const DropObjectHandler handlerInstance; -@@ -2878,6 +2881,7 @@ - class EditDDLHandler: public URIHandler - { - public: -+ EditDDLHandler() {}; - bool handleURI(URI& uri); - private: - static const EditDDLHandler handlerInstance; -@@ -2919,6 +2923,7 @@ - class EditProcedureHandler: public URIHandler - { - public: -+ EditProcedureHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -2947,6 +2952,7 @@ - class AlterViewHandler: public URIHandler - { - public: -+ AlterViewHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -2973,6 +2979,7 @@ - class EditTriggerHandler: public URIHandler - { - public: -+ EditTriggerHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -2999,6 +3006,7 @@ - class EditGeneratorValueHandler: public URIHandler - { - public: -+ EditGeneratorValueHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -3041,6 +3049,7 @@ - class EditExceptionHandler: public URIHandler - { - public: -+ EditExceptionHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -3067,6 +3076,7 @@ - class IndexActionHandler: public URIHandler - { - public: -+ IndexActionHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -@@ -3113,6 +3123,7 @@ - class ActivateTriggersHandler: public URIHandler - { - public: -+ ActivateTriggersHandler() {}; - bool handleURI(URI& uri); - private: - static const ActivateTriggersHandler handlerInstance; -@@ -3160,6 +3171,7 @@ - class ActivateTriggerHandler: public URIHandler - { - public: -+ ActivateTriggerHandler() {}; - bool handleURI(URI& uri); - private: - static const ActivateTriggerHandler handlerInstance; -Index: src/images.cpp -=================================================================== ---- src/images.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/images.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -68,6 +68,8 @@ - return wxArtProvider::GetIcon(ART_Trigger, wxART_OTHER, sz); - case ntView: - return wxArtProvider::GetIcon(ART_View, wxART_OTHER, sz); -+ default: -+ break; - } - return wxArtProvider::GetIcon(ART_FlameRobin, wxART_OTHER, sz); - } -Index: src/objectdescriptionhandler.cpp -=================================================================== ---- src/objectdescriptionhandler.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/objectdescriptionhandler.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -46,6 +46,7 @@ - class ObjectDescriptionHandler: public URIHandler - { - public: -+ ObjectDescriptionHandler() {}; - bool handleURI(URI& uri); - private: - // singleton; registers itself on creation. -Index: src/addconstrainthandler.cpp -=================================================================== ---- src/addconstrainthandler.cpp (.../rel_0_9_2/src) (révision 2085) -+++ src/addconstrainthandler.cpp (.../rel_0_9_2-1/src) (révision 2085) -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2004-2009 The FlameRobin Development Team -+ Copyright (c) 2004-2011 The FlameRobin Development Team - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the -@@ -51,6 +51,8 @@ - class AddConstraintHandler: public URIHandler - { - public: -+ AddConstraintHandler() {}; -+ - bool handleURI(URI& uri); - private: - static const AddConstraintHandler handlerInstance; // singleton; registers itself on creation. diff --git a/dev-db/flamerobin/flamerobin-0.9.2.ebuild b/dev-db/flamerobin/flamerobin-0.9.2.ebuild deleted file mode 100644 index 7e92ac8b3949..000000000000 --- a/dev-db/flamerobin/flamerobin-0.9.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -WX_GTK_VER="2.8" -inherit eutils wxwidgets - -DESCRIPTION="A database administration tool for Firebird DBMS" -HOMEPAGE="http://www.flamerobin.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" - -LICENSE="MIT IBPP-1.1 LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND="x11-libs/wxGTK:2.8[X] - dev-db/firebird" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${P}-src" - -src_prepare() { - epatch "${FILESDIR}/${P}-gcc46.patch" -} - -src_configure() { - # temp hack since configure is not executable - chmod +x configure - - local myconf - myconf="${myconf} \ - --disable-shared \ - --disable-debug \ - --with-wx=yes \ - --with-wx-config=${WX_CONFIG}" - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc devdocs/* docs/* docs-src/* -} diff --git a/dev-db/flamerobin/metadata.xml b/dev-db/flamerobin/metadata.xml deleted file mode 100644 index 6b8b207f2403..000000000000 --- a/dev-db/flamerobin/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription> - FlameRobin is a database administration tool for Firebird DBMS. - FlameRobin is lightweight (small footprint, fast execution) and - dependent only on other Open Source software - </longdescription> - <upstream> - <remote-id type="sourceforge">flamerobin</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 1955db8822d3..0300737ea976 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,5 +1,6 @@ DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e +DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5 diff --git a/dev-db/mariadb/mariadb-10.0.24.ebuild b/dev-db/mariadb/mariadb-10.0.24.ebuild new file mode 100644 index 000000000000..7ee3980439b5 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.0.24.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +MY_EXTRAS_VER="20151223-1501Z" +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number +WSREP_REVISION="25" +SUBSLOT="18" +MYSQL_PV_MAJOR="5.6" + +inherit toolchain-funcs mysql-multilib-r1 + +HOMEPAGE="http://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" + +IUSE="bindist odbc oqgraph pam sphinx tokudb xml" +RESTRICT="!bindist? ( bindist )" + +REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +COMMON_DEPEND=" + !bindist? ( >=sys-libs/readline-4.1:0= ) + server? ( + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( virtual/pam:0= ) + tokudb? ( app-arch/snappy ) + ) + >=dev-libs/libpcre-8.35:3= +" +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + ${COMMON_DEPEND}" +RDEPEND="${RDEPEND} ${COMMON_DEPEND} + perl? ( !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) +" +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) + +src_configure(){ + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + local MYSQL_CMAKE_NATIVE_DEFINES=( + -DWITH_JEMALLOC=$(usex jemalloc system) + -DWITH_PCRE=system + ) + if use server ; then + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + MYSQL_CMAKE_NATIVE_DEFINES+=( + -DWITHOUT_FEDERATED=1 + -DWITHOUT_FEDERATEDX=1 ) + fi + + MYSQL_CMAKE_NATIVE_DEFINES+=( + $(mysql-cmake_use_plugin oqgraph OQGRAPH) + $(mysql-cmake_use_plugin sphinx SPHINX) + $(mysql-cmake_use_plugin tokudb TOKUDB) + $(mysql-cmake_use_plugin pam AUTH_PAM) + -DWITHOUT_CASSANDRA=0 + $(mysql-cmake_use_plugin extraengine SEQUENCE) + $(mysql-cmake_use_plugin extraengine SPIDER) + $(mysql-cmake_use_plugin extraengine CONNECT) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DWITHOUT_MROONGA=1 + ) + fi + mysql-multilib-r1_src_configure +} + +# Official test instructions: +# USE='embedded extraengine perl server openssl static-libs' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if use server ; then + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} + + # These are failing in MariaDB 10.0 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql main.bootstrap + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test, main.mysql_client_test_nonblock + # main.mysql_client_test_comp: + # segfaults at random under Portage only, suspect resource limits. + # + # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # fails due to bad cleanup of previous tests when run in parallel + # The tool is deprecated anyway + # Bug 532288 + + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + main.mysql_client_test_comp \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help main.bootstrap \ + archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" + done + + # Run mysql tests + pushd "${TESTDIR}" || die + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder + + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + + else + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 75a57b3c8867..2739d17f7c4f 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -3,4 +3,4 @@ DIST mongodb-src-r2.6.11.tar.gz 16461163 SHA256 e1a64a1ef7114f3e8ed3c7acaa4e97ff DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28 DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e DIST mongodb-src-r3.0.9.tar.gz 26249669 SHA256 5b6f189458739a327a2ad4a5ecab4f733c6a6751ccb067ec8879a0f98f2b97c3 SHA512 4ebcd89394ea0ccbd84adde1a6ce1776d86873bea13520c31bf3a783a922598cadd9ce1c11998f028e5e1affe6cb6639d1a4ff9c0e5771ff88bed873ddf7dc97 WHIRLPOOL a7d6cb51ee62717bcc2e612ae8e72ea43be7c9867c0de3fa2afc1d5c731bc3b1ca04ac70a351feaba71c27e00cf6cbf9b9997c4276362f98a725350aff37b750 -DIST mongodb-src-r3.2.1.tar.gz 26397562 SHA256 50431a3ba5ab68bd0bed4a157a8528ca27753a63cf101f13135255e4e9d42f15 SHA512 5ce0af3e70010e3602dd2f7c49c80feee1c89903a694db038543a7f399f4296f2c04bf3aee7089da0b24aa9239aa79823e6f5408bf0f3c6fade6166e94070309 WHIRLPOOL de59175ad56577ffc5a90358e2f387c901a8353bb3b98ef6861d917480d853f926de7645ee4a2d8a704824609f251c82ead6e6cd95e982be18271677cfd6e2b3 +DIST mongodb-src-r3.2.3.tar.gz 29607224 SHA256 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa SHA512 43b652da8fb461c36be1566965985aed036d53a8f4ed2a5f4a67e08571697c4030eb682a2a14ebc41991757d7083a268c5161b536d20dc1b3de13dac8df1da53 WHIRLPOOL 2e262616f0f317185330c8386ea31f81af9d7713dd02e70a4292d2ace17b22fadaead8666840679aa3eedccb624a48817cf68d1d29af3840e4af10aa77d434a5 diff --git a/dev-db/mongodb/mongodb-3.2.1.ebuild b/dev-db/mongodb/mongodb-3.2.3.ebuild index e1e5a32be806..e1e5a32be806 100644 --- a/dev-db/mongodb/mongodb-3.2.1.ebuild +++ b/dev-db/mongodb/mongodb-3.2.3.ebuild diff --git a/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild index 90bf84d6ae9e..8d989c63ab3b 100644 --- a/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild +++ b/dev-db/pgadmin3/pgadmin3-1.22.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.pgadmin.org/" SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz" LICENSE="POSTGRESQL" -KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" SLOT="0" IUSE="debug +databasedesigner" diff --git a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild index ac1b4fe859aa..25e7948cd781 100644 --- a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild @@ -219,7 +219,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild index 817622c4a539..3ad70613b443 100644 --- a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild @@ -223,7 +223,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.1.20.ebuild b/dev-db/postgresql/postgresql-9.1.20.ebuild index 2409a1e446f5..b8227f2117d4 100644 --- a/dev-db/postgresql/postgresql-9.1.20.ebuild +++ b/dev-db/postgresql/postgresql-9.1.20.ebuild @@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" @@ -223,7 +223,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild index 83a2fa7543ce..1889593643b3 100644 --- a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild @@ -217,7 +217,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.2.15.ebuild b/dev-db/postgresql/postgresql-9.2.15.ebuild index 4a1af030f41c..49e7f99fed25 100644 --- a/dev-db/postgresql/postgresql-9.2.15.ebuild +++ b/dev-db/postgresql/postgresql-9.2.15.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" @@ -217,7 +217,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild index 2367c975064a..69bce41c3fb4 100644 --- a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild @@ -217,7 +217,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild index 7bbba3eefff5..b49eb23321d3 100644 --- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild +++ b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild @@ -222,7 +222,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.3.11.ebuild b/dev-db/postgresql/postgresql-9.3.11.ebuild index b84d9281d8ce..ef0898e6fff5 100644 --- a/dev-db/postgresql/postgresql-9.3.11.ebuild +++ b/dev-db/postgresql/postgresql-9.3.11.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" @@ -222,7 +222,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild index d705b1003811..2cacd75aff9a 100644 --- a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild @@ -249,7 +249,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild index 1cffab75197b..36a8b40b203a 100644 --- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild +++ b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild @@ -254,7 +254,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.4.6.ebuild b/dev-db/postgresql/postgresql-9.4.6.ebuild index 486c94461e56..8a77d200ca82 100644 --- a/dev-db/postgresql/postgresql-9.4.6.ebuild +++ b/dev-db/postgresql/postgresql-9.4.6.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" @@ -254,7 +254,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9.5.1.ebuild b/dev-db/postgresql/postgresql-9.5.1.ebuild index 486c94461e56..8a77d200ca82 100644 --- a/dev-db/postgresql/postgresql-9.5.1.ebuild +++ b/dev-db/postgresql/postgresql-9.5.1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" @@ -254,7 +254,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild index addb7aa53fc9..0f52d99f9e53 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -211,7 +211,7 @@ pkg_postinst() { elog elog "It looks like this is your first time installing PostgreSQL. Run the" elog "following command in all active shells to pick up changes to the default" - elog "environemnt:" + elog "environment:" elog " source /etc/profile" fi diff --git a/dev-db/rqlite/rqlite-1.0.ebuild b/dev-db/rqlite/rqlite-1.0.ebuild index 0f178d7b6b0d..053d71253fb1 100644 --- a/dev-db/rqlite/rqlite-1.0.ebuild +++ b/dev-db/rqlite/rqlite-1.0.ebuild @@ -58,6 +58,17 @@ src_unpack() { unpack_go_packages } +src_compile() { + # Omit $(get_golibdir_gopath) from GOPATH, in order to avoid + # interference from installed rqlite sources. + GOPATH="${WORKDIR}/${P}" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die +} + +src_install() { + golang_install_pkgs +} + golang_install_pkgs() { dobin bin/${PN} insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}") diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index 8d3eb638d6a0..c1e7536fd81b 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -1,4 +1,3 @@ -DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512 8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30 WHIRLPOOL 83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5 DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256 8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512 afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65 WHIRLPOOL f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8 DIST sqlite-autoconf-3081101.tar.gz 2101885 SHA256 fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 SHA512 b87e3a94462c26e875833c7f83dcc453146377a403d173169e2db7198bede2467f8c480645141da678e0fd3071764558f2dd2630086964431ead25ac43212ee6 WHIRLPOOL 2045496055b02151211080110dc8fc2c474337788704a0e4db8841a1928b82d6490afa682c8d8b1bb6b9e98808d7eabf0f763a41e4768b1c21629107895bb66b diff --git a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch b/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch deleted file mode 100644 index 7081ffd00323..000000000000 --- a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr sqlite.orig/src/vdbeInt.h sqlite/src/vdbeInt.h ---- sqlite.orig/src/vdbeInt.h 2004-10-16 01:33:02.779442000 +0200 -+++ sqlite/src/vdbeInt.h 2004-10-16 01:35:01.139442000 +0200 -@@ -115,7 +115,7 @@ - int flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */ - double r; /* Real value */ - char *z; /* String value */ -- char zShort[NBFS]; /* Space for short strings */ -+ char zShort[NBFS] __attribute__ ((__aligned__(16))); /* Space for short strings */ - }; - typedef struct Mem Mem; - diff --git a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch b/dev-db/sqlite/files/sqlite-2.8.16-exit.patch deleted file mode 100644 index aaccb575e0a9..000000000000 --- a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch +++ /dev/null @@ -1,12 +0,0 @@ -temp.c:4:1: warning: incompatible implicit declaration of built-in function ‘exit’ - ---- Makefile.in -+++ Makefile.in -@@ -269,6 +269,7 @@ - # - config.h: - echo '#include <stdio.h>' >temp.c -+ echo '#include <stdlib.h>' >>temp.c - echo 'int main(){printf(' >>temp.c - echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c - echo 'exit(0);}' >>temp.c diff --git a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch b/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch deleted file mode 100644 index 32111877c1b6..000000000000 --- a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -Naurp sqlite-2.8.16.orig/Makefile.in sqlite-2.8.16/Makefile.in ---- sqlite-2.8.16.orig/Makefile.in 2005-02-14 00:22:04.000000000 +0000 -+++ sqlite-2.8.16/Makefile.in 2005-02-17 18:22:50.174537727 +0000 -@@ -187,12 +187,12 @@ last_change: $(SRC) - | awk '{print $$5,$$6}' >last_change - - libsqlite.la: $(LIBOBJ) -- $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \ -+ $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @libdir@ \ - -version-info "8:6:8" - - libtclsqlite.la: tclsqlite.lo libsqlite.la - $(LTLINK) -o libtclsqlite.la tclsqlite.lo \ -- libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \ -+ libsqlite.la $(LIBTCL) -rpath @libdir@/sqlite \ - -version-info "8:6:8" - - sqlite@TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h -@@ -465,14 +465,14 @@ doc: $(DOC) - mv $(DOC) doc - - install: sqlite libsqlite.la sqlite.h -- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib -- $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib -+ $(INSTALL) -d $(DESTDIR)@libdir@ -+ $(LTINSTALL) libsqlite.la $(DESTDIR)@libdir@ - $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin - $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin - $(INSTALL) -d $(DESTDIR)$(prefix)/include - $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include -- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; -- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; -+ $(INSTALL) -d $(DESTDIR)@libdir@/pkgconfig; -+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)@libdir@/pkgconfig; - - clean: - rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* -diff -Naurp sqlite-2.8.16.orig/Makefile.linux-gcc sqlite-2.8.16/Makefile.linux-gcc ---- sqlite-2.8.16.orig/Makefile.linux-gcc 2005-02-14 00:22:04.000000000 +0000 -+++ sqlite-2.8.16/Makefile.linux-gcc 2005-02-17 18:21:47.654969648 +0000 -@@ -14,7 +14,7 @@ - #### The toplevel directory of the source tree. This is the directory - # that contains this "Makefile.in" and the "configure.in" script. - # --TOP = ../sqlite -+TOP = @@S@@ - - #### C Compiler and options for use in building executables that - # will run on the platform that is doing the build. -@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0 - #### Specify any extra linker options needed to make the library - # thread safe - # --#THREADLIB = -lpthread --THREADLIB = -+THREADLIB = -lpthread -+#THREADLIB = - - #### Leave MEMORY_DEBUG undefined for maximum speed. Use MEMORY_DEBUG=1 - # to check for memory leaks. Use MEMORY_DEBUG=2 to print a log of all -@@ -64,7 +64,7 @@ EXE = - # will run on the target platform. This is usually the same - # as BCC, unless you are cross-compiling. - # --TCC = gcc -O6 -+TCC = @@CC@@ @@CFLAGS@@ - #TCC = gcc -g -O0 -Wall - #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage - #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6 -@@ -72,23 +72,23 @@ TCC = gcc -O6 - - #### Tools used to build a static library. - # --AR = ar cr -+AR = @@AR@@ cr - #AR = /opt/mingw/bin/i386-mingw32-ar cr --RANLIB = ranlib -+RANLIB = @@RANLIB@@ - #RANLIB = /opt/mingw/bin/i386-mingw32-ranlib - - #### Extra compiler options needed for programs that use the TCL library. - # --#TCL_FLAGS = -+#TCL_FLAGS = @@TCL_FLAGS@@ - #TCL_FLAGS = -DSTATIC_BUILD=1 --TCL_FLAGS = -I/home/drh/tcltk/8.4linux -+#TCL_FLAGS = -I/home/drh/tcltk/8.4linux - #TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1 - #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux - - #### Linker options needed to link against the TCL library. - # --#LIBTCL = -ltcl -lm -ldl --LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl -+LIBTCL = -ltcl -lm -ldl -+#LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl - #LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt - #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc - -@@ -100,7 +100,7 @@ READLINE_FLAGS = -DHAVE_READLINE=1 -I/us - #### Linker options needed by programs using readline() must link against. - # - #LIBREADLINE = --LIBREADLINE = -static -lreadline -ltermcap -+LIBREADLINE = -static -lreadline -lncurses - - #### Should the database engine assume text is coded as UTF-8 or iso8859? - # diff --git a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild deleted file mode 100644 index 2cb8a32b49a1..000000000000 --- a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils alternatives multilib toolchain-funcs - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - -DESCRIPTION="SQLite: an SQL Database Engine in a C Library" -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -IUSE="doc nls tcl" - -DEPEND="doc? ( dev-lang/tcl ) - tcl? ( dev-lang/tcl )" - -RDEPEND="tcl? ( dev-lang/tcl )" - -SOURCE="/usr/bin/lemon" -ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0" - -RESTRICT="!tcl? ( test )" - -src_unpack() { - # test - if has test ${FEATURES}; then - if ! has userpriv ${FEATURES}; then - ewarn "The userpriv feature must be enabled to run tests." - eerror "Testsuite will not be run." - fi - if ! use tcl; then - ewarn "You must enable the tcl use flag if you want to run the test" - ewarn "suite." - eerror "Testsuite will not be run." - fi - fi - - unpack ${A} - cd "${S}" - - use hppa && epatch "${FILESDIR}"/${PN}-2.8.15-alignement-fix.patch - - epatch \ - "${FILESDIR}"/${P}-multilib.patch \ - "${FILESDIR}"/${P}-exit.patch - - epunt_cxx - - if use nls ; then - ENCODING=${ENCODING-"UTF8"} - else - ENCODING="ISO8859" - fi - - sed -i -e "s:@@S@@:${S}:g" \ - -e "s:@@CC@@:$(tc-getCC):g" \ - -e "s:@@CFLAGS@@:${CFLAGS}:g" \ - -e "s:@@AR@@:$(tc-getAR):g" \ - -e "s:@@RANLIB@@:$(tc-getRANLIB):g" \ - -e "s:@@ENCODING@@:${ENCODING}:g" \ - "${S}"/Makefile.linux-gcc - - sed -i \ - -e '/^LTLINK/s:$(TCC):& $(LDFLAGS):' \ - -e '/lemon/s:-o:$(LDFLAGS) &:' \ - "${S}"/{main.mk,Makefile.in} -} - -src_compile() { - local myconf="--enable-incore-db --enable-tempdb-in-ram" - - if ! use tcl ; then - myconf="${myconf} --without-tcl" - fi - - econf ${myconf} \ - --disable-static \ - $(use_enable nls utf8) - - emake all || die "emake all failed" - - if use doc ; then - emake doc || die "emake doc failed" - fi - - if use tcl ; then - cp -P "${FILESDIR}"/maketcllib.sh "${S}" - chmod +x ./maketcllib.sh - ./maketcllib.sh - fi -} - -src_test() { - if use tcl ; then - if has userpriv ${FEATURES} ; then - elog "SQLite 2.x is known to have problems on 64 bit architectures." - elog "If you observe segmentation faults please use 3.x instead!" - - cd "${S}" - emake test || die "some test failed" - fi - fi -} - -src_install () { - dodir /usr/{bin,include,$(get_libdir)} - - make DESTDIR="${D}" install || die "make install failed" - - find "${D}" -name '*.la' -exec rm -f {} + - - newbin lemon lemon-${SLOT} - - dodoc README VERSION - doman sqlite.1 - - use doc && dohtml doc/*.html doc/*.txt doc/*.png - - if use tcl ; then - mkdir "${D}"/usr/$(get_libdir)/tclsqlite${PV} - cp "${S}"/tclsqlite.so "${D}"/usr/$(get_libdir)/tclsqlite${PV}/ - cp "${S}"/pkgIndex.tcl "${D}"/usr/$(get_libdir)/tclsqlite${PV}/ - fi -} diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild new file mode 100644 index 000000000000..7cdd7b7e23ac --- /dev/null +++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils autotools + +DESCRIPTION="A library of routines for managing a database" +HOMEPAGE="http://fallabs.com/tokyocabinet/" +SRC_URI="${HOMEPAGE}${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="bzip2 debug doc examples threads zlib" + +DEPEND="bzip2? ( app-arch/bzip2 ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/fix_rpath.patch" + sed -i \ + -e "/ldconfig/d" \ + -e "/DATADIR/d" Makefile.in || die + # cflags fix - remove -O2 at end of line and -fomit-frame-pointer + sed -i -e 's/-O3"$/"/' configure.in || die + sed -i -e 's/-fomit-frame-pointer//' configure.in || die + # flag only works on x86 derivatives, remove everywhere else + if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi + eautoreconf +} + +src_configure() { + # we use the "fastest" target without the -O3 + econf \ + $(use_enable debug) \ + $(use_enable bzip2 bzip) \ + $(use_enable zlib) \ + $(use_enable threads pthread) \ + --enable-off64 --enable-fastest +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + if use examples; then + insinto /usr/share/${PF}/example + doins example/* || die "Install failed" + fi + + if use doc; then + insinto /usr/share/doc/${PF} + doins -r doc/* || die "Install failed" + fi +} + +src_test() { + emake -j1 check || die "Tests failed" +} |