[gentoo-commits] repo/gentoo:master commit in: media-gfx/farbfeld/, media-gfx/farbfeld/files/ - gentoo-commits

From:	Jeroen Roovers <jer@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-gfx/farbfeld/, media-gfx/farbfeld/files/
Date:	Sat, 15 Apr 2017 13:04:01
Message-Id:	`1492261241.3fc00f135e66dc82d84bf4b03da12846a934016e.jer@gentoo`

1

commit:     3fc00f135e66dc82d84bf4b03da12846a934016e

2

Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

3

AuthorDate: Sat Apr 15 13:00:41 2017 +0000

4

Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

5

CommitDate: Sat Apr 15 13:00:41 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc00f13

7

8

media-gfx/farbfeld: Version bump.

9

10

Package-Manager: Portage-2.3.5, Repoman-2.3.2

11

12

 media-gfx/farbfeld/Manifest                        |  1 +

13

 .../{farbfeld-9999.ebuild => farbfeld-3.ebuild}    | 27 ++++++++++++----------

14

 media-gfx/farbfeld/farbfeld-9999.ebuild            | 21 +++++++++--------

15

 .../farbfeld/files/farbfeld-3-as-needed.patch      | 11 +++++++++

16

 4 files changed, 39 insertions(+), 21 deletions(-)

17

18

diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest

19

index fe8dd7099ce..1e731e5d635 100644

20

--- a/media-gfx/farbfeld/Manifest

21

+++ b/media-gfx/farbfeld/Manifest

22

@@ -1,2 +1,3 @@

23

 DIST farbfeld-1.tar.gz 6770 SHA256 34faf878ee9bf20a690604b2e09f97ce517b20bb7b5e37433997941825c0b46e SHA512 cbd977175412ad7b143415643a3767b041e87d441f3bf9783872ffb48ed987f60156d6e2d7eff715071eb0349a3a131188487a1c9645dffa78966f0102b8405e WHIRLPOOL 6a6a489fcffda4b7c337097d51b181f7533a97a948af0c781cb035dba05b2b3ad892a1cde6f0dab05d3db893ddddfbf5666621144f4b8ed7e4a6981df3821343

24

 DIST farbfeld-2.tar.gz 6646 SHA256 a366e7628274fb9b4dc9508a7340a32b5e7557d99895b7ed7b5165241d613f58 SHA512 04471f0d6092433083b1441c17fb80db27fcedea6a12ddab3b08eaf9731da06f48560cf49124b56e1e27d7de2b69109b0ce38513ee90c735ac966dc2132e000f WHIRLPOOL 3d125bac271db2e8ab6411abc1c809cb2de4c6401a4c978f6a34fad97387136225b8d93dae5f89aa2bc303f4e8498350193f74a7f156b9bd65ec8dcac05a2341

25

+DIST farbfeld-3.tar.gz 10169 SHA256 5b953b86a72d3feaedf62698532c8888e5f6e2f6363193a4cc8cee0e38c378ad SHA512 4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49 WHIRLPOOL f7105f1ea59366159a9b350d862e356eeb373685287a25827a72360ce917a6a23b4473286b82a081afea8b9dd60ec5b7ea37450084a54f615c00186753c70cbf

26

27

diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-3.ebuild

28

similarity index 67%

29

copy from media-gfx/farbfeld/farbfeld-9999.ebuild

30

copy to media-gfx/farbfeld/farbfeld-3.ebuild

31

index a0cf3c93adb..6ff7acb7cee 100644

32

--- a/media-gfx/farbfeld/farbfeld-9999.ebuild

33

+++ b/media-gfx/farbfeld/farbfeld-3.ebuild

34

@@ -1,39 +1,42 @@

35

-# Copyright 1999-2015 Gentoo Foundation

36

+# Copyright 1999-2017 Gentoo Foundation

37

 # Distributed under the terms of the GNU General Public License v2

38

39

-EAPI=5

40

-inherit git-r3 toolchain-funcs

41

