summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-04-06 13:46:51 +0000
committerJustin Lecher <jlec@gentoo.org>2011-04-06 13:46:51 +0000
commit1c9f9de0bbc7e22cf042c3cfe9a775e32e70434c (patch)
treeff725c299eb7d31fe7b61fbd829375ab47049788 /sci-chemistry/cyana
parentRestrict Jython ABIs. (diff)
downloadhistorical-1c9f9de0bbc7e22cf042c3cfe9a775e32e70434c.tar.gz
historical-1c9f9de0bbc7e22cf042c3cfe9a775e32e70434c.tar.bz2
historical-1c9f9de0bbc7e22cf042c3cfe9a775e32e70434c.zip
Using xiar instead of ar
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/cyana')
-rw-r--r--sci-chemistry/cyana/ChangeLog6
-rw-r--r--sci-chemistry/cyana/Manifest13
-rw-r--r--sci-chemistry/cyana/cyana-2.1.ebuild17
-rw-r--r--sci-chemistry/cyana/files/2.1-xiar.patch16
4 files changed, 38 insertions, 14 deletions
diff --git a/sci-chemistry/cyana/ChangeLog b/sci-chemistry/cyana/ChangeLog
index 1ddb4fde5615..f1fbc2532c67 100644
--- a/sci-chemistry/cyana/ChangeLog
+++ b/sci-chemistry/cyana/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/cyana
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/ChangeLog,v 1.8 2011/01/05 14:14:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/ChangeLog,v 1.9 2011/04/06 13:46:51 jlec Exp $
+
+ 06 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/2.1-xiar.patch,
+ cyana-2.1.ebuild:
+ Using xiar instead of ar
05 Jan 2011; Justin Lecher <jlec@gentoo.org> files/2.1-expire.patch:
Let cyana run forever, thanks xarthisius for the patch
diff --git a/sci-chemistry/cyana/Manifest b/sci-chemistry/cyana/Manifest
index b1dca82e4bcc..a785b3d4f25d 100644
--- a/sci-chemistry/cyana/Manifest
+++ b/sci-chemistry/cyana/Manifest
@@ -4,14 +4,15 @@ Hash: SHA1
AUX 2.1-exec.patch 1959 RMD160 c67a5748eb7627c1dc66d1e6546bc24416bf8263 SHA1 002889b52871499fe62e85d9217c1c3e0b52d163 SHA256 fe8835c6dcdb6a8befa32e6bff1b761c5c6ae6131f73750e18724fb96f9a9623
AUX 2.1-expire.patch 578 RMD160 7fd79ba6c2b477b06769182485d8c4b09b642bdd SHA1 9417eb4dddfb0c3fabcdedb65e8182088cf4dcc0 SHA256 723d69026e63995b281ae36582f5114562a1c4d6295d311ca2eb2900a1dc7b95
AUX 2.1-typo.patch 484 RMD160 c947da047f562eedcc8036d8d97bef37885e1521 SHA1 65f772b18082b956ae5bdfebe8663a522b7d7cc3 SHA256 ef05c4254cf859e804c44cdfa5774aca5a2f1aa853f0b6c0bccee837db2a5b8b
+AUX 2.1-xiar.patch 385 RMD160 4a8953e2f058facaca4010950d4ff8876f771c2a SHA1 bacbe534b6c701e2700ec5bfe594642f1d4f5fb9 SHA256 c8d4daddaafa1388b87c7b107206df873fe98dc418db36ab48bfb2c60b3435e6
DIST cyana-2.1.tar.gz 2203650 RMD160 20dc614587792f5d02d50a104871a04b2507ee24 SHA1 60583c10117634e6031a901021ce6bad3206bb7d SHA256 4b49d23eda3a327074fa337c7ee13262e93fb2b92cc6feb9139dfb7695bdeded
-EBUILD cyana-2.1.ebuild 1656 RMD160 5c4deb11e21cd1c1eea603be07fa7131c21a579b SHA1 1f34f7b3ad39d913a9da40d9f2fde67a43221426 SHA256 92720b56316226689357231da5ee9554aa837b0a857dd4ac2c7fba0b2dd94ee4
-MISC ChangeLog 1562 RMD160 819dd68db8fb18dc2c7258520a565616a4d46c9f SHA1 0c4ec7a3e842ca2e3f9a4e193e3e43c3732304f3 SHA256 5e481b262808679b3c5694c3332887a73802639133554e1440927d3f39911b57
+EBUILD cyana-2.1.ebuild 1752 RMD160 caff8c66d36f76ac9ece7ed4f1a467e1e8ac1599 SHA1 f8c9f61faffd05854046bf38638d712d95c927bd SHA256 0ae58ffd6ef9cbf4753494288abae0be56337053becff51b8044038f35329896
+MISC ChangeLog 1680 RMD160 ac57b63fb3d28df15d3659459f1c69885fac5c5b SHA1 0f8ecf6cefc1619f0699cc1664d6977547719f0e SHA256 7c183f9d9c66771ea8ff781cc5894e671bbeb6f6d8956596e0eb9ecc683b9535
MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk0kfOgACgkQgAnW8HDreRZH1QCeLbh9BMcJU6UgLE6seD+ZdHst
-LN4AnRMJf74lPtQY3/Gz64tnRwS9R0cD
-=7GP5
+iEYEARECAAYFAk2cbtAACgkQgAnW8HDreRZ0HACgheZ1n9rOWjz0dAy4RFm6wTkY
+QmkAn0UsgtytGoQMGePkD4hu7+O3OT6n
+=aRUB
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/cyana/cyana-2.1.ebuild b/sci-chemistry/cyana/cyana-2.1.ebuild
index 8bc49e90f8ba..726f8e4c77bf 100644
--- a/sci-chemistry/cyana/cyana-2.1.ebuild
+++ b/sci-chemistry/cyana/cyana-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/cyana-2.1.ebuild,v 1.6 2010/12/20 08:19:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cyana/cyana-2.1.ebuild,v 1.7 2011/04/06 13:46:51 jlec Exp $
EAPI="3"
@@ -32,18 +32,21 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PV}-typo.patch \
"${FILESDIR}"/${PV}-exec.patch \
- "${FILESDIR}"/${PV}-expire.patch
+ "${FILESDIR}"/${PV}-expire.patch \
+ "${FILESDIR}"/${PV}-xiar.patch
cat >> etc/config <<- EOF
VERSION=${PV}
SHELL=${EPREFIX}/bin/sh
FC=ifort
- FFLAGS=${FFLAGS}
- FFLAGS2=${FFLAGS}
+ FFLAGS=${FFLAGS} -openmp -threads
+ FFLAGS2=${FFLAGS} -openmp -threads
CC=$(tc-getCC)
+ AR=xiar
+ RANLIB=ranlib
FORK=g77fork.o
- LDFLAGS=${LDFLAGS}
- LIBS=-pthread -lpthread -liomp5
+ LDFLAGS=${LDFLAGS} -reentrancy threaded -openmp
+ LIBS=
EOF
if [[ $(tc-getFC) =~ gfortran ]]; then
diff --git a/sci-chemistry/cyana/files/2.1-xiar.patch b/sci-chemistry/cyana/files/2.1-xiar.patch
new file mode 100644
index 000000000000..e8393253d7f6
--- /dev/null
+++ b/sci-chemistry/cyana/files/2.1-xiar.patch
@@ -0,0 +1,16 @@
+ src/inclan/Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/inclan/Makefile b/src/inclan/Makefile
+index fc5a8bf..482d48f 100644
+--- a/src/inclan/Makefile
++++ b/src/inclan/Makefile
+@@ -35,7 +35,7 @@ clean:
+
+ inclan.a: $(OBJS)
+ rm -f $@
+- ar rc $@ $(OBJS)
++ $(AR) rc $@ $(OBJS)
+ if [ "$(RANLIB)" ]; then $(RANLIB) $@; fi
+
+ inclan.o: inclan.for