From 574463d3d9425fb3e044829c5304b3cc860b93f0 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 2 May 2007 22:51:22 +0000 Subject: [PATCH] Change java-pkg-2 eclass to java-pkg-opt-2 to fix compilation with USE=-java - bug #176855; also call its pkg_setup. Package-Manager: portage-2.1.2.5 --- sci-geosciences/mapserver/ChangeLog | 7 ++++++- sci-geosciences/mapserver/Manifest | 16 ++++++++-------- .../mapserver/mapserver-4.10.0-r1.ebuild | 9 +++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog index 0369b2ebea59..9ce122cb8abb 100644 --- a/sci-geosciences/mapserver/ChangeLog +++ b/sci-geosciences/mapserver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-geosciences/mapserver # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.3 2007/04/28 18:32:29 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.4 2007/05/02 22:51:22 caster Exp $ + + 02 May 2007; Vlastimil Babka + mapserver-4.10.0-r1.ebuild: + Change java-pkg-2 eclass to java-pkg-opt-2 to fix compilation with USE=-java + - bug #176855; also call its pkg_setup. *mapserver-4.10.0-r1 (28 Apr 2007) diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index 6a500c59e7e2..53fb0c9374ef 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -11,18 +11,18 @@ MD5 f885111c787be0e68c17073ab14ae73b files/mapserver_tcl.patch 1499 RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 files/mapserver_tcl.patch 1499 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09 files/mapserver_tcl.patch 1499 DIST mapserver-4.10.0.tar.gz 1782838 RMD160 425b1e856e98165cb7d4facf6a1ef393bf9c7f36 SHA1 ee2b7befc738ec79fab83bafe27b4e4efe11b1cb SHA256 c59b0b6b75443fbbced153c4b01f752e748cf73ce7c29125cfe8e223893b9d99 -EBUILD mapserver-4.10.0-r1.ebuild 7286 RMD160 db4723fb62c8404075d0766d884eeb4983cf6834 SHA1 f5ccc4aa4b5d9096eb56b75e98a254797a00f53d SHA256 c2b019482a308545840bf4565c764316023ac8b0d045086f0756e845450959eb -MD5 b49a76b90f800a765e08e2fb46b07aa5 mapserver-4.10.0-r1.ebuild 7286 -RMD160 db4723fb62c8404075d0766d884eeb4983cf6834 mapserver-4.10.0-r1.ebuild 7286 -SHA256 c2b019482a308545840bf4565c764316023ac8b0d045086f0756e845450959eb mapserver-4.10.0-r1.ebuild 7286 +EBUILD mapserver-4.10.0-r1.ebuild 7356 RMD160 423c79ed54f46b5859a77a9e8089fc89a1e16ebb SHA1 b574b915b6a09455813f7ce56aaf599af56e9ae7 SHA256 19ad0d41ad421930ce6265146a039a884aff9e14f1911bf2f7e59d1cb47c023b +MD5 1d27339ad9436241b85fc539fba6af76 mapserver-4.10.0-r1.ebuild 7356 +RMD160 423c79ed54f46b5859a77a9e8089fc89a1e16ebb mapserver-4.10.0-r1.ebuild 7356 +SHA256 19ad0d41ad421930ce6265146a039a884aff9e14f1911bf2f7e59d1cb47c023b mapserver-4.10.0-r1.ebuild 7356 EBUILD mapserver-4.10.0.ebuild 7282 RMD160 9171b0312aeee3849679091e8c8093cf6506a666 SHA1 ac85d2735602c2551c56da3ff547eebefda65be0 SHA256 b491b9baee8023e6c46ba7ad97ad20686d1f4813bbe5117182b5ee1c9cf57b1c MD5 ca86b06d57ab19af05d66f258d7c9364 mapserver-4.10.0.ebuild 7282 RMD160 9171b0312aeee3849679091e8c8093cf6506a666 mapserver-4.10.0.ebuild 7282 SHA256 b491b9baee8023e6c46ba7ad97ad20686d1f4813bbe5117182b5ee1c9cf57b1c mapserver-4.10.0.ebuild 7282 -MISC ChangeLog 1144 RMD160 2360543dc0dea01bc0ea54043c0a8a56dba404ac SHA1 a50bc73dcf63e1db0ddf66288e3172e1d7dc51eb SHA256 1e92d7c5b7d226b19d557cb0e01a3137f33933e0e1f3a85bc616c96c26071b3b -MD5 f4ef26f9f84221835155d44dbad54116 ChangeLog 1144 -RMD160 2360543dc0dea01bc0ea54043c0a8a56dba404ac ChangeLog 1144 -SHA256 1e92d7c5b7d226b19d557cb0e01a3137f33933e0e1f3a85bc616c96c26071b3b ChangeLog 1144 +MISC ChangeLog 1345 RMD160 3d21e5d69eb52de70560f92b3b2b59242ca9508a SHA1 2687528bae1ee04a0e4239d3b4e0351b30e510f5 SHA256 6b644cfa608b967d2fd523918c2e3d2e574b7cb3ed0abf73a250cb298a8bb207 +MD5 9521e5636f52bcfaa3d707bc7e5fd5e8 ChangeLog 1345 +RMD160 3d21e5d69eb52de70560f92b3b2b59242ca9508a ChangeLog 1345 +SHA256 6b644cfa608b967d2fd523918c2e3d2e574b7cb3ed0abf73a250cb298a8bb207 ChangeLog 1345 MISC metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab SHA1 1221e73982792f6e23f10d95e878e86e8f62fe35 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d MD5 398851fd6e5d040b232773963c208fc6 metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab metadata.xml 168 diff --git a/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild index 00d66d362705..5d5b116b5a96 100644 --- a/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild +++ b/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild,v 1.1 2007/04/28 18:32:29 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild,v 1.2 2007/05/02 22:51:22 caster Exp $ PHP_EXT_NAME="php_mapscript php_proj" RUBY_OPTIONAL="yes" -inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-2 +inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-opt-2 DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications." @@ -21,7 +21,7 @@ KEYWORDS="~x86" #"mono" IUSE="xml pdf proj geos tiff gdal xpm postgis flash php python perl ruby tcl java" - +# compilation fails with jdk > 1.4 on some native part probably DEPEND="media-libs/libpng media-libs/jpeg >=media-libs/gd-2.0.12 @@ -41,7 +41,7 @@ DEPEND="media-libs/libpng ruby? ( dev-lang/ruby dev-lang/swig ) perl? ( dev-perl/DBI dev-lang/swig ) python? ( dev-lang/python dev-lang/swig ) - java? ( =virtual/jdk-1.4* dev-java/java-config dev-lang/swig ) + java? ( =virtual/jdk-1.4* dev-lang/swig ) tcl? ( dev-lang/tcl dev-lang/swig )" WEBAPP_MANUAL_SLOT=yes @@ -55,6 +55,7 @@ cd_script() { pkg_setup(){ webapp_pkg_setup + java-pkg-opt-2_pkg_setup if use php; then # check how many versions of php was installed has_php -- 2.26.2