Rename sql.1 manpage to sql.1grass (file collision with sys-process/parallel) wrt #381599 by Matt Summers

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 342 insertions, 3 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index f2caa5f6e85e..e457fedde3cb 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.109 2011/11/15 04:05:27 nerdboy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.110 2012/01/23 11:40:33 ssuominen Exp $
+
+*grass-6.4.1-r1 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +grass-6.4.1-r1.ebuild:
+  Rename sql.1 manpage to sql.1grass (file collision with sys-process/parallel)
+  wrt #381599 by Matt Summers
 
   15 Nov 2011; Steve Arnold <nerdboy@gentoo.org> grass-6.4.1.ebuild,
   +files/grass-6.4.1-nopycompile.patch, +files/grass-6.4.1-timer_flags.patch:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index a6e05f0add03..a09802ddf274 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX grass-6.4.0-html-nonviz.patch 1774 RMD160 95f278e851dc782fa89861a60e97f2c6c4da564b SHA1 d917690626b669a9e9455b12bcb1aa14db65c29d SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff
 AUX grass-6.4.1-libpng15.patch 906 RMD160 50d1df3a4470f937776ad1f1a30afa757f6423e7 SHA1 79f06b8e62a4e09889cf44289e7b98b361264ef9 SHA256 60135350574b9f2c769cb1513446c6b9fea5f949bc084a9e05d2d81a20ae6d55
 AUX grass-6.4.1-nopycompile.patch 533 RMD160 fd245f604ac1b09476916bd116152afee0e64fcb SHA1 0508368015d74ab425490aa4e643a957c76c4143 SHA256 105c9d69763d961e8b52dd8ecd507bc3e7a853c1fc3feb4591b9e7a62ce44a3e
 AUX grass-6.4.1-timer_flags.patch 337 RMD160 9ea5905fe405ef55cd82a7008e2b64edec4e3bb5 SHA1 6d61aa234bd8b616c407ed79d9afabeaf17dfdd7 SHA256 fe574ff5657b3c4a13e857f9cb182ee89a74db07d3a59e3f2e84c742510f847c
 AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA1 cb33293f442ad0bdd5592f842bcafe13eb021b48 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c
 DIST grass-6.4.1.tar.gz 23608488 RMD160 2a9ee5da891c9d89a5ad0e66f914d2dd763e5128 SHA1 ea1cdfd1b7422367d671eeaf66f362d694a94abd SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03
+EBUILD grass-6.4.1-r1.ebuild 7987 RMD160 db264cc0dcadff0139fb076815b9eb719e6ee3e3 SHA1 510495501a1d87d1ed496e9c98095d0d7d308f3d SHA256 6727bb26aaee14f2a6379ce8c13c09f73412a0aa4bb9c149e471fe4ef46e828a
 EBUILD grass-6.4.1.ebuild 7916 RMD160 c215ee0028231cbdeeb49a2125f10970b4f05798 SHA1 e348311a483d8430d6935976bbd0925585bc794d SHA256 e89bdef021400cf0ef5a359740946db63197af7b8f57fb179295c7e2ac60ab9c
-MISC ChangeLog 21229 RMD160 564c534142e8260b8ca6ebc654a069959d32d8f2 SHA1 a5711cfda4e3ba3630e09b6b06d9297abf6599c5 SHA256 0268872f51f929b9e4f0685064f52037a1551aee61dc0fd3de58a11728ed7646
+MISC ChangeLog 21451 RMD160 21fc5af345499ec853a75fbcd7330024e748f1e6 SHA1 9943fa0ddba286dce8684ecc5c1115a30312f0a3 SHA256 40414b59c6b97cc1c315c69848834517d1a95fd1379ed3b15c20f332ff21c672
 MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPHUamAAoJEEdUh39IaPFNV1IH/j0gyDN35u/rzauMS8G8yQ5W
+l0OblKjysZlhzU2dHTChuP47OkQoSb3I+BBFmbppfCFGLKk5DugD0qNZ98MuUw30
+q6oQS8ZKKR6U0vXcQd/njMBQZXvLS6e6RiKLsmbh+yDsmEJW7C+l/wgtTofCXeed
+I+MsoKNBHnHnpidl5oz15h91v6VYT0VTYT5SObQyD2zcU0/fGpkOu6ByARuNbo9H
+S0xLSIGi6L2OvhYXpTD0qi4oBLqhJT4/CQdazfaegHvEhOy8CndM5IivlTSaJaCl
+x9ZMO+bGcb1IwAHFDh05hM4LSgENwvpaxxiFplfskzeYFWRhRvTH81maeEC78hA=
+=6UWQ
+-----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
new file mode 100644
index 000000000000..4582116acec9
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.4.1-r1.ebuild
@@ -0,0 +1,318 @@
+# 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.1 2012/01/23 11:40:33 ssuominen 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/openmotif-2.3:0
+			opengl? ( media-libs/mesa[motif] )
+		)
+		opengl? (
+			virtual/opengl
+			${TCL_DEPS}
+		)
+		python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) )
+		!python? ( ${TCL_DEPS} )
+		!wxwidgets? ( ${TCL_DEPS} )
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/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
+)
+
+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
+}