Fixed runtime depend on swig (bug #221491)

Package-Manager: portage-2.1.5

4 files changed, 49 insertions, 32 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index d3350c3a8490..fcd185f628d9 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/mapserver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.11 2008/03/02 08:26:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.12 2008/05/17 10:25:04 bicatali Exp $
+
+  17 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  mapserver-5.0.0.ebuild, mapserver-5.0.0-r1.ebuild:
+  Fixed runtime depend on swig (bug #221491)
 
   02 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
   +files/mapserver_tcl.patch-r1, metadata.xml:
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 8395566b3e2c..6f15f380c417 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -6,14 +6,14 @@ AUX mapserver_php4.patch 344 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d SHA
 AUX mapserver_tcl.patch 1499 RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 SHA1 24c8a7a306fbb7bd5bb27b33658a45156f7e6515 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09
 AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
 DIST mapserver-5.0.0.tar.gz 1803416 RMD160 82b505bf59139afc4a581543c6b4789a52ac1b2c SHA1 156987dbb5b19aaa310a391737a9e649fbc08ea1 SHA256 c754b87a62776d7cd9e781df7523a0560f0773ece5faefb8acc6c030f776b5b7
-EBUILD mapserver-5.0.0-r1.ebuild 7408 RMD160 a5f12ff4edc20debd9d7799df19c27c515acd6cc SHA1 31bcb7a80261adf9a8d388b7bedc7fd5de28600c SHA256 9597146820d38a681dedce74d68636ec53b109562863162cbd2abdabed305230
-EBUILD mapserver-5.0.0.ebuild 8710 RMD160 c2ab1269061899dfea82704a4d959691b5031964 SHA1 4a1ba23169b039e3036fb746abfeb103135bc0ef SHA256 b39adeb40a4ec16eac47a6f55f40ee3787b0816bd2d848d5aad6675e1b5dff5d
-MISC ChangeLog 3029 RMD160 616ca690b01f5e34b69d495d3d69e12f5681338b SHA1 228ce0b3316069fba42b2f4961d00b1bfb962b5e SHA256 6585c6101bc0cf7221637713547910c1210ce383a07d83c96b0b422b7fd81038
+EBUILD mapserver-5.0.0-r1.ebuild 7468 RMD160 ff85d88ffd5fee629eea2926cf1498701d0df125 SHA1 e1d7b4518dfb6b7abe2abcf311c2cbb8f3d0e9bb SHA256 a4c546cbc1096db73a413c3aeb8f6cc1a7e8f5c45df4e31e2e67b9088aae2be1
+EBUILD mapserver-5.0.0.ebuild 8772 RMD160 4ce2af99f2bdec2e5d1891e593c7c1d723c92225 SHA1 d4db60d3492330f408eb37f9feefdc8c6501e67b SHA256 b18c344d8ed3d7b7bd9fb029893d761842d3e0134c58775e04757a3dcd5e7df2
+MISC ChangeLog 3185 RMD160 4a088ca5a8df0dbe0ca3eb3518f2c58a3eccc240 SHA1 35c575182e8fb0707ed84234218ca681434c661a SHA256 4a809541269d30cdd02ca119c0d668b96aa1f82481b111e1a46d1db984671555
 MISC metadata.xml 169 RMD160 e1db75ae5d177dffc400468c7d76a7e1fe41876d SHA1 0c953712f9b97d5ab3f95ae71997ffbc96c4007d SHA256 36837b011d26f0b83477c7a8632cb0099aedbcba5a3e45c61f20292e079f6180
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfKZPUACgkQmPFBzbX68WG9PgCghvOuZ3ZOxEN+aUL4N6k/0qHh
-FewAniRIOYAHMBsj8/8dL3lci2XJAAgx
-=ffx6
+iEYEARECAAYFAkguso0ACgkQ1ycZbhPLE2BR+gCcCub6vqvi9l49IABx6K1Rdyo4
+rY8An0jLzESwmGRlZl1+Bq/E9NXUY9Cs
+=OI3O
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
index 61035ada07ab..659806f372c9 100644
--- a/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild,v 1.1 2008/02/05 08:29:18 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild,v 1.2 2008/05/17 10:25:04 bicatali Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="agg doc flash gdal geos java pdf perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
 
 # compilation fails with jdk > 1.4 on some native part probably
-DEPEND="media-libs/libpng
+RDEPEND="media-libs/libpng
 	media-libs/jpeg
 	media-libs/freetype
 	>=media-libs/gd-2.0.12
@@ -29,21 +29,27 @@ DEPEND="media-libs/libpng
 	flash? ( media-libs/ming )
 	gdal? ( >sci-libs/gdal-1.2.6 )
 	geos? ( sci-libs/geos )
-	java? ( >=virtual/jdk-1.4 dev-lang/swig )
+	java? ( >=virtual/jdk-1.4 )
 	pdf? ( media-libs/pdflib )
-	perl? ( dev-perl/DBI dev-lang/swig )
-	php? ( dev-lang/php dev-lang/swig )
+	perl? ( dev-perl/DBI )
+	php? ( dev-lang/php )
 	postgis? ( dev-db/postgis )
 	proj? ( sci-libs/proj net-misc/curl )
-	python? ( dev-lang/python dev-lang/swig )
-	ruby? ( dev-lang/ruby dev-lang/swig )
-	tcl? ( dev-lang/tcl dev-lang/swig )
+	python? ( dev-lang/python )
+	ruby? ( dev-lang/ruby )
+	tcl? ( dev-lang/tcl )
 	tiff? ( media-libs/tiff sci-libs/libgeotiff )
 	unicode? ( virtual/libiconv )
 	xml? ( dev-libs/libxml2 )
 	xpm? ( x11-libs/libXpm )"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	java? ( dev-lang/swig )
+	perl? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	php? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
 want_apache2
 
 cd_script() {
@@ -131,8 +137,8 @@ src_compile() {
 	fi
 
 	if use php && use proj; then
-		    cd_script php3 ${step}
-		    emake php_proj.so || die "unable to built php_proj.so"
+			cd_script php3 ${step}
+			emake php_proj.so || die "unable to built php_proj.so"
 	fi
 
 	if use python; then
@@ -251,7 +257,7 @@ src_install() {
 	fi
 
 	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
-		    sortshp tile4ms msencrypt mapserver-config \
+			sortshp tile4ms msencrypt mapserver-config \
 			|| die "Unable to setup mapserver tools"
 
 	dodoc INSTALL README HISTORY.TXT || die "Unable to setup documentation"
diff --git a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
index 580e59753596..01e5ef639506 100644
--- a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
+++ b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0.ebuild,v 1.6 2008/02/06 21:12:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0.ebuild,v 1.7 2008/05/17 10:25:04 bicatali Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="agg xml pdf proj geos tiff gdal xpm postgis flash php python perl ruby tcl threads unicode java doc"
 
 # compilation fails with jdk > 1.4 on some native part probably
-DEPEND="media-libs/libpng
+RDEPEND="media-libs/libpng
 	media-libs/jpeg
 	media-libs/freetype
 	sys-libs/zlib
@@ -35,13 +35,20 @@ DEPEND="media-libs/libpng
 	xpm? ( x11-libs/libXpm )
 	flash? ( media-libs/ming )
 	pdf? ( media-libs/pdflib )
-	php? ( dev-lang/php dev-lang/swig )
-	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-lang/swig )
-	tcl? ( dev-lang/tcl dev-lang/swig )"
-RDEPEND="${DEPEND}"
+	php? ( dev-lang/php )
+	ruby? ( dev-lang/ruby )
+	perl? ( dev-perl/DBI )
+	python? ( dev-lang/python )
+	java? ( >=virtual/jdk-1.4 )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	php? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	java? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+
 
 WEBAPP_MANUAL_SLOT=yes
 
@@ -96,7 +103,7 @@ pkg_setup(){
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	if (use tcl); then
@@ -187,7 +194,7 @@ src_compile() {
 	make || die "make failed"
 
 	if (use php && use proj); then
-	    cd "${S}"/mapscript/php3/
+		cd "${S}"/mapscript/php3/
 		if [ ${np} -eq 2 ]; then
 			cp *.so ../php4/ || die "Unable to copy php4 mapscript object files"
 		fi
@@ -289,7 +296,7 @@ src_install() {
 
 	if use perl; then
 			cd_script perl ${step}
-		    make DESTDIR="${D}" install || \
+			make DESTDIR="${D}" install || \
 				die "Unable to setup perl mapscript support"
 			mapscript_install_examples perl
 	fi