Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/roundcube/
Date: Thu, 31 Dec 2020 14:21:16
Message-Id: 1609424465.1a551cea0052b43c6ce7ebff00dcde50655feb45.candrews@gentoo
1 commit: 1a551cea0052b43c6ce7ebff00dcde50655feb45
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 28 18:27:09 2020 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 31 14:21:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a551cea
7
8 mail-client/roundcube: Add -9999 live ebuild
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
12 Closes: https://github.com/gentoo/gentoo/pull/18852
13 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
14
15 mail-client/roundcube/roundcube-1.4.9.ebuild | 27 +++++++++++++++++++---
16 ...oundcube-1.4.9.ebuild => roundcube-9999.ebuild} | 27 +++++++++++++++++++---
17 2 files changed, 48 insertions(+), 6 deletions(-)
18
19 diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-1.4.9.ebuild
20 index e3ccf0af49a..0b5033a74a7 100644
21 --- a/mail-client/roundcube/roundcube-1.4.9.ebuild
22 +++ b/mail-client/roundcube/roundcube-1.4.9.ebuild
23 @@ -11,12 +11,10 @@ MY_P=${MY_PN}-${MY_PV}
24
25 DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
26 HOMEPAGE="https://roundcube.net"
27 -SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
28
29 # roundcube is GPL-licensed, the rest of the licenses here are
30 # for bundled PEAR components, googiespell and utf8.class.php
31 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
32 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
33
34 IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
35 REQUIRED_USE="|| ( mysql postgres sqlite )"
36 @@ -43,7 +41,30 @@ RDEPEND="
37 spell? ( dev-lang/php[curl,spell] )
38 "
39
40 -S="${WORKDIR}/${MY_P}"
41 +if [[ ${PV} == *9999 ]] ; then
42 + inherit git-r3
43 + EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
44 + EGIT_BRANCH="master"
45 + DEPEND="${DEPEND}
46 + dev-php/composer"
47 +else
48 + SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
49 + S="${WORKDIR}/${MY_P}"
50 + KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
51 +fi
52 +
53 +src_unpack() {
54 + if [[ "${PV}" == *9999* ]]; then
55 + git-r3_src_unpack
56 + pushd "${S}" > /dev/null || die
57 + mv composer.json-dist composer.json || die
58 + composer install --no-dev || die
59 + ./bin/install-jsdeps.sh || die
60 + popd > /dev/null || die
61 + else
62 + default
63 + fi
64 +}
65
66 src_install() {
67 webapp_src_preinst
68
69 diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
70 similarity index 72%
71 copy from mail-client/roundcube/roundcube-1.4.9.ebuild
72 copy to mail-client/roundcube/roundcube-9999.ebuild
73 index e3ccf0af49a..0b5033a74a7 100644
74 --- a/mail-client/roundcube/roundcube-1.4.9.ebuild
75 +++ b/mail-client/roundcube/roundcube-9999.ebuild
76 @@ -11,12 +11,10 @@ MY_P=${MY_PN}-${MY_PV}
77
78 DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
79 HOMEPAGE="https://roundcube.net"
80 -SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
81
82 # roundcube is GPL-licensed, the rest of the licenses here are
83 # for bundled PEAR components, googiespell and utf8.class.php
84 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
85 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
86
87 IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
88 REQUIRED_USE="|| ( mysql postgres sqlite )"
89 @@ -43,7 +41,30 @@ RDEPEND="
90 spell? ( dev-lang/php[curl,spell] )
91 "
92
93 -S="${WORKDIR}/${MY_P}"
94 +if [[ ${PV} == *9999 ]] ; then
95 + inherit git-r3
96 + EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
97 + EGIT_BRANCH="master"
98 + DEPEND="${DEPEND}
99 + dev-php/composer"
100 +else
101 + SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
102 + S="${WORKDIR}/${MY_P}"
103 + KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
104 +fi
105 +
106 +src_unpack() {
107 + if [[ "${PV}" == *9999* ]]; then
108 + git-r3_src_unpack
109 + pushd "${S}" > /dev/null || die
110 + mv composer.json-dist composer.json || die
111 + composer install --no-dev || die
112 + ./bin/install-jsdeps.sh || die
113 + popd > /dev/null || die
114 + else
115 + default
116 + fi
117 +}
118
119 src_install() {
120 webapp_src_preinst