Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/
Date: Tue, 04 May 2021 16:05:22
Message-Id: 1620143772.2b64abf82a29fef9dfe1f2a5e9c5ad4d099bb4ce.asturm@gentoo
1 commit: 2b64abf82a29fef9dfe1f2a5e9c5ad4d099bb4ce
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 4 15:15:54 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 15:56:12 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b64abf8
7
8 media-sound/amarok: Unclutter pkg_postinst() message
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-sound/amarok/amarok-9999.ebuild | 36 ++++++++++++++++++-----------------
14 1 file changed, 19 insertions(+), 17 deletions(-)
15
16 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
17 index 397a86c538..40c1222c75 100644
18 --- a/media-sound/amarok/amarok-9999.ebuild
19 +++ b/media-sound/amarok/amarok-9999.ebuild
20 @@ -111,25 +111,27 @@ pkg_postinst() {
21 echo "${1} ($(has_version ${1} || echo "not ")installed)"
22 }
23
24 + db_name() {
25 + use mariadb && echo "MariaDB" || echo "MySQL"
26 + }
27 +
28 optfeature "Audio CD support" kde-apps/audiocd-kio
29
30 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
31 - elog "You'll have to configure amarok to use an external database server:"
32 - if use mariadb ; then
33 - elog " $(pkg_is_installed dev-db/mariadb)"
34 - elog " For preliminary configuration of MariaDB Server please refer to"
35 - elog " https://wiki.gentoo.org/wiki/MariaDB#Configuration"
36 - else
37 - elog " $(pkg_is_installed dev-db/mysql)"
38 - elog " For preliminary configuration of MySQL Server please refer to"
39 - elog " https://wiki.gentoo.org/wiki/MySQL#Configuration"
40 - fi
41 - elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how"
42 - elog "to configure the external database and migrate your data from the embedded database."
43 - elog "To create external amarok database with default user/password please:"
44 - elog " 1. Make sure that MySQL or MariaDB is installed and configured (see above)"
45 - elog " 2. Ensure that 'mysql' service is started and then run command 'emerge --config amarok'"
46 - elog " 3. On 'Configure Amarok - Database' menu page check 'Use external MySQL database' and press OK"
47 + if [[ -z ${REPLACING_VERSIONS} ]]; then
48 + elog "You must configure ${PN} to use an external database server."
49 + elog " 1. Make sure either MySQL or MariaDB is installed and configured"
50 + elog " Checking local system:"
51 + elog " $(pkg_is_installed dev-db/mariadb)"
52 + elog " $(pkg_is_installed dev-db/mysql)"
53 + elog " For preliminary configuration of $(db_name) Server refer to"
54 + elog " https://wiki.gentoo.org/wiki/$(db_name)#Configuration"
55 + elog " 2. Ensure 'mysql' service is started and run:"
56 + elog " # emerge --config amarok"
57 + elog " 3. Run ${PN} and go to 'Configure Amarok - Database' menu page"
58 + elog " Check 'Use external MySQL database' and press OK"
59 + elog
60 + elog "For more information please read:"
61 + elog " https://community.kde.org/Amarok/Community/MySQL"
62 fi
63 }