stop using $IMAGE

Package-Manager: portage-2.1.2.2

diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest
index f43fc2b53ef44248c9eb6ca8f1e4d28533610839..8a3b2fab8a2d730709da09a93e7ac0ba6becc1e6 100644 (file)
--- a/www-apps/open-xchange/Manifest
+++ b/www-apps/open-xchange/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 88_mod_jk.ox.conf 1228 RMD160 ac45be1d0824ab54728d5a304b59d5824297c974 SHA1 33e76d4dd9c2e5c719dc51e00248ed399cbac566 SHA256 f62c842769c9675968e9d1f3d6469315cf18b1802049e57d1dbfb39f66725a9a
 MD5 cfa72c4f5e62b779052acf1cd629234b files/88_mod_jk.ox.conf 1228
 RMD160 ac45be1d0824ab54728d5a304b59d5824297c974 files/88_mod_jk.ox.conf 1228
@@ -34,10 +37,10 @@ DIST Crystal_OX_Theme.tgz 53788 RMD160 24d8b0501783f23b16f1a0b20800fcb59da7a464
 DIST Crystal_OX_Theme_Webmail.tar.bz2 9442 RMD160 2dd6c3b90d56219dfcab5ae48dcce635ed9e7311 SHA1 b4ec6731bebf4e92fe32c819e0b7a57120ca6ca0 SHA256 06b4d834bbd2a352468997671077f3630f60ff901651a865419e0156ac0d7e77
 DIST open-xchange-0.8.2.tar.bz2 1970970 RMD160 bea788b8264a8b882229612d6b284586c7250659 SHA1 e7f252bf810dd52c3018d23524bc2c49e10fa41e SHA256 576ac912d5fdfc98a84fe69abc7aa2b9f7d1ca24e7b40ff8e71b6642b131ef3d
 DIST smartsieve-ox-1.03.tar.gz 102899 RMD160 aaf58bc7549db4cad719f120635269fdf3585317 SHA1 c327a425a2638cbcfe959d3d6dc6a8fddae3436a SHA256 77a55ebe3c4e5f27e564d75f5cd80742c3bdb2e6e920d833de26eadec0fe6494
-EBUILD open-xchange-0.8.2.ebuild 24952 RMD160 8bb28c1f74f12556bfe763626a3ecfc083dd8432 SHA1 97f89a3351a9904adbef8d8e314d57596b7bb6b3 SHA256 3991fd966e3612fd2cb9b0320f965485beffca4eb91ed9bf1141e5495042e1bb
-MD5 1fefc62861f72cde1ad549238ea55c85 open-xchange-0.8.2.ebuild 24952
-RMD160 8bb28c1f74f12556bfe763626a3ecfc083dd8432 open-xchange-0.8.2.ebuild 24952
-SHA256 3991fd966e3612fd2cb9b0320f965485beffca4eb91ed9bf1141e5495042e1bb open-xchange-0.8.2.ebuild 24952
+EBUILD open-xchange-0.8.2.ebuild 24946 RMD160 6e0a95345bfcdad147a69094da1a40162e9af380 SHA1 cdc1f5aa9fb8ef68e5e3b8a70d9f49fe24be2f94 SHA256 c4ea2a2491560526fe6996683c5c39551fee38799495bd36fdbb969dacad7e37
+MD5 0598372101f49e877d67443dc19040d1 open-xchange-0.8.2.ebuild 24946
+RMD160 6e0a95345bfcdad147a69094da1a40162e9af380 open-xchange-0.8.2.ebuild 24946
+SHA256 c4ea2a2491560526fe6996683c5c39551fee38799495bd36fdbb969dacad7e37 open-xchange-0.8.2.ebuild 24946
 MISC ChangeLog 3549 RMD160 a5e0ccfcef1bd00969a146a7ed3c7338f30d4505 SHA1 da5914f7c41b31527cf0d3713c5bfe76f00310ff SHA256 5a64865a7e12d86a1b9ff1a3c66ea1290c53ee2d013d1d14fe0189aa38d4fa27
 MD5 a50f191edc69808c0159dfeb528f57e2 ChangeLog 3549
 RMD160 a5e0ccfcef1bd00969a146a7ed3c7338f30d4505 ChangeLog 3549
@@ -49,3 +52,10 @@ SHA256 cd689fe179b5312728a09b08357517439bcfb056b7ca2a8056ad12fbd2a8ec39 metadata
 MD5 efcf8c2cd32c6b5540ccf05b2d7bf93f files/digest-open-xchange-0.8.2 1027
 RMD160 d845e48cd305140770ec038e151162f7442b3e45 files/digest-open-xchange-0.8.2 1027
 SHA256 510b4d70c3fc18609947acf251f06b1f3afcfa9bd12fb483b81132f732ea7e5f files/digest-open-xchange-0.8.2 1027
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF8sPJ8bi6rjpTunYRAqDSAKCNv8o/1rv2+vp1y9NEFJV8WfQFKwCfbw/l
+Zit6HnqYneGJAD7S0ixkpMg=
+=WdGP
+-----END PGP SIGNATURE-----

diff --git a/www-apps/open-xchange/open-xchange-0.8.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.2.ebuild
index 1e9949dd6c0cfd1a766758198b12413bb8f0fdfc..1f189414a4802102cf4561a71c09ef74138a43ec 100644 (file)
--- a/www-apps/open-xchange/open-xchange-0.8.2.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.2.ebuild,v 1.4 2006/11/23 17:21:52 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.2.ebuild,v 1.5 2007/03/10 14:42:07 vapier Exp $
 
 inherit eutils autotools webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -11,7 +11,6 @@ MY_PV="$(get_version_component_range 1-3)"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A Collaboration and Integration Server Environment"
 HOMEPAGE="http://www.open-xchange.org/"
-
 SRC_URI="http://www.mikefetherston.ca/OX/Crystal_OX_Theme.tgz
        http://dev.gentoo.org/~azarah/OX/Crystal_OX_Theme_Webmail.tar.bz2
        sieve? ( http://www.pro-nets.de/user/mhoffmann/smartsieve-ox-${SIEVE_VER}.tar.gz )"
@@ -23,11 +22,10 @@ fi
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-RESTRICT="primaryuri"
-
 IUSE="ssl doc webdav mysql postgres sieve jikes"
+RESTRICT="primaryuri"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 OX_DB="postgres"
 if use mysql && ! use postgres ; then
@@ -65,7 +63,7 @@ RDEPEND="${RDEPEND}
 #parameter $1 == 1 for config part or == 0 for preinst
 ox_setup() {
        local config=$1
-       local WORKINGBASE="${IMAGE}" #is used during pkg_*
+       local WORKINGBASE="${D}" #is used during pkg_*
        if [[ $config -eq 1 ]]; then
                #executed from in pkg_config
                WORKINGBASE="${ROOT}"