Make php extension really work.

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

4 files changed, 47 insertions, 11 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 1ad3569e8208..4b8a4cbd31ae 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/mapserver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.37 2011/05/02 20:09:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.38 2011/05/02 21:51:22 scarabeus Exp $
+
+  02 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/6.0.0_rc1-php_ldflags.patch, mapserver-6.0.0_rc1.ebuild:
+  Make php extension really work.
 
   02 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   mapserver-6.0.0_rc1.ebuild:
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 86d2b88168d1..b7aa21f950cc 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX 5.4.2-ldflags.patch 3851 RMD160 db486a2c5611b3bc9102ded21c3aa03f47f0dfe6 SHA1 7cef034f6d3a176934bbb9df957057309fe409be SHA256 518ebe8e12b590001571110d521939a44a1fc74d82cdc04d76f81943c99a5463
 AUX 6.0.0_rc1-bool.patch 862 RMD160 0678d6fa9ccf74143601122b4d2b75fbed702322 SHA1 5f06f5ce26ca4d022be7840dff82cf36a0d1be9f SHA256 59ce6a605768fd849c33fbb7093802f2906315f9abe520b78a985891d39508a6
 AUX 6.0.0_rc1-ldflags.patch 3954 RMD160 33dc08159230f49070891ad6626548746324370a SHA1 35a72f6f03e47c31971503865f05d0a6dc9beb76 SHA256 09ec9d68eccc100a315c60527bd51623ff03caa7b4721434aedb972aa96aa3b7
+AUX 6.0.0_rc1-php_ldflags.patch 551 RMD160 88de8414b4d6ea8fbeb7c11c6ad4f3c673487175 SHA1 9914dca230858fea212983521b85aa5a719fa4b7 SHA256 50023a92811b2856bdb04d8e2d241c4e424c4b00557c1d70615a3940f664fd59
 AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
 DIST mapserver-5.6.6.tar.gz 2326652 RMD160 251d3448fbdc2f0a14351389fc85d6b014a22d99 SHA1 e0fa6455737ca2cd14357775adda92a47b4e53ff SHA256 e5d00321456791cebcbf0b0cb3fa1b69c5cd8bfa8d6003ad05480682465684f6
 DIST mapserver-6.0.0-rc1.tar.gz 2423113 RMD160 edb2e0dc723bf6ad5024b73985591d63ffeb982f SHA1 8b57e6aff77775027dd1ec72478c88629cf7bfa7 SHA256 d77d0b674dc4f9431b57add57215551a48db06c5843b3c65b2524befa7b010fa
 EBUILD mapserver-5.6.6.ebuild 7312 RMD160 c5ae1310ac90c28ea6e0910a18b8616dc1d8ab55 SHA1 d43b123ee7a61bf64e42d3bcc48397cd11947911 SHA256 bbfe04300654d2aa8531af13bebeb07ccec3f1388b26d4b4f6a55a0a181c13db
-EBUILD mapserver-6.0.0_rc1.ebuild 5391 RMD160 3986a06fa1e95743b2e12d3552373e71a5d511c3 SHA1 5b33fee4d6aef6f3d86f5a1ff3bb9a3c9cdcd898 SHA256 ed4c671302db351bda13de99e47ab931329416ab7f1dfe657916e32ec33a2b6e
-MISC ChangeLog 7125 RMD160 f6da26cf24a6a12d1ac72b8950f225ff06d3e6fe SHA1 ab2d6fe6794bce268be19f514bb459ef08fa5627 SHA256 6f709366159477959d0326e9ccc0c3a79c7c2416e479e232053089711b89d1a9
+EBUILD mapserver-6.0.0_rc1.ebuild 5903 RMD160 1c727fbcde02bd92d12d93efb15b869aefdc0cfa SHA1 f9e7e4f321d5d957a784b91e5f287c378d11b49e SHA256 ebbb43d7583fe6ca0657e0d38d4f793eaf32e573294b4960211099c90cc4d850
+MISC ChangeLog 7281 RMD160 9acf411cc0f9b3ef516cc199b3dde589fa28e980 SHA1 dd29aa16b83d63626d5e3a80dac2862f4acfa3bc SHA256 939c90eda645372b68d49c6ceb06406f986389fe0e3ab87036635761175af0f7
 MISC metadata.xml 752 RMD160 336d701cfcb45e8d38e7d7be62910a3b92ef4e6b SHA1 268cb1d2aad5143713b52a2be77b44fb73d29553 SHA256 0e50fb47de44ad1fe80ff9473bc5f37927cfeeaa536809782fc17d5b3a7667a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2/DzgACgkQHB6c3gNBRYcEYQCdF/7mWpRUkkvWn5vVpmLf7e5s
