1 |
commit: ac6b0176cd43caf31dcd1a0e6506f766fb70ba81 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 07:13:56 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 07:13:56 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6b0176 |
7 |
|
8 |
sci-geosciences/gdal-grass: Adopt deps to recent changes in grass |
9 |
|
10 |
Drop invalid use of ROOT |
11 |
|
12 |
Package-Manager: portage-2.2.23 |
13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
14 |
|
15 |
sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild | 11 +++++------ |
16 |
sci-geosciences/gdal-grass/metadata.xml | 20 ++++++++++---------- |
17 |
2 files changed, 15 insertions(+), 16 deletions(-) |
18 |
|
19 |
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild |
20 |
index b36f1f9..c8b1e32 100644 |
21 |
--- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild |
22 |
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild |
23 |
@@ -15,10 +15,9 @@ LICENSE="MIT" |
24 |
KEYWORDS="~amd64 ~x86" |
25 |
|
26 |
IUSE="postgres" |
27 |
- |
28 |
RDEPEND=" |
29 |
>=sci-libs/gdal-2.0.0 |
30 |
- >=sci-geosciences/grass-7.0.1[gdal] |
31 |
+ >=sci-geosciences/grass-7.0.1-r3 |
32 |
" |
33 |
DEPEND="${RDEPEND} |
34 |
dev-libs/expat |
35 |
@@ -37,9 +36,9 @@ src_prepare() { |
36 |
|
37 |
src_configure() { |
38 |
econf \ |
39 |
- --with-grass="${ROOT}/usr/$(get_libdir)/grass70" \ |
40 |
- --with-gdal="${ROOT}/usr/bin/gdal-config" \ |
41 |
- $(use_with postgres postgres-includes "${ROOT}/usr/include/postgresql") |
42 |
+ --with-grass="/usr/$(get_libdir)/grass70" \ |
43 |
+ --with-gdal="/usr/bin/gdal-config" \ |
44 |
+ $(use_with postgres postgres-includes "/usr/include/postgresql") |
45 |
} |
46 |
|
47 |
src_install() { |
48 |
@@ -48,4 +47,4 @@ src_install() { |
49 |
GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \ |
50 |
AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \ |
51 |
install |
52 |
-} |
53 |
\ No newline at end of file |
54 |
+} |
55 |
|
56 |
diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml |
57 |
index 152a2cd..cbf8066 100644 |
58 |
--- a/sci-geosciences/gdal-grass/metadata.xml |
59 |
+++ b/sci-geosciences/gdal-grass/metadata.xml |
60 |
@@ -1,14 +1,14 @@ |
61 |
<?xml version="1.0" encoding="UTF-8"?> |
62 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
63 |
<pkgmetadata> |
64 |
-<herd>sci-geosciences</herd> |
65 |
-<herd>proxy-maintainers</herd><maintainer> |
66 |
- <email>wraeth@×××××××××.au</email> |
67 |
- <name>Sam Jorna</name> |
68 |
- <description>Proxy maintainer - assign bugs to him</description> |
69 |
- </maintainer> |
70 |
- <use> |
71 |
- <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag> |
72 |
- </use> |
73 |
+ <herd>sci-geosciences</herd> |
74 |
+ <herd>proxy-maintainers</herd> |
75 |
+ <maintainer> |
76 |
+ <email>wraeth@×××××××××.au</email> |
77 |
+ <name>Sam Jorna</name> |
78 |
+ <description>Proxy maintainer - assign bugs to him</description> |
79 |
+ </maintainer> |
80 |
+ <use> |
81 |
+ <flag name="postgres">Include support for <pkg>dev-db/postgresql</pkg></flag> |
82 |
+ </use> |
83 |
</pkgmetadata> |
84 |
- |