Dropping 'extra' USE flag since x11-libs/gtk+extra is going to be removed

(Portage version: 2.1.7.17/cvs/Linux x86_64)

5 files changed, 14 insertions, 252 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 4e37e8894a7d..29842c93412d 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php5/php-gtk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.17 2009/09/13 10:20:21 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.18 2010/02/21 17:30:56 pacho Exp $
+
+*php-gtk-2.0.1-r2 (21 Feb 2010)
+
+  21 Feb 2010; Pacho Ramos <pacho@gentoo.org> -php-gtk-2.0.0.ebuild,
+  -php-gtk-2.0.1.ebuild, -php-gtk-2.0.1-r1.ebuild, +php-gtk-2.0.1-r2.ebuild,
+  metadata.xml:
+  Dropping 'extra' USE flag since x11-libs/gtk+extra is going to be removed,
+  see bug 292211
 
 *php-gtk-2.0.1-r1 (13 Sep 2009)
 
diff --git a/dev-php5/php-gtk/metadata.xml b/dev-php5/php-gtk/metadata.xml
index c82175bac8df..4378d99dc5ef 100644
--- a/dev-php5/php-gtk/metadata.xml
+++ b/dev-php5/php-gtk/metadata.xml
@@ -7,7 +7,6 @@
     providing the ability to write GUI applications in PHP.
   </longdescription>
   <use>
-    <flag name="extra">Enable GtkExtra support</flag>
     <flag name="glade">Enable libglade support</flag>
     <flag name="libsexy">Enable libsexy support</flag>
     <flag name="mozembed">Enable GtkMozembed support</flag>
diff --git a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0.ebuild
deleted file mode 100644
index 49122a44679d..000000000000
--- a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 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.4 2009/09/12 21:35:59 eva Exp $
-
-EAPI="1"
-
-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
-
-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 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
-	>=x11-libs/gtk+-2.6.0
-	>=dev-libs/glib-2.6.0
-	>=x11-libs/pango-1.8.0
-	>=dev-libs/atk-1.9.0
-	extra? ( >=x11-libs/gtk+extra-2.1.1 )
-	glade? ( >=gnome-base/libglade-2.5.0 )
-	libsexy? ( >=x11-libs/libsexy-0.1.10 )
-	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
-	spell? ( >=app-text/gtkspell-2.0.0 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	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 PHP-GTK."
-			eerror "This is needed to work with the debug version of PHP."
-			die "Enable 'debug' USE flag for dev-lang/php"
-		fi
-		require_php_with_use cli pcre
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"
-	# we already check for CLI and built-in check creates trouble
-	# on suhosin-based installations, so we remove it
-	epatch "${FILESDIR}"/${P}-no-cli-check.patch
-
-	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_compile() {
-	local GLCONF
-	use glade || GLCONF=" --without-libglade"
-
-	# 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 libsexy) \
-		$(use_with mozembed) \
-		$(use_with spell) \
-		$(use_with debug) \
-		$(use_enable scintilla) \
-		--without-html \
-		--without-sourceview \
-		${GLCONF}
-
-	emake || die "make failed!"
-	mv -f "modules/${PHP_EXT_NAME}.so" "${WORKDIR}/${PHP_EXT_NAME}-default.so" || die "Unable to move extension"
-}
-
-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
-}
diff --git a/dev-php5/php-gtk/php-gtk-2.0.1-r1.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild
index c3d028ec582a..d06c4160ad18 100644
--- a/dev-php5/php-gtk/php-gtk-2.0.1-r1.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2009/09/13 10:20:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild,v 1.1 2010/02/21 17:30:56 pacho 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 gtkhtml libsexy mozembed scintilla spell"
+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"
@@ -36,7 +36,6 @@ RDEPEND=">=dev-lang/php-5.1.2
 	>=dev-libs/glib-2.6.0
 	>=x11-libs/pango-1.8.0
 	>=dev-libs/atk-1.9.0
-	extra? ( >=x11-libs/gtk+extra-2.1.1 )
 	glade? ( >=gnome-base/libglade-2.5.0 )
 	libsexy? ( >=x11-libs/libsexy-0.1.10 )
 	gtkhtml? ( gnome-extra/gtkhtml:3.14 )
@@ -93,7 +92,7 @@ src_unpack() {
 }
 
 src_compile() {
-	my_conf="$(use_with extra) \
+	my_conf="--without-extra \
 		$(use_with gtkhtml html) \
 		$(use_with libsexy) \
 		$(use_with mozembed) \
diff --git a/dev-php5/php-gtk/php-gtk-2.0.1.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
deleted file mode 100644
index d5581dfc81a7..000000000000
--- a/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.3 2009/09/12 21:35:59 eva Exp $
-
-EAPI="1"
-
-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
-
-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 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
-	>=x11-libs/gtk+-2.6.0
-	>=dev-libs/glib-2.6.0
-	>=x11-libs/pango-1.8.0
-	>=dev-libs/atk-1.9.0
-	extra? ( >=x11-libs/gtk+extra-2.1.1 )
-	glade? ( >=gnome-base/libglade-2.5.0 )
-	libsexy? ( >=x11-libs/libsexy-0.1.10 )
-	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
-	spell? ( >=app-text/gtkspell-2.0.0 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	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 PHP-GTK."
-			eerror "This is needed to work with the debug version of PHP."
-			die "Enable 'debug' USE flag for dev-lang/php"
-		fi
-		require_php_with_use cli pcre
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"
-	# 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
-
-	# 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_compile() {
-	my_conf="$(use_with extra) \
-		$(use_with libsexy) \
-		$(use_with mozembed) \
-		$(use_with spell) \
-		$(use_enable debug) \
-		$(use_enable scintilla) \
-		--without-html \
-		--without-sourceview \
-		$(use glade || echo '--without-libglade')"
-	php-ext-source-r1_src_compile
-}
-
-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
-}