| 1 |
scarabeus 11/05/02 10:20:58 |
| 2 |
|
| 3 |
Modified: ChangeLog mapserver-6.0.0_rc1.ebuild |
| 4 |
Log: |
| 5 |
Migrate 6.0.0 to ruby-ng eclass. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.29 sci-geosciences/mapserver/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.29&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.29&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.28&r2=1.29 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v |
| 19 |
retrieving revision 1.28 |
| 20 |
retrieving revision 1.29 |
| 21 |
diff -u -r1.28 -r1.29 |
| 22 |
--- ChangeLog 2 May 2011 10:16:17 -0000 1.28 |
| 23 |
+++ ChangeLog 2 May 2011 10:20:58 -0000 1.29 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for sci-geosciences/mapserver |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.28 2011/05/02 10:16:17 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.29 2011/05/02 10:20:58 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 02 May 2011; Tomáš Chvátal <scarabeus@g.o> |
| 31 |
+ mapserver-6.0.0_rc1.ebuild: |
| 32 |
+ Migrate 6.0.0 to ruby-ng eclass. |
| 33 |
|
| 34 |
*mapserver-6.0.0_rc1 (02 May 2011) |
| 35 |
*mapserver-5.6.6 (02 May 2011) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: mapserver-6.0.0_rc1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- mapserver-6.0.0_rc1.ebuild 2 May 2011 10:16:17 -0000 1.1 |
| 52 |
+++ mapserver-6.0.0_rc1.ebuild 2 May 2011 10:20:58 -0000 1.2 |
| 53 |
@@ -1,10 +1,12 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.1 2011/05/02 10:16:17 scarabeus Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.2 2011/05/02 10:20:58 scarabeus Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
|
| 61 |
PHP_EXT_NAME="php_mapscript php_proj" |
| 62 |
+ |
| 63 |
+USE_RUBY="ruby18 ruby19" |
| 64 |
RUBY_OPTIONAL="yes" |
| 65 |
|
| 66 |
PYTHON_DEPEND="2" |
| 67 |
@@ -12,7 +14,7 @@ |
| 68 |
RESTRICT_PYTHON_ABIS="3.*" |
| 69 |
PYTHON_MODNAME="mapscript.py" |
| 70 |
|
| 71 |
-inherit eutils autotools confutils multilib distutils depend.php perl-module php-ext-source-r1 depend.apache webapp ruby java-pkg-opt-2 |
| 72 |
+inherit eutils autotools confutils multilib distutils depend.php perl-module php-ext-source-r1 depend.apache webapp ruby-ng java-pkg-opt-2 |
| 73 |
|
| 74 |
MY_P="${PN}-${PV/_/-}" |
| 75 |
|
| 76 |
@@ -44,7 +46,6 @@ |
| 77 |
php? ( dev-lang/php ) |
| 78 |
postgis? ( dev-db/postgis ) |
| 79 |
proj? ( sci-libs/proj net-misc/curl ) |
| 80 |
- ruby? ( dev-lang/ruby ) |
| 81 |
tcl? ( dev-lang/tcl ) |
| 82 |
tiff? ( media-libs/tiff sci-libs/libgeotiff ) |
| 83 |
unicode? ( virtual/libiconv ) |
| 84 |
@@ -73,6 +74,7 @@ |
| 85 |
use perl && perl-module_pkg_setup |
| 86 |
use php && has_php |
| 87 |
use python && python_pkg_setup |
| 88 |
+ use ruby && ruby-ng_pkg_setup |
| 89 |
|
| 90 |
confutils_use_conflict gdal tiff |
| 91 |
confutils_use_depend_all java threads |
| 92 |
@@ -85,6 +87,7 @@ |
| 93 |
sed -i -e "s:@libdir@:$(get_libdir):g" mapscript/tcl/Makefile.in \ |
| 94 |
|| die "failed to fix libdir in Makefile.in" |
| 95 |
fi |
| 96 |
+ use ruby && ruby-ng_src_prepare |
| 97 |
eautoreconf |
| 98 |
} |
| 99 |
|
| 100 |
@@ -132,7 +135,7 @@ |
| 101 |
if use ruby; then |
| 102 |
cd_script ruby ${step} |
| 103 |
RUBY_ECONF="-I${D}" |
| 104 |
- ruby_econf |
| 105 |
+ ruby-ng_econf |
| 106 |
cp ../mapscript.i . || die "Unable to find mapscript.i" |
| 107 |
sed -e "s:ruby.h defines.h::g" -i ./Makefile |
| 108 |
fi |
| 109 |
@@ -174,7 +177,7 @@ |
| 110 |
|
| 111 |
if use ruby; then |
| 112 |
cd_script ruby ${step} |
| 113 |
- ruby_emake |
| 114 |
+ ruby-ng_src_compile |
| 115 |
fi |
| 116 |
|
| 117 |
if use tcl; then |
| 118 |
@@ -233,7 +236,7 @@ |
| 119 |
|
| 120 |
if use ruby ; then |
| 121 |
cd_script ruby ${step} |
| 122 |
- ruby_einstall |
| 123 |
+ ruby-ng_src_install |
| 124 |
mapscript_install_examples ruby |
| 125 |
fi |
Archives