PHP in the portage tree now supports kolab.

svn path=/overlay/; revision=2821

6 files changed, 19 insertions, 33 deletions

diff --git a/net-mail/kolab-resource-handlers/ChangeLog b/net-mail/kolab-resource-handlers/ChangeLog
index 76cbe59..f6e1767 100644
--- a/net-mail/kolab-resource-handlers/ChangeLog
+++ b/net-mail/kolab-resource-handlers/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 May 2008; wrobel@gentoo.org kolab-resource-handlers-2.1.ebuild:
+  PHP in the portage tree now supports kolab.
+
   22 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org>
   kolab-resource-handlers-2.1.ebuild:
   Require the patched php version.
diff --git a/net-mail/kolab-resource-handlers/Manifest b/net-mail/kolab-resource-handlers/Manifest
index 00b18bc..19327ab 100644
--- a/net-mail/kolab-resource-handlers/Manifest
+++ b/net-mail/kolab-resource-handlers/Manifest
@@ -1,36 +1,9 @@
 AUX kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.class.php.in-2.1.patch 3578 RMD160 dff9cf98ef9c36de91b902cec0f3ab2932c397a2 SHA1 10288708df0b912611462305e8b6ef44dcbb3601 SHA256 25449abf5dacdd732b7d987bfcfb2db3de5db1e137701d97998bdf52d9b08993
-MD5 f3f3a017242563542b33cae61ea03de7 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.class.php.in-2.1.patch 3578
-RMD160 dff9cf98ef9c36de91b902cec0f3ab2932c397a2 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.class.php.in-2.1.patch 3578
-SHA256 25449abf5dacdd732b7d987bfcfb2db3de5db1e137701d97998bdf52d9b08993 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.class.php.in-2.1.patch 3578
 AUX kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.php.in-2.1.patch 1031 RMD160 1294beb7501467a62f348d3e9d139c2210eddc11 SHA1 383aac750d9614c65733daa7baae0d97d327c71c SHA256 4a49a8dbc0ec9200dd4db919d10460a4e8a27d58296aad78b90e13829694b226
-MD5 ab0d6a5da40e692e3b8fe293da9846d7 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.php.in-2.1.patch 1031
-RMD160 1294beb7501467a62f348d3e9d139c2210eddc11 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.php.in-2.1.patch 1031
-SHA256 4a49a8dbc0ec9200dd4db919d10460a4e8a27d58296aad78b90e13829694b226 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_freebusy.php.in-2.1.patch 1031
 AUX kolab-resource-handlers_kolab-resource-handlers_freebusy_pfb.php.in-2.1.patch 1053 RMD160 0569fa1da612692fc33176183976d92cd0dd27e4 SHA1 c904c64a18e69426f6f2c35fd058d79667cb0bed SHA256 5de5b6685c83788ff4884fc81227f93fae215a580febf49626701f0260725c62
-MD5 37ca267b12bb172cec6e2f95689d2c42 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_pfb.php.in-2.1.patch 1053
-RMD160 0569fa1da612692fc33176183976d92cd0dd27e4 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_pfb.php.in-2.1.patch 1053
-SHA256 5de5b6685c83788ff4884fc81227f93fae215a580febf49626701f0260725c62 files/kolab-resource-handlers_kolab-resource-handlers_freebusy_pfb.php.in-2.1.patch 1053
 AUX kolab-resource-handlers_kolab-resource-handlers_resmgr_olhacks.php.in-2.1.patch 539 RMD160 5ade64d8da7656f477656ca91d8f88f0bb70737f SHA1 436832ff8c302693cd5481b7208b976e53365a5a SHA256 defbc7106927ed068de488c42865cf23d6df442f0e8284c48de9048dd197ba60
-MD5 db08235df834395a4a68ba4ae9751628 files/kolab-resource-handlers_kolab-resource-handlers_resmgr_olhacks.php.in-2.1.patch 539
-RMD160 5ade64d8da7656f477656ca91d8f88f0bb70737f files/kolab-resource-handlers_kolab-resource-handlers_resmgr_olhacks.php.in-2.1.patch 539
-SHA256 defbc7106927ed068de488c42865cf23d6df442f0e8284c48de9048dd197ba60 files/kolab-resource-handlers_kolab-resource-handlers_resmgr_olhacks.php.in-2.1.patch 539
 AUX kolab-resource-handlers_kolab-resource-handlers_resmgr_resmgr.php.in-2.1.patch 2729 RMD160 2d49c478b5845eb9e4234dfd97445022c3dc2fd1 SHA1 c33885a46b6af42e5918039f49cf49ffba41aff1 SHA256 1ac77701446a52d7ce006d5a9806a73be3639aac849735713cdf0d353bddb6d5
