sci-geosciences/grass: Drop old; punt base.eclass

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 33 insertions, 352 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index f8b27a3990a9..65ca84bf82cd 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.122 2013/07/04 13:06:30 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.123 2014/01/06 14:58:08 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -grass-6.4.1-r1.ebuild,
+  grass-6.4.2.ebuild, metadata.xml:
+  Drop old; punt base.eclass
 
   04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> grass-6.4.2.ebuild:
   Stable for ppc, wrt bug #464568
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3d62ae618c9a..9d9617a8f640 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -10,26 +10,24 @@ AUX grass-6.4.2-configure.patch 1169 SHA256 83911fe9231724c3383954ed2aa5457cc964
 AUX grass-6.4.2-ffmpeg-1.patch 2271 SHA256 290eaeed4f74d68b36460fbf2c936d25efd46d640b2c2f12b5685e4f3093af7f SHA512 e8a89e4f91f80b58c1c3b96ff5a3319d5ec9d9a924df445801b62f89603bcf7ddf56efc05dce680bd3f5f882ea5c8b8fb580c24ca62965e3c09bd9a44d92ac31 WHIRLPOOL 122a2b7ca283236cb739f8d4c7923b90c585b1774739c60fb608f3f93c8d0f4ceadd20a1d733989f00aefb6e9df3d7c231a2d2187a6a04a68007c0217fc87ba3
 AUX grass-6.4.2-libav-9.patch 354 SHA256 828dee79382d9980cee279f9b405d0a5538b74be99e1c5d26aff1b6c27f67b90 SHA512 2864751b07fc9ffe72b179dff3bcf3eb28dc2c2b9fc4e377904bafb8756eae61aeb522474cce2decdda7d6997327568f5371175d4e88d45323e84a1b11463406 WHIRLPOOL 9058ad5e7351e2e7347671cd543a770fa9523a0c1e7dcd91baa18b4504310649d2a0280572d3cd1edc326940e7bb839ebf8678be6121b3c1a27ad88464314389
 AUX grass-pkgconf.patch 1322 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c SHA512 61ef0b337844f6e855de059e11c3d26f2c798914a86373b200cf733614644f703fda811f264151bcd51a628f8f5715148e3ff02f7f52d5b2771044ad6983b348 WHIRLPOOL c49f58d308355c955d1efcaf864c21f532665792cd490d3ead55bdacf7ef110c7f4465919434f5f3b1ab41fa6dfb0595f798eabd24f9d653c40df8cd48e2327f
-DIST grass-6.4.1.tar.gz 23608488 SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03 SHA512 97a2a81dd5699307ea09745da3be44be7269cdc36b42dfafb29b7fd9dec9c1d31e648f713efc9c66cdcdcd98a85276bc06a7eaeec21c8ae3c155ec867d0159bf WHIRLPOOL 9b7ba6ad14611812649107d61cd18f298c3c5f8b39728ab066000e3a00093d452027bfa21c17f52cce7862a11a4032874c2e21da26651b2b0a408535696356a6
 DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4
