Cleanup.

Package-Manager: portage-2.1.2.2

4 files changed, 52 insertions, 53 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index b30dc2b9859e..524a7aa1b28d 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.2 2007/03/09 21:04:11 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.3 2007/03/18 01:41:15 chtekk Exp $
+
+  18 Mar 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  php-gtk-2.0.0_alpha.ebuild:
+  Cleanup, make it concurrentmodphp compatible.
 
 *php-gtk-2.0.0_alpha (20 Feb 2007)
 
diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest
index 4b56dd5661c2..5bf8d3636dfb 100644
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -3,18 +3,18 @@ MD5 5959d6cdf2c414896f654c23f3e5e7ca files/gtkmozembed.patch 1449
 RMD160 6b24ffe5c7b9ca8d044161593c97b42d9fffb414 files/gtkmozembed.patch 1449
 SHA256 690a9f40fcca0606626ac4057c0564bbad158b9a709c692332f4247c660fedf0 files/gtkmozembed.patch 1449
 DIST php-gtk-2.0.0alpha.tar.gz 725543 RMD160 f3414718eebcda652b8c6d0c4be5c805779530d7 SHA1 f24e7822c3345167f334cb87edc9494112a14a98 SHA256 003b9e0863b59014690770865d441cf59269fed7776305d002933d1d749971c0
-EBUILD php-gtk-2.0.0_alpha.ebuild 2197 RMD160 0b7686093e259e2ebfbbe81186608a403b935a88 SHA1 350d1abb061ebaff38fd618a0ae788d85d25e309 SHA256 9b77bbefa8f0c346f318da5e1503355947d651ad94889bff67c225bc9ca51d56
-MD5 d89e817c535315782031c732a6ae41d4 php-gtk-2.0.0_alpha.ebuild 2197
-RMD160 0b7686093e259e2ebfbbe81186608a403b935a88 php-gtk-2.0.0_alpha.ebuild 2197
-SHA256 9b77bbefa8f0c346f318da5e1503355947d651ad94889bff67c225bc9ca51d56 php-gtk-2.0.0_alpha.ebuild 2197
-MISC ChangeLog 400 RMD160 92b67e39101303ba440c22e6e41a400d1890514e SHA1 6ca3552a484b70fb6b38e6db4e779f31e4d2b286 SHA256 9f27ecb2e3634e1d17c505a2de31f331cea919040f52e1b4342c38b66b9ba879
-MD5 de257305b620db63bddb6224a32d7e49 ChangeLog 400
-RMD160 92b67e39101303ba440c22e6e41a400d1890514e ChangeLog 400
-SHA256 9f27ecb2e3634e1d17c505a2de31f331cea919040f52e1b4342c38b66b9ba879 ChangeLog 400
-MISC metadata.xml 405 RMD160 acee3270373b0fa234b1231d34487f109885c083 SHA1 4fc53604200511ec9e1e8b43928176e80fce82a1 SHA256 18e24b16b180676ae3445a64d4ff936da5b2d7df7eb36d45c352df033dc9a197
-MD5 ff22ec75ee671ec520e263f8c60fe0c2 metadata.xml 405
-RMD160 acee3270373b0fa234b1231d34487f109885c083 metadata.xml 405
-SHA256 18e24b16b180676ae3445a64d4ff936da5b2d7df7eb36d45c352df033dc9a197 metadata.xml 405
+EBUILD php-gtk-2.0.0_alpha.ebuild 1964 RMD160 3aaddf99063fede7e4ce285b7fa75e98aed3a56b SHA1 bb239258956ca8f869dff74984ea24f77abc3a06 SHA256 a2ee2fdfcb781d6290a19284f8295ae93b6a6616baa7ef982f937ef105f16d7e
+MD5 080265d189f2fc4a7711e191f939dd1e php-gtk-2.0.0_alpha.ebuild 1964
+RMD160 3aaddf99063fede7e4ce285b7fa75e98aed3a56b php-gtk-2.0.0_alpha.ebuild 1964
+SHA256 a2ee2fdfcb781d6290a19284f8295ae93b6a6616baa7ef982f937ef105f16d7e php-gtk-2.0.0_alpha.ebuild 1964
+MISC ChangeLog 545 RMD160 7af3927069e73e25a348d623c206ceae290c9500 SHA1 8f7fc88a50c084a192386fa1919b100ee8b381cc SHA256 a074b29f75cc74443c393c4dfd595774a3c95eda8d4daab358cf584181843362
+MD5 9a6e5508deee9e12b199d349ef2888a2 ChangeLog 545
+RMD160 7af3927069e73e25a348d623c206ceae290c9500 ChangeLog 545
+SHA256 a074b29f75cc74443c393c4dfd595774a3c95eda8d4daab358cf584181843362 ChangeLog 545
+MISC metadata.xml 403 RMD160 e3aeec7bef8ab5548c3146c01d959d08bd8bad2e SHA1 546780bec6b4636c191e16d45d9707f356be681b SHA256 48da2cda3ea301263a4c75fddcc263e565f1790ec75e744765076ad85f5d9ddb
+MD5 6185acd3ecb95c509cb29f52a233a77e metadata.xml 403
+RMD160 e3aeec7bef8ab5548c3146c01d959d08bd8bad2e metadata.xml 403
+SHA256 48da2cda3ea301263a4c75fddcc263e565f1790ec75e744765076ad85f5d9ddb metadata.xml 403
 MD5 a2d4e4a3c04d762209cf6c4d78cec7e2 files/digest-php-gtk-2.0.0_alpha 256
 RMD160 b75781cabe7ed04eda0713189e95f831b1ebf7eb files/digest-php-gtk-2.0.0_alpha 256
 SHA256 67c63c2360fcf140b9dac338f2b7165fabfe6c28109bd5ed6007f41cefc27c0f files/digest-php-gtk-2.0.0_alpha 256