-fJIAoLbu2e6eSlne65FONfaN3aCXMH/E
-=GjLq
+iEYEARECAAYFAk2/JvAACgkQHB6c3gNBRYfbEgCguCWyOWNGD2v47yLGSFP+eq+/
+NgoAn1F9PzVU0YmezhXC5CwIne2/uNDk
+=XAFX
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
new file mode 100644
index 000000000000..706bae4ce7b1
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
@@ -0,0 +1,15 @@
+--- mapserver-6.0.0-rc1.old/mapscript/php/Makefile.in	2011-05-02 12:10:03.000000000 +0200
++++ mapserver-6.0.0-rc1/mapscript/php/Makefile.in	2011-05-02 23:43:15.000000000 +0200
+@@ -86,10 +86,10 @@
+ 
+ 
+ php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
+-	$(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
++	$(LD) -o $@ $(LDFLAGS) $(PHPMS_OBJS) $(MS_LIBS)
+ 
+ php_proj.so:  $(PHPPROJ_OBJS)
+-	$(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
++	$(LD) -o $@ $(LDFLAGS) $(PHPPROJ_OBJS) $(MS_LIBS)
+ 
+ %.o: %.c php_mapscript_util.h php_mapscript.h
+ 	$(CC) $(CFLAGS112) -c -o $@ $<
diff --git a/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild b/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild
index 27916ca8a827..e618286523ef 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.10 2011/05/02 20:09:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.11 2011/05/02 21:51:22 scarabeus Exp $
 
 EAPI=3
 
@@ -87,6 +87,16 @@ _enter_build_dir() {
 
 each_ruby_configure() { ${RUBY} extconf.rb || die ; }
 
+ext-source-r2_src_install() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		insinto "${EXT_DIR}"
+		newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+	done
+	php-ext-source-r2_createinifiles
+}
+
 pkg_setup() {
 	webapp_pkg_setup
 	use perl && perl-module_pkg_setup
@@ -97,11 +107,17 @@ pkg_setup() {
 src_unpack() {
 	# unpack A and then copy the php thingies into workdir/php-slot
 	php-ext-source-r2_src_unpack
+	# HACK: and then remove it and replace by symlink
+	for slot in $(php_get_slots); do
+		rm -rf "${WORKDIR}/${slot}" || die
+		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+	done
 }
 
 src_prepare() {
 	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
-		"${FILESDIR}/6.0.0_rc1-bool.patch"
+		"${FILESDIR}/6.0.0_rc1-bool.patch" \
+		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch"
 	eautoreconf
 }
 
@@ -158,11 +174,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 || die
+	emake || die
 	use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
 	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
 	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
-	use php && php-ext-source-r2_src_compile
+	#use php && php-ext-source-r2_src_compile # already compiled by the emake all
 	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
 }
 
@@ -184,7 +200,7 @@ src_install() {
 	use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"
 	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
 	use perl && _enter_build_dir "${S}/mapscript/perl" "fixlocalpod"
-	use php && php-ext-source-r2_src_install
+	use php && ext-source-r2_src_install
 	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
 
 	webapp_src_preinst