sci-visualization/grace: Steal some patches from fedora

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

5 files changed, 146 insertions, 19 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index 85b02ecaaab8..8c8b91086623 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/grace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.59 2012/02/09 09:44:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.60 2012/09/05 06:50:00 jlec Exp $
+
+*grace-5.1.22-r3 (05 Sep 2012)
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> grace-5.1.22-r2.ebuild,
+  +grace-5.1.22-r3.ebuild, +files/grace.desktop:
+  Steal some patches from fedora
 
   09 Feb 2012; Justin Lecher <jlec@gentoo.org> grace-5.1.22-r2.ebuild,
   metadata.xml:
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index 56fbdd833661..dc82564bc64a 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX grace-5.1.21-fortran.patch 650 RMD160 1eb2b9cb37cad4b103f5fe4749e65403a1dffab5 SHA1 50b5a5af6ab802936fcb227ebba46bb69e37bd7b SHA256 5001b3eb4ceb4b408b01a92651162bdf6f3ce1823199ae8f0a62c32a816a5c1e
-AUX grace-5.1.21-netcdf.patch 413 RMD160 dab48c7889042ebe741293da0184c36c00034e32 SHA1 750efdb37af1f1c1eab0f8c28f52df4621964c44 SHA256 57c36bfd320d2a3a61c2f7628ede67f96c4c165969f7162b4d3dbf07d23d5adb
-AUX grace-5.1.22-dlmodule.patch 356 RMD160 1900c1e7a2d964d299408af73f52b32b145d976f SHA1 a06088c543c1c6ae0280af1fdba7a80c55e97a62 SHA256 b8e0b2527a2083b0594756e927f45ad9051711ac370330deb11e299ca849e05a
-AUX grace-5.1.22-ldflags.patch 1161 RMD160 483e599df369dd2bad51c58e5ccaf05540946393 SHA1 5ce5accd804bb611fabfcbee78bfa7ea3d208632 SHA256 955c74169f859bef042601d85be80319c29d7774b62aacceafeb352803d5ea15
-AUX grace-5.1.22-libpng15.patch 335 RMD160 b8575a9939dd749a6e69192300e9ca3f97ead4cd SHA1 fe8617aacee10120c9736cb47fb7b43fd6e91896 SHA256 1a5ada21bb4c365d8fdc023b215403e24fd55be0f0ede80909ac2f89f28c972c
-AUX grace-5.1.22-mkstemp.patch 1664 RMD160 5dc6c1b84d33e5848f546b17509ca1c36973d152 SHA1 5221a837385c762ad397dfdf4c733381e9318821 SHA256 6e436fe9c27d4b627a8116ca2a1bea94bd5fc01bc475be6f56a63ec9b5cf2f97
-DIST grace-5.1.22.tar.gz 2516576 RMD160 ca7b1abe240de7cd3dbdc52d5182020c410b9772 SHA1 3ce88c7c264d2de73b8935f835a1c1f8e368c78f SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25
-DIST grace.png.tar 10240 RMD160 da044204a4482d4c9253b208fd8a11ed0974035f SHA1 7c25a6b8db019ed1973a9dabfb4981d50f48b78c SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c
-EBUILD grace-5.1.22-r2.ebuild 2835 RMD160 0207b62ebd5df3c350626eee60141d777951510d SHA1 e653ac63c89deeb35917d05ed6d1ca7f8bce47d1 SHA256 db44bb51781ef0bc821940a05c77fe8562c9523d0debbe948cd1a1a10126269d
-MISC ChangeLog 15763 RMD160 bb25f099a358687f4fde40c091c741450a8df25c SHA1 44d27ae7b12d1568feacaeb87b7631961e069bca SHA256 72ff1be45b04e4866d1d09624290ef04ed6793d9814fc6a6aa76f740bb09498f
-MISC metadata.xml 648 RMD160 23545dca7bce8147c80ad62456230e28e416b18a SHA1 a6e7a426c54c8982d5a7770ecca7428757332c29 SHA256 6e6b7236e3ee83b5d72ca91593bcbc7009f648ab2d4eb99a50f70a0d3c580290
+AUX grace-5.1.21-fortran.patch 650 SHA256 5001b3eb4ceb4b408b01a92651162bdf6f3ce1823199ae8f0a62c32a816a5c1e SHA512 1d2cedea11af42b8424c7aace282c95246a007905a5efc3810ef2644cb270f50741e92b59e1143b259ad1135ede12cfe70987c295bc49889dbc10aeb71371657 WHIRLPOOL 5ce0fdc5b31eb3fc6fddf1eb1f1c491725632810948b84f57f26c50136a7e98dbd72d085ad3e51900902f2a5e50daa77718df6c95150dea12fb6dd624be58b39
+AUX grace-5.1.21-netcdf.patch 413 SHA256 57c36bfd320d2a3a61c2f7628ede67f96c4c165969f7162b4d3dbf07d23d5adb SHA512 6cb16d6fe88fc5ef8303545cf0d884427807b00b1dc2f947bd5a3f62ba3f91a3536f8ae13d172ef956064e21a9ef087816f0197d9b488e1982f77607251ec0bf WHIRLPOOL d5303fdedc541ff14eb03d4517a63e006cc5f73238a4eef8c0fdd232ec85b33ef3ee035ce50d2193c6a879313be4ebae3f8b07fd511a59d863c43a5514d6b912
+AUX grace-5.1.22-dlmodule.patch 356 SHA256 b8e0b2527a2083b0594756e927f45ad9051711ac370330deb11e299ca849e05a SHA512 963b5108f902291ce75bd409219214a16ca9e5335d7309507770207348860cefbf15fb2010045dec41b277226357b66dad80b6fcc48be9c0543596189dbb5021 WHIRLPOOL 6dc6fa604e950039bc44a888915ba0a8d24ef09b88f4fe5484cbba71b04c003108964d62871b97061b1830964ee7d33c0818491ae9e48a93c7c9220f3539c174
+AUX grace-5.1.22-ldflags.patch 1161 SHA256 955c74169f859bef042601d85be80319c29d7774b62aacceafeb352803d5ea15 SHA512 43950d98c61cbeaa93d84d1c4b37233a49150ef804b6a00ffbcccc4dd926878bafa9d24007640f193c323e093f0c4c731ac676f5e5d410c8e814796babdf6e0a WHIRLPOOL 3812bbfaff8c4b7aa7bdc16dfca2db48575f7d172eaac4f3e59b77523d097480aaeee24778708b09ba2b1cd931cf59c65f6914f1298202af324ee582e06d81e5
+AUX grace-5.1.22-libpng15.patch 335 SHA256 1a5ada21bb4c365d8fdc023b215403e24fd55be0f0ede80909ac2f89f28c972c SHA512 48425fbd0e1a605e6d3853061abca94f016035e9411919e1659b38fb238252f2dcfdcbc2e4026b0b1eb3ed20471951d6991909dfb5cd20ea08c93ee4a42b95bf WHIRLPOOL dc670febe1e086f1cda0d2bf5e84f0527e908905b41a79fa5cabf8a74568c8adbcd5fde0505adfb16d2eb260c163b2d91c9b0cbc6dd45f38bdd5fc407f54ea4a
+AUX grace-5.1.22-mkstemp.patch 1664 SHA256 6e436fe9c27d4b627a8116ca2a1bea94bd5fc01bc475be6f56a63ec9b5cf2f97 SHA512 e7ba04f9be93e2bb12e5f78894eec255b76ee85463ec35b2890ff111f9f64567c67effec1678d4a953a602be3d0ecd2123487e3dd88704d325b369e59750ad44 WHIRLPOOL 4a092c453fca29d44ed20d1c366ce0cba5d724f5dd5a8900d2d09d795753e5ff36a184f6beb5e90b86bc38e18b12b62c607bd42536aa1ca59a58798e80e71f71
+AUX grace.desktop 161 SHA256 0e522ef577b5658559b6e4a4be531ae4989b294935897e84e03f6ad1cc4e83ff SHA512 6d43de6f8d5f85c3fff36202320864ea3611d3ee842efa677ad59ae1390c6499f9f14aefd37345c0cec62024637b057e804efd26577c45b4f7a5bb6717952b2a WHIRLPOOL e7ca9891b4b4cffa0f9bb31f398a2fdb4d662dc255a869487f0155e35662a61e9b05aaf8cf6543fed6e584758a8c1a7fc4a2056a77c65b84628eea9778bb684c
+DIST grace-5.1.22.tar.gz 2516576 SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 SHA512 0187f0305ff5e404e9adab60e9f3d328121c9ab8352f0b65fa523e2e9078dcee073d347a252a5e8b516728cae24b1ac0718b5011ab17247ae9ea9149336866d4 WHIRLPOOL 206ceb7dee5572e756fe67d528925705ab3b56913f26d8c9b066b07423cdd6b4e70c0739e3b66bdf7aa992dae243755f81ea097e1a33b94817322bc30b33274a
+DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94
+DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556
+EBUILD grace-5.1.22-r2.ebuild 2844 SHA256 99235ef271b85da06cc01f0714965f605d5a9271ee652a5623949610f3b9b563 SHA512 65cd84282ba6692444faf271b63ffbe68be3d86e8afe0968733d59f9c4dc0798d8f04bdcc272fec0de78ee04301bab2f2da913fb01e549e36bbe81f39fdb0e9f WHIRLPOOL f9eee5be2af979fc8892878723b21e01adce00244484ff8a48fd897e2578d5df5a4d957f1fc4b7c71768d3f1f62fbfccd00c05de808e79cee47d0ac2d920ba36
+EBUILD grace-5.1.22-r3.ebuild 2939 SHA256 6f81488c90c14e727bbc13ae28ba7b3a258037ef65579996d670f15f24b18223 SHA512 dd5f40302447f5601929a1fcdb8306787a20cd5d085a1a41251761ee0c211587ac1527b95c25f8f4617c597eca59ae3cde9ddecee69c813b7ae006f8aadb92a3 WHIRLPOOL be03985b7422c21c70fc6f7683dd0e2221738785c26ec4959298f4dddb09a3bd82cc46258e33051c042fb24be2d8c3275e4232ee0fa36ba076fdcbc07f477f8d
+MISC ChangeLog 15949 SHA256 223ba5a70e2608ef2a06f7182800f059cf2d7a8d605e4ca6f28218059533be85 SHA512 104bd5bb5d3b6c7aa641b9dd625545db17e65411d4319b5b2ec03a69914ff44cf6f151456a43e85b369e31c8864ef188b7bf4c75bd7e43420bac147dff3ab277 WHIRLPOOL 106f2678e5f249e19b9c443048b34db31fdb0ddd7bccee53bddfb231b38844de5e7f6d7834749f1f8c001c6a239c4ab3e6a1c95c0658ad24a7dae3bbbc11c24a
+MISC metadata.xml 648 SHA256 6e6b7236e3ee83b5d72ca91593bcbc7009f648ab2d4eb99a50f70a0d3c580290 SHA512 be245ac48652fd636eaed28a9a29ba2797df74d79c3305eb27ba9a5ed07be1f2901ba8e332b242fb920406257b16240cea0255b57472bf6e7a5fee0381a93762 WHIRLPOOL 56d8ae0b49319907302272f0f6e6c253eb88a5e540b57309f84433c726c40e2b30812aceebfa95e39b5ab35933c88f8da1c16580483ade452ab11ba87b49e4ae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk8zlXMACgkQgAnW8HDreRbcfgCguCvjuIOHfqSJepbolqmIgHzG
-20sAoJP11Z9HtYFUI+GozCtAsGdrjjB4
-=hbbO
+iEYEAREIAAYFAlBG9h4ACgkQgAnW8HDreRbg1gCgwkYJkb9IhqRx5es5j+8U6nse
+N+UAmwSQLLVd0zyMIql/MQBFgzV5Tdb0
+=71gP
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/grace/files/grace.desktop b/sci-visualization/grace/files/grace.desktop
new file mode 100644
index 000000000000..227d88d9cbe4
--- /dev/null
+++ b/sci-visualization/grace/files/grace.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Grace
+Comment=Numerical Data Processing and Visualization Tool
+Exec=xmgrace
+Icon=grace
+Terminal=false
+Type=Application
+Categories=Graphics;
diff --git a/sci-visualization/grace/grace-5.1.22-r2.ebuild b/sci-visualization/grace/grace-5.1.22-r2.ebuild
index 4771e50110b3..781cf2b29bf9 100644
--- a/sci-visualization/grace/grace-5.1.22-r2.ebuild
+++ b/sci-visualization/grace/grace-5.1.22-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.16 2012/02/09 09:44:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.17 2012/09/05 06:50:00 jlec Exp $
 
 EAPI=4
 
