sci-visualization/grace: Respect AR, #468182

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 122 insertions, 5 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index 42601aeb3401..9838f2e76cb8 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/grace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.67 2013/01/23 11:29:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.68 2013/05/02 10:35:33 jlec Exp $
+
+*grace-5.1.23-r1 (02 May 2013)
+
+  02 May 2013; Justin Lecher <jlec@gentoo.org> +grace-5.1.23-r1.ebuild:
+  Respect AR, #468182
 
 *grace-5.1.23 (23 Jan 2013)
 
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index 1b717a947956..cfd6918ac205 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -14,13 +14,14 @@ DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c6
 DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556
 EBUILD grace-5.1.22-r2.ebuild 2815 SHA256 b634ca9381ed24e53f127d9fe381925b629952be12b5d92236d7423125c8d359 SHA512 23b03fdecb464da94d9d4a7b41fae5ce9a77fc22df3a89470393861283d7b07a9599218246777b9e93b26b2e50c12033a9ddced6397ac9d3ced3f2661d174002 WHIRLPOOL f70cdd61d82adf058a1209d4f404e24390be2fa517b425ca9d452d2b71de1d869b5fe3bf6927af051a218286297b5c2c97a246ca29f733b66f19918f0b940c38
 EBUILD grace-5.1.22-r3.ebuild 2998 SHA256 4f6bd431916bcedd75213a58df8c30e6f3b81061870b5a4b224e8359a6987342 SHA512 126bb2eb77e64090252453918353e331e0abcf5c0098fbf0e5b0b2fedf9d2e74ae305a9716baca795a1721eeea0342ddab6cbdb42649e0d29b571d1c41de3857 WHIRLPOOL 8753fef5ae9e895206e967ea3e9f4acfa6ccc2e26f95afe5f917be92f3f5f13900394f74d3a11700950e64a96ba4407dcb75faf3b6a76d6e1bcaeba604fda474
+EBUILD grace-5.1.23-r1.ebuild 2992 SHA256 d909b0f2b40d1d12ef941a30c15f2b9ba344b1ccd241be93a325dd5ac0a829b8 SHA512 d2e09672193d6a0ceda25eab6ebea7a89ba413248ec2688fefe08d9f3b0f0867b6e5dae549967d593328a0ed045ae50ef21cccd197a103573d7cbd04cfa4fc46 WHIRLPOOL c00b9bb0c9a64a4becd9017c57e0e16766ee351a0d7da95c5e2e905c6fbe3270a53ebf468de21103cfc9c5a5091b63001f595797804081efb29455877ca32122
 EBUILD grace-5.1.23.ebuild 2986 SHA256 0e7438a4fccb0ab25617922d95e5c74d91dfeea2d1346d221edb43107b836a85 SHA512 d874193e85045050be7165372f638fcb2e54c6ceea109116aa5373ec833e6e8f8b4d3dac536b03cc546a2d5ba873f0e43ed7a395829299c9e7cdce37918aa90a WHIRLPOOL f3d22a81802b49e4f1e3852c510cf584c0b7ac9ed379244df407c590dda9d149b10601e49ed0fa16120ad1d518953ea591ee74a5d7e70cd36985ccc078907773
-MISC ChangeLog 17073 SHA256 ddcffec40136bd14fe36b5bd790bb07461436f16bec65d981a13185254035ba4 SHA512 0b1b61901203f868d4bc47dd462f66d92eb31d12ed44f26813e1466f2403b92e2df0efd99ef4648dc355b1e350481d5478139cb88f01a9f29c9456a45d449cf0 WHIRLPOOL b8eef33d3113317c5d7a6d81a56fd5f7e110f80606741bac896b36792f9fed4f188da2333b40da6ec9b410002c61b90a6352ba3a0f71c031b297255399a16b25
+MISC ChangeLog 17200 SHA256 2b809ae48cb4c47e0666541e69919ab3d8b87834ed739bf30dd016a7140d0d29 SHA512 ff64bd7bbaddb008b628d3795a4b4d1fc950991966a6b3ed7b1b18ab1949712d8853a30456b58e9be8a98e2bea27eb5e7362c79c9a957a4dd5f340b59f649424 WHIRLPOOL 3533c6686103f59912793893cf7e7b71067446c5132b035338c428dd4dccda915d5f3da84dccb0b5d616de90cc33d16f4ea42a72e8a4a303e3ae973d73ca8a4b
 MISC metadata.xml 651 SHA256 8e324e0968d970d22e5e4f4397644afabddaac5e86a437188bc49f3b70352615 SHA512 df327f6ee8a1fda716897ef0dc7ed066d6a7d893050d74c72db7b0734e0390589279d7d580b63a4a57eaf03d9d6ef3ee8c0913a29a199ea409d61a42dcb41629 WHIRLPOOL 6364f8af95f53c5ae93684648ba7feb4c0197de166647719ad6545f85306402a432ec4d69e77d8b9d4f16a9ceeb2e8a8237f6a95ea93dda28682c3e3d6007053
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlD/yY4ACgkQgAnW8HDreRZVTgCgycPUwdVfGE7qaENQftUdpLRc
-JnQAoLqgSgsbo2OhrR7xqeox1Yj1l67C
-=IKch
+iEYEAREKAAYFAlGCQXYACgkQgAnW8HDreRbT5gCgyIJbljyi0vRc/IMoELGtQkq0
+88UAn0q546kCGcckQqgXklwJaHUHU+qg
+=QLCW
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/grace/grace-5.1.23-r1.ebuild b/sci-visualization/grace/grace-5.1.23-r1.ebuild
new file mode 100644
index 000000000000..9e853125cd92
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.23-r1.ebuild,v 1.1 2013/05/02 10:35:33 jlec Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+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="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran fftw jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1 )
+	jpeg? ( virtual/jpeg )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	tc-export CC AR
+}
+
+src_prepare() {
+	# move tmpnam to mkstemp (adapted from debian)
+	epatch "${FILESDIR}"/${PN}-5.1.22-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}"/${PN}-5.1.22-dlmodule.patch \
+		"${FILESDIR}"/${PN}-5.1.22-ldflags.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" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(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
+}