public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-v2.eclass
@ 2011-11-17 16:04 Tiziano Mueller (dev-zero)
  0 siblings, 0 replies; 3+ messages in thread
From: Tiziano Mueller (dev-zero) @ 2011-11-17 16:04 UTC (permalink / raw
  To: gentoo-commits

dev-zero    11/11/17 16:04:02

  Modified:             ChangeLog mysql-v2.eclass
  Log:
  Fixed misplaced quotes in mysql-v2 eclass causing 'emerge --config mysql' to fail (bug #388673).

Revision  Changes    Path
1.15                 eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	15 Nov 2011 09:02:15 -0000	1.14
+++ ChangeLog	17 Nov 2011 16:04:02 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.14 2011/11/15 09:02:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.15 2011/11/17 16:04:02 dev-zero Exp $
+
+  17 Nov 2011; Tiziano Müller <dev-zero@gentoo.org> mysql-v2.eclass:
+  Fixed misplaced quotes in mysql-v2 eclass causing 'emerge --config mysql' to
+  fail (bug #388673).
 
   15 Nov 2011; Vlastimil Babka <caster@gentoo.org> java-vm-2.eclass:
   Drop the repetitive elogs about revdep rebuild control files for binary



1.10                 eclass/mysql-v2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.9&r2=1.10

Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mysql-v2.eclass	7 Oct 2011 04:30:18 -0000	1.9
+++ mysql-v2.eclass	17 Nov 2011 16:04:02 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.9 2011/10/07 04:30:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.10 2011/11/17 16:04:02 dev-zero Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -640,7 +640,7 @@
 	help_tables="${TMPDIR}/fill_help_tables.sql"
 
 	pushd "${TMPDIR}" &>/dev/null
-	"${ROOT}/usr/bin/mysql_install_db --basedir=/usr" >"${TMPDIR}"/mysql_install_db.log 2>&1
+	"${ROOT}/usr/bin/mysql_install_db" --basedir=/usr >"${TMPDIR}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
 		die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-v2.eclass
@ 2014-06-04  1:17 Brian Evans (grknight)
  0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans (grknight) @ 2014-06-04  1:17 UTC (permalink / raw
  To: gentoo-commits

grknight    14/06/04 01:17:11

  Modified:             ChangeLog mysql-v2.eclass
  Log:
  Sync mysql-v2.eclass from the mysql overlay

Revision  Changes    Path
1.1281               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1281&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1281&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1280&r2=1.1281

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -r1.1280 -r1.1281
--- ChangeLog	1 Jun 2014 23:00:45 -0000	1.1280
+++ ChangeLog	4 Jun 2014 01:17:11 -0000	1.1281
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1280 2014/06/01 23:00:45 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1281 2014/06/04 01:17:11 grknight Exp $
+
+  03 Jun 2014; Brian Evans <grknight@gentoo.org> mysql-v2.eclass:
+  Sync mysql-v2 eclass from the mysql overlay.
 
   01 Jun 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass:
   If we keep the flag list sorted by version there's no need for this function



1.30                 eclass/mysql-v2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.29&r2=1.30

Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mysql-v2.eclass	15 May 2014 03:18:47 -0000	1.29
+++ mysql-v2.eclass	4 Jun 2014 01:17:11 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.29 2014/05/15 03:18:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04 01:17:11 grknight Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -264,7 +264,6 @@
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
 	mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
-	mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
 	mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )"
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )"
@@ -802,7 +801,7 @@
 	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
 	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
 	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}'"
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'"
 	einfo "Command: $cmd"
 	eval $cmd \
 		>"${TMPDIR}"/mysql_install_db.log 2>&1
@@ -831,12 +830,13 @@
 		--user=mysql \
 		--log-warnings=0 \
 		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
+		--datadir=${EROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--default-storage-engine=MyISAM \
 		--socket=${socket} \
-		--pid-file=${pidfile}"
+		--pid-file=${pidfile}
+		--tmpdir=${EROOT}/${MYSQL_TMPDIR}"
 	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
 	einfo "Command ${mysqld}"





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-v2.eclass
@ 2015-02-16 14:37 Brian Evans (grknight)
  0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans (grknight) @ 2015-02-16 14:37 UTC (permalink / raw
  To: gentoo-commits

grknight    15/02/16 14:37:50

  Modified:             ChangeLog mysql-v2.eclass
  Log:
  Silence repoman warnings by providing slots on openssl and readline

Revision  Changes    Path
1.1536               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1536&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1536&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1535&r2=1.1536

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -r1.1535 -r1.1536
--- ChangeLog	13 Feb 2015 01:32:01 -0000	1.1535
+++ ChangeLog	16 Feb 2015 14:37:50 -0000	1.1536
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1535 2015/02/13 01:32:01 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1536 2015/02/16 14:37:50 grknight Exp $
+
+  16 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-v2.eclass:
+  Silence repoman warnings by providing slots on openssl and readline
 
   13 Feb 2015; Mike Pagano <mpagano@gentoo.org> ChangeLog:
   Handle cpu optimization patch for different gcc versions



1.36                 eclass/mysql-v2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.35&r2=1.36

Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mysql-v2.eclass	10 Aug 2014 05:47:24 -0000	1.35
+++ mysql-v2.eclass	16 Feb 2015 14:37:50 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.35 2014/08/10 05:47:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.36 2015/02/16 14:37:50 grknight Exp $
 
 # @ECLASS: mysql-v2.eclass
 # @MAINTAINER:
@@ -266,7 +266,7 @@
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
 DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d )
+	ssl? ( >=dev-libs/openssl-0.9.6d:0 )
 	kernel_linux? ( sys-process/procps )
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
@@ -284,9 +284,9 @@
 	DEPEND="${DEPEND} dev-libs/libedit"
 else
 	if mysql_version_is_at_least "5.5" ; then
-		DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )"
+		DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0 )"
 	else
-		DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+		DEPEND="${DEPEND} >=sys-libs/readline-4.1:0"
 	fi
 fi
 





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-02-16 14:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 16:04 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-v2.eclass Tiziano Mueller (dev-zero)
  -- strict thread matches above, loose matches on Subject: below --
2014-06-04  1:17 Brian Evans (grknight)
2015-02-16 14:37 Brian Evans (grknight)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox