version bump to 2.0.1, fixing the build problems with libtool-2.2* (bug 232538, many thanks to Rafał Mużyło <galtgendo@o2.pl> again), fixing --with-debug (it's --enable-debug now)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 53 insertions, 36 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 9880347d4cb9..105d4c722f4f 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.12 2008/03/07 19:58:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.13 2008/07/22 14:34:39 hoffie Exp $
+
+*php-gtk-2.0.1 (22 Jul 2008)
+
+  22 Jul 2008; Christian Hoffmann <hoffie@gentoo.org>
+  -php-gtk-2.0.0_beta-r1.ebuild, +php-gtk-2.0.1.ebuild:
+  version bump to 2.0.1, fixing the build problems with libtool-2.2* (bug
+  232538, many thanks to Rafał Mużyło <galtgendo@o2.pl> again), fixing
+  --with-debug (it's --enable-debug now)
 
   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:
diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest
index d21149972e51..b3bbd382c443 100644
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX no-cli-check.patch 391 RMD160 15754f4f2fe8a2e55c521a6301e1db2ac971ec31 SHA1 3a43d565115737c3292d4ae4779ca2f461ba6e85 SHA256 7d505e67ddf87808842dc0b747b12f99b60af74526bee3b59159ed8346449e23
 AUX php-gtk-2.0.0-no-cli-check.patch 402 RMD160 82dcbd36ce596c98fed40523e4751a40fabbbf13 SHA1 d3acf2905959f6c5e7997e16efa96413d3887e6a SHA256 d6c0d4d541647c205d73b1f8e20747f2974c44494350cf59c0b24198f4462dab
 DIST php-gtk-2.0.0.tar.gz 1022830 RMD160 de59554ba447c755ea64b805ba65eb24fad7efa8 SHA1 f9172ce64d85479d341c808b44a6127b164cd1a2 SHA256 711934fbdd6b84d8e2b78588f6b4ef9a4e9378e622a4e80279744ff6bded0718
-DIST php-gtk-2.0.0beta.tar.gz 1291728 RMD160 107f030baa5bc3752a815eacb11a8fa2d8086780 SHA1 1d0de61ee4a082aa103875a87e86c62d5c35327b SHA256 9e43326859bb59f79a8e688bd1cb457a915829cf2a5a626f1a06395abb9b1430
+DIST php-gtk-2.0.1.tar.gz 1254316 RMD160 2e305f45d95a2c1abbe8cd551c794823dfc3d919 SHA1 a4f42c715b51554c1322de4beb3054012ec58696 SHA256 996c79892f168e5f6b50ca2aaa1e925ec4ba4de8ad6d3b86dd2722ad4662cc0b
 DIST php_gtk_manual-20071130_bg.tar.bz2 871540 RMD160 5d2499ecc023ecff37d72bd32cbc3c5c6511926f SHA1 0f3c3d5aaf2596832a60b8aa6c2bbae137cdd9b4 SHA256 480a79abf3fda29f5bb22deca71110dc9be0ceedf7688df1bc4ba94254b23cbe
 DIST php_gtk_manual-20071130_en.tar.bz2 922621 RMD160 b654f1ee83a3608208005d60a8bd8480449855fa SHA1 f9e36b5f77020cfba97386e0439d4ebf34eac9e4 SHA256 9095b3205c2b411fe3b8f65cad00cb8648dec6581fcd678569e8cae09ceb17fc
 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.0.ebuild 3276 RMD160 11604973d01f474ca9cc8aa2eda0e69136d31700 SHA1 388f8d95acecf87580e869e0fcb262562619db9b SHA256 163860e8cb6916169c935a858fd45a6333388345cd5bf41e48f2446489604223
-EBUILD php-gtk-2.0.0_beta-r1.ebuild 3278 RMD160 7edcafdc0869f1a13bbde53446e24c23fba48fe1 SHA1 093a4a5ba97b8ef8b409e9f7a102182471aa3d23 SHA256 0fcfebb22e7b183900ef870180d96985a3162ffecb1968ff60e829c03176abc2
-MISC ChangeLog 2469 RMD160 e2bacb82ccb37375e85c71ed8f57191b3779f50d SHA1 479af8ad557ade7d6c0527c0bd273f85feebb42e SHA256 2c8c924655569696a4ea842268e9db0e3b7b62237c0ae75aeb2619abacd16d48
+EBUILD php-gtk-2.0.1.ebuild 3396 RMD160 c1a175dae8f21ec5e9613b3bb5a3987ca972e3a3 SHA1 6f35e71706e312ef1e47d9fe7c68623780b30533 SHA256 b911786507460bd1640432a19d9710843edd6a1f5e4720f9b762ec71c1113b3b
+MISC ChangeLog 2798 RMD160 5df8a191af5287a098c5b35d66f552e2b8bf517d SHA1 fa94bcb0a9382433a18e0742517a7ec8fc0f797b SHA256 47fcb5a329cc49161890266e57dd31a2bee62f8022ce4a6a73f02745be2db767
 MISC metadata.xml 403 RMD160 e3aeec7bef8ab5548c3146c01d959d08bd8bad2e SHA1 546780bec6b4636c191e16d45d9707f356be681b SHA256 48da2cda3ea301263a4c75fddcc263e565f1790ec75e744765076ad85f5d9ddb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiF8AcACgkQV6E0EIywUuURnACgrhXEtDg1o+uBiG+qTnJ5Mv4i
+WZ4AoIue8Z/MnZsNEOdXLaajsiYZkRMO
+=fkeE
+-----END PGP SIGNATURE-----
diff --git a/dev-php5/php-gtk/php-gtk-2.0.0_beta-r1.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
index e1d1b82f45ac..70cddfc39ab1 100644
--- a/dev-php5/php-gtk/php-gtk-2.0.0_beta-r1.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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_beta-r1.ebuild,v 1.2 2007/12/06 04:46:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1.ebuild,v 1.1 2008/07/22 14:34:39 hoffie Exp $
 
 EAPI="1"
 
@@ -12,12 +12,10 @@ DOCS="AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2"
 
 inherit php-ext-source-r1
 
-MY_P="${PN}-${PV/_beta/beta}"
-
 DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
 HOMEPAGE="http://gtk.php.net/"
-SRC_URI="http://gtk.php.net/distributions/${MY_P}.tar.gz"
-IUSE="debug doc extra +glade html libsexy mozembed scintilla sourceview spell"
+SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz"
+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"
@@ -37,41 +35,48 @@ 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
+	>=dev-libs/atk-1.9.0
 	extra? ( >=x11-libs/gtk+extra-2.1.1 )
 	glade? ( >=gnome-base/libglade-2.5.0 )
 	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* )
 	spell? ( >=app-text/gtkspell-2.0.0 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
-S="${WORKDIR}/${MY_P}"
-
 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"
-			eerror "PHP-GTK, this is needed to work with"
-			eerror "the debug version of PHP."
-			die "Enable 'debug' USE flag"
+			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 ${MY_P}.tar.gz
+	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}"/no-cli-check.patch
+	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
@@ -85,27 +90,16 @@ src_unpack() {
 }
 
 src_compile() {
-	local GLCONF
-	use glade || GLCONF=" --disable-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) \
+	my_conf="$(use_with extra) \
 		$(use_with html) \
 		$(use_with libsexy) \
 		$(use_with mozembed) \
-		$(use_with sourceview) \
 		$(use_with spell) \
-		$(use_with debug) \
+		$(use_enable debug) \
 		$(use_enable scintilla) \
-		${GLCONF}
-
-	emake || die "make failed!"
-	mv -f "modules/${PHP_EXT_NAME}.so" "${WORKDIR}/${PHP_EXT_NAME}-default.so" || die "Unable to move extension"
+		--without-sourceview \
+		$(use glade || echo '--without-libglade')"
+	php-ext-source-r1_src_compile
 }
 
 src_install() {
@@ -121,4 +115,9 @@ src_install() {
 			fi
 		done
 	fi
+
+	if use examples	; then
+		insinto /usr/share/doc/${CATEGORY}/${PF}/examples
+		doins -r "${S}"/demos/*
+	fi
 }