-EBUILD grass-6.4.1-r1.ebuild 8066 SHA256 91895cc9bd102ab6ede0d6bcf3d63b4a7c4fbfd1ad3fdfd6a8bea794c53f9f77 SHA512 54a5f90f2d49feea91cc9d09e5fa11a0ad35ae6d288ce50e2ce4a00de67c064e4bb4f1214a19d8308f788f1af2948a25997beeba23957dfa573430bd0d118413 WHIRLPOOL 05c738d7bbf41349c60175b3e256a61687d2b0ddad1499837433fd1ae13f58f101a9208ef808a42d549716a41e0d341510e84aa1725f96083fa83efa692e7dbd
-EBUILD grass-6.4.2.ebuild 7575 SHA256 8e33b9711488ef9c86c86ab78a07d70793fae81a447536e16e28f0f1396fff16 SHA512 23c1af73de33b5983027f6082c0bd1583fb5b315a4c63dd610406285636a4a2f4beb544f289d4a7900f7d2262b3525834fc96bc3b4d191913dd527dedb512a7b WHIRLPOOL d1d526f4021dc15fb1ecaec8162f5aaf0d445d33584ba2aa0dfbb21661a44755b52065539fd693d0276c0a1df04fabf1b074286fa225ba396253d0f2d6508bd0
-MISC ChangeLog 23180 SHA256 bb37394ad078947215b22a18aae63003be944e8fefd66380358493e407debe4a SHA512 df790260ddb735e63a1a0380f3de643a82f1cdf51e083a69a35e5e33ddf1954c7053d8ec3033b01e73c7c1aa9de3395b6f4be89d100f6e2bff380eef6e1ee1a1 WHIRLPOOL 225754ec5f30217d29c41c5ba5e775c412b85188b254e5566694e3344eba7cb689f210d9b17ba589bf74f0620004c71e07417565591e64124199b8be592c8ed7
-MISC metadata.xml 536 SHA256 0ff3609731832618bbbee94829ffd448c83a84eff573d4adc7956f5db4b2f1ce SHA512 72fdd15db80afdcebb8c9e0b09aaf8b2f416509f2958ad3fdd2f661bd8ce5d6a8777df20a94fe1f5f1cd9cdbd93d856808ac0c63e84fd914f1ce9c1105f55d82 WHIRLPOOL e7bf561fe667104e9a3aea2e00fd4576f1ef6b09e2975d0b130da1d7cc58a83f235ec150d6313361cb04a12f725878ad8a96ad16bf3c11cb6165cd8c774dd50f
+EBUILD grass-6.4.2.ebuild 7589 SHA256 80359c5de8b2772bcbc769a0f601865a072e4858b88b935a55b10fdb076cf7d0 SHA512 1e5c4031507570d18b718ab039037c29e9bdee6cd7ee7e161a17f90e998b4abdf70fba958e1e239d486c6ec383dd9ab11cae48f7722e1284dd55dc6525dea7d8 WHIRLPOOL d57442864a026af4298ce2afa513204192666b4652f9429b791d970998faee2f40ffcb3da79e463fe11cd1f1369557d1442991854f224ed7bc47b280dceb62ee
+MISC ChangeLog 23318 SHA256 610083e65b7d20f102fe3cb6fb53d340cd0d6109369ab64baa718c5b71338ebd SHA512 487c9b96909e8fba23dbd1339bc2fa4ddf9b4ba372f425997885794f535d1b935db2d2d5a82560e07d74fedfee54f98d5514bf2824d746f64f76f003cd65f67a WHIRLPOOL c17c491f141420e92a523e300e515d4eab532645a6a79cc36eb5523aa3dff2530b32bb05a4cbf22cfd6fc168b3be99f70c8110739117a884cbeebffc4d89f5dd
+MISC metadata.xml 542 SHA256 d6f9bcb14ec237e0589d92e5308f324be400a9d4203ba4489393b23d827d6daf SHA512 7e7cf91121ace3c25b832c0f3090b00b43903efc2e12dbdd3af052aab2f4d10b775bde953dd92f879608792173b4123bf05af767dc5708b8ca7f5a3a1486bd2f WHIRLPOOL 001818f36ed4cde9b3743af70b6cb67890c6a5b68bb75826fffda2ced6d818a4bf1f354d4064423e39f22dd4aad3df8268c87ed69e1e4ef2a23c86ce1b0b9ce2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR1XKhAAoJELp701BxlEWfGbsP/1rAJ8+AU7uq7PTpDAvBy5Id
-j7gqCvX9suINB4A5DUOYv76U+cufG1mRwoB+9/HRF0kEhpTQwMwQ+YMJ0Q/OQ2WW
-0ooF4ao7qPFwWbNLqTX78TpVjEDoT18bSGdD/GClYN/QqNu7DSzfu5b+w4vqV5EV
-Of9OEpllho/Z9r4hL/+hjOG8ZwF6L9ApXtYmAFB4imRAMTzUsHcvJz7j8F/lJmNl
-CdJkS3YmCyxNRITnmPpgQkKGu1iAusjZRp7F7L63bzEXGfpdUpzv7DG/Ab01O+K3
-es95DgqCMarfPW42Tanr9zszzKRYfpYvitCF9cYVRFabnNGVGZ+tz3U8eWbBCLc6
-AIwOkeEMBwSKj5MJD6NX0Sa3Uu/dwvJE3DGL4T/iNGP56/Bl3VYBh4OCv/99hE9R
-7jxbRZgYjUu8BG0jIfhAn5wcOXvwwbNkGyhOKA7EvLm4abGW91/OU76roFJvSJD7
-Wl7RO1V4RLejXsZqbi20Mk+PJ7ZmTDZaoT7bbMdJlT88Y/JXYJn9SSs1kD4I+e7J
-HUBNrdgXrTZEl1lEVr+iFj1kHThBUrhVlu6wJJdPkMA18c6BadaJTi3iENMGx0dX
-+swOaeZS5fj4sLVtkxlMMCPPeZeQHLTuLkfPeQpS4TWQLbhh+2h24VEyN8t36UgC
-X7lkXoTwSehRkng1Qr9I
-=ncXa
+iQIcBAEBCgAGBQJSysSBAAoJELnU8jG9FVirr8gQAIS2HBKaS5URbjg4StmEDeV0
+Fx6/VfY6IfLKIdCyNBbKpI51aaICjfG4J+8e99ILOfGR8duM41SrFlrx7rz3zc5N
+E6sSXlZqRVpKWfo0ysa+pXvNwjcx/aN7lu4wyjOKEwoJh46JRwG5SmqBeSkM0QRa
+4VGhJocsN4PDI/+kOrH4OaWY8y+YYKNOa+AgOtEcwMaLaN3Bjz/fIqcFRs4EQVcr
+dQSSyGvKnp6nHomElm7BhMgAxj0tvpm46T5kPwLgr4gFPNveRZ36pbeRee6uXGn2
+Rglm9BEMbu1QN/om9+LbizYX7lnFf/2PMdCT8MaJm+aQYNyaDW+ekzAmHT44zx0l
+UMxjTpKHjTD6GmwoL4kphd5+kQ1iUpLjbC01ROzJvdkT5Yhq7bqlUiHt//GNkY0u
+ZrcRLiM+7/V50YyQbxuzxIHWW3e5pf2gVSjcEXLWmhGWMqZuRDVIAvS+3+sJwJg7
+kD5ETPH95w+fEHVRa1OXK7LAUkZ9dfM5jrLbAPBh7zrN2K3/8UC3IXk4XXD7ghwk
+o8zlbwoG2aUfIuRWEXbmNGOOD0davrRmaIYBERbPz7pTYkbCCiUpzByor38sqAw1
+hwlfyNmeaeiwapsQ88qjtbc83MPJjMhsOJnqUIExKZSn3qd3NzzfGHjossmvdfiQ
+1djyJ8F5U3MI9KC1X3Mw
+=wT5b
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.4.1-r1.ebuild b/sci-geosciences/grass/grass-6.4.1-r1.ebuild
deleted file mode 100644
index b48150c0a339..000000000000
--- a/sci-geosciences/grass/grass-6.4.1-r1.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1-r1.ebuild,v 1.5 2012/10/24 19:38:26 ulm Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2"
-
-inherit eutils gnome2 multilib python versionator wxwidgets base
-
-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
-	>=dev-lang/tk-8.5"
-
-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 )
-	fftw? ( sci-libs/fftw:3.0 )
-	gmath? (
-		virtual/blas
-		virtual/lapack
-	)
-	jpeg? ( virtual/jpeg )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	png? ( media-libs/libpng )
-	postgres? ( >=dev-db/postgresql-base-8.4 )
-	readline? ( sys-libs/readline )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	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 ) ) )
-		)
-		opengl? (
-			virtual/opengl
-			${TCL_DEPS}
-		)
-		python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) )
-		!python? ( ${TCL_DEPS} )
-		!wxwidgets? ( ${TCL_DEPS} )
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/bison
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		python? ( wxwidgets? ( dev-lang/swig ) )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-pkgconf.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-	"${FILESDIR}"/${P}-nopycompile.patch
-	"${FILESDIR}"/${P}-timer_flags.patch
-	"${FILESDIR}"/${P}-libav-0.8.patch
-)
-
-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 <impl>"
-			ewarn "where <impl> 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 <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	# check useflag nesting.
-	use motif && ! use X && ewarn "For motif support X useflag must be enabled"
-	use opengl && ! use X && ewarn "For opengl support X useflag must be enabled"
-	use wxwidgets && ! use X && ewarn "For wxwidgets support X useflag must be enabled"
-	use wxwidgets && ! use python && ewarn "For wxwidgets support python useflag must be enabled"
-
-	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
-	base_src_prepare
-}
-
-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
-			"
-
-		if use python && 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
-
-		use opengl && myconf+=" --with-tcltk"
-		use motif && use opengl && myconf+=" --with-glw"
-		use motif || myconf+=" --without-glw"
-	else
-		myconf+="
-			--without-opengl
-			--without-glw
-			--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) \
-		--with-ffmpeg-includes="/usr/include/libavcodec /usr/include/libavdevice /usr/include/libavfilter /usr/include/libavformat /usr/include/libavutil /usr/include/libpostproc /usr/include/libswscale" \
-		$(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
-	base_src_compile MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}"/usr/${MY_PM} \
-		prefix="${D}"/usr BINDIR="${D}"/usr/bin \
-		PREFIX="${D}"/usr/ \
-		install || die
-
-	pushd "${D}"/usr/${MY_PM} &> /dev/null
-
-	# fix docs
-	dodoc AUTHORS CHANGES || die
-	dohtml -r docs/html/* || die
-	rm -rf docs/ || die
-	rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
-	# manuals
-	dodir /usr/share/man/man1 || die
-	mv man/man1/* "${D}"/usr/share/man/man1/ || die
-	rm -rf man/ || die
-	mv -vf "${D}"/usr/share/man/man1/sql.1{,grass} || die #381599
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/ || die
-		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
-
-	# 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
-
-	# set proper default window renderer
-	if [[ ${WX_BUILD} == yes ]]; then
-		sed -i \
-			-e "1,\$s:^DEFAULT_GUI.*:DEFAULT_GUI=\"wxpython\":" \
-			"${D}"/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}:" \
-		"${D}"usr/bin/${MY_PM} || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}/usr/${MY_PM}|/usr/$(get_libdir)/${MY_PM}|" \
-		"${D}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
-
-	if use X; then
-		generate_files
-		doicon gui/icons/${PN}-48x48.png || die
-		domenu ${MY_PM}-grass.desktop || die
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc || die
-
-	# 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/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild
index e89927d1703e..80ea26b9dcbc 100644
--- a/sci-geosciences/grass/grass-6.4.2.ebuild
+++ b/sci-geosciences/grass/grass-6.4.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.9 2013/07/04 13:06:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.10 2014/01/06 14:58:08 jlec Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2"
 WANT_AUTOCONF="2.1"
 
-inherit eutils gnome2 multilib python versionator wxwidgets base autotools
+inherit eutils gnome2 multilib python versionator wxwidgets autotools
 
 MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
 MY_PM=${MY_PM/.}
@@ -133,7 +133,8 @@ pkg_setup() {
 
 src_prepare() {
 	use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
-	base_src_prepare
+	epatch ${PATCHES[@]}
+	epatch_user
 	eautoconf
 }
 
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 6d0fe91b33af..4d20223c9a1f 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
-	<longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS. 
+  <herd>sci-geosciences</herd>
+  <longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS. 
 See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
 </longdescription>
-	<use>
-		<flag name="gmath">Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
-	</use>
+  <use>
+    <flag name="gmath">Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
+  </use>
 </pkgmetadata>