* [gentoo-commits] gentoo-x86 commit in eclass: mysql-v2.eclass mysql.eclass
@ 2011-08-19 20:06 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-08-19 20:06 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/08/19 20:06:12
Modified: mysql-v2.eclass mysql.eclass
Log:
[eclass] Added virtual/yacc dependency - fixes bug 376773.
Revision Changes Path
1.5 eclass/mysql-v2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.4&r2=1.5
Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysql-v2.eclass 21 Jul 2011 05:57:22 -0000 1.4
+++ mysql-v2.eclass 19 Aug 2011 20:06:12 -0000 1.5
@@ -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.4 2011/07/21 05:57:22 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.5 2011/08/19 20:06:12 jmbsvicetto Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -239,6 +239,7 @@
>=sys-apps/texinfo-4.7-r1
>=sys-libs/readline-4.1
>=sys-libs/zlib-1.2.3
+ virtual/yacc
"
[[ ${PN} == mariadb ]] \
1.162 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.161&r2=1.162
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- mysql.eclass 8 Jul 2011 11:35:01 -0000 1.161
+++ mysql.eclass 19 Aug 2011 20:06:12 -0000 1.162
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.161 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.162 2011/08/19 20:06:12 jmbsvicetto Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -130,7 +130,8 @@
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
>=sys-libs/readline-4.1
- >=sys-libs/zlib-1.2.3"
+ >=sys-libs/zlib-1.2.3
+ virtual/yacc"
[[ "${PN}" == "mariadb" ]] \
&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql-v2.eclass mysql.eclass
@ 2011-08-21 16:14 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2011-08-21 16:14 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 11/08/21 16:14:56
Modified: mysql-v2.eclass mysql.eclass
Log:
[eclass] Move virtual/yacc dependency so that it's not added to RDEPEND. Fixes bug 379937.
Revision Changes Path
1.6 eclass/mysql-v2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.5&r2=1.6
Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql-v2.eclass 19 Aug 2011 20:06:12 -0000 1.5
+++ mysql-v2.eclass 21 Aug 2011 16:14:56 -0000 1.6
@@ -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.5 2011/08/19 20:06:12 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.6 2011/08/21 16:14:56 jmbsvicetto Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -239,7 +239,6 @@
>=sys-apps/texinfo-4.7-r1
>=sys-libs/readline-4.1
>=sys-libs/zlib-1.2.3
- virtual/yacc
"
[[ ${PN} == mariadb ]] \
@@ -256,6 +255,10 @@
selinux? ( sec-policy/selinux-mysql )
"
+DEPEND="${DEPEND}
+ virtual/yacc
+"
+
DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
# compile-time-only
1.163 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.162&r2=1.163
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- mysql.eclass 19 Aug 2011 20:06:12 -0000 1.162
+++ mysql.eclass 21 Aug 2011 16:14:56 -0000 1.163
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.162 2011/08/19 20:06:12 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.163 2011/08/21 16:14:56 jmbsvicetto Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -130,8 +130,7 @@
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
>=sys-libs/readline-4.1
- >=sys-libs/zlib-1.2.3
- virtual/yacc"
+ >=sys-libs/zlib-1.2.3"
[[ "${PN}" == "mariadb" ]] \
&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
@@ -146,6 +145,9 @@
!minimal? ( dev-db/mysql-init-scripts )
selinux? ( sec-policy/selinux-mysql )"
+DEPEND="${DEPEND}
+ virtual/yacc"
+
if [ "${EAPI:-0}" = "2" ]; then
DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: mysql-v2.eclass mysql.eclass
@ 2011-09-25 12:43 Fabian Groffen (grobian)
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2011-09-25 12:43 UTC (permalink / raw
To: gentoo-commits
grobian 11/09/25 12:43:28
Modified: mysql-v2.eclass mysql.eclass
Log:
mysql: don't depend on mysql-init-script in Prefix
Revision Changes Path
1.8 eclass/mysql-v2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.7&r2=1.8
Index: mysql-v2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysql-v2.eclass 22 Aug 2011 04:46:32 -0000 1.7
+++ mysql-v2.eclass 25 Sep 2011 12:43:28 -0000 1.8
@@ -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.7 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.8 2011/09/25 12:43:28 grobian Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -251,8 +251,9 @@
DEPEND="${DEPEND} !dev-db/${i}"
done
+# prefix: first need to implement something for #196294
RDEPEND="${DEPEND}
- !minimal? ( dev-db/mysql-init-scripts )
+ !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
selinux? ( sec-policy/selinux-mysql )
"
1.166 eclass/mysql.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.165&r2=1.166
Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- mysql.eclass 29 Aug 2011 01:28:10 -0000 1.165
+++ mysql.eclass 25 Sep 2011 12:43:28 -0000 1.166
@@ -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.eclass,v 1.165 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/25 12:43:28 grobian Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -142,8 +142,9 @@
DEPEND="${DEPEND} !dev-db/${i}"
done
+# prefix: first need to implement something for #196294
RDEPEND="${DEPEND}
- !minimal? ( dev-db/mysql-init-scripts )
+ !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
selinux? ( sec-policy/selinux-mysql )"
DEPEND="${DEPEND}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-25 12:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 20:06 [gentoo-commits] gentoo-x86 commit in eclass: mysql-v2.eclass mysql.eclass Jorge Manuel B. S. Vicetto (jmbsvicetto)
-- strict thread matches above, loose matches on Subject: below --
2011-08-21 16:14 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2011-09-25 12:43 Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox