1 |
commit: 531c146bbc11879bee4645fd6fb3c1b2223fa924 |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 22 23:00:17 2015 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 22 23:00:48 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531c146b |
7 |
|
8 |
dev-perl/DBD-mysql: Fix test logic |
9 |
|
10 |
Package-Manager: portage-2.2.25 |
11 |
|
12 |
dev-perl/DBD-mysql/DBD-mysql-4.20.0-r1.ebuild | 26 -------------------- |
13 |
...ql-4.31.0.ebuild => DBD-mysql-4.31.0-r1.ebuild} | 28 ++++++++-------------- |
14 |
...ql-4.32.0.ebuild => DBD-mysql-4.32.0-r1.ebuild} | 28 ++++++++-------------- |
15 |
dev-perl/DBD-mysql/Manifest | 1 - |
16 |
4 files changed, 20 insertions(+), 63 deletions(-) |
17 |
|
18 |
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.20.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.20.0-r1.ebuild |
19 |
deleted file mode 100644 |
20 |
index ce983cb..0000000 |
21 |
--- a/dev-perl/DBD-mysql/DBD-mysql-4.20.0-r1.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,26 +0,0 @@ |
24 |
-# Copyright 1999-2014 Gentoo Foundation |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Id$ |
27 |
- |
28 |
-EAPI=5 |
29 |
- |
30 |
-MODULE_AUTHOR=CAPTTOFU |
31 |
-MODULE_VERSION=4.020 |
32 |
-inherit eutils perl-module |
33 |
- |
34 |
-DESCRIPTION="The Perl DBD:mysql Module" |
35 |
- |
36 |
-SLOT="0" |
37 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
38 |
-IUSE="embedded" |
39 |
- |
40 |
-RDEPEND="dev-perl/DBI |
41 |
- virtual/mysql[embedded?]" |
42 |
-DEPEND="${RDEPEND}" |
43 |
- |
44 |
-mydoc="ToDo" |
45 |
- |
46 |
-src_configure() { |
47 |
- use embedded && myconf="${myconf} --force-embedded --embedded=mysql_config" |
48 |
- perl-module_src_configure |
49 |
-} |
50 |
|
51 |
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.31.0-r1.ebuild |
52 |
similarity index 64% |
53 |
rename from dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild |
54 |
rename to dev-perl/DBD-mysql/DBD-mysql-4.31.0-r1.ebuild |
55 |
index d9af44c..0e6ef29 100644 |
56 |
--- a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild |
57 |
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.31.0-r1.ebuild |
58 |
@@ -19,12 +19,6 @@ RDEPEND="dev-perl/DBI |
59 |
virtual/mysql[embedded?]" |
60 |
DEPEND="${RDEPEND}" |
61 |
|
62 |
-if use test; then |
63 |
- SRC_TEST="do" |
64 |
-else |
65 |
- SRC_TEST="skip" |
66 |
-fi |
67 |
- |
68 |
src_prepare() { |
69 |
epatch "${FILESDIR}"/${PN}-print_embedded_options.patch |
70 |
} |
71 |
@@ -41,16 +35,14 @@ src_configure() { |
72 |
} |
73 |
|
74 |
src_test() { |
75 |
- if use test; then |
76 |
- einfo |
77 |
- einfo "If tests fail, you have to configure your MySQL instance to create" |
78 |
- einfo "and grant some privileges to the test user." |
79 |
- einfo "You can run the following commands at the MySQL prompt: " |
80 |
- einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';" |
81 |
- einfo "> CREATE DATABASE test;" |
82 |
- einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';" |
83 |
- einfo |
84 |
- sleep 5 |
85 |
- perl-module_src_test |
86 |
- fi |
87 |
+ einfo |
88 |
+ einfo "If tests fail, you have to configure your MySQL instance to create" |
89 |
+ einfo "and grant some privileges to the test user." |
90 |
+ einfo "You can run the following commands at the MySQL prompt: " |
91 |
+ einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';" |
92 |
+ einfo "> CREATE DATABASE test;" |
93 |
+ einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';" |
94 |
+ einfo |
95 |
+ sleep 5 |
96 |
+ perl-module_src_test |
97 |
} |
98 |
|
99 |
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild |
100 |
similarity index 64% |
101 |
rename from dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild |
102 |
rename to dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild |
103 |
index c75335f..1336897 100644 |
104 |
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0.ebuild |
105 |
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild |
106 |
@@ -19,12 +19,6 @@ RDEPEND="dev-perl/DBI |
107 |
virtual/mysql[embedded?]" |
108 |
DEPEND="${RDEPEND}" |
109 |
|
110 |
-if use test; then |
111 |
- SRC_TEST="do" |
112 |
-else |
113 |
- SRC_TEST="skip" |
114 |
-fi |
115 |
- |
116 |
src_prepare() { |
117 |
epatch "${FILESDIR}"/${PN}-print_embedded_options.patch |
118 |
} |
119 |
@@ -41,16 +35,14 @@ src_configure() { |
120 |
} |
121 |
|
122 |
src_test() { |
123 |
- if use test; then |
124 |
- einfo |
125 |
- einfo "If tests fail, you have to configure your MySQL instance to create" |
126 |
- einfo "and grant some privileges to the test user." |
127 |
- einfo "You can run the following commands at the MySQL prompt: " |
128 |
- einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';" |
129 |
- einfo "> CREATE DATABASE test;" |
130 |
- einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';" |
131 |
- einfo |
132 |
- sleep 5 |
133 |
- perl-module_src_test |
134 |
- fi |
135 |
+ einfo |
136 |
+ einfo "If tests fail, you have to configure your MySQL instance to create" |
137 |
+ einfo "and grant some privileges to the test user." |
138 |
+ einfo "You can run the following commands at the MySQL prompt: " |
139 |
+ einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';" |
140 |
+ einfo "> CREATE DATABASE test;" |
141 |
+ einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';" |
142 |
+ einfo |
143 |
+ sleep 5 |
144 |
+ perl-module_src_test |
145 |
} |
146 |
|
147 |
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest |
148 |
index e061014..b188781 100644 |
149 |
--- a/dev-perl/DBD-mysql/Manifest |
150 |
+++ b/dev-perl/DBD-mysql/Manifest |
151 |
@@ -1,3 +1,2 @@ |
152 |
-DIST DBD-mysql-4.020.tar.gz 137736 SHA256 9299f39f3903d3e0afa6440401f88329a057834817684aa699a507dad6a993e7 SHA512 4f1b788ec7490e585b5d31e719dfa1418fee210705781e05f19fee5da386fc87d7c56a348e508448f6d83148367fbc41e1f4673f2ccb52f16a62938b40c1d600 WHIRLPOOL 65bf1f3abec057cf77cb2a96195d0193bfdc1f7b7fde7914dc141fc897f0a1a16931fb0b30a644604f5fe409deeee4d552ba88e22282c83f10a9fc99210d672f |
153 |
DIST DBD-mysql-4.031.tar.gz 145217 SHA256 ae2ee4339fb13429922d76d37e25ce838f98baa011f691a6bbec8513ddb4cfd2 SHA512 b7cdd80e340ecd5d2d9ab59fde73824dc1334afc9ccc3e851e1c5bbf39b95f2a82181d0a78785b8c9543bf4ae6d3115809da186a7778320adeaecdf318876f95 WHIRLPOOL f10f002796c723a4095055e8bbbcb3a585c59f6d2ca1b2937d3a1d5b24d91221ad6d474b403d26fffc34059e13097194933dfca8771a46ce0668485aafc6b782 |
154 |
DIST DBD-mysql-4.032.tar.gz 146476 SHA256 b8e681e719d8f2d1cecb9e8603e13483b09b56508629b079022778e7dfd7bfb6 SHA512 7e7ebaed07f0540079854294cc3ab4a4554fd0f850dd0927b2485cc985c2c9f5b70a650d971027c883cc4d8450020245656f6ff1f792a56d1a2d4b45402d73d0 WHIRLPOOL 79b94c7c85406e0f3a0469c8017594f81f6151eab3059d483c50326222fdb920d12db04a5382dbdc2862cf853e1c421fe0d7acc4a35b131a0f9d39c2d79f5d0b |