dev-db/mysql-init-scripts: Version bump wrt bug 571508

Package-Manager: portage-2.3.0

diff --git a/dev-db/mysql-init-scripts/files/init.d-2.0 b/dev-db/mysql-init-scripts/files/init.d-2.0
index ec4f996db1e9872082c1f2fab13b27a58a94e77f..19a4b927dc48f5d6b1e5f4d7b35808d842002c4b 100644 (file)
--- a/dev-db/mysql-init-scripts/files/init.d-2.0
+++ b/dev-db/mysql-init-scripts/files/init.d-2.0
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,7 +72,7 @@ start() {
        if [ ! -d "${datadir}"/mysql ] ; then
                # find which package is installed to report an error
                local EROOT=$(portageq envvar EROOT)
-               local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
+               local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
                if [ -z ${DBPKG_P} ] ; then
                        eerror "You don't appear to have a server package installed yet."
                else

diff --git a/dev-db/mysql-init-scripts/files/init.d-s6 b/dev-db/mysql-init-scripts/files/init.d-s6
index 3c6feeca20575bae5c6ff39f2d076bdc42c695fa..573ffbc0cf565469ea67dfc3f844d473cb11c09f 100644 (file)
--- a/dev-db/mysql-init-scripts/files/init.d-s6
+++ b/dev-db/mysql-init-scripts/files/init.d-s6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,7 +63,7 @@ start_pre() {
        if [ ! -d "${datadir}"/mysql ] ; then
                # find which package is installed to report an error
                local EROOT=$(portageq envvar EROOT)
-               local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
+               local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
                if [ -z ${DBPKG_P} ] ; then
                        eerror "You don't appear to have a server package installed yet."
                else

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild
similarity index 100%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild