From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 124A5139695 for ; Tue, 18 Apr 2017 23:25:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1059121C07D; Tue, 18 Apr 2017 23:25:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2C9A21C07D for ; Tue, 18 Apr 2017 23:25:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D57F34162D for ; Tue, 18 Apr 2017 23:25:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9BE17435 for ; Tue, 18 Apr 2017 23:25:32 +0000 (UTC) From: "Sam Jorna" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam Jorna" Message-ID: <1492557880.a731471948b52704467b4dce88fa448505b21b00.wraeth@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/Manifest sci-geosciences/grass/grass-7.0.4-r1.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: wraeth X-VCS-Committer-Name: Sam Jorna X-VCS-Revision: a731471948b52704467b4dce88fa448505b21b00 X-VCS-Branch: master Date: Tue, 18 Apr 2017 23:25:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 036a923c-2247-4feb-91f1-ce749699cd82 X-Archives-Hash: 5cdb355f3c0981a72834858ee38fd8a4 commit: a731471948b52704467b4dce88fa448505b21b00 Author: Sam Jorna gentoo org> AuthorDate: Tue Apr 18 23:23:39 2017 +0000 Commit: Sam Jorna gentoo org> CommitDate: Tue Apr 18 23:24:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7314719 sci-geosciences/grass: remove old Package-Manager: Portage-2.3.5, Repoman-2.3.2 sci-geosciences/grass/Manifest | 1 - sci-geosciences/grass/grass-7.0.4-r1.ebuild | 270 ---------------------------- 2 files changed, 271 deletions(-) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 24138832790..b90b90cc19e 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,3 +1,2 @@ -DIST grass-7.0.4.tar.gz 40601012 SHA256 657188dc640b8482d16f889ff281abe424a0b232d03328086ba28cbf02c65af2 SHA512 5ac1359f1d1d6602a567f4d85eb4f92f665788ebba51767696894228b31b5d65c1fa343e068b5c2990c12ff023b5c09ff441b7c2e1e1d990956be3250fe45658 WHIRLPOOL b2b81aca710419f22476660462ba6c47d953621d0d02ea3b4d8ee64deec047d7947698073270d778a308782f89575ec897707db8139d85743a1eb22714ee203e DIST grass-7.0.5.tar.gz 40862798 SHA256 60de3ba67eaf4f05dcff4f48ef710113f9efa9367ece784c13423bc620246f3c SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd WHIRLPOOL fb0077dd81074721e9ad53d0e3d7a76260a237426e37bb9e2ab393c7647e2204ee5f85e7936fe94e59f4e9413442e86f6ba6cf40bf31be9b833e70cebaa781bd DIST grass-7.2.0.tar.gz 48315008 SHA256 f0bc0c3cfccc98330ce01547bd86d8281f93f05a45b6115eb33044a07cf70750 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b WHIRLPOOL dfee9a8ca203a5c969b48e57ab8e97dfbb92bbe70cbc6b31d3734e2ddb21fb06402f83f9c3e1cafc4b139056fc0f601d9d6361c165b39b384e1da93382233db1 diff --git a/sci-geosciences/grass/grass-7.0.4-r1.ebuild b/sci-geosciences/grass/grass-7.0.4-r1.ebuild deleted file mode 100644 index dd1ae7758cf..00000000000 --- a/sci-geosciences/grass/grass-7.0.4-r1.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" # bug 572440 -WANT_AUTOCONF="2.1" -WX_GTK_VER=3.0 - -inherit eutils gnome2 fdo-mime 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/7.0.4" -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 - dev-python/numpy[${PYTHON_USEDEP}] - 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:3.0[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 -) - -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[@]}" - - eapply_user - eautoconf - - ebegin "Fixing python shebangs" - python_fix_shebang -q "${S}" - eend $? -} - -src_configure() { - if use X; then - WX_BUILD=yes - setup-wxwidgets - 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 - docinto html - dodoc -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 -}