-MD5 d205ab3a04e5004a16df6dbf529a3f94 files/kolab-resource-handlers_kolab-resource-handlers_resmgr_resmgr.php.in-2.1.patch 2729
-RMD160 2d49c478b5845eb9e4234dfd97445022c3dc2fd1 files/kolab-resource-handlers_kolab-resource-handlers_resmgr_resmgr.php.in-2.1.patch 2729
-SHA256 1ac77701446a52d7ce006d5a9806a73be3639aac849735713cdf0d353bddb6d5 files/kolab-resource-handlers_kolab-resource-handlers_resmgr_resmgr.php.in-2.1.patch 2729
 DIST kolab-resource-handlers-2.1-gentoo-20070510.tar.bz2 92597 RMD160 342c63bc7192dbf9a3a613ff90bf542eef9b3310 SHA1 e30092aee978bb062ea3b5a6e2fc68e8bfd497ce SHA256 6638d31b0d93c4b2c7062fc7a7008fb4cee07394a00f61f7c90ebe438db85d91
-EBUILD kolab-resource-handlers-2.1.ebuild 1074 RMD160 24d50d815e41310583c4dfbe08fded4725560503 SHA1 e74254c97c14057103cdd7021265abcba5cbe321 SHA256 8762b6315e3dc845e77f0615f00f1a14f1e633563f2ed1696468e60ecbc0029a
-MD5 c043cb07c92e303ff1e2fc36c9d48ce0 kolab-resource-handlers-2.1.ebuild 1074
-RMD160 24d50d815e41310583c4dfbe08fded4725560503 kolab-resource-handlers-2.1.ebuild 1074
-SHA256 8762b6315e3dc845e77f0615f00f1a14f1e633563f2ed1696468e60ecbc0029a kolab-resource-handlers-2.1.ebuild 1074
-MISC ChangeLog 866 RMD160 77fd88403306f23097af434c13be07990073da15 SHA1 16d70b33cd7e854fba09a77c1db3bd7824620b2c SHA256 7062bb938b5938421ee752075743dd0ebe01d3937f89a6fe8cc6f1e0783271e6
-MD5 b6a71bd845032e8e328b5a8f74f5581e ChangeLog 866
-RMD160 77fd88403306f23097af434c13be07990073da15 ChangeLog 866
-SHA256 7062bb938b5938421ee752075743dd0ebe01d3937f89a6fe8cc6f1e0783271e6 ChangeLog 866
+EBUILD kolab-resource-handlers-2.1.ebuild 1061 RMD160 e4f458284ad45eddc7a1289bfb5197b9ab7935fb SHA1 4559952ea99029bc005afccd7ab6392d92468d92 SHA256 2df2c5860dc32d7198b85a24715e6f831efff333c1e19dfb929eadbcaedc6c08
+MISC ChangeLog 982 RMD160 692cc22a24184c789a4c76c50f88eb125e959cf7 SHA1 87de4c3c7c310708a23efac76bdba4202fdef353 SHA256 e210861d9d4ad0414302c43223de9831fe01a3f626891301db101d0e402e46b3
 MISC metadata.xml 255 RMD160 00d1bf05efc8050697b679c64d4992fae7bf6145 SHA1 5988787daa740dee18325bf78b25c044877e25a2 SHA256 1d7904c945fbe3d9946d23bcd9f1b00ac8c94700c9121955d71a0301016cb968
-MD5 ea6f2a6e433525a4268b91fa5f51c706 metadata.xml 255
-RMD160 00d1bf05efc8050697b679c64d4992fae7bf6145 metadata.xml 255
-SHA256 1d7904c945fbe3d9946d23bcd9f1b00ac8c94700c9121955d71a0301016cb968 metadata.xml 255
-MD5 dbb717508a078966718eaa1899ab6f64 files/digest-kolab-resource-handlers-2.1 331
-RMD160 bf3c69776ae5fa2431083ce37f0211910f516786 files/digest-kolab-resource-handlers-2.1 331
-SHA256 c00e70a4074726ef8234d0a3b821fe653edc1242283bed917145a406d28b56d5 files/digest-kolab-resource-handlers-2.1 331
diff --git a/net-mail/kolab-resource-handlers/kolab-resource-handlers-2.1.ebuild b/net-mail/kolab-resource-handlers/kolab-resource-handlers-2.1.ebuild
index a7df9de..3164dfa 100644
--- a/net-mail/kolab-resource-handlers/kolab-resource-handlers-2.1.ebuild
+++ b/net-mail/kolab-resource-handlers/kolab-resource-handlers-2.1.ebuild
@@ -20,7 +20,7 @@ DEPEND=""
 
 RDEPEND="${DEPEND}
 >=net-libs/c-client-2004g-r1
->=dev-lang/php-5.2.5_p20080206-r4
+>=dev-lang/php-5.2.6
 
 >=dev-php/PEAR-PEAR-1.4.6-r1
 >=dev-php/PEAR-Net_SMTP-1.2.7
