[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ - gentoo-commits

From:	"Andreas Hüttel" <dilfridge@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/
Date:	Wed, 06 Jul 2011 19:22:54
Message-Id:	`f6f5ae976d8b11fa107d4ec5b61f8c35aa0413a9.dilfridge@gentoo`

1

commit:     f6f5ae976d8b11fa107d4ec5b61f8c35aa0413a9

2

Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jul  6 19:22:49 2011 +0000

4

Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>

5

CommitDate: Wed Jul  6 19:22:49 2011 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f6f5ae97

7

8

[kde-base/kdelibs] Only check for gcc version if we actually compile something

9

10

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 7887F787)

11

12

---

13

 kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild |    8 +++++---

14

 kde-base/kdelibs/kdelibs-4.6.5.ebuild       |    8 +++++---

15

 kde-base/kdelibs/kdelibs-4.6.90.ebuild      |    8 +++++---

16

 kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild |    8 +++++---

17

 kde-base/kdelibs/kdelibs-9999.ebuild        |    8 +++++---

18

 5 files changed, 25 insertions(+), 15 deletions(-)

19

20

diff --git a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild

21

index 8e72ab2..29d25fb 100644

22

--- a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild

23

+++ b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild

24

@@ -142,9 +142,11 @@ PATCHES=(

25

)

26

27

 pkg_pretend() {

28

-	[[ $(gcc-major-version) -lt 4 ]] || \

29

-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

30

-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

31

+	if [[ ${MERGE_TYPE} != binary ]]; then

32

+		[[ $(gcc-major-version) -lt 4 ]] || \

33

+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

34

+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

35

+	fi

36

}

37

