bump to 2.0.0beta.

(Portage version: 2.1.3_rc3)

7 files changed, 131 insertions, 123 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 5b4fea9654f6..0e5b9de36fee 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/php-gtk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.7 2007/04/18 22:59:14 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.8 2007/06/17 04:48:37 anant Exp $
+
+*php-gtk-2.0.0_beta (17 Jun 2007)
+
+  17 Jun 2007; Anant Narayanan <anant@gentoo.org> -files/gtkmozembed.patch,
+  +files/no-cli-check.patch, -php-gtk-2.0.0_alpha.ebuild,
+  +php-gtk-2.0.0_beta.ebuild:
+  bump to 2.0.0beta.
 
   18 Apr 2007; Anant Narayanan <anant@gentoo.org>
   php-gtk-2.0.0_alpha.ebuild:
diff --git a/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_alpha b/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_alpha
deleted file mode 100644
index 4128927204bd..000000000000
--- a/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_alpha
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2621750f1dec322d3fe3670cb62b926 php-gtk-2.0.0alpha.tar.gz 725543
-RMD160 f3414718eebcda652b8c6d0c4be5c805779530d7 php-gtk-2.0.0alpha.tar.gz 725543
-SHA256 003b9e0863b59014690770865d441cf59269fed7776305d002933d1d749971c0 php-gtk-2.0.0alpha.tar.gz 725543
diff --git a/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta b/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta
new file mode 100644
index 000000000000..6316fb87082e
--- /dev/null
+++ b/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta
@@ -0,0 +1,3 @@
+MD5 a02568508c2fb13bfc1b20802d8e702b php-gtk-2.0.0beta.tar.gz 1291728
+RMD160 107f030baa5bc3752a815eacb11a8fa2d8086780 php-gtk-2.0.0beta.tar.gz 1291728
+SHA256 9e43326859bb59f79a8e688bd1cb457a915829cf2a5a626f1a06395abb9b1430 php-gtk-2.0.0beta.tar.gz 1291728
diff --git a/dev-php5/php-gtk/files/gtkmozembed.patch b/dev-php5/php-gtk/files/gtkmozembed.patch
deleted file mode 100644
index cb5892bb2011..000000000000
--- a/dev-php5/php-gtk/files/gtkmozembed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../php-gtk/ext/mozembed/config.m4	2006-03-08 01:03:41.000000000 +0530
-+++ ext/mozembed/config.m4	2006-10-01 21:42:04.000000000 +0530
-@@ -1,16 +1,22 @@
- dnl $Id: gtkmozembed.patch,v 1.1 2007/02/20 16:40:23 anant Exp $
- dnl config.m4 for mozembed module
- 
--define(mozembed_required_version,   1.7.0)
-+define(firefox_required_version, 1.5.0)
-+define(mozilla_required_version, 1.7.0)
- 
- PHP_GTK_ARG_ENABLE(mozembed,for GtkMozEmbed support,
--[  --enable-mozembed      Enable GtkMozEmbed support],no)
-+[  --enable-mozembed       Enable GtkMozEmbed support],no)
- 
-+dnl first check for firefox, then mozilla
- if test "$PHP_GTK_MOZEMBED" != "no"; then
--  PKG_CHECK_MODULES(MOZEMBED, [mozilla-gtkmozembed >= mozembed_required_version],
-+  PKG_CHECK_MODULES(MOZEMBED, [firefox-gtkmozembed >= firefox_required_version],
-   have_mozembed=yes, have_mozembed=no)
-   if test "$have_mozembed" != "yes"; then
--    AC_MSG_RESULT([Unable to locate mozembed version mozembed_required_version or higher: not building])
-+    PKG_CHECK_MODULES(MOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version],
-+    have_mozembed=yes, have_mozembed=no)
-+  fi
-+  if test "$have_mozembed" != "yes"; then
-+    AC_MSG_RESULT([Unable to locate firefox-gtkmozembed version firefox_required_version or mozilla-gtkmozembed version mozilla_required_version or higher: not building])
-   else
-     AC_DEFINE(HAVE_MOZEMBED, 1, [mozembed support])
-     PHP_EVAL_INCLINE($MOZEMBED_CFLAGS)
diff --git a/dev-php5/php-gtk/files/no-cli-check.patch b/dev-php5/php-gtk/files/no-cli-check.patch
new file mode 100644
index 000000000000..8c7ab18dafc7
--- /dev/null
+++ b/dev-php5/php-gtk/files/no-cli-check.patch
@@ -0,0 +1,14 @@
+--- config.m4.old	2007-06-17 09:27:39.000000000 +0530
++++ config.m4	2007-06-17 09:27:47.000000000 +0530
+@@ -27,11 +27,6 @@
+     AC_MSG_ERROR(Could not locate PHP executable)
+   fi
+ 
+-  PHP_SAPI=`$PHP --version | sed -n 's/.*(\(...\)).*/\1/p'`
+-  if test "$PHP_SAPI" != "cli" ; then
+-    AC_MSG_ERROR(PHP CLI version is required[,] $PHP_SAPI found)
+-  fi
+-
+   AC_PROG_AWK
+   PHP_SUBST(AWK)
+ 
diff --git a/dev-php5/php-gtk/php-gtk-2.0.0_alpha.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0_alpha.ebuild
deleted file mode 100644
index 2cf74f1e5900..000000000000
--- a/dev-php5/php-gtk/php-gtk-2.0.0_alpha.ebuild
+++ /dev/null
@@ -1,90 +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/php-gtk/php-gtk-2.0.0_alpha.ebuild,v 1.6 2007/04/18 22:59:14 anant Exp $
-
-PHP_EXT_NAME="php_gtk2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-source-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
-HOMEPAGE="http://gtk.php.net/"
-SRC_URI="http://gtk.php.net/distributions/${PN}-${PV/_alpha/}alpha.tar.gz"
-
-LICENSE="PHP"
-SLOT="0"
-IUSE="debug mozembed nolibglade sourceview"
-
-RDEPEND=">=dev-lang/php-5.1.2
-		>=x11-libs/gtk+-2.6.0
-		>=dev-libs/glib-2.6.0
-		>=x11-libs/pango-1.8.0
-		>=dev-libs/atk-1.6.0
-		!nolibglade? ( >=gnome-base/libglade-2.5.0 )
-		mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
-		sourceview? ( >=x11-libs/gtksourceview-1.6.0 )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-S="${WORKDIR}/${PN}-${PV/_alpha/}alpha"
-
-pkg_setup() {
-	has_php
-	require_php_cli
-	if use debug ; then
-		require_php_with_use cli pcre debug
-	else
-		if has_debug ; then
-			# PHP has debug enabled, but PHP-GTK doesn't!
-			eerror "Please enable the 'debug' USE flag in"
-			eerror "PHP-GTK, this is needed to work with"
-			eerror "the debug version of PHP."
-			die "Enable 'debug' USE flag"
-		fi
-		require_php_with_use cli pcre
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Allow building against firefox
-	epatch "${FILESDIR}/gtkmozembed.patch"
-}
-
-src_compile() {
-	# Can't use php-ext-source-r1_src_compile,
-	# because PHP-GTK 2 uses buildconf and not autoconf
-	./buildconf
-
-	if use nolibglade ; then
-		GLCONF=" --disable-libglade"
-	else
-		GLCONF=""
-	fi
-
-	addpredict /session_mm_cli0.sem
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable mozembed) \
-		$(use_enable sourceview) \
-		${GLCONF} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# Can't use php-ext-source-r1_src_install
-	# because it looks for {ext}-default.so,
-	# that too in the wrong location
-	insinto "${EXT_DIR}"
-	newins "${S}/modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-
-	dodoc-php AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2
-}
diff --git a/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild
new file mode 100644
index 000000000000..0c2a7ae8548d
--- /dev/null
+++ b/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild,v 1.1 2007/06/17 04:48:37 anant Exp $
+
+PHP_EXT_NAME="php_gtk2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+inherit php-ext-source-r1
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
+HOMEPAGE="http://gtk.php.net/"
+SRC_URI="http://gtk.php.net/distributions/${PN}-${PV/_beta/}beta.tar.gz"
+
+LICENSE="PHP"
+SLOT="0"
+IUSE="extra html libsexy mozembed sourceview spell scintilla debug nolibglade"
+
+RDEPEND=">=dev-lang/php-5.1.2
+	>=x11-libs/gtk+-2.6.0
+	>=dev-libs/glib-2.6.0
+	>=x11-libs/pango-1.8.0
+	>=dev-libs/atk-1.6.0
+	!nolibglade? ( >=gnome-base/libglade-2.5.0 )
+	extra? ( >=x11-libs/gtk+extra-2.1.1 )
+	html? ( >=gnome-extra/gtkhtml-3.10.0 )
+	libsexy? ( >=x11-libs/libsexy-0.1.10 )
+	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
+	sourceview? ( >=x11-libs/gtksourceview-1.2.0 )
+	spell? ( >=app-text/gtkspell-2.0.0 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+S="${WORKDIR}/${PN}-${PV/_beta/}beta"
+
+pkg_setup() {
+	has_php
+	require_php_cli
+	if use debug ; then
+		require_php_with_use cli pcre debug
+	else
+		if has_debug ; then
+			# PHP has debug enabled, but PHP-GTK doesn't!
+			eerror "Please enable the 'debug' USE flag in"
+			eerror "PHP-GTK, this is needed to work with"
+			eerror "the debug version of PHP."
+			die "Enable 'debug' USE flag"
+		fi
+		require_php_with_use cli pcre
+	fi
+}
+
+src_compile() {
+	# we already check for CLI
+	# in-built check creates troubke on suhosin
+	# based installations, so remove it
+	epatch ${FILESDIR}/no-cli-check.patch
+
+	if use nolibglade ; then
+		GLCONF=" --disable-libglade"
+	else
+		GLCONF=""
+	fi
+
+	# php-ext-source-r1_src_compile can't be used
+	has_php
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /session_mm_cli0.sem
+	./buildconf
+
+	econf $(use_with extra) \
+		$(use_with html) \
+		$(use_with libsexy) \
+		$(use_with mozembed) \
+		$(use_with sourceview) \
+		$(use_with spell) \
+		$(use_with debug) \
+		$(use_enable scintilla) \
+		${GLCONF} || die "configure failed!"
+	emake || die "make failed!"
+	mv -f "modules/${PHP_EXT_NAME}.so" "${WORKDIR}/${PHP_EXT_NAME}-default.so" || die "Unable to move extension"
+}
+
+src_install() {
+	# can't use php-ext-source-r1_src_install
+	# since it adds ini to apache2 too!
+	# concurrentmodphp not applicable
+	has_php
+	addpredict /usr/share/snmp/mibs/.index
+
+	insinto "${EXT_DIR}"
+	newins "${WORKDIR}/${PHP_EXT_NAME}-default.so" "${PHP_EXT_NAME}.so"
+
+	if [[ -f "/etc/php/cli-php${PHP_VERSION}/php.ini" ]] ; then
+		inifile="etc/php/cli-php${PHP_VERSION}/ext/${PHP_EXT_NAME}.ini"
+		inidir="${inifile/${PHP_EXT_NAME}.ini/}"
+		inidir="${inidir/ext/ext-active}"
+		dodir "/${inidir}"
+		dosym "/${inifile}" "/${inifile/ext/ext-active}"
+	fi
+	php-ext-base-r1_addtoinifile "extension" "${PHP_EXT_NAME}.so" "${inifile}" "Extension added"
+
+	dodoc-php AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2
+}