diff --git a/net-mail/kolabd/ChangeLog b/net-mail/kolabd/ChangeLog
index a872523..8d6703e 100644
--- a/net-mail/kolabd/ChangeLog
+++ b/net-mail/kolabd/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 May 2008; wrobel@gentoo.org kolabd-2.1.ebuild:
+  PHP in the portage tree now supports kolab.
+
   21 Apr 2008; wrobel@gentoo.org kolabd-2.1.ebuild:
   Fixed cyrus-imapd dependency
 
diff --git a/net-mail/kolabd/Manifest b/net-mail/kolabd/Manifest
index 5364faf..6b46480 100644
--- a/net-mail/kolabd/Manifest
+++ b/net-mail/kolabd/Manifest
@@ -51,6 +51,6 @@ AUX powered-by-gentoo.jpg 12582 RMD160 8c31f3e2072ea81cb9ab88f4cf6cdf6cc41fac17
 AUX relocated.2.1.postfix 457 RMD160 eb16b0af4f8ba7e7edf7cf748fa0498e15533bbe SHA1 5a8150bc90ef557fa56e668acaa72c92ad3759b4 SHA256 7d9436948c531fa3fd7bdf38f3995a94648c94b866742800b088996dd0c43911
 AUX v310.pre.use-spam-2.1.template 2503 RMD160 4c7db951eefb456f00085c190b6e93737a708ae7 SHA1 b99db01963519929b477448b59249ddb2cd7e9a8 SHA256 4c5b8e60ef1795ad9259a9b957b0cbd79d802226da8a82f558853454d004b73a
 DIST kolabd-2.1-gentoo-20070510.tar.bz2 156622 RMD160 589b75593436a5057c17b286e68dd9a1453df572 SHA1 2544ce056a8c459963e9bf9828f9b4659ab905c3 SHA256 f320b597a379539ae734d6833bd957bd306cdbc784ca5de1009e68a921ec88ce
-EBUILD kolabd-2.1.ebuild 12007 RMD160 3bbd955de7ac6596ed00c53046c3df13a375aaef SHA1 a0c3ac2a3ad31e961f9f4e0708fec0d40c153dc2 SHA256 6e5dfe9fc171c53dd6194b082b5ba379ecf53ac4aee1f93dfc883e25506dda4e
-MISC ChangeLog 1236 RMD160 7276282e74948cd4665e5531f51f23215704ad1d SHA1 e5f08955384d7b7a200570f0d66e7e192a267b58 SHA256 7e6c1906b45a2423ee51969af9dabf0854a0eac7bc1c1304f49cc2bad954ab8a
+EBUILD kolabd-2.1.ebuild 12255 RMD160 890729d29917b038a06be3665655bb766b84a1cc SHA1 d9492798344994bffb9f1ac6e8df1bd27c969cc2 SHA256 c622227f92bf2837f90bd73740ddc632c8b4c94bd60e5284b1592439fd7f6fd2
+MISC ChangeLog 1335 RMD160 62bb26b599000da5b09eb70b86e89446912ee1b1 SHA1 c8c5aea1e59b905ff68922952e9edabedb16eea9 SHA256 75c513b92981a38f984bdefa21005ebd1562ba5535c1f8ca668a7c03c3cb62eb
 MISC metadata.xml 255 RMD160 00d1bf05efc8050697b679c64d4992fae7bf6145 SHA1 5988787daa740dee18325bf78b25c044877e25a2 SHA256 1d7904c945fbe3d9946d23bcd9f1b00ac8c94700c9121955d71a0301016cb968
diff --git a/net-mail/kolabd/kolabd-2.1.ebuild b/net-mail/kolabd/kolabd-2.1.ebuild
index ec4db7a..0f19d44 100644
--- a/net-mail/kolabd/kolabd-2.1.ebuild
+++ b/net-mail/kolabd/kolabd-2.1.ebuild
@@ -20,7 +20,7 @@ DEPEND=""
 
 RDEPEND="
 >=net-libs/c-client-2004g-r1
->=dev-lang/php-5.2.5_p20080206-r4
+>=dev-lang/php-5.2.6
 
 !<net-mail/cyrus-imapd-2.3.9-r21
 =net-mail/cyrus-imapd-2.3.9-r21
@@ -181,6 +181,13 @@ pkg_setup() {
 	die "Current openldap installation does not support Kolabd!"
 	fi
 
+	if ! built_with_use dev-lang/php kolab ; then
+	eerror "You MUST re-emerge php with the"
+	eerror "kolab use flag enabled. Please add this use flags"
+	eerror "to your USE variable and re-emerge php!"
+	die "Current php installation does not support Kolabd!"
+	fi
+
 	if ! built_with_use dev-libs/cyrus-sasl ldap ssl; then
 	eerror "You MUST re-emerge cyrus-sasl with ldap and ssl support."
 	eerror "Please add the these use flags"