diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-03-07 19:58:44 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-03-07 19:58:44 +0000 |
| commit | a908e648512c61a2f9ee48add79c2f1b8875ed79 (patch) | |
| tree | 312c2dd295d837ec953851b2c5123f591d4a4bb4 /dev-php5 | |
| parent | Add ~ia64 (diff) | |
| download | gentoo-2-a908e648512c61a2f9ee48add79c2f1b8875ed79.tar.gz gentoo-2-a908e648512c61a2f9ee48add79c2f1b8875ed79.tar.bz2 gentoo-2-a908e648512c61a2f9ee48add79c2f1b8875ed79.zip | |
import from the php overlay
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-php5')
| -rw-r--r-- | dev-php5/php-gtk/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch | 14 | ||||
| -rw-r--r-- | dev-php5/php-gtk/php-gtk-2.0.0.ebuild | 7 |
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog index 8bd80dc4c31b..9880347d4cb9 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.11 2008/03/04 19:39:43 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.12 2008/03/07 19:58:43 armin76 Exp $ + + 07 Mar 2008; Raúl Porcel <armin76@gentoo.org> + +files/php-gtk-2.0.0-no-cli-check.patch, php-gtk-2.0.0.ebuild: + import from the php overlay + + 07 Mar 2008; Jakub Moc <jakub@gentoo.org> php-gtk-2.0.0.ebuild: + Remove sourceview use flag wrt Bug 212595 *php-gtk-2.0.0 (04 Mar 2008) diff --git a/dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch b/dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch new file mode 100644 index 000000000000..8b8d3aecee37 --- /dev/null +++ b/dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch @@ -0,0 +1,14 @@ +--- config.m4.orig 2008-02-13 06:05:27.000000000 +0100 ++++ config.m4 2008-03-03 23:38:00.000000000 +0100 +@@ -27,11 +27,6 @@ + AC_MSG_ERROR(Could not locate PHP executable) + fi + +- PHP_SAPI=`$PHP --version | head -1 | 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.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0.ebuild index 75a7c20db679..9b2435ff14ea 100644 --- a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild +++ b/dev-php5/php-gtk/php-gtk-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.ebuild,v 1.1 2008/03/04 19:39:43 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0.ebuild,v 1.2 2008/03/07 19:58:43 armin76 Exp $ EAPI="1" @@ -15,7 +15,7 @@ inherit php-ext-source-r1 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 extra +glade html libsexy mozembed scintilla sourceview spell" +IUSE="debug doc examples extra +glade html libsexy mozembed scintilla spell" LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -41,7 +41,6 @@ RDEPEND=">=dev-lang/php-5.1.2 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:1.0 ) spell? ( >=app-text/gtkspell-2.0.0 )" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9" @@ -93,10 +92,10 @@ src_compile() { $(use_with html) \ $(use_with libsexy) \ $(use_with mozembed) \ - $(use_with sourceview) \ $(use_with spell) \ $(use_with debug) \ $(use_enable scintilla) \ + --without-sourceview \ ${GLCONF} emake || die "make failed!" |