38

 src_prepare() {

39

40

diff --git a/kde-base/kdelibs/kdelibs-4.6.5.ebuild b/kde-base/kdelibs/kdelibs-4.6.5.ebuild

41

index 8f87994..58c109b 100644

42

--- a/kde-base/kdelibs/kdelibs-4.6.5.ebuild

43

+++ b/kde-base/kdelibs/kdelibs-4.6.5.ebuild

44

@@ -142,9 +142,11 @@ PATCHES=(

45

)

46

47

 pkg_pretend() {

48

-	[[ $(gcc-major-version) -lt 4 ]] || \

49

-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

50

-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

51

+	if [[ ${MERGE_TYPE} != binary ]]; then

52

+		[[ $(gcc-major-version) -lt 4 ]] || \

53

+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

54

+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

55

+	fi

56

}

57

58

 src_prepare() {

59

60

diff --git a/kde-base/kdelibs/kdelibs-4.6.90.ebuild b/kde-base/kdelibs/kdelibs-4.6.90.ebuild

61

index 17dfacb..0affb50 100644

62

--- a/kde-base/kdelibs/kdelibs-4.6.90.ebuild

63

+++ b/kde-base/kdelibs/kdelibs-4.6.90.ebuild

64

@@ -142,9 +142,11 @@ PATCHES=(

65

)

66

67

 pkg_pretend() {

68

-	[[ $(gcc-major-version) -lt 4 ]] || \

69

-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

70

-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

71

+	if [[ ${MERGE_TYPE} != binary ]]; then

72

+		[[ $(gcc-major-version) -lt 4 ]] || \

73

+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

74

+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

75

+	fi

76

}

77

78

 src_prepare() {

79

80

diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild

81

index 1df0e13..e401de8 100644

82

--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild

83

+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild

84

@@ -142,9 +142,11 @@ PATCHES=(

85

)

86

87

 pkg_pretend() {

88

-	[[ $(gcc-major-version) -lt 4 ]] || \

89

-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

90

-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

91

+	if [[ ${MERGE_TYPE} != binary ]]; then

92

+		[[ $(gcc-major-version) -lt 4 ]] || \

93

+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

94

+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

95

+	fi

96

}

97

98

 src_prepare() {

99

100

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild

101

index 1df0e13..e401de8 100644

102

--- a/kde-base/kdelibs/kdelibs-9999.ebuild

103

+++ b/kde-base/kdelibs/kdelibs-9999.ebuild

104

@@ -142,9 +142,11 @@ PATCHES=(

105

)

106

107

 pkg_pretend() {

108

-	[[ $(gcc-major-version) -lt 4 ]] || \

109

-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

110

-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

111

+	if [[ ${MERGE_TYPE} != binary ]]; then

112

+		[[ $(gcc-major-version) -lt 4 ]] || \

113

+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \

114

+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."

115

+	fi

116

}

117

118

 src_prepare() {

1	commit: f6f5ae976d8b11fa107d4ec5b61f8c35aa0413a9
2	Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jul 6 19:22:49 2011 +0000
4	Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5	CommitDate: Wed Jul 6 19:22:49 2011 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f6f5ae97
7
8	[kde-base/kdelibs] Only check for gcc version if we actually compile something
9
10	(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 7887F787)
11
12	---
13	kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild \| 8 +++++---
14	kde-base/kdelibs/kdelibs-4.6.5.ebuild \| 8 +++++---
15	kde-base/kdelibs/kdelibs-4.6.90.ebuild \| 8 +++++---
16	kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild \| 8 +++++---
17	kde-base/kdelibs/kdelibs-9999.ebuild \| 8 +++++---
18	5 files changed, 25 insertions(+), 15 deletions(-)
19
20	diff --git a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
21	index 8e72ab2..29d25fb 100644
22	--- a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
23	+++ b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
24	@@ -142,9 +142,11 @@ PATCHES=(
25	)
26
27	pkg_pretend() {
28	- [[ $(gcc-major-version) -lt 4 ]] \|\| \
29	- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
30	- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
31	+ if [[ ${MERGE_TYPE} != binary ]]; then
32	+ [[ $(gcc-major-version) -lt 4 ]] \|\| \
33	+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
34	+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
35	+ fi
36	}
37
38	src_prepare() {
39
40	diff --git a/kde-base/kdelibs/kdelibs-4.6.5.ebuild b/kde-base/kdelibs/kdelibs-4.6.5.ebuild
41	index 8f87994..58c109b 100644
42	--- a/kde-base/kdelibs/kdelibs-4.6.5.ebuild
43	+++ b/kde-base/kdelibs/kdelibs-4.6.5.ebuild
44	@@ -142,9 +142,11 @@ PATCHES=(
45	)
46
47	pkg_pretend() {
48	- [[ $(gcc-major-version) -lt 4 ]] \|\| \
49	- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
50	- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
51	+ if [[ ${MERGE_TYPE} != binary ]]; then
52	+ [[ $(gcc-major-version) -lt 4 ]] \|\| \
53	+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
54	+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
55	+ fi
56	}
57
58	src_prepare() {
59
60	diff --git a/kde-base/kdelibs/kdelibs-4.6.90.ebuild b/kde-base/kdelibs/kdelibs-4.6.90.ebuild
61	index 17dfacb..0affb50 100644
62	--- a/kde-base/kdelibs/kdelibs-4.6.90.ebuild
63	+++ b/kde-base/kdelibs/kdelibs-4.6.90.ebuild
64	@@ -142,9 +142,11 @@ PATCHES=(
65	)
66
67	pkg_pretend() {
68	- [[ $(gcc-major-version) -lt 4 ]] \|\| \
69	- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
70	- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
71	+ if [[ ${MERGE_TYPE} != binary ]]; then
72	+ [[ $(gcc-major-version) -lt 4 ]] \|\| \
73	+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
74	+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
75	+ fi
76	}
77
78	src_prepare() {
79
80	diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
81	index 1df0e13..e401de8 100644
82	--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
83	+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
84	@@ -142,9 +142,11 @@ PATCHES=(
85	)
86
87	pkg_pretend() {
88	- [[ $(gcc-major-version) -lt 4 ]] \|\| \
89	- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
90	- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
91	+ if [[ ${MERGE_TYPE} != binary ]]; then
92	+ [[ $(gcc-major-version) -lt 4 ]] \|\| \
93	+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
94	+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
95	+ fi
96	}
97
98	src_prepare() {
99
100	diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
101	index 1df0e13..e401de8 100644
102	--- a/kde-base/kdelibs/kdelibs-9999.ebuild
103	+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
104	@@ -142,9 +142,11 @@ PATCHES=(
105	)
106
107	pkg_pretend() {
108	- [[ $(gcc-major-version) -lt 4 ]] \|\| \
109	- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
110	- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
111	+ if [[ ${MERGE_TYPE} != binary ]]; then
112	+ [[ $(gcc-major-version) -lt 4 ]] \|\| \
113	+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
114	+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
115	+ fi
116	}
117
118	src_prepare() {

Gentoo Archives: gentoo-commits