diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-05-02 22:51:22 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-05-02 22:51:22 +0000 |
| commit | b891f09c057ccd2576cd56fbb82c461ba8d3f0df (patch) | |
| tree | 6be0d3ce897655afeae554600da57ecc87d19849 | |
| parent | * closing bug #176742 (diff) | |
| download | gentoo-2-b891f09c057ccd2576cd56fbb82c461ba8d3f0df.tar.gz gentoo-2-b891f09c057ccd2576cd56fbb82c461ba8d3f0df.tar.bz2 gentoo-2-b891f09c057ccd2576cd56fbb82c461ba8d3f0df.zip | |
Change java-pkg-2 eclass to java-pkg-opt-2 to fix compilation with USE=-java - bug #176855; also call its pkg_setup.
(Portage version: 2.1.2.5)
| -rw-r--r-- | sci-geosciences/mapserver/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild | 9 |
2 files changed, 11 insertions, 5 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 <caster@gentoo.org> + 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/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 |