Add new rc version (in-progress)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 278 insertions, 5 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index ec2024265c25..7764b824e8d0 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.76 2010/02/17 16:48:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.77 2010/04/30 08:48:39 scarabeus Exp $
+
+*grass-6.4.0_rc6 (30 Apr 2010)
+
+  30 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +grass-6.4.0_rc6.ebuild:
+  Add new rc version (in-progress)
 
   17 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   grass-6.4.0_rc5.ebuild, +files/grass-6.4.0-html-nonviz.patch:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ab09aa12278c..6494c11a9317 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -18,17 +18,19 @@ DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295
 DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc SHA1 bbd179b9145d735873a13f40a25784b64762387b SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
 DIST grass-6.4.0RC5.tar.gz 21087594 RMD160 3fa11d2672a4717a7f348cec3810bcbe51700202 SHA1 6f1f069d3044555f578c62e0601965ff745462b8 SHA256 2a9b43f5ca4946c204a20b286ebb49fe08ef022ea1537595cb9b8d1009aa8e7a
+DIST grass-6.4.0RC6.tar.gz 22598465 RMD160 6c8a0cd56b72b11395cf97953bc74672939225f3 SHA1 4e82d7211ac85dbefa15ff27397d896d1955db64 SHA256 5f550abf05e65ac91ef38aa249d6de62774bfda1fae02a7ac0a4652284ea6c10
 EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
 EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
 EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1
 EBUILD grass-6.3.0.ebuild 8584 RMD160 1bca3fa24ec28bcf0fe1fed886887cb18870c199 SHA1 670624f4df9bb9599ea6e6b25e956d0dabc1ff77 SHA256 a58832dc2a9f23b8136a8c10277c8590ce4aed2240ce042fa77859d1288e2d74
 EBUILD grass-6.4.0_rc5.ebuild 7659 RMD160 eaca7a1d7ade7f259bdfdfdbd4bd7905667568a3 SHA1 1aea332d6ab2cf7fdfd2fdd6de1005dede18fed9 SHA256 ad1be0cdf195dc708bbbca82777adad31a4bf4b7fd94180c3ed85b01bbf3254b
-MISC ChangeLog 15792 RMD160 3e38ea0798846841ed12b7e22faad0c5188e2ca8 SHA1 bfb6ac73e04ac81c9deb1911b9a344e19bc3b3f3 SHA256 1c735a758f88acada67c9e7b65ca5c24a6ef86a3306793a4f0af9cf18e0fd7a9
+EBUILD grass-6.4.0_rc6.ebuild 6368 RMD160 e8d6e8fe1fa76ccb1eba49004ecc5770deb3a2e8 SHA1 c390256588a2ab16c2fb5172e3e199e6c1827d2d SHA256 dd9eba564e2b1927cd8223c98e08202107c04edfac7da5e9aa6de89f41d58c64
+MISC ChangeLog 15942 RMD160 5ba53d0471719ebe69b354df47dfe365f8cd5f30 SHA1 106d56fe3aea3951c7eb60a0e1c2d89aaae495bb SHA256 3be7a5da0ab53893a5f6b7838c932a9d4a29dd88176a58f1cbadd2231f5219cf
 MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt8HaAACgkQHB6c3gNBRYdW+wCfY8pzAtdiw1hcy3OBD7gM0WXA
-iqUAnj1w8KFEKSceHlNOEKJQOAr+v2ee
-=4PGe
+iEYEARECAAYFAkvamVoACgkQHB6c3gNBRYdgSgCfaU/6poIcIc9hrPqDMmVrRwig
+S9QAoJBYdf1jkRnRMnn3QCuhL7WvjHvJ
+=Qezc
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
new file mode 100644
index 000000000000..03270b543149
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.1 2010/04/30 08:48:39 scarabeus Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2"
+inherit eutils python gnome2 versionator wxwidgets base
+
+MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
+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 ~sparc ~x86"
+
+IUSE="X cairo cxx ffmpeg fftw gmath jpeg largefile 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="
+	sci-libs/gdal
+	sci-libs/proj
+	sys-libs/gdbm
+	sys-libs/ncurses
+	sys-libs/zlib
+	cairo? ( x11-libs/cairo[X?,opengl?] )
+	ffmpeg? ( media-video/ffmpeg )
+	fftw? ( sci-libs/fftw:3.0 )
+	gmath? (
+		virtual/blas
+		virtual/lapack
+	)
+	jpeg? ( media-libs/jpeg )
+	motif? ( x11-libs/openmotif )
+	mysql? ( dev-db/mysql )
+	odbc? ( dev-db/unixODBC )
+	png? ( media-libs/libpng )
+	postgres? (
+		|| (
+			>=virtual/postgresql-base-8.4
+			>=virtual/postgresql-server-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
+		opengl? ( virtual/opengl )
+		python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1 ) )
+		!python? ( ${TCL_DEPS} )
+		!wxwidgets? ( ${TCL_DEPS} )
+	)
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		python? ( wxwidgets? ( dev-lang/swig ) )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+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 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"
+
+	# only py2 is supported
+	python_set_active_version 2
+}
+
+src_prepare() {
+	if ! use opengl; then
+	    epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
+	fi
+
+	base_src_prepare
+}
+
+src_configure() {
+	local myconf TCL_LIBDIR
+
+	if use X; then
+		myconf+="
+			$(use_with opengl)
+			--with-x
+		"
+		if use python && use wxwidgets; then
+			WX_BUILD=yes
+			WX_GTK_VER=2.8
+			need-wxwidgets base
+			myconf+="
+				--without-tcltk
+				--with-wxwidgets=${WX_CONFIG}
+			"
+		else
+			WX_BUILD=no
+			# use tcl gui if wxwidgets are disabled
+			TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
+			myconf+="
+				--with-tcltk
+				--with-tcltk-libs=${TCL_LIBDIR}
+				--without-wxwidgets
+			"
+		fi
+	else
+		myconf+="
+			--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_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_enable largefile) \
+		$(use_with motif) \
+		$(use_with 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/" \
+		${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/share/${PN}/$(get_version_component_range 1-2 ${PV})/ \
+		PREFIX="${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/ \
+		BINDIR="${D}"/usr/bin \
+		install || die
+
+	cd "${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/
+	# 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
+
+	# translations
+	dodir /usr/share/locale/ || die
+	mv locale/* "${D}"/usr/share/locale/ || die
+	rm -rf locale/ || die
+
+	# get rid of DESTDIR in script path
+	sed -i -e "s:${D}:/:" "${D}"usr/bin/${MY_PM/.} || die
+
+	cd ${S}
+	if use X; then
+		generate_files
+		doicon gui/icons/${PN}-48x48.png || die
+		domenu ${MY_PM/.}-grass.desktop || die
+	fi
+
+	# FIXME: install .pc file so other apps know where to look for grass
+}
+
+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
+}