--- gdal-2.0.0.ebuild.orig 2015-07-09 14:11:57.532141436 +0200 +++ gdal-2.0.0.ebuild.orig 2015-07-09 14:18:04.270607363 +0200 @@ -19,7 +19,7 @@ SLOT="0" LICENSE="MIT" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls" +IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls" RDEPEND=" dev-libs/expat @@ -53,19 +53,17 @@ dev-python/setuptools[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) - ruby? ( dev-lang/ruby:1.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) " -SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4" +SWIG_DEP=">=dev-lang/swig-2.0.2" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.6 ) perl? ( ${SWIG_DEP} ) - python? ( ${SWIG_DEP} ) - ruby? ( ${SWIG_DEP} )" + python? ( ${SWIG_DEP} )" AT_M4DIR="${S}/m4" MAKEOPTS+=" -j1" @@ -94,8 +92,6 @@ -e "s:--prefix=\$(DESTDIR):--prefix=:" \ "${S}"/swig/python/GNUmakefile || die - epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch - # -soname is only accepted by GNU ld/ELF [[ ${CHOST} == *-darwin* ]] \ && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ @@ -143,11 +139,6 @@ gdal_src_configure() { local myopts="" - if use ruby; then - RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" - echo "Ruby module dir is: $RUBY_MOD_DIR" - fi - if use java; then myopts+=" --with-java=$(java-config --jdk-home 2>/dev/null) @@ -220,7 +211,6 @@ $(use_with png) \ $(use_with postgres pg) \ $(use_with python) \ - $(use_with ruby) \ $(use_with spatialite) \ $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \ $(use_with threads) \ @@ -259,13 +249,10 @@ } src_compile() { - local i - for i in perl ruby; do - if use $i; then - rm "${S}"/swig/$i/*_wrap.cpp - emake -C "${S}"/swig/$i generate - fi - done + if use perl; then + rm "${S}"/swig/perl/*_wrap.cpp + emake -C "${S}"/swig/perl generate + fi default @@ -294,21 +281,12 @@ perl-module_src_install popd > /dev/null sed -i \ - -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \ + -e "s:BINDINGS = python perl:BINDINGS = python:g" \ GDALmake.opt || die fi default - if use ruby ; then - # weird reinstall collision; needs manual intervention... - pushd "${S}"/swig/ruby > /dev/null - rm -rf "${D}"${RUBY_MOD_DIR}/gdal - exeinto ${RUBY_MOD_DIR}/gdal - doexe *.so || die "doins ruby modules failed" - popd > /dev/null - fi - use perl && perl_delete_localpod dodoc Doxyfile HOWTO-RELEASE NEWS