| 1 |
commit: 5aa4f6f7a3eb16cc92ef192bbde227e8326b7c82 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 27 17:03:50 2013 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 27 17:03:50 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5aa4f6f7 |
| 7 |
|
| 8 |
sci-chemistry/simpson: Use PKG_CONFIG instead of generic pkg-config |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha163 |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/simpson/ChangeLog | 5 +++++ |
| 14 |
sci-chemistry/simpson/files/3.0.1-gentoo.patch | 2 +- |
| 15 |
sci-chemistry/simpson/files/3.1.0-gentoo.patch | 2 +- |
| 16 |
sci-chemistry/simpson/files/3.1.2-gentoo.patch | 2 +- |
| 17 |
sci-chemistry/simpson/simpson-3.0.1.ebuild | 3 ++- |
| 18 |
sci-chemistry/simpson/simpson-3.1.0.ebuild | 3 ++- |
| 19 |
sci-chemistry/simpson/simpson-3.1.2.ebuild | 3 ++- |
| 20 |
7 files changed, 14 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog |
| 23 |
index cbbfccd..386dae8 100644 |
| 24 |
--- a/sci-chemistry/simpson/ChangeLog |
| 25 |
+++ b/sci-chemistry/simpson/ChangeLog |
| 26 |
@@ -2,6 +2,11 @@ |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
# $Header: $ |
| 29 |
|
| 30 |
+ 27 Feb 2013; Justin Lecher <jlec@g.o> files/3.0.1-gentoo.patch, |
| 31 |
+ files/3.1.0-gentoo.patch, files/3.1.2-gentoo.patch, simpson-3.0.1.ebuild, |
| 32 |
+ simpson-3.1.0.ebuild, simpson-3.1.2.ebuild: |
| 33 |
+ Use PKG_CONFIG instead of generic pkg-config |
| 34 |
+ |
| 35 |
22 Feb 2013; Justin Lecher <jlec@g.o> simpson-3.0.1.ebuild, |
| 36 |
simpson-3.1.0.ebuild, simpson-3.1.2.ebuild, metadata.xml: |
| 37 |
Add missing dep on virtual/pkgconfig |
| 38 |
|
| 39 |
diff --git a/sci-chemistry/simpson/files/3.0.1-gentoo.patch b/sci-chemistry/simpson/files/3.0.1-gentoo.patch |
| 40 |
index 61d170f..77c886d 100644 |
| 41 |
--- a/sci-chemistry/simpson/files/3.0.1-gentoo.patch |
| 42 |
+++ b/sci-chemistry/simpson/files/3.0.1-gentoo.patch |
| 43 |
@@ -9,7 +9,7 @@ index c5f6fcf..25e328f 100644 |
| 44 |
-INCLUDES = -I/usr/include/tcl8.5 |
| 45 |
-LIBRARIES = -lm -lgslcblas -llapack -ltcl8.5 |
| 46 |
+INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ |
| 47 |
-+BLASLIBS = `pkg-config --libs cblas lapack` |
| 48 |
++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack` |
| 49 |
+LIBRARIES = -lm ${BLASLIBS} -ltcl |
| 50 |
|
| 51 |
FLAGS = -c -O3 |
| 52 |
|
| 53 |
diff --git a/sci-chemistry/simpson/files/3.1.0-gentoo.patch b/sci-chemistry/simpson/files/3.1.0-gentoo.patch |
| 54 |
index 3424cb9..7675d79 100644 |
| 55 |
--- a/sci-chemistry/simpson/files/3.1.0-gentoo.patch |
| 56 |
+++ b/sci-chemistry/simpson/files/3.1.0-gentoo.patch |
| 57 |
@@ -13,7 +13,7 @@ index 7206ba5..832e76a 100644 |
| 58 |
-#LIBRARIES = -lm -llapack -lblas -ltcl8.4 |
| 59 |
-#BINDIR = /usr/local/bin |
| 60 |
+INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ |
| 61 |
-+BLASLIBS = `pkg-config --libs cblas lapack` |
| 62 |
++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack` |
| 63 |
+LIBRARIES = -lm ${BLASLIBS} -ltcl |
| 64 |
|
| 65 |
# Linux MPI |
| 66 |
|
| 67 |
diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch |
| 68 |
index a820012..d81daea 100644 |
| 69 |
--- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch |
| 70 |
+++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch |
| 71 |
@@ -73,7 +73,7 @@ index 216955d..ba54573 100644 |
| 72 |
+ |
| 73 |
+# Linux |
| 74 |
+INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ |
| 75 |
-+BLASLIBS = `pkg-config --libs cblas lapack` |
| 76 |
++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack` |
| 77 |
+LIBRARIES = -lm ${BLASLIBS} -ltcl |
| 78 |
+ |
| 79 |
+# Linux MPI |
| 80 |
|
| 81 |
diff --git a/sci-chemistry/simpson/simpson-3.0.1.ebuild b/sci-chemistry/simpson/simpson-3.0.1.ebuild |
| 82 |
index 6b0911a..6777509 100644 |
| 83 |
--- a/sci-chemistry/simpson/simpson-3.0.1.ebuild |
| 84 |
+++ b/sci-chemistry/simpson/simpson-3.0.1.ebuild |
| 85 |
@@ -4,7 +4,7 @@ |
| 86 |
|
| 87 |
EAPI=4 |
| 88 |
|
| 89 |
-inherit eutils prefix |
| 90 |
+inherit eutils prefix toolchain-funcs |
| 91 |
|
| 92 |
DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" |
| 93 |
HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" |
| 94 |
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND} |
| 95 |
S="${WORKDIR}"/${PN}-source-${PV} |
| 96 |
|
| 97 |
src_prepare() { |
| 98 |
+ tc-export PKG_CONFIG |
| 99 |
edos2unix Makefile |
| 100 |
epatch "${FILESDIR}"/${PV}-gentoo.patch |
| 101 |
epatch "${FILESDIR}"/${PV}-type.patch |
| 102 |
|
| 103 |
diff --git a/sci-chemistry/simpson/simpson-3.1.0.ebuild b/sci-chemistry/simpson/simpson-3.1.0.ebuild |
| 104 |
index 5f73f9e..75e9f8e 100644 |
| 105 |
--- a/sci-chemistry/simpson/simpson-3.1.0.ebuild |
| 106 |
+++ b/sci-chemistry/simpson/simpson-3.1.0.ebuild |
| 107 |
@@ -4,7 +4,7 @@ |
| 108 |
|
| 109 |
EAPI=4 |
| 110 |
|
| 111 |
-inherit eutils prefix |
| 112 |
+inherit eutils prefix toolchain-funcs |
| 113 |
|
| 114 |
DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" |
| 115 |
HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" |
| 116 |
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND} |
| 117 |
S="${WORKDIR}"/${PN}-source-${PV} |
| 118 |
|
| 119 |
src_prepare() { |
| 120 |
+ tc-export PKG_CONFIG |
| 121 |
edos2unix Makefile |
| 122 |
epatch "${FILESDIR}"/${PV}-gentoo.patch |
| 123 |
epatch "${FILESDIR}"/3.0.1-type.patch |
| 124 |
|
| 125 |
diff --git a/sci-chemistry/simpson/simpson-3.1.2.ebuild b/sci-chemistry/simpson/simpson-3.1.2.ebuild |
| 126 |
index 5f73f9e..75e9f8e 100644 |
| 127 |
--- a/sci-chemistry/simpson/simpson-3.1.2.ebuild |
| 128 |
+++ b/sci-chemistry/simpson/simpson-3.1.2.ebuild |
| 129 |
@@ -4,7 +4,7 @@ |
| 130 |
|
| 131 |
EAPI=4 |
| 132 |
|
| 133 |
-inherit eutils prefix |
| 134 |
+inherit eutils prefix toolchain-funcs |
| 135 |
|
| 136 |
DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" |
| 137 |
HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" |
| 138 |
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND} |
| 139 |
S="${WORKDIR}"/${PN}-source-${PV} |
| 140 |
|
| 141 |
src_prepare() { |
| 142 |
+ tc-export PKG_CONFIG |
| 143 |
edos2unix Makefile |
| 144 |
epatch "${FILESDIR}"/${PV}-gentoo.patch |
| 145 |
epatch "${FILESDIR}"/3.0.1-type.patch |
Archives