1 |
commit: b872c592e255afa57e63f140ba322847b4a5c694 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 6 13:56:30 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 17:04:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b872c592 |
7 |
|
8 |
app-text/libetonyek: Check for GCC >= 4.8, bug 557348 |
9 |
|
10 |
Pin mdds DEPEND to slot 0. |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
app-text/libetonyek/libetonyek-0.1.3.ebuild | 13 +++++++++++-- |
15 |
app-text/libetonyek/libetonyek-9999.ebuild | 9 +++++++++ |
16 |
app-text/libetonyek/metadata.xml | 8 ++++---- |
17 |
3 files changed, 24 insertions(+), 6 deletions(-) |
18 |
|
19 |
diff --git a/app-text/libetonyek/libetonyek-0.1.3.ebuild b/app-text/libetonyek/libetonyek-0.1.3.ebuild |
20 |
index b289548..295a5d8 100644 |
21 |
--- a/app-text/libetonyek/libetonyek-0.1.3.ebuild |
22 |
+++ b/app-text/libetonyek/libetonyek-0.1.3.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2015 Gentoo Foundation |
25 |
+# Copyright 1999-2016 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
# $Id$ |
28 |
|
29 |
@@ -25,7 +25,7 @@ RDEPEND=" |
30 |
" |
31 |
DEPEND="${RDEPEND} |
32 |
>=dev-libs/boost-1.46 |
33 |
- >=dev-util/mdds-0.12.1 |
34 |
+ >=dev-util/mdds-0.12.1:0 |
35 |
media-libs/glm |
36 |
sys-devel/libtool |
37 |
virtual/pkgconfig |
38 |
@@ -33,6 +33,15 @@ DEPEND="${RDEPEND} |
39 |
test? ( dev-util/cppunit ) |
40 |
" |
41 |
|
42 |
+pkg_pretend() { |
43 |
+ if [[ $(gcc-major-version) -lt 4 ]] || { |
44 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; } |
45 |
+ then |
46 |
+ eerror "Compilation with gcc older than 4.8 is not supported" |
47 |
+ die "Too old gcc found." |
48 |
+ fi |
49 |
+} |
50 |
+ |
51 |
src_prepare() { |
52 |
[[ -d m4 ]] || mkdir "m4" |
53 |
base_src_prepare |
54 |
|
55 |
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild |
56 |
index 649d812..2106900 100644 |
57 |
--- a/app-text/libetonyek/libetonyek-9999.ebuild |
58 |
+++ b/app-text/libetonyek/libetonyek-9999.ebuild |
59 |
@@ -33,6 +33,15 @@ DEPEND="${RDEPEND} |
60 |
test? ( dev-util/cppunit ) |
61 |
" |
62 |
|
63 |
+pkg_pretend() { |
64 |
+ if [[ $(gcc-major-version) -lt 4 ]] || { |
65 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; } |
66 |
+ then |
67 |
+ eerror "Compilation with gcc older than 4.8 is not supported" |
68 |
+ die "Too old gcc found." |
69 |
+ fi |
70 |
+} |
71 |
+ |
72 |
src_prepare() { |
73 |
[[ -d m4 ]] || mkdir "m4" |
74 |
base_src_prepare |
75 |
|
76 |
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml |
77 |
index 9d67a9d..13ce236 100644 |
78 |
--- a/app-text/libetonyek/metadata.xml |
79 |
+++ b/app-text/libetonyek/metadata.xml |
80 |
@@ -1,8 +1,8 @@ |
81 |
<?xml version="1.0" encoding="UTF-8"?> |
82 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
83 |
<pkgmetadata> |
84 |
-<maintainer type="project"> |
85 |
- <email>office@g.o</email> |
86 |
- <name>Gentoo Office project</name> |
87 |
-</maintainer> |
88 |
+ <maintainer type="project"> |
89 |
+ <email>office@g.o</email> |
90 |
+ <name>Gentoo Office project</name> |
91 |
+ </maintainer> |
92 |
</pkgmetadata> |