From fe884855fab40bdf5889d841edad76d8c421bb45 Mon Sep 17 00:00:00 2001 From: wraeth Date: Sat, 21 Nov 2015 00:59:47 +1100 Subject: [PATCH 1/4] sci-geosciences/grass: remove masked version 6.4.2 Remove masked version and now obsolete patches, update metadata.xml to remove unused USE flags. Gentoo-Bug: 566314 Package-Manager: portage-2.2.25 --- sci-geosciences/grass/Manifest | 1 - .../grass/files/grass-6.4.0-html-nonviz.patch | 33 --- .../grass/files/grass-6.4.1-libav-0.8.patch | 60 ---- .../grass/files/grass-6.4.1-libpng15.patch | 28 -- .../grass/files/grass-6.4.1-nopycompile.patch | 12 - .../grass/files/grass-6.4.1-timer_flags.patch | 13 - .../grass/files/grass-6.4.2-configure.patch | 26 -- .../grass/files/grass-6.4.2-ffmpeg-1.patch | 79 ----- .../grass/files/grass-6.4.2-libav-9.patch | 11 - sci-geosciences/grass/files/grass-pkgconf.patch | 22 -- sci-geosciences/grass/grass-6.4.2.ebuild | 327 --------------------- sci-geosciences/grass/metadata.xml | 4 - 12 files changed, 616 deletions(-) delete mode 100644 sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.1-libpng15.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.2-configure.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch delete mode 100644 sci-geosciences/grass/files/grass-6.4.2-libav-9.patch delete mode 100644 sci-geosciences/grass/files/grass-pkgconf.patch delete mode 100644 sci-geosciences/grass/grass-6.4.2.ebuild diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index f520f8f..4fc483a 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,2 +1 @@ -DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4 DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266 diff --git a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch deleted file mode 100644 index a5afd0d..0000000 --- a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- tools/build_html_index.sh.old 2010-06-16 23:07:37.000000000 +0200 -+++ tools/build_html_index.sh 2010-06-16 23:10:00.000000000 +0200 -@@ -135,7 +135,6 @@ - - - - -@@ -245,11 +244,11 @@ - #copy over CSS: - cp -f grassdocs.css $HTMLDIR/ - mkdir -p $HTMLDIR/nviz/ --cp -f grassdocs.css $HTMLDIR/nviz/ -+#cp -f grassdocs.css $HTMLDIR/nviz/ - chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css - #copy over GRASS logo: - cp -f grass_logo.png $HTMLDIR/ --cp -f grass_logo.png $HTMLDIR/nviz/ -+#cp -f grass_logo.png $HTMLDIR/nviz/ - chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png - if [ "$MACOSX" ] ; then - cp -f grass_icon.png $HTMLDIR/ -@@ -302,7 +301,7 @@ - echo "  r3.* raster3D commands" >> "$FULLINDEX" - echo "  v.* vector commands" >> "$FULLINDEX" - echo "  gis.m GUI frontend to GIS menus and display" >> "$FULLINDEX" --echo "  nviz visualization suite" >> "$FULLINDEX" -+#echo "  nviz visualization suite" >> "$FULLINDEX" - echo "  wxGUI wxPython-based GUI frontend" >> "$FULLINDEX" - echo "  xganim raster map slideshow" >> "$FULLINDEX" - echo "" >> "$FULLINDEX" diff --git a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch b/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch deleted file mode 100644 index 4864d88..0000000 --- a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch +++ /dev/null @@ -1,60 +0,0 @@ -Adjust Grass 6.4.1 to work with ffmpeg 8. - -2011-11-17 Fabio Erculiani -2011-12-08 Martin von Gagern - -References: -https://bugs.gentoo.org/390827 -https://bugs.gentoo.org/392371 - ---- grass-6.4.1.orig/lib/ogsf/gsd_img_mpeg.c -+++ grass-6.4.1/lib/ogsf/gsd_img_mpeg.c -@@ -66,7 +66,7 @@ static AVStream *add_video_stream(AVForm - - c = st->codec; - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - - /* put sample parameters */ - c->bit_rate = 400000; -@@ -215,7 +215,7 @@ static void write_video_frame(AVFormatCo - - av_init_packet(&pkt); - -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = st->index; - pkt.data = (uint8_t *) picture; - pkt.size = sizeof(AVPicture); -@@ -236,7 +236,7 @@ static void write_video_frame(AVFormatCo - av_rescale_q(c->coded_frame->pts, c->time_base, - st->time_base); - if (c->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = st->index; - pkt.data = video_outbuf; - pkt.size = out_size; -@@ -301,10 +301,10 @@ int gsd_init_mpeg(const char *filename) - av_register_all(); - - /* auto detect the output format from the name. default is mpeg. */ -- fmt = guess_format(NULL, filename, NULL); -+ fmt = av_guess_format(NULL, filename, NULL); - if (!fmt) { - G_warning(_("Unable to deduce output format from file extension: using MPEG")); -- fmt = guess_format("mpeg", NULL, NULL); -+ fmt = av_guess_format("mpeg", NULL, NULL); - } - if (!fmt) { - G_warning(_("Unable to find suitable output format")); -@@ -312,7 +312,7 @@ int gsd_init_mpeg(const char *filename) - } - - /* allocate the output media context */ -- oc = av_alloc_format_context(); -+ oc = av_malloc(sizeof(AVFormatContext)); - if (!oc) { - G_warning(_("Out of memory")); - return (-1); diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch deleted file mode 100644 index 3c040e7..0000000 --- a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- raster/r.out.png/r.out.png.c -+++ raster/r.out.png/r.out.png.c -@@ -261,9 +261,6 @@ - png_info_init(info_ptr); - #endif - png_init_io(png_ptr, fp); -- info_ptr->width = win.cols; -- info_ptr->height = win.rows; -- info_ptr->bit_depth = depth; - - /* explicit filter-type (or none) required */ - if ((filter >= 0) && (filter <= 4)) { -@@ -302,10 +299,13 @@ - /*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */ - - if (TRUE) { -+ int color_type; - if (do_alpha) -- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - else -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -+ color_type = PNG_COLOR_TYPE_RGB; -+ -+ png_set_IHDR(png_ptr, info_ptr, win.cols, win.rows, depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - - /* write the png-info struct */ - png_write_info(png_ptr, info_ptr); diff --git a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch deleted file mode 100644 index 75f173a..0000000 --- a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur grass-6.4.1.orig/gui/wxpython/Makefile grass-6.4.1/gui/wxpython/Makefile ---- grass-6.4.1.orig/gui/wxpython/Makefile -+++ grass-6.4.1/gui/wxpython/Makefile -@@ -11,7 +11,7 @@ - ETCDIR = $(ETC)/wxpython - - SRCFILES := $(wildcard compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README --DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES))) -+DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) - - default: install_scripts - $(MAKE) parsubdirs diff --git a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch deleted file mode 100644 index 7c25094..0000000 --- a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tools/timer/Makefile.orig 2011-11-14 18:58:13.000000000 -0800 -+++ tools/timer/Makefile 2011-11-14 19:00:41.000000000 -0800 -@@ -8,8 +8,8 @@ - default: $(ETC)/$(PGM) - - $(ETC)/$(PGM): main.c -- $(CC) -c $< -- $(CC) -o $(ETC)/$(PGM) $< -+ $(CC) $(CFLAGS) -c $< -+ $(CC) $(LDFLAGS) -o $(ETC)/$(PGM) $< - - clean: - \rm -f $(ETC)/$(PGM) main.o diff --git a/sci-geosciences/grass/files/grass-6.4.2-configure.patch b/sci-geosciences/grass/files/grass-6.4.2-configure.patch deleted file mode 100644 index 37b7516..0000000 --- a/sci-geosciences/grass/files/grass-6.4.2-configure.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- grass-6.4.2.orig/configure.in 2012-02-06 11:16:07.000000000 +0100 -+++ grass-6.4.2/configure.in 2013-01-17 23:25:41.126387684 +0100 -@@ -1110,9 +1110,9 @@ - - LOC_CHECK_INC_PATH(ffmpeg, FFMPEG, FFMPEGINCPATH) - --LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH) --LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH) --LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH) -+LOC_CHECK_INCLUDES(libavcodec/avcodec.h,FFMPEG,$FFMPEGINCPATH) -+LOC_CHECK_INCLUDES(libavformat/avformat.h,FFMPEG,$FFMPEGINCPATH) -+LOC_CHECK_INCLUDES(libswscale/swscale.h,FFMPEG,$FFMPEGINCPATH) - - AC_DEFINE(HAVE_FFMPEG) - -@@ -1125,8 +1125,8 @@ - LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH) - - LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB) --LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) --LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) -+LOC_CHECK_LIBS(avcodec, avcodec_open2, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) -+LOC_CHECK_LIBS(avformat, av_write_frame, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) - - fi # $USE_FFMPEG - diff --git a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch deleted file mode 100644 index ec26ae2..0000000 --- a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch +++ /dev/null @@ -1,79 +0,0 @@ -Fix build with ffmpeg-1. -Part of https://bugs.gentoo.org/show_bug.cgi?id=443264 - -Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c -=================================================================== ---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c -+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c -@@ -26,7 +26,8 @@ - - /* FFMPEG stuff */ - #ifdef HAVE_FFMPEG --#include -+#include -+#include - - /* 5 seconds stream duration */ - #define STREAM_DURATION 5.0 -@@ -58,7 +59,7 @@ static AVStream *add_video_stream(AVForm - AVCodecContext *c; - AVStream *st; - -- st = av_new_stream(oc, 0); -+ st = avformat_new_stream(oc, 0); - if (!st) { - G_warning(_("Unable to allocate stream")); - return NULL; -@@ -97,7 +98,7 @@ static AVStream *add_video_stream(AVForm - c->flags |= CODEC_FLAG_GLOBAL_HEADER; - - c->flags |= CODEC_FLAG_QSCALE; -- c->global_quality = st->quality = FF_QP2LAMBDA * 10; -+ c->global_quality = FF_QP2LAMBDA * 10; - - return st; - } -@@ -332,13 +333,7 @@ int gsd_init_mpeg(const char *filename) - add_video_stream(oc, fmt->video_codec, (r - l + 1), (t - b + 1)); - } - -- /* set the output parameters (must be done even if no parameters). */ -- if (av_set_parameters(oc, NULL) < 0) { -- G_warning(_("Invalid output format parameters")); -- return (-1); -- } -- -- dump_format(oc, 0, filename, 1); -+ av_dump_format(oc, 0, filename, 1); - - /* now that all the parameters are set, we can open the audio and - video codecs and allocate the necessary encode buffers */ -@@ -347,14 +342,17 @@ int gsd_init_mpeg(const char *filename) - - /* open the output file, if needed */ - if (!(fmt->flags & AVFMT_NOFILE)) { -- if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) { - G_warning(_("Unable to open <%s>"), filename); - return (-1); - } - } - - /* write the stream header, if any */ -- av_write_header(oc); -+ if (avformat_write_header(oc, NULL) < 0) { -+ G_warning(_("Failed to write header")); -+ return (-1); -+ } - - - #else -@@ -439,7 +437,7 @@ int gsd_close_mpeg(void) - #if (LIBAVFORMAT_VERSION_INT>>16) < 52 - url_fclose(&oc->pb); - #else -- url_fclose(oc->pb); -+ avio_close(oc->pb); - #endif - } - diff --git a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch deleted file mode 100644 index 7fbe325..0000000 --- a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c 2013-01-18 02:11:37.570025278 +0100 -+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c 2013-01-18 02:13:01.663022218 +0100 -@@ -159,7 +159,7 @@ - } - - /* open the codec */ -- if (avcodec_open(c, codec) < 0) { -+ if (avcodec_open2(c, codec, NULL) < 0) { - G_warning(_("Unable to open codec")); - return; - } diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch deleted file mode 100644 index 5c00b9d..0000000 --- a/sci-geosciences/grass/files/grass-pkgconf.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- grass.pc.in.old 2010-06-13 10:53:46.747474687 +0200 -+++ grass.pc.in 2010-06-13 10:54:45.957349463 +0200 -@@ -1,12 +1,13 @@ - # Package Information for pkg-config - --prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ --exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ --libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib --includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include -+prefix=@prefix@ -+exec_prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+grassdir=@libdir@/grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@ - - Name: GRASS - Description: GRASS GIS - Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ --Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient --Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include -+Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -+Cflags: -I${includedir}/grass diff --git a/sci-geosciences/grass/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild deleted file mode 100644 index d76e8bf..0000000 --- a/sci-geosciences/grass/grass-6.4.2.ebuild +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -PYTHON_DEPEND="python? 2" -WANT_AUTOCONF="2.1" - -inherit eutils gnome2 multilib python versionator wxwidgets autotools - -MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="http://grass.osgeo.org/" -SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="6" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="X cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite tiff truetype wxwidgets" - -TCL_DEPS=" - >=dev-lang/tcl-8.5:0 - >=dev-lang/tk-8.5:0 - " - -RDEPEND=" - >=app-admin/eselect-1.2 - sci-libs/gdal - sci-libs/proj - sys-libs/gdbm - sys-libs/ncurses - sys-libs/zlib - cairo? ( x11-libs/cairo[X?,opengl?] ) - ffmpeg? ( >=virtual/ffmpeg-0.10 ) - fftw? ( sci-libs/fftw:3.0 ) - gmath? ( - virtual/blas - virtual/lapack - ) - jpeg? ( virtual/jpeg:0 ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - opengl? ( - virtual/opengl - ${TCL_DEPS} - ) - png? ( media-libs/libpng:0 ) - postgres? ( >=dev-db/postgresql-8.4 ) - readline? ( sys-libs/readline:0 ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0 ) - truetype? ( media-libs/freetype:2 ) - wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXp - x11-libs/libXpm - x11-libs/libXt - motif? ( - >=x11-libs/motif-2.3:0 - opengl? ( - || ( - media-libs/mesa[motif] - ( media-libs/mesa x11-libs/libGLw ) - ) - ) - ) - !python? ( ${TCL_DEPS} ) - !wxwidgets? ( ${TCL_DEPS} ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/gettext - sys-devel/bison - wxwidgets? ( dev-lang/swig ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-pkgconf.patch - "${FILESDIR}"/${PN}-6.4.1-libav-0.8.patch - "${FILESDIR}"/${PN}-6.4.2-ffmpeg-1.patch - "${FILESDIR}"/${PN}-6.4.2-configure.patch - "${FILESDIR}"/${PN}-6.4.2-libav-9.patch -) - -REQUIRED_USE=" - motif? ( X ) - opengl? ( X ) - wxwidgets? ( X python ) -" - -pkg_setup() { - local myblas - - # check correct gmath profiles (this must sadly die) - if use gmath; then - for d in $(eselect lapack show); do myblas=${d}; done - if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" - fi - for d in $(eselect blas show); do myblas=${d}; done - if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use python; then - # only py2 is supported - python_set_active_version 2 - fi -} - -src_prepare() { - use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch - epatch ${PATCHES[@]} - epatch_user - eautoconf -} - -src_configure() { - local myconf TCL_LIBDIR - - if use X; then - TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" - myconf+=" - --with-tcltk-libs=${TCL_LIBDIR} - $(use_with motif) - $(use_with opengl) - --with-x - " - - use opengl && myconf+=" --with-tcltk" - use motif && use opengl && myconf+=" --with-glw" - use motif || myconf+=" --without-glw" - - if use wxwidgets; then - WX_BUILD=yes - WX_GTK_VER=2.8 - need-wxwidgets unicode - myconf+=" - --without-tcltk - --with-wxwidgets=${WX_CONFIG} - " - else - WX_BUILD=no - # use tcl gui if wxwidgets are disabled - myconf+=" - --with-tcltk - --without-wxwidgets - " - fi - else - myconf+=" - --without-glw - --without-opengl - --without-tcltk - --without-wxwidgets - --without-x - " - fi - - econf \ - --with-gdal=$(type -P gdal-config) \ - --with-curses \ - --with-proj \ - --with-proj-share="/usr/share/proj/" \ - --without-glw \ - --enable-shared \ - $(use_enable amd64 64bit) \ - $(use_enable ppc64 64bit) \ - $(use_with cairo) \ - $(use_with cxx) \ - $(use_with fftw) \ - $(use_with ffmpeg) \ - $(use_with gmath blas) \ - $(use_with gmath lapack) \ - $(use_with jpeg) \ - $(use_with mysql) \ - --with-mysql-includes=/usr/include/mysql \ - --with-mysql-libs=/usr/$(get_libdir)/mysql \ - $(use_with nls) \ - $(use_with odbc) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with sqlite) \ - $(use_with tiff) \ - $(use_with truetype freetype) \ - --with-freetype-includes="/usr/include/freetype2/" \ - --enable-largefile \ - ${myconf} -} - -src_compile() { - # we don't want to link against embeded mysql lib - emake MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}"/usr/${MY_PM} \ - prefix="${D}"/usr BINDIR="${D}"/usr/bin \ - PREFIX="${D}"/usr/ \ - install - - pushd "${ED}"/usr/${MY_PM} &> /dev/null - - # fix docs - dodoc AUTHORS CHANGES - dohtml -r docs/html/* - rm -rf docs/ || die - rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die - - # manuals - dodir /usr/share/man/man1 - mv man/man1/* "${ED}"/usr/share/man/man1/ || die - rm -rf man/ || die - mv -vf "${ED}"/usr/share/man/man1/sql.1{,grass} || die #381599 - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${ED}"/usr/share/locale/ || die - rm -rf locale/ || die - # pt_BR is broken - mv "${ED}"/usr/share/locale/pt_br "${ED}"/usr/share/locale/pt_BR || die - fi - - popd &> /dev/null - - # place libraries where they belong - mv "${ED}"/usr/${MY_PM}/lib/ "${ED}"/usr/$(get_libdir)/ || die - - # place header files where they belong - mv "${ED}"/usr/${MY_PM}/include/ "${ED}"/usr/include/ || die - # make rules are not required on installed system - rm -rf "${ED}"/usr/include/Make || die - - # mv remaining gisbase stuff to libdir - mv "${ED}"/usr/${MY_PM} "${ED}"/usr/$(get_libdir) || die - - # set proper default window renderer - if [[ ${WX_BUILD} == yes ]]; then - sed -i \ - -e "1,\$s:^DEFAULT_GUI.*:DEFAULT_GUI=\"wxpython\":" \ - "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/Init.sh || die - fi - - # get proper folder for grass path in script - sed -i \ - -e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \ - "${ED}"usr/bin/${MY_PM} || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${ED}/usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ - "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die - - if use X; then - generate_files - doicon gui/icons/${PN}-48x48.png - domenu ${MY_PM}-grass.desktop - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi -} - -pkg_postrm() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi -} - -generate_files() { - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - - cat <<-EOF > ${MY_PM}-grass.desktop - [Desktop Entry] - Encoding=UTF-8 - Version=1.0 - Name=Grass ${PV} - Type=Application - Comment=GRASS (Geographic Resources Analysis Support System), the original GIS. - Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} ${GUI} - Path= - Icon=${PN}-48x48.png - Categories=Science;Education; - Terminal=false -EOF -} diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml index 3dc849a..8a0d685 100644 --- a/sci-geosciences/grass/metadata.xml +++ b/sci-geosciences/grass/metadata.xml @@ -12,12 +12,8 @@ Army Corp of Engineers, now an active open source GIS. See the GRASS Documentati Project for more info http://grass.itc.it/gdp/index.php - Use sci-libs/gdal for import and export - of most external raster and vector map formats Use sci-libs/geos for v.buffer and adds extended options to the v.select module - Enable gmath wrapper for BLAS/Lapack - (virtual/blas, virtual/lapack) Include support for LAS and LAZ encoded LiDAR files through sci-geosciences/liblas Enable OpenCL support -- 2.6.3 From 8e620bdd57debbd6af3a7f2f99f6194df074cc46 Mon Sep 17 00:00:00 2001 From: wraeth Date: Sat, 21 Nov 2015 01:00:03 +1100 Subject: [PATCH 2/4] profiles/package.mask: remove obsolete mask Remove obsolete mask on sci-geosciences/grass-6.4.2 as it has been removed. Gentoo-Bug: 566314 --- profiles/package.mask | 5 ----- 1 file changed, 5 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 14f655c..0acc247 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -198,11 +198,6 @@ www-apache/mod_h2 # Amy Winston (21 Oct 2015) # gdal-grass-1.4.3-r1 fails to build. New version added. # Masked for removal in 30 days. -# Ian Delaney (18 Oct 2015) -# Fails to build for ages. Lot of bugs repaired -# in new version. Masked for removal in 30 days. -=sci-geosciences/grass-6.4.2 =sci-geosciences/gdal-grass-1.4.3-r1 # Patrice Clement (18 Oct 2015) -- 2.6.3 From cc8ecc4345ffe4ac22140e3e72f81c246a423e59 Mon Sep 17 00:00:00 2001 From: wraeth Date: Sat, 21 Nov 2015 01:17:26 +1100 Subject: [PATCH 3/4] sci-geosciences/grass: remove ~ppc64, change slot Removes ~ppc64 keyword due to bad dependency on virtual/opencl, change SLOT to 0 as grass-6.4.2 no longer occupies SLOT 6, fix patchs not getting applied during src_prepare(). Gentoo-Bug: 566314 Package-Manager: portage-2.2.25 --- .../grass/files/grass-7.0.2-soname.patch | 26 ++ sci-geosciences/grass/grass-7.0.1-r3.ebuild | 267 -------------------- sci-geosciences/grass/grass-7.0.1-r4.ebuild | 270 +++++++++++++++++++++ 3 files changed, 296 insertions(+), 267 deletions(-) create mode 100644 sci-geosciences/grass/files/grass-7.0.2-soname.patch delete mode 100644 sci-geosciences/grass/grass-7.0.1-r3.ebuild create mode 100644 sci-geosciences/grass/grass-7.0.1-r4.ebuild diff --git a/sci-geosciences/grass/files/grass-7.0.2-soname.patch b/sci-geosciences/grass/files/grass-7.0.2-soname.patch new file mode 100644 index 0000000..3f3442c --- /dev/null +++ b/sci-geosciences/grass/files/grass-7.0.2-soname.patch @@ -0,0 +1,26 @@ +Index: aclocal.m4 +=================================================================== +--- aclocal.m4 (revision 66647) ++++ aclocal.m4 (working copy) +@@ -488,7 +488,7 @@ + case $host in + *-linux-* | *-gnu* | *-kfreebsd*-gnu) + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD_FLAGS="" ++ SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])" + SHLIB_SUFFIX=".so" + SHLIB_LD="${CC} -shared" + LDFLAGS="-Wl,--export-dynamic" +Index: configure +=================================================================== +--- configure (revision 66647) ++++ configure (working copy) +@@ -1481,7 +1481,7 @@ + case $host in + *-linux-* | *-gnu* | *-kfreebsd*-gnu) + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD_FLAGS="" ++ SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)" + SHLIB_SUFFIX=".so" + SHLIB_LD="${CC} -shared" + LDFLAGS="-Wl,--export-dynamic" diff --git a/sci-geosciences/grass/grass-7.0.1-r3.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild deleted file mode 100644 index e4dd7e6..0000000 --- a/sci-geosciences/grass/grass-7.0.1-r3.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite(-)?" -WANT_AUTOCONF="2.1" - -inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools - -MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) -MY_PM=${MY_PM/.} -MY_P=${P/_rc/RC} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="http://grass.osgeo.org/" -SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="7" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" - -RDEPEND="${PYTHON_DEPS} - >=app-admin/eselect-1.2 - media-libs/libprojectm - sci-libs/proj - sci-libs/xdrfile - sci-libs/gdal - sys-libs/gdbm - sys-libs/ncurses:0= - sys-libs/zlib - fftw? ( sci-libs/fftw:3.0 ) - geos? ( sci-libs/geos ) - blas? ( virtual/blas - sci-libs/cblas-reference ) - lapack? ( virtual/lapack ) - liblas? ( sci-geosciences/liblas ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf ) - odbc? ( dev-db/unixODBC ) - opencl? ( virtual/opencl ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - readline? ( sys-libs/readline:0= ) - sqlite? ( dev-db/sqlite:3 ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2 ) - X? ( - >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?] - x11-libs/cairo[X,opengl?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXp - x11-libs/libXpm - x11-libs/libXt - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/gettext - sys-devel/bison - X? ( - dev-lang/swig - x11-proto/xextproto - x11-proto/xproto - )" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - opengl? ( X )" - -PATCHES=( - "${FILESDIR}/${P}"-include-errno.patch - "${FILESDIR}/${P}"-declare-inespg.patch - "${FILESDIR}/${PV}"-sec-format.patch -) - -pkg_setup() { - if use lapack; then - local mylapack - mylapack=$(eselect lapack show) || die - if [[ -z "${mylapack/.*reference.*/}" ]] && \ - [[ -z "${mylapack/.*atlas.*/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use blas; then - local myblas - myblas=$(eselect blas show) || die - if [[ -z "${myblas/.*reference.*/}" ]] && \ - [[ -z "${myblas/.*atlas.*/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix unversioned python calls - local pyver=${EPYTHON/python/} - sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die - sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die - - # fix header being unconditionally included - # see upstream https://trac.osgeo.org/grass/ticket/2779 - sed -e 's:\(#include \):#ifdef HAVE_OGR\n\1\n#endif:' \ - -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" - - epatch_user - eautoconf - - python_fix_shebang "${S}" -} - -src_configure() { - if use X; then - WX_BUILD=yes - WX_GTK_VER=2.8 - need-wxwidgets unicode - fi - - use opencl && addwrite "${ROOT}dev/dri/renderD128" - - econf \ - --enable-shared \ - --disable-w11 \ - $(use_with cxx) \ - $(use_with tiff) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with mysql) \ - $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \ - $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \ - $(use_with sqlite) \ - $(use_with opengl) \ - $(use_with odbc) \ - $(use_with fftw) \ - $(use_with blas) \ - $(use_with lapack) \ - $(use_with X cairo) \ - $(use_with truetype freetype) \ - $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \ - $(use_with nls) \ - $(use_with readline) \ - --without-opendwg \ - --with-regex \ - $(use_with threads pthread) \ - $(use_with openmp) \ - $(use_with opencl) \ - --with-gdal="${ROOT}usr/bin/gdal-config" \ - $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \ - $(use_with X wxwidgets "${WX_CONFIG}") \ - $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \ - $(use_with geos geos "${ROOT}usr/bin/geos-config") \ - --with-proj-includes="${ROOT}usr/include/libprojectM" \ - --with-proj-libs="${ROOT}usr/$(get_libdir)" \ - --with-proj-share="${ROOT}usr/share/proj/" \ - $(use_with X x) -} - -src_compile() { - # we don't want to link against embedded mysql lib - emake CC="$(tc-getCC)" MYSQLDLIB="" -} - -src_install() { - emake DESTDIR="${D}" \ - INST_DIR="${D}usr/${MY_PM}" \ - prefix="${D}usr" BINDIR="${D}usr/bin" \ - PREFIX="${D}usr/" \ - install - - pushd "${D}usr/${MY_PM}" &> /dev/null || die - - # fix docs - dodoc AUTHORS CHANGES - dohtml -r docs/html/* - rm -rf docs/ || die - rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die - - # manuals - dodir /usr/share/man/man1 - rm -rf man/ || die - - # translations - if use nls; then - dodir /usr/share/locale/ - mv locale/* "${D}usr/share/locale/" || die - rm -rf locale/ || die - # pt_BR is broken - mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die - fi - - popd &> /dev/null || die - - # place libraries where they belong - mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die - - # place header files where they belong - mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die - # make rules are not required on installed system - rm -rf "${D}usr/include/Make" || die - - # mv remaining gisbase stuff to libdir - mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die - - # get proper folder for grass path in script - local gisbase - gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" - sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ - -i "${D}usr/bin/${MY_PM}" || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ - "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die - - # set proper python interpreter - sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die - - if use X; then - local GUI="-gui" - [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" - doicon -s 48 gui/icons/${PN}-48x48.png - fi - - # install .pc file so other apps know where to look for grass - insinto /usr/$(get_libdir)/pkgconfig/ - doins grass.pc - - # fix weird +x on tcl scripts - find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; -} - -pkg_postinst() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi -} - -pkg_postrm() { - if use X; then - fdo-mime_desktop_database_update - gnome2_icon_cache_update - fi -} \ No newline at end of file diff --git a/sci-geosciences/grass/grass-7.0.1-r4.ebuild b/sci-geosciences/grass/grass-7.0.1-r4.ebuild new file mode 100644 index 0000000..f960865 --- /dev/null +++ b/sci-geosciences/grass/grass-7.0.1-r4.ebuild @@ -0,0 +1,270 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite(-)?" +WANT_AUTOCONF="2.1" + +inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools + +MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) +MY_PM=${MY_PM/.} +MY_P=${P/_rc/RC} + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="http://grass.osgeo.org/" +SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" + +RDEPEND="${PYTHON_DEPS} + >=app-admin/eselect-1.2 + media-libs/libprojectm + sci-libs/proj + sci-libs/xdrfile + sci-libs/gdal + sys-libs/gdbm + sys-libs/ncurses:0= + sys-libs/zlib + fftw? ( sci-libs/fftw:3.0 ) + geos? ( sci-libs/geos ) + blas? ( virtual/blas + sci-libs/cblas-reference ) + lapack? ( virtual/lapack ) + liblas? ( sci-geosciences/liblas ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:0= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:0= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:0= ) + truetype? ( media-libs/freetype:2 ) + X? ( + >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?] + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXp + x11-libs/libXpm + x11-libs/libXt + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/flex + sys-devel/gettext + sys-devel/bison + X? ( + dev-lang/swig + x11-proto/xextproto + x11-proto/xproto + )" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +PATCHES=( + "${FILESDIR}/${P}"-include-errno.patch + "${FILESDIR}/${P}"-declare-inespg.patch + "${FILESDIR}/${PV}"-sec-format.patch + "${FILESDIR}/${PN}"-7.0.2-soname.patch +) + +pkg_setup() { + if use lapack; then + local mylapack + mylapack=$(eselect lapack show) || die + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas + myblas=$(eselect blas show) || die + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + local pyver=${EPYTHON/python/} + sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die + + # fix header being unconditionally included + # see upstream https://trac.osgeo.org/grass/ticket/2779 + sed -e 's:\(#include \):#ifdef HAVE_OGR\n\1\n#endif:' \ + -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" + + epatch "${PATCHES[@]}" + + epatch_user + eautoconf + + python_fix_shebang "${S}" +} + +src_configure() { + if use X; then + WX_BUILD=yes + WX_GTK_VER=2.8 + need-wxwidgets unicode + fi + + use opencl && addwrite "${ROOT}dev/dri/renderD128" + + econf \ + --enable-shared \ + --disable-w11 \ + $(use_with cxx) \ + $(use_with tiff) \ + $(use_with png) \ + $(use_with postgres) \ + $(use_with mysql) \ + $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \ + $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \ + $(use_with sqlite) \ + $(use_with opengl) \ + $(use_with odbc) \ + $(use_with fftw) \ + $(use_with blas) \ + $(use_with lapack) \ + $(use_with X cairo) \ + $(use_with truetype freetype) \ + $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \ + $(use_with nls) \ + $(use_with readline) \ + --without-opendwg \ + --with-regex \ + $(use_with threads pthread) \ + $(use_with openmp) \ + $(use_with opencl) \ + --with-gdal="${ROOT}usr/bin/gdal-config" \ + $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \ + $(use_with X wxwidgets "${WX_CONFIG}") \ + $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \ + $(use_with geos geos "${ROOT}usr/bin/geos-config") \ + --with-proj-includes="${ROOT}usr/include/libprojectM" \ + --with-proj-libs="${ROOT}usr/$(get_libdir)" \ + --with-proj-share="${ROOT}usr/share/proj/" \ + $(use_with X x) +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${D}" \ + INST_DIR="${D}usr/${MY_PM}" \ + prefix="${D}usr" BINDIR="${D}usr/bin" \ + PREFIX="${D}usr/" \ + install + + pushd "${D}usr/${MY_PM}" &> /dev/null || die + + # fix docs + dodoc AUTHORS CHANGES + dohtml -r docs/html/* + rm -rf docs/ || die + rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die + + # manuals + dodir /usr/share/man/man1 + rm -rf man/ || die + + # translations + if use nls; then + dodir /usr/share/locale/ + mv locale/* "${D}usr/share/locale/" || die + rm -rf locale/ || die + # pt_BR is broken + mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die + fi + + popd &> /dev/null || die + + # place libraries where they belong + mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die + + # place header files where they belong + mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die + # make rules are not required on installed system + rm -rf "${D}usr/include/Make" || die + + # mv remaining gisbase stuff to libdir + mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die + + # get proper folder for grass path in script + local gisbase + gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" + sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ + -i "${D}usr/bin/${MY_PM}" || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ + "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die + + # set proper python interpreter + sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die + + if use X; then + local GUI="-gui" + [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; +} + +pkg_postinst() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi +} + +pkg_postrm() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi +} -- 2.6.3 From 481eb5fb3d9f1efe5fb5524e55b766aacd6dae77 Mon Sep 17 00:00:00 2001 From: wraeth Date: Sat, 21 Nov 2015 01:22:00 +1100 Subject: [PATCH 4/4] sci-geosciences/grass: version bump to 7.0.2 Remove obsolete patches, add patch from upstream for SONAME, fix addwrite not being applied in some cases, minor output changes. Gentoo-Bug: 566314 Package-Manager: portage-2.2.25 --- sci-geosciences/grass/Manifest | 1 + sci-geosciences/grass/grass-7.0.2.ebuild | 269 +++++++++++++++++++++++++++++++ 2 files changed, 270 insertions(+) create mode 100644 sci-geosciences/grass/grass-7.0.2.ebuild diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 4fc483a..09a6c76 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1 +1,2 @@ DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266 +DIST grass-7.0.2.tar.gz 38102415 SHA256 2eabd84c5426c675b7f3046213bbacb0cee9d0225df15e1530b93f43ec6b190b SHA512 5f6432263e4d52c914dfdd2bc8199f32c8f366b0ffae6a178033af7eee7b3c2632668b3d3cd70219969ecfd5ad6abefe6e65f0eaf72f27784fea3b4b9d51acfe WHIRLPOOL e1f5a90e793db74bcdf891b5f5a00c2bafa2842a6415ec433a45d6604d4943aa3d95b6e4d95265753a4ee8fc6819ec1b66ddea2d11802ac1c7a37150f7cea6d1 diff --git a/sci-geosciences/grass/grass-7.0.2.ebuild b/sci-geosciences/grass/grass-7.0.2.ebuild new file mode 100644 index 0000000..a8e9b7e --- /dev/null +++ b/sci-geosciences/grass/grass-7.0.2.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite(-)?" +WANT_AUTOCONF="2.1" + +inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools + +MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) +MY_PM=${MY_PM/.} +MY_P=${P/_rc/RC} + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="http://grass.osgeo.org/" +SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" + +RDEPEND="${PYTHON_DEPS} + !sci-geosciences/grass:6 + !sci-geosciences/grass:7 + >=app-admin/eselect-1.2 + media-libs/libprojectm + sci-libs/proj + sci-libs/xdrfile + sci-libs/gdal + sys-libs/gdbm + sys-libs/ncurses:0= + sys-libs/zlib + fftw? ( sci-libs/fftw:3.0 ) + geos? ( sci-libs/geos ) + blas? ( virtual/blas + sci-libs/cblas-reference ) + lapack? ( virtual/lapack ) + liblas? ( sci-geosciences/liblas ) + mysql? ( virtual/mysql ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:0= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:0= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:0= ) + truetype? ( media-libs/freetype:2 ) + X? ( + >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?] + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXp + x11-libs/libXpm + x11-libs/libXt + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/flex + sys-devel/gettext + sys-devel/bison + X? ( + dev-lang/swig + x11-proto/xextproto + x11-proto/xproto + )" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +PATCHES=( + "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch + + # sourced from https://trac.osgeo.org/grass/ticket/68 + "${FILESDIR}/${P}"-soname.patch +) + +pkg_setup() { + if use lapack; then + local mylapack + mylapack=$(eselect lapack show) || die + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas + myblas=$(eselect blas show) || die + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + local pyver=${EPYTHON/python/} + sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die + + epatch "${PATCHES[@]}" + + epatch_user + eautoconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? +} + +src_configure() { + if use X; then + WX_BUILD=yes + WX_GTK_VER=2.8 + need-wxwidgets unicode + fi + + addwrite "${ROOT}dev/dri/renderD128" + + econf \ + --enable-shared \ + --disable-w11 \ + $(use_with cxx) \ + $(use_with tiff) \ + $(use_with png) \ + $(use_with postgres) \ + $(use_with mysql) \ + $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \ + $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \ + $(use_with sqlite) \ + $(use_with opengl) \ + $(use_with odbc) \ + $(use_with fftw) \ + $(use_with blas) \ + $(use_with lapack) \ + $(use_with X cairo) \ + $(use_with truetype freetype) \ + $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \ + $(use_with nls) \ + $(use_with readline) \ + --without-opendwg \ + --with-regex \ + $(use_with threads pthread) \ + $(use_with openmp) \ + $(use_with opencl) \ + --with-gdal="${ROOT}usr/bin/gdal-config" \ + $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \ + $(use_with X wxwidgets "${WX_CONFIG}") \ + $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \ + $(use_with geos geos "${ROOT}usr/bin/geos-config") \ + --with-proj-includes="${ROOT}usr/include/libprojectM" \ + --with-proj-libs="${ROOT}usr/$(get_libdir)" \ + --with-proj-share="${ROOT}usr/share/proj/" \ + $(use_with X x) +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${D}" \ + INST_DIR="${D}usr/${MY_PM}" \ + prefix="${D}usr" BINDIR="${D}usr/bin" \ + PREFIX="${D}usr/" \ + install + + pushd "${D}usr/${MY_PM}" &> /dev/null || die + + # fix docs + dodoc AUTHORS CHANGES + dohtml -r docs/html/* + rm -rf docs/ || die + rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die + + # manuals + dodir /usr/share/man/man1 + rm -rf man/ || die + + # translations + if use nls; then + dodir /usr/share/locale/ + mv locale/* "${D}usr/share/locale/" || die + rm -rf locale/ || die + # pt_BR is broken + mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die + fi + + popd &> /dev/null || die + + # place libraries where they belong + mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die + + # place header files where they belong + mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die + # make rules are not required on installed system + rm -rf "${D}usr/include/Make" || die + + # mv remaining gisbase stuff to libdir + mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die + + # get proper folder for grass path in script + local gisbase + gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}" + sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ + -i "${D}usr/bin/${MY_PM}" || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \ + "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die + + # set proper python interpreter + sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die + + if use X; then + local GUI="-gui" + [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; +} + +pkg_postinst() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi +} + +pkg_postrm() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi +} -- 2.6.3