QA: Drop eapi1 ebuilds so virtualx eclass can require eapi2 unconditionally.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 7 insertions, 247 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index abece368296f..bd3db88c1235 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2010/11/04 17:50:57 mabi Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.24 2011/02/18 12:22:41 scarabeus Exp $
+
+  18 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -php-gtk-2.0.1-r2.ebuild, -php-gtk-2.0.1-r3.ebuild:
+  QA: Drop eapi1 ebuilds so virtualx eclass can require eapi2 unconditionally.
 
 *php-gtk-2.0.1-r4 (04 Nov 2010)
 
diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest
index df0dbbe27d67..ce2c2397203f 100644
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -7,8 +7,6 @@ DIST php_gtk_manual-20071130_en.tar.bz2 922621 RMD160 b654f1ee83a3608208005d60a8
 DIST php_gtk_manual-20071130_ja.tar.bz2 873089 RMD160 f34e2887a4890877b1582113fd07b399b0b72ceb SHA1 e01128053e96147a25b44a0aea24bef0023f2280 SHA256 3a990b8e156e88a06c70a6eab450600304132fc3670f4240a8a152413d333ccc
 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 3530 RMD160 68c8bccf233821f57c482bd70ac4d67c7cc8c56b SHA1 47d329008d7a8baa8e36ea243b42d2fb92bb080a SHA256 b962301954e0d723f5f016ee64bead325d68f35acb07621345fb83b48e5213d9
-EBUILD php-gtk-2.0.1-r3.ebuild 3204 RMD160 eb3164efe34b8beb5ebd0155f02743419899e7fd SHA1 0087cb95ba45a48c2c5ad888ca98a9d82e0d3573 SHA256 da92bbac5e3f2c45d3d20fea836f619c4a6d56be1594dcb604364039c70cad1e
 EBUILD php-gtk-2.0.1-r4.ebuild 3449 RMD160 8b1587f0a9337ad86f80a07084925f9565c1e298 SHA1 6d99a90028bd91d6b9a781adbaec3eea9c69b364 SHA256 701cb0cdaf2cba151529890af1f54ee11e67d7942bbef0491204499db2bf3502
-MISC ChangeLog 4574 RMD160 befcc197a216b06dedd2bbedb229be6f189adc6f SHA1 999c76fa907595536d0de757095a43724f992bed SHA256 1accf4d671467ba6c12fb06a0ad79e50129696842bd1f3f608ff9f83c761bdcf
+MISC ChangeLog 4768 RMD160 fa611a8b906e0cf938adf22b0359a4073c6942a2 SHA1 85582ec0f5b38714b952448bf0da29e85bc5cea5 SHA256 67132a5e9c7ac5b2123ad9ea076323d763a546af68b46eb6f588ee2858d7a5cf
 MISC metadata.xml 561 RMD160 70336718c05f32cd7fa2d0f6c68c03a9e9174011 SHA1 3636adffca1aea7f969d7d797f7b033fc94726e0 SHA256 1ef6b61cbf37cee3ab157d5841d6abe860f52282129b5109d3d8c4ddd48c23fd
diff --git a/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild
deleted file mode 100644
index 6aa03096a4d9..000000000000
--- a/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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-r2.ebuild,v 1.3 2010/07/25 19:10:00 nirbheek 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 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
-	>=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/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
-
-	# depends on newer gtkhtml
-	epatch "${FILESDIR}"/${PN}-2.0.1-gtkhtml314.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="--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
-}
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
deleted file mode 100644
index e508cec149bc..000000000000
--- a/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.3 2010/07/25 19:10:00 nirbheek 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/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 "${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
-
-	# 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
-}
-
-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
-}