+EAPI=6

42

+inherit toolchain-funcs

43

44

 DESCRIPTION="farbfeld simple image format tools"

45

 HOMEPAGE="http://tools.suckless.org/farbfeld/"

46

-EGIT_REPO_URI="git://git.suckless.org/farbfeld"

47

+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"

48

49

 LICENSE="ISC"

50

 SLOT="0"

51

-KEYWORDS=""

52

+KEYWORDS="~amd64"

53

54

 RDEPEND="

55

 	media-libs/libjpeg-turbo

56

 	media-libs/libpng:*

57

-	media-libs/lcms:2

58

"

59

 DEPEND="

60

 	${RDEPEND}

61

"

62

+PATCHES=(

63

+	"${FILESDIR}"/${PN}-3-as-needed.patch

64

+)

65

66

 src_prepare() {

67

-	sed config.mk \

68

+	default

69

+

70

+	sed -i \

71

 		-e '/^CC/d' \

72

 		-e 's|/usr/local|/usr|g' \

73

 		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \

74

 		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \

75

 		-e 's|{|(|g;s|}|)|g' \

76

-		-i || die

77

+		config.mk || die

78

79

-	sed Makefile \

80

-		-e 's|{|(|g;s|}|)|g' \

81

-		-e 's|^	@|	|g' \

82

-		-i || die

83

+	sed -i \

84

+		-e '/[a-z]-LDFLAGS/s| = | += |g' \

85

+		Makefile || die

86

}

87