diff --git a/dev-php5/php-gtk/metadata.xml b/dev-php5/php-gtk/metadata.xml
index 38a7a57d2a4c..e777db1d008b 100644
--- a/dev-php5/php-gtk/metadata.xml
+++ b/dev-php5/php-gtk/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>php</herd>
 	<maintainer>
-  		<email>anant@gentoo.org</email>
+		<email>anant@gentoo.org</email>
 		<name>Anant Narayanan</name>
 	</maintainer>
 	<longdescription>
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
index 52d0a7d5e96b..28317620746e 100644
--- a/dev-php5/php-gtk/php-gtk-2.0.0_alpha.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.0_alpha.ebuild
@@ -1,41 +1,47 @@
 # 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.1 2007/02/20 16:40:23 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0_alpha.ebuild,v 1.2 2007/03/18 01:41:15 chtekk Exp $
 
 PHP_EXT_NAME="php_gtk2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
 inherit php-ext-source-r1
 
-DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library"
+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="2"
-KEYWORDS="~x86"
 IUSE="debug mozembed nolibglade sourceview"
 
-S="${WORKDIR}/${PN}-${PV/_alpha/}alpha"
-
 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-1.7.0 >=www-client/mozilla-firefox-1.5.0 ) )
-	sourceview? ( >=x11-libs/gtksourceview-1.6.0 )"
+		>=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-1.7.0 >=www-client/mozilla-firefox-1.5.0 ) )
+		sourceview? ( >=x11-libs/gtksourceview-1.6.0 )"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
+		>=dev-util/pkgconfig-0.9"
+
+S="${WORKDIR}/${PN}-${PV/_alpha/}alpha"
 
 pkg_setup() {
+	has_php
 	require_php_cli
-	if use debug; then
+	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!"
-			die
+		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
@@ -44,45 +50,34 @@ pkg_setup() {
 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
+	# Can't use php-ext-source-r1_src_compile,
 	# because PHP-GTK 2 uses buildconf and not autoconf
 	./buildconf
 
-	if use nolibglade; then
+	if use nolibglade ; then
 		GLCONF=" --disable-libglade"
 	else
 		GLCONF=""
 	fi
 
 	econf \
-		$(use_enable debug ) \
-		$(use_enable mozembed ) \
+		$(use_enable debug) \
+		$(use_enable mozembed) \
 		$(use_enable sourceview) \
-		$GLCONF \
-		|| die "Configure failed!"
+		${GLCONF} \
+		|| die "econf failed"
 
-	emake || die "Compilation 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"
+	php-ext-source-r1_src_install
 
 	dodoc-php AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2
 }
-
-pkg_postinst() {
-	ewarn "Portage has not enabled this extension automatically!"
-	ewarn "You must add the line: 'extension=php_gtk2.so' in the"
-	ewarn "appropriate ini file, usually found in:"
-	ewarn "/etc/php/cli-php/php.ini"
-	epause
-}