Version bump.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.24-gentoo-r4 Intel(R) Core(TM)2 CPU 6600 @ 2.40GHz

7 files changed, 136 insertions, 41 deletions

diff --git a/dev-php5/eaccelerator/ChangeLog b/dev-php5/eaccelerator/ChangeLog
index b459cb1ce1fd..13ecec169cd0 100644
--- a/dev-php5/eaccelerator/ChangeLog
+++ b/dev-php5/eaccelerator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/eaccelerator
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.19 2008/05/09 12:45:41 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.20 2008/06/03 03:12:50 chtekk Exp $
+
+*eaccelerator-0.9.5.3 (03 Jun 2008)
+
+  03 Jun 2008; Luca Longinotti <chtekk@gentoo.org>
+  +eaccelerator-0.9.5.3.ebuild:
+  Version bump.
 
   09 May 2008; Christian Hoffmann <hoffie@gentoo.org>
   eaccelerator-0.9.5.1.ebuild:
diff --git a/dev-php5/eaccelerator/eaccelerator-0.9.5.3.ebuild b/dev-php5/eaccelerator/eaccelerator-0.9.5.3.ebuild
new file mode 100644
index 000000000000..066b53d4bb0f
--- /dev/null
+++ b/dev-php5/eaccelerator/eaccelerator-0.9.5.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/eaccelerator-0.9.5.3.ebuild,v 1.1 2008/06/03 03:12:50 chtekk Exp $
+
+PHP_EXT_NAME="eaccelerator"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+
+[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
+
+inherit php-ext-source-r1 eutils depend.apache
+
+KEYWORDS="~amd64 ~sparc ~x86"
+
+DESCRIPTION="A PHP Accelerator & Encoder."
+HOMEPAGE="http://www.eaccelerator.net/"
+SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="contentcache debug disassembler inode session sharedmem"
+
+DEPEND="!dev-php5/pecl-apc !dev-php5/xcache"
+RDEPEND="${DEPEND}"
+
+# Webserver user and group, here for Apache by default
+HTTPD_USER="${HTTPD_USER:-apache}"
+HTTPD_GROUP="${HTTPD_GROUP:-apache}"
+
+need_php_by_category
+want_apache
+
+pkg_setup() {
+	has_php
+
+	require_php_sapi_from cgi apache2
+
+	if use session ; then
+		require_php_with_use session zlib
+	else
+		require_php_with_use zlib
+	fi
+
+	if ! use apache2 ; then
+		if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
+			eerror "You did not enable apache2 USE flag, so you need to define"
+			eerror "the user and group that will be used for ${PN} yourself."
+			eerror
+			eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
+			eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
+			eerror
+			die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
+		else
+			enewgroup ${HTTPD_GROUP}
+			enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
+		fi
+	fi
+}
+
+src_compile() {
+	has_php
+
+	my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
+
+	use contentcache && my_conf="${my_conf} --with-eaccelerator-content-caching"
+	use debug && my_conf="${my_conf} --with-eaccelerator-debug"
+	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
+	! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
+	use session && my_conf="${my_conf} --with-eaccelerator-sessions"
+	use sharedmem && my_conf="${my_conf} --with-eaccelerator-shared-memory"
+
+	php-ext-source-r1_src_compile
+}
+
+src_install() {
+	php-ext-source-r1_src_install
+
+	keepdir "${EACCELERATOR_CACHEDIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
+	fperms 750 "${EACCELERATOR_CACHEDIR}"
+
+	insinto "/usr/share/${PN}-php5/"
+	doins -r doc/php/
+	dodoc-php AUTHORS ChangeLog COPYING NEWS README README.eLoader
+
+	php-ext-base-r1_addtoinifiles "eaccelerator.shm_size" '"28"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
+	php-ext-base-r1_addtoinifiles "eaccelerator.enable" '"1"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.optimizer" '"1"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.debug" '"0"'
+	php-ext-base-r1_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.check_mtime" '"1"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.filter" '""'
+	php-ext-base-r1_addtoinifiles "eaccelerator.shm_max" '"0"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.shm_ttl" '"0"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.shm_only" '"0"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.compress" '"1"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.compress_level" '"9"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.keys" '"shm_and_disk"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.sessions" '"shm_and_disk"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.content" '"shm_and_disk"'
+	php-ext-base-r1_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
+}
+
+pkg_postinst() {
+	elog "Please see the files in ${ROOT}usr/share/${PN}-php5/ for some"
+	elog "examples and informations on how to use the functions that"
+	elog "eAccelerator adds to PHP."
+}
diff --git a/dev-php5/ffmpeg-php/ChangeLog b/dev-php5/ffmpeg-php/ChangeLog
index a8abd71c6da4..c3664899f364 100644
--- a/dev-php5/ffmpeg-php/ChangeLog
+++ b/dev-php5/ffmpeg-php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/ffmpeg-php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ChangeLog,v 1.2 2008/05/09 13:23:33 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ChangeLog,v 1.3 2008/06/03 03:17:04 chtekk Exp $
+
+*ffmpeg-php-0.5.3 (03 Jun 2008)
+
+  03 Jun 2008; Luca Longinotti <chtekk@gentoo.org> -ffmpeg-php-0.5.1.ebuild,
+  +ffmpeg-php-0.5.3.ebuild:
+  Version bump.
 
 *ffmpeg-php-0.5.2.1 (09 May 2008)
 
diff --git a/dev-php5/ffmpeg-php/ffmpeg-php-0.5.1.ebuild b/dev-php5/ffmpeg-php/ffmpeg-php-0.5.3.ebuild
index be49d53a7d23..50742557945e 100644
--- a/dev-php5/ffmpeg-php/ffmpeg-php-0.5.1.ebuild
+++ b/dev-php5/ffmpeg-php/ffmpeg-php-0.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ffmpeg-php-0.5.1.ebuild,v 1.1 2007/08/30 13:00:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ffmpeg-php-0.5.3.ebuild,v 1.1 2008/06/03 03:17:04 chtekk Exp $
 
 PHP_EXT_NAME="ffmpeg"
 PHP_EXT_INI="yes"
diff --git a/dev-php5/magickwand/ChangeLog b/dev-php5/magickwand/ChangeLog
index efe0b8a10a8f..c2dc6110d174 100644
--- a/dev-php5/magickwand/ChangeLog
+++ b/dev-php5/magickwand/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/magickwand
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/ChangeLog,v 1.5 2008/02/11 21:22:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/ChangeLog,v 1.6 2008/06/03 03:20:33 chtekk Exp $
+
+*magickwand-1.0.7 (03 Jun 2008)
+
+  03 Jun 2008; Luca Longinotti <chtekk@gentoo.org> -magickwand-1.0.4.ebuild,
+  -magickwand-1.0.5.ebuild, +magickwand-1.0.7.ebuild:
+  Version bump.
 
 *magickwand-1.0.6 (11 Feb 2008)
 
diff --git a/dev-php5/magickwand/magickwand-1.0.4.ebuild b/dev-php5/magickwand/magickwand-1.0.4.ebuild
deleted file mode 100644
index 17b92729f18a..000000000000
--- a/dev-php5/magickwand/magickwand-1.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/magickwand-1.0.4.ebuild,v 1.3 2007/04/27 00:11:19 beandog Exp $
-
-PHP_EXT_NAME="magickwand"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_INI="yes"
-
-MY_PN="MagickWandForPHP"
-
-inherit php-ext-source-r1
-
-DESCRIPTION="A native PHP-extension to the ImageMagick MagickWand API."
-HOMEPAGE="http://www.magickwand.org/"
-SRC_URI="http://www.magickwand.org/download/php/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=media-gfx/imagemagick-6.3.3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-need_php_by_category
-
-src_install() {
-	php-ext-source-r1_src_install
-
-	dodoc AUTHOR ChangeLog CREDITS README TODO
-}
diff --git a/dev-php5/magickwand/magickwand-1.0.5.ebuild b/dev-php5/magickwand/magickwand-1.0.7.ebuild
index a42d9a3f6bbe..795b83e17c91 100644
--- a/dev-php5/magickwand/magickwand-1.0.5.ebuild
+++ b/dev-php5/magickwand/magickwand-1.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/magickwand-1.0.5.ebuild,v 1.1 2007/10/05 23:43:40 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/magickwand-1.0.7.ebuild,v 1.1 2008/06/03 03:20:33 chtekk Exp $
 
 PHP_EXT_NAME="magickwand"
 PHP_EXT_ZENDEXT="no"
@@ -14,7 +14,7 @@ DESCRIPTION="A native PHP-extension to the ImageMagick MagickWand API."
 HOMEPAGE="http://www.magickwand.org/"
 SRC_URI="http://www.magickwand.org/download/php/${MY_PN}-${PV}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="MagickWand"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -28,5 +28,5 @@ need_php_by_category
 src_install() {
 	php-ext-source-r1_src_install
 
-	dodoc AUTHOR ChangeLog CREDITS README TODO
+	dodoc-php AUTHOR ChangeLog CREDITS README TODO
 }