-inherit eutils fortran-2 toolchain-funcs
+inherit eutils fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Motif based XY-plotting tool"
 HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
diff --git a/sci-visualization/grace/grace-5.1.22-r3.ebuild b/sci-visualization/grace/grace-5.1.22-r3.ebuild
new file mode 100644
index 000000000000..256a5515b45d
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.22-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r3.ebuild,v 1.1 2012/09/05 06:50:00 jlec Exp $
+
+EAPI=4
+
+inherit eutils fortran-2 multilib toolchain-funcs
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="
+	http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran fftw jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff
+	sys-libs/zlib
+	>=x11-libs/openmotif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1 )
+	jpeg? ( virtual/jpeg )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng )"
+RDEPEND="
+	fortran? ( virtual/fortran )
+${DEPEND}
+	x11-misc/xdg-utils"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	tc-export CC
+}
+
+src_prepare() {
+	# move tmpnam to mkstemp (adapted from debian)
+	epatch "${FILESDIR}"/${P}-mkstemp.patch
+	# fix configure instead of aclocal.m4
+	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak (from freebsd)
+	epatch "${FILESDIR}"/${P}-dlmodule.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+}
+
+src_configure() {
+	local myconf
+	if use fortran; then
+		myconf="--with-f77=$(tc-getFC)"
+	else
+		myconf="--without-f77"
+	fi
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
+	doicon "${WORKDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	doicon "${WORKDIR}"/${PN}.png
+}