Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: www-apps/horde/, eclass/
Date: Sun, 05 Feb 2012 04:57:39
Message-Id: f49a2dc850df62ecef8899d2d47d8159ded6b05e.jmbsvicetto@gentoo
1 commit: f49a2dc850df62ecef8899d2d47d8159ded6b05e
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 5 05:09:39 2012 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 5 05:09:39 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=f49a2dc8
7
8 [www-apps/horde] Add initial ebuilds for live and snapshot versions.
9 More work on the eclass to support horde packages.
10
11 ---
12 eclass/horde-v2.eclass | 48 +++++++++++++-------
13 www-apps/horde/Manifest | 5 ++-
14 www-apps/horde/horde-4.0.13.ebuild | 10 ++---
15 .../{horde-4.0.13.ebuild => horde-9998.ebuild} | 10 ++---
16 .../{horde-4.0.13.ebuild => horde-9999.ebuild} | 10 ++---
17 5 files changed, 47 insertions(+), 36 deletions(-)
18
19 diff --git a/eclass/horde-v2.eclass b/eclass/horde-v2.eclass
20 index 7631a33..9cb9b5f 100644
21 --- a/eclass/horde-v2.eclass
22 +++ b/eclass/horde-v2.eclass
23 @@ -26,41 +26,55 @@
24 # You set this via the ebuild to whatever branch you wish to grab a
25 # snapshot of. Typically this is 'HEAD' or 'RELENG'.
26
27 +# @ECLASS-VARIABLE: EHORDE_SNAP_PV
28 +# @DESCRIPTION:
29 +# The date of the snapshot to fetch
30 +
31 # @ECLASS-VARIABLE: EHORDE_VCS
32 # @DESCRIPTION:
33 # Track whether this is a live version or not
34
35 -# This eclass requires at least EAPI-2
36 +# This eclass requires at least EAPI-3
37 case ${EAPI:-0} in
38 - 4|3|2) : ;;
39 + 4|3) : ;;
40 *) die "EAPI=${EAPI} is not supported" ;;
41 esac
42
43 -inherit webapp eutils php-pear-r1
44 -
45 -if [[ ${PV} == 9999* ]]; then
46 +if [[ ${PV} == *9999 ]]; then
47 EHORDE_VCS="git-2"
48 - inherit ${EHORDE_VCS}
49 fi
50
51 +inherit webapp eutils php-pear-r1 ${EHORDE_VCS}
52 +
53 +HOMEPAGE="http://www.horde.org/${HORDE_PN}"
54 +LICENSE="LGPL-2"
55 +
56 [[ -z ${HORDE_PN} ]] && HORDE_PN="${PN/horde-}"
57 [[ -z ${HORDE_MAJ} ]] && HORDE_MAJ=""
58 HORDE_P="${HORDE_PN}-${PV}"
59
60 -SRC_URI="http://pear.horde.org/get/${HORDE_P}.tgz"
61 -HOMEPAGE="http://www.horde.org/${HORDE_PN}"
62 -LICENSE="LGPL-2"
63 S=${WORKDIR}/${HORDE_PN}${HORDE_MAJ}-${PV/_/-}
64
65 -if [[ ${PV} == 9998* ]] ; then
66 - EHORDE_SNAP="true"
67 -# EHORDE_SNAP_BRANCH=""
68 - let date=$(date +%s)-24*60*60
69 - EHORDE_SNAP_PV=$(date -s @${date} +%Y-%m-%d)
70 +case ${PV} in
71 + *9999)
72 + EGIT_REPO_URI="git://github.com/horde/${HORDE_PN}"
73 + SRC_URI=""
74 + RESTRICT="mirror"
75 + ;;
76 + *9998)
77 + EHORDE_SNAP="true"
78 + if [[ -z ${EHORDE_SNAP_PV} ]]; then
79 + let date=$(date +%s)-24*60*60
80 + EHORDE_SNAP_PV=$(date -d @${date} +%Y-%m-%d)
81 + fi
82
83 - SRC_URI="http://ftp.horde.org/pub/snaps/${SNAP_PV}/${HORDE_PN}-git.tar.gz"
84 - S=${WORKDIR}/${HORDE_PN}
85 -fi
86 + SRC_URI="http://ftp.horde.org/pub/snaps/${EHORDE_SNAP_PV}/${HORDE_PN}-git.tar.gz"
87 + S=${WORKDIR}/${HORDE_PN}
88 + ;;
89 + *)
90 + SRC_URI="http://pear.horde.org/get/${HORDE_P}.tgz"
91 + ;;
92 +esac
93
94 IUSE="vhosts"
95
96
97 diff --git a/www-apps/horde/Manifest b/www-apps/horde/Manifest
98 index b483f1e..c70645e 100644
99 --- a/www-apps/horde/Manifest
100 +++ b/www-apps/horde/Manifest
101 @@ -1,3 +1,6 @@
102 DIST horde-4.0.13.tgz 3933774 RMD160 9a7a812c7653009098f25038a5cf9487ec0b58ba SHA1 49c2e7a4088d258d42854f6177a5173c38f32343 SHA256 826cf64dd5d1e13774e308e7d8abe453647771be5787a3eee77f6e24817589fd
103 -EBUILD horde-4.0.13.ebuild 882 RMD160 19b2c8645eda7df1166346778f809a7861621ca6 SHA1 2bd8bef9001ef1e9f77bc618db8bfc1833c1204c SHA256 84578892d1931f9e4c21c16da3dbb65179b2d773dfbd83f60ed850c8fb20ac39
104 +DIST horde-git.tar.gz 3909669 RMD160 890d6a3633e4fd72b0fccfafebaa4022fc856f41 SHA1 54496288e31ec7da3ee2e52dfc57955d792086a3 SHA256 c2a279f6f170fd44b4c02ba4674d7ace88eda45e2f1094eb8d689e343f196973
105 +EBUILD horde-4.0.13.ebuild 768 RMD160 205d3ea8ead310547a6027f4d4204968f1a1e91b SHA1 cbd92059bd78d18057bab792c6a690e60d98ed59 SHA256 0d033728a6631e8b02aaf80affe00abbf6239ef121a0e4d6594896edf16fd4f3
106 +EBUILD horde-9998.ebuild 768 RMD160 205d3ea8ead310547a6027f4d4204968f1a1e91b SHA1 cbd92059bd78d18057bab792c6a690e60d98ed59 SHA256 0d033728a6631e8b02aaf80affe00abbf6239ef121a0e4d6594896edf16fd4f3
107 +EBUILD horde-9999.ebuild 768 RMD160 205d3ea8ead310547a6027f4d4204968f1a1e91b SHA1 cbd92059bd78d18057bab792c6a690e60d98ed59 SHA256 0d033728a6631e8b02aaf80affe00abbf6239ef121a0e4d6594896edf16fd4f3
108 MISC metadata.xml 414 RMD160 61e5d45c11bb069bed25c203cb9134e054049710 SHA1 b286c2b943e7ee16fb6db20e2177e176b62ec550 SHA256 7b48c03004cdadcf8c8f53510079ff0254b12f9c7f30c2d0221f0f1d958ce613
109
110 diff --git a/www-apps/horde/horde-4.0.13.ebuild b/www-apps/horde/horde-4.0.13.ebuild
111 index 7afbd41..27ea928 100644
112 --- a/www-apps/horde/horde-4.0.13.ebuild
113 +++ b/www-apps/horde/horde-4.0.13.ebuild
114 @@ -1,15 +1,13 @@
115 # Copyright 1999-2010 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.3.9.ebuild,v 1.7 2010/10/19 02:16:58 jer Exp $
118 +# $Header: $
119
120 EAPI=4
121
122 inherit horde-v2
123
124 DESCRIPTION="Horde Application Framework"
125 -HOMEPAGE="http://www.horde.org/"
126 -
127 -KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
128 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
129 IUSE="mysql"
130
131 DEPEND=""
132 @@ -22,13 +20,13 @@ RDEPEND="dev-lang/php[session,xml]
133 mysql? ( dev-php/PEAR-DB )"
134
135 src_unpack() {
136 - horde_src_unpack
137 + horde-v2_src_unpack
138 cd "${S}"
139 chmod 600 scripts/sql/create.*.sql #137510
140 }
141
142 pkg_postinst() {
143 - horde_pkg_postinst
144 + horde-v2_pkg_postinst
145 elog "Horde requires PHP to have:"
146 elog " ==> 'short_open_tag enabled = On'"
147 elog " ==> 'magic_quotes_runtime set = Off'"
148
149 diff --git a/www-apps/horde/horde-4.0.13.ebuild b/www-apps/horde/horde-9998.ebuild
150 similarity index 74%
151 copy from www-apps/horde/horde-4.0.13.ebuild
152 copy to www-apps/horde/horde-9998.ebuild
153 index 7afbd41..27ea928 100644
154 --- a/www-apps/horde/horde-4.0.13.ebuild
155 +++ b/www-apps/horde/horde-9998.ebuild
156 @@ -1,15 +1,13 @@
157 # Copyright 1999-2010 Gentoo Foundation
158 # Distributed under the terms of the GNU General Public License v2
159 -# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.3.9.ebuild,v 1.7 2010/10/19 02:16:58 jer Exp $
160 +# $Header: $
161
162 EAPI=4
163
164 inherit horde-v2
165
166 DESCRIPTION="Horde Application Framework"
167 -HOMEPAGE="http://www.horde.org/"
168 -
169 -KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
170 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
171 IUSE="mysql"
172
173 DEPEND=""
174 @@ -22,13 +20,13 @@ RDEPEND="dev-lang/php[session,xml]
175 mysql? ( dev-php/PEAR-DB )"
176
177 src_unpack() {
178 - horde_src_unpack
179 + horde-v2_src_unpack
180 cd "${S}"
181 chmod 600 scripts/sql/create.*.sql #137510
182 }
183
184 pkg_postinst() {
185 - horde_pkg_postinst
186 + horde-v2_pkg_postinst
187 elog "Horde requires PHP to have:"
188 elog " ==> 'short_open_tag enabled = On'"
189 elog " ==> 'magic_quotes_runtime set = Off'"
190
191 diff --git a/www-apps/horde/horde-4.0.13.ebuild b/www-apps/horde/horde-9999.ebuild
192 similarity index 74%
193 copy from www-apps/horde/horde-4.0.13.ebuild
194 copy to www-apps/horde/horde-9999.ebuild
195 index 7afbd41..27ea928 100644
196 --- a/www-apps/horde/horde-4.0.13.ebuild
197 +++ b/www-apps/horde/horde-9999.ebuild
198 @@ -1,15 +1,13 @@
199 # Copyright 1999-2010 Gentoo Foundation
200 # Distributed under the terms of the GNU General Public License v2
201 -# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.3.9.ebuild,v 1.7 2010/10/19 02:16:58 jer Exp $
202 +# $Header: $
203
204 EAPI=4
205
206 inherit horde-v2
207
208 DESCRIPTION="Horde Application Framework"
209 -HOMEPAGE="http://www.horde.org/"
210 -
211 -KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
212 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
213 IUSE="mysql"
214
215 DEPEND=""
216 @@ -22,13 +20,13 @@ RDEPEND="dev-lang/php[session,xml]
217 mysql? ( dev-php/PEAR-DB )"
218
219 src_unpack() {
220 - horde_src_unpack
221 + horde-v2_src_unpack
222 cd "${S}"
223 chmod 600 scripts/sql/create.*.sql #137510
224 }
225
226 pkg_postinst() {
227 - horde_pkg_postinst
228 + horde-v2_pkg_postinst
229 elog "Horde requires PHP to have:"
230 elog " ==> 'short_open_tag enabled = On'"
231 elog " ==> 'magic_quotes_runtime set = Off'"