block php-5.3, EAPI=2

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 125 insertions, 2 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index d06719642932..0ffa0139544a 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/php-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.19 2010/03/06 18:57:13 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.20 2010/06/11 18:13:09 mabi Exp $
+
+*php-gtk-2.0.1-r3 (11 Jun 2010)
+
+  11 Jun 2010; <mabi@gentoo.org> +php-gtk-2.0.1-r3.ebuild:
+  php-gtk does not compile with php-5.3 (bug #318061), thanks to Ole Markus
+  With for testing, update to EAPI=2
 
   06 Mar 2010; Sebastian Pipping <sping@gentoo.org> php-gtk-2.0.1-r2.ebuild:
   Make use of virtualx eclass. Patch for bug #213037 by Myckel Habets
diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest
index 1220214ddd37..b0b9c9296233 100644
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -8,5 +8,6 @@ DIST php_gtk_manual-20071130_ja.tar.bz2 873089 RMD160 f34e2887a4890877b1582113fd
 DIST php_gtk_manual-20071130_pt_BR.tar.bz2 940444 RMD160 37fd4a08f8aadeec338481fd61d4f8c2bc831adc SHA1 b3cd5ce5e9e9c4ec5ab6db7b55063ce8f8ffd7eb SHA256 7dfecfafbc2f3e796f5deafbce5e389eba2877e453b3fd9fd69e3fc5c33df083
 DIST php_gtk_manual-20071130_zh_CN.tar.bz2 869165 RMD160 3b3b51f3c4e1ca9827fc238e86e59a2b64d40d9e SHA1 091215691890cf8b51c2fea962fca18f8c845e05 SHA256 2c242e78b0de5253edafdc0df852cc32b2c9fa49878fa494dfe5e1df10790ae2
 EBUILD php-gtk-2.0.1-r2.ebuild 3535 RMD160 4affc17b172c8bbf1afe8fa83c5329b5ce988d7b SHA1 e5bb55b91e26d7337428c61db3259e7a3d2e2c73 SHA256 b365546b09d30978af37775a84d7ecb1ba74aac2cbbe2b7259cc9b47f9432ec8
-MISC ChangeLog 3922 RMD160 2af83b62d2d01996e81a7d2e04536e70f1d8fb0e SHA1 aaa8d6246027686f900dfd73e20e988a3cc1d8c1 SHA256 ebdfca052c7bd2e8b3a673810d3869570c7f35a729b4d64aedda620f1e387328
+EBUILD php-gtk-2.0.1-r3.ebuild 3219 RMD160 5b47d6835b7c950359ba7b4247b8ba2efdcc12d4 SHA1 00b142c5db457acad733cefed75f4e4c566bc7fa SHA256 94ec0f2a773a120228c72b743a1467d363c5fa1a3c1974c9d3148898333ccda7
+MISC ChangeLog 4127 RMD160 7d254c29fc406208b855e54ead85c4a706bc6dc0 SHA1 c5a0847f3a673c80e8f9e422288f92cd60476274 SHA256 9021237f2f49e15064c20ae9f95bb939a3328ee48bd67c63823d379748d3d719
 MISC metadata.xml 561 RMD160 70336718c05f32cd7fa2d0f6c68c03a9e9174011 SHA1 3636adffca1aea7f969d7d797f7b033fc94726e0 SHA256 1ef6b61cbf37cee3ab157d5841d6abe860f52282129b5109d3d8c4ddd48c23fd
diff --git a/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..44e8766b5435
--- /dev/null
+++ b/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 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.1-r3.ebuild,v 1.1 2010/06/11 18:13:09 mabi Exp $
+
+EAPI="2"
+
+PHP_EXT_NAME="php_gtk2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHPSAPILIST="cli"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2"
+
+inherit php-ext-source-r1 virtualx
+
+DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
+HOMEPAGE="http://gtk.php.net/"
+SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz"
+IUSE="debug doc examples +glade gtkhtml libsexy mozembed scintilla spell"
+LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MYDOC_PN="php_gtk_manual"
+MYDOC_PV="20071130"
+
+LANGS="bg en ja pt_BR zh_CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="${SRC_URI}
+		doc? ( linguas_${lang}? ( http://dev.gentooexperimental.org/~jakub/distfiles/${MYDOC_PN}-${MYDOC_PV}_${lang}.tar.bz2
+					    mirror://gentoo/${MYDOC_PN}-${MYDOC_PV}_${lang}.tar.bz2 ) )"
+done
+
+RDEPEND=">=dev-lang/php-5.1.2
+	<dev-lang/php-5.3[pcre,cli,debug=]
+	>=x11-libs/gtk+-2.6.0
+	>=dev-libs/glib-2.6.0
+	>=x11-libs/pango-1.8.0
+	>=dev-libs/atk-1.9.0
+	glade? ( >=gnome-base/libglade-2.5.0 )
+	libsexy? ( >=x11-libs/libsexy-0.1.10 )
+	gtkhtml? ( gnome-extra/gtkhtml:3.14 )
+	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
+	spell? ( >=app-text/gtkspell-2.0.0 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}"
+	# see bug 232538 for details:
+	# this is needed so that autoconf can find the m4 gtk files (non-standard
+	# location)
+	export AT_M4DIR="${S}"
+	# phpize will invoke autoconf/autoheader (which will fail); we are replacing
+	# these calls with dummies as we call eautoreconf shortly afterwards
+	# anyway
+	export PHP_AUTOCONF="true"
+	export PHP_AUTOHEADER="true"
+	php-ext-source-r1_phpize
+
+	cd "${WORKDIR}"
+	for lang in ${LANGS} ; do
+		if use doc && use linguas_${lang} ; then
+			mkdir ${lang}
+			pushd ${lang} >/dev/null
+			unpack ${MYDOC_PN}-${MYDOC_PV}_${lang}.tar.bz2
+			popd >/dev/null
+		fi
+	done
+}
+
+src_prepare() {
+	# we already check for CLI and built-in check creates trouble
+	# on suhosin-based installations, so we remove it
+	epatch "${FILESDIR}"/${PN}-2.0.0-no-cli-check.patch
+
+	# depends on newer gtkhtml
+	epatch "${FILESDIR}"/${PN}-2.0.1-gtkhtml314.patch
+}
+
+src_compile() {
+	my_conf="--without-extra \
+		$(use_with gtkhtml html) \
+		$(use_with libsexy) \
+		$(use_with mozembed) \
+		$(use_with spell) \
+		$(use_enable debug) \
+		$(use_enable scintilla) \
+		--without-sourceview \
+		$(use glade || echo '--without-libglade')"
+	# call virtualmake to setup an virtual x environment
+	export maketype="php-ext-source-r1_src_compile"
+	virtualmake
+}
+
+src_install() {
+	php-ext-source-r1_src_install
+
+	if use doc; then
+		for lang in ${LANGS} ; do
+			if use linguas_${lang} ; then
+				ebegin "Installing ${lang} manual, will take a while"
+				insinto /usr/share/doc/${CATEGORY}/${PF}/manual-${lang}
+				doins -r "${WORKDIR}"/${lang}/html/*
+				eend $?
+			fi
+		done
+	fi
+
+	if use examples	; then
+		insinto /usr/share/doc/${CATEGORY}/${PF}/examples
+		doins -r "${S}"/demos/*
+	fi
+}