88

 src_compile() {

89

90

diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild

91

index a0cf3c93adb..1d283868c3a 100644

92

--- a/media-gfx/farbfeld/farbfeld-9999.ebuild

93

+++ b/media-gfx/farbfeld/farbfeld-9999.ebuild

94

@@ -1,7 +1,7 @@

95

-# Copyright 1999-2015 Gentoo Foundation

96

+# Copyright 1999-2017 Gentoo Foundation

97

 # Distributed under the terms of the GNU General Public License v2

98

99

-EAPI=5

100

+EAPI=6

101

 inherit git-r3 toolchain-funcs

102

103

 DESCRIPTION="farbfeld simple image format tools"

104

@@ -15,25 +15,28 @@ KEYWORDS=""

105

 RDEPEND="

106

 	media-libs/libjpeg-turbo

107

 	media-libs/libpng:*

108

-	media-libs/lcms:2

109

"

110

 DEPEND="

111

 	${RDEPEND}

112

"

113

+PATCHES=(

114

+	"${FILESDIR}"/${PN}-3-as-needed.patch

115

+)

116

117

 src_prepare() {

118

-	sed config.mk \

119

+	default

120

+

121

+	sed -i \

122

 		-e '/^CC/d' \

123

 		-e 's|/usr/local|/usr|g' \

124

 		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \

125

 		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \

126

 		-e 's|{|(|g;s|}|)|g' \

127

-		-i || die

128

+		config.mk || die

129

130

-	sed Makefile \

131

-		-e 's|{|(|g;s|}|)|g' \

132

-		-e 's|^	@|	|g' \

133

-		-i || die

134

+	sed -i \

135

+		-e '/[a-z]-LDFLAGS/s| = | += |g' \

136

+		Makefile || die

137

}

138

139

 src_compile() {

140

141

diff --git a/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch

142

new file mode 100644

143

index 00000000000..61502e55543

144

--- /dev/null

145

+++ b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch

146

@@ -0,0 +1,11 @@

147

+--- a/Makefile

148

++++ b/Makefile

149

+@@ -23,7 +23,7 @@

150

+ $(BIN:=.o): config.mk $(HDR) $(REQ:=.h)

151

+

152

+ .o:

153

+-	$(CC) $(LDFLAGS) $($*-LDFLAGS) -o $@ $< $(REQ:=.o)

154

++	$(CC) $(LDFLAGS) -o $@ $< $(REQ:=.o) $($*-LDFLAGS)

155

+

156

+ clean:

157

+ 	rm -f $(BIN) $(BIN:=.o) $(REQ:=.o)

1	commit: 3fc00f135e66dc82d84bf4b03da12846a934016e
2	Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3	AuthorDate: Sat Apr 15 13:00:41 2017 +0000
4	Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5	CommitDate: Sat Apr 15 13:00:41 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc00f13
7
8	media-gfx/farbfeld: Version bump.
9
10	Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12	media-gfx/farbfeld/Manifest \| 1 +
13	.../{farbfeld-9999.ebuild => farbfeld-3.ebuild} \| 27 ++++++++++++----------
14	media-gfx/farbfeld/farbfeld-9999.ebuild \| 21 +++++++++--------
15	.../farbfeld/files/farbfeld-3-as-needed.patch \| 11 +++++++++
16	4 files changed, 39 insertions(+), 21 deletions(-)
17
18	diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest
19	index fe8dd7099ce..1e731e5d635 100644
20	--- a/media-gfx/farbfeld/Manifest
21	+++ b/media-gfx/farbfeld/Manifest
22	@@ -1,2 +1,3 @@
23	DIST farbfeld-1.tar.gz 6770 SHA256 34faf878ee9bf20a690604b2e09f97ce517b20bb7b5e37433997941825c0b46e SHA512 cbd977175412ad7b143415643a3767b041e87d441f3bf9783872ffb48ed987f60156d6e2d7eff715071eb0349a3a131188487a1c9645dffa78966f0102b8405e WHIRLPOOL 6a6a489fcffda4b7c337097d51b181f7533a97a948af0c781cb035dba05b2b3ad892a1cde6f0dab05d3db893ddddfbf5666621144f4b8ed7e4a6981df3821343
24	DIST farbfeld-2.tar.gz 6646 SHA256 a366e7628274fb9b4dc9508a7340a32b5e7557d99895b7ed7b5165241d613f58 SHA512 04471f0d6092433083b1441c17fb80db27fcedea6a12ddab3b08eaf9731da06f48560cf49124b56e1e27d7de2b69109b0ce38513ee90c735ac966dc2132e000f WHIRLPOOL 3d125bac271db2e8ab6411abc1c809cb2de4c6401a4c978f6a34fad97387136225b8d93dae5f89aa2bc303f4e8498350193f74a7f156b9bd65ec8dcac05a2341
25	+DIST farbfeld-3.tar.gz 10169 SHA256 5b953b86a72d3feaedf62698532c8888e5f6e2f6363193a4cc8cee0e38c378ad SHA512 4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49 WHIRLPOOL f7105f1ea59366159a9b350d862e356eeb373685287a25827a72360ce917a6a23b4473286b82a081afea8b9dd60ec5b7ea37450084a54f615c00186753c70cbf
26
27	diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-3.ebuild
28	similarity index 67%
29	copy from media-gfx/farbfeld/farbfeld-9999.ebuild
30	copy to media-gfx/farbfeld/farbfeld-3.ebuild
31	index a0cf3c93adb..6ff7acb7cee 100644
32	--- a/media-gfx/farbfeld/farbfeld-9999.ebuild
33	+++ b/media-gfx/farbfeld/farbfeld-3.ebuild
34	@@ -1,39 +1,42 @@
35	-# Copyright 1999-2015 Gentoo Foundation
36	+# Copyright 1999-2017 Gentoo Foundation
37	# Distributed under the terms of the GNU General Public License v2
38
39	-EAPI=5
40	-inherit git-r3 toolchain-funcs
41	+EAPI=6
42	+inherit toolchain-funcs
43
44	DESCRIPTION="farbfeld simple image format tools"
45	HOMEPAGE="http://tools.suckless.org/farbfeld/"
46	-EGIT_REPO_URI="git://git.suckless.org/farbfeld"
47	+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
48
49	LICENSE="ISC"
50	SLOT="0"
51	-KEYWORDS=""
52	+KEYWORDS="~amd64"
53
54	RDEPEND="
55	media-libs/libjpeg-turbo
56	media-libs/libpng:*
57	- media-libs/lcms:2
58	"
59	DEPEND="
60	${RDEPEND}
61	"
62	+PATCHES=(
63	+ "${FILESDIR}"/${PN}-3-as-needed.patch
64	+)
65
66	src_prepare() {
67	- sed config.mk \
68	+ default
69	+
70	+ sed -i \
71	-e '/^CC/d' \
72	-e 's\|/usr/local\|/usr\|g' \
73	-e 's\|^CFLAGS.*\|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)\|g' \
74	-e 's\|^LDFLAGS.*\|LDFLAGS += $(LIBS)\|g' \
75	-e 's\|{\|(\|g;s\|}\|)\|g' \
76	- -i \|\| die
77	+ config.mk \|\| die
78
79	- sed Makefile \
80	- -e 's\|{\|(\|g;s\|}\|)\|g' \
81	- -e 's\|^ @\| \|g' \
82	- -i \|\| die
83	+ sed -i \
84	+ -e '/[a-z]-LDFLAGS/s\| = \| += \|g' \
85	+ Makefile \|\| die
86	}
87
88	src_compile() {
89
90	diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild
91	index a0cf3c93adb..1d283868c3a 100644
92	--- a/media-gfx/farbfeld/farbfeld-9999.ebuild
93	+++ b/media-gfx/farbfeld/farbfeld-9999.ebuild
94	@@ -1,7 +1,7 @@
95	-# Copyright 1999-2015 Gentoo Foundation
96	+# Copyright 1999-2017 Gentoo Foundation
97	# Distributed under the terms of the GNU General Public License v2
98
99	-EAPI=5
100	+EAPI=6
101	inherit git-r3 toolchain-funcs
102
103	DESCRIPTION="farbfeld simple image format tools"
104	@@ -15,25 +15,28 @@ KEYWORDS=""
105	RDEPEND="
106	media-libs/libjpeg-turbo
107	media-libs/libpng:*
108	- media-libs/lcms:2
109	"
110	DEPEND="
111	${RDEPEND}
112	"
113	+PATCHES=(
114	+ "${FILESDIR}"/${PN}-3-as-needed.patch
115	+)
116
117	src_prepare() {
118	- sed config.mk \
119	+ default
120	+
121	+ sed -i \
122	-e '/^CC/d' \
123	-e 's\|/usr/local\|/usr\|g' \
124	-e 's\|^CFLAGS.*\|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)\|g' \
125	-e 's\|^LDFLAGS.*\|LDFLAGS += $(LIBS)\|g' \
126	-e 's\|{\|(\|g;s\|}\|)\|g' \
127	- -i \|\| die
128	+ config.mk \|\| die
129
130	- sed Makefile \
131	- -e 's\|{\|(\|g;s\|}\|)\|g' \
132	- -e 's\|^ @\| \|g' \
133	- -i \|\| die
134	+ sed -i \
135	+ -e '/[a-z]-LDFLAGS/s\| = \| += \|g' \
136	+ Makefile \|\| die
137	}
138
139	src_compile() {
140
141	diff --git a/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch
142	new file mode 100644
143	index 00000000000..61502e55543
144	--- /dev/null
145	+++ b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch
146	@@ -0,0 +1,11 @@
147	+--- a/Makefile
148	++++ b/Makefile
149	+@@ -23,7 +23,7 @@
150	+ $(BIN:=.o): config.mk $(HDR) $(REQ:=.h)
151	+
152	+ .o:
153	+- $(CC) $(LDFLAGS) $($*-LDFLAGS) -o $@ $< $(REQ:=.o)
154	++ $(CC) $(LDFLAGS) -o $@ $< $(REQ:=.o) $($*-LDFLAGS)
155	+
156	+ clean:
157	+ rm -f $(BIN) $(BIN:=.o) $(REQ:=.o)

Gentoo Archives: gentoo-commits