[gentoo-commits] repo/gentoo:master commit in: app-arch/zopfli/files/, app-arch/zopfli/ - gentoo-commits

From:	Mikle Kolyada <zlogene@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-arch/zopfli/files/, app-arch/zopfli/
Date:	Sat, 16 Feb 2019 08:31:26
Message-Id:	`1550305877.f3507058729cddaf655c61ef4e1e72038f477bc0.zlogene@gentoo`

1

commit:     f3507058729cddaf655c61ef4e1e72038f477bc0

2

Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>

3

AuthorDate: Sat Feb 16 08:31:01 2019 +0000

4

Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>

5

CommitDate: Sat Feb 16 08:31:17 2019 +0000

6

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

7

8

app-arch/zopfli: Drop old

9

10

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

11

Package-Manager: Portage-2.3.51, Repoman-2.3.11

12

13

 app-arch/zopfli/Manifest                          |  2 -

14

 app-arch/zopfli/files/zopfli-1.0.1-makefile.patch | 55 -----------------------

15

 app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild     | 25 -----------

16

 app-arch/zopfli/zopfli-1.0.1-r2.ebuild            | 41 -----------------

17

 4 files changed, 123 deletions(-)

18

19

diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest

20

index ad9cc5bcbb8..e618e56d29d 100644

21

--- a/app-arch/zopfli/Manifest

22

+++ b/app-arch/zopfli/Manifest

23

@@ -1,3 +1 @@

24

-DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413e5000ab1fabe7edd2877b9bbc04a0041c5f02fa67fe6a818f68eb4af15251dabf7e599615656956e315b5ece497e2afa1a SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca

25

-DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430

26

 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e

27

28

diff --git a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch

29

deleted file mode 100644

30

index a4a7dc28091..00000000000

31

--- a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch

32

+++ /dev/null

33

@@ -1,55 +0,0 @@

34

---- zopfli-zopfli-1.0.1/Makefile

35

-+++ zopfli-zopfli-1.0.1/Makefile

36

-@@ -1,8 +1,10 @@

37

--CC = gcc

38

--CXX = g++

39

-+CC ?= gcc

40

-+CXX ?= g++

41

-

42

--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2

43

--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2

44

-+CFLAGS += -W -Wall -Wextra -ansi -pedantic

45

-+CXXFLAGS += -W -Wall -Wextra -ansi -pedantic

46

-+LDFLAGS += -L.

47

-+LIBS = -lm

48

-

49

- ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\

50

-                 src/zopfli/deflate.c src/zopfli/gzip_container.c\

51

-@@ -18,24 +20,28 @@

52

-

53

- .PHONY: zopfli zopflipng

54

-

55

-+all: zopfli zopflipng

56

-+

57

- # Zopfli binary

58

--zopfli:

59

--	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli

60

-+zopfli: libzopfli

61

-+	$(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli

62

-

63

- # Zopfli shared library

64

- libzopfli:

65

- 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c

66

--	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1

67

-+	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1

68

-+	@ln -s libzopfli.so.1.0.1 libzopfli.so.1

69

-+	@ln -s libzopfli.so.1.0.1 libzopfli.so

70

-

71

- # ZopfliPNG binary

72

--zopflipng:

73

--	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c

74

--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng

75

-+zopflipng: libzopflipng

76

-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng

77

-

78

- # ZopfliPNG shared library

79

--libzopflipng:

80

--	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c

81

--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0

82

-+libzopflipng: libzopfli

83

-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0

84

-+	@ln -s libzopflipng.so.1.0.0 libzopflipng.so.1

85

-+	@ln -s libzopflipng.so.1.0.0 libzopflipng.so

86

-

87

- # Remove all libraries and binaries

88

- clean:

89

90

diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild

91

deleted file mode 100644

92

index 13820f174c0..00000000000

93

--- a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild

94

+++ /dev/null

95

@@ -1,25 +0,0 @@

96

-# Copyright 1999-2017 Gentoo Foundation

97

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

98

-

99

-EAPI=5

100

-

101

-inherit eutils multilib toolchain-funcs vcs-snapshot

102

-

103

-DESCRIPTION="Very good, but slow, deflate or zlib compression"

104

-HOMEPAGE="https://github.com/Hello71/zopfli/"

105

-SRC_URI="https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> ${P}.tar.gz"

106

-

107

-LICENSE="Apache-2.0"

108

-SLOT="0/1"

109

-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"

110

-

111

-src_prepare() {

112

-	tc-export CC CXX

113

-

114

-	epatch_user

115

-}

116

-

117

-src_install() {

118

-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" install

119

-	dodoc CONTRIBUTORS README README.${PN}png

120

-}

121

122

diff --git a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild b/app-arch/zopfli/zopfli-1.0.1-r2.ebuild

123

deleted file mode 100644

124

index cb39213529a..00000000000

125

--- a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild

126

+++ /dev/null

127

@@ -1,41 +0,0 @@

128

-# Copyright 1999-2016 Gentoo Foundation

129

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

130

-

131

-EAPI=6

132

-

133

-inherit toolchain-funcs

134

-

135

-DESCRIPTION="Very good, but slow, deflate or zlib compression"

136

-HOMEPAGE="https://github.com/google/zopfli/"

137

-SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"

138

-

139

-S="${WORKDIR}/${PN}-${P}"

140

-

141

-LICENSE="Apache-2.0"

142

-SLOT="0/1"

143

-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

144

-

145

-DOCS=( CONTRIBUTORS README README.zopflipng )

146

-

147

-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )

148

-

149

-# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)

150

-

151

-src_prepare() {

152

-	default

153

-	tc-export CC CXX

154

-}

155

-

156

-# The Makefile has no install phase

157

-src_install() {

158

-	dolib.so libzopfli.so*

159

-	doheader src/zopfli/zopfli.h

160

-

161

-	dobin ${PN}

162

-

163

-	# This version was erroneously not bumped to match ${PV}

164

-	dolib.so libzopflipng.so*

165

-	doheader src/zopflipng/zopflipng_lib.h

166

-

167

-	dobin zopflipng

168

-}

1	commit: f3507058729cddaf655c61ef4e1e72038f477bc0
2	Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3	AuthorDate: Sat Feb 16 08:31:01 2019 +0000
4	Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5	CommitDate: Sat Feb 16 08:31:17 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3507058
7
8	app-arch/zopfli: Drop old
9
10	Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11	Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13	app-arch/zopfli/Manifest \| 2 -
14	app-arch/zopfli/files/zopfli-1.0.1-makefile.patch \| 55 -----------------------
15	app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild \| 25 -----------
16	app-arch/zopfli/zopfli-1.0.1-r2.ebuild \| 41 -----------------
17	4 files changed, 123 deletions(-)
18
19	diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
20	index ad9cc5bcbb8..e618e56d29d 100644
21	--- a/app-arch/zopfli/Manifest
22	+++ b/app-arch/zopfli/Manifest
23	@@ -1,3 +1 @@
24	-DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413e5000ab1fabe7edd2877b9bbc04a0041c5f02fa67fe6a818f68eb4af15251dabf7e599615656956e315b5ece497e2afa1a SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca
25	-DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430
26	DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
27
28	diff --git a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
29	deleted file mode 100644
30	index a4a7dc28091..00000000000
31	--- a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
32	+++ /dev/null
33	@@ -1,55 +0,0 @@
34	---- zopfli-zopfli-1.0.1/Makefile
35	-+++ zopfli-zopfli-1.0.1/Makefile
36	-@@ -1,8 +1,10 @@
37	--CC = gcc
38	--CXX = g++
39	-+CC ?= gcc
40	-+CXX ?= g++
41	-
42	--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
43	--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
44	-+CFLAGS += -W -Wall -Wextra -ansi -pedantic
45	-+CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
46	-+LDFLAGS += -L.
47	-+LIBS = -lm
48	-
49	- ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
50	- src/zopfli/deflate.c src/zopfli/gzip_container.c\
51	-@@ -18,24 +20,28 @@
52	-
53	- .PHONY: zopfli zopflipng
54	-
55	-+all: zopfli zopflipng
56	-+
57	- # Zopfli binary
58	--zopfli:
59	-- $(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
60	-+zopfli: libzopfli
61	-+ $(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
62	-
63	- # Zopfli shared library
64	- libzopfli:
65	- $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
66	-- $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
67	-+ $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
68	-+ @ln -s libzopfli.so.1.0.1 libzopfli.so.1
69	-+ @ln -s libzopfli.so.1.0.1 libzopfli.so
70	-
71	- # ZopfliPNG binary
72	--zopflipng:
73	-- $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
74	-- $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
75	-+zopflipng: libzopflipng
76	-+ $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
77	-
78	- # ZopfliPNG shared library
79	--libzopflipng:
80	-- $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
81	-- $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
82	-+libzopflipng: libzopfli
83	-+ $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
84	-+ @ln -s libzopflipng.so.1.0.0 libzopflipng.so.1
85	-+ @ln -s libzopflipng.so.1.0.0 libzopflipng.so
86	-
87	- # Remove all libraries and binaries
88	- clean:
89
90	diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
91	deleted file mode 100644
92	index 13820f174c0..00000000000
93	--- a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
94	+++ /dev/null
95	@@ -1,25 +0,0 @@
96	-# Copyright 1999-2017 Gentoo Foundation
97	-# Distributed under the terms of the GNU General Public License v2
98	-
99	-EAPI=5
100	-
101	-inherit eutils multilib toolchain-funcs vcs-snapshot
102	-
103	-DESCRIPTION="Very good, but slow, deflate or zlib compression"
104	-HOMEPAGE="https://github.com/Hello71/zopfli/"
105	-SRC_URI="https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> ${P}.tar.gz"
106	-
107	-LICENSE="Apache-2.0"
108	-SLOT="0/1"
109	-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
110	-
111	-src_prepare() {
112	- tc-export CC CXX
113	-
114	- epatch_user
115	-}
116	-
117	-src_install() {
118	- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" install
119	- dodoc CONTRIBUTORS README README.${PN}png
120	-}
121
122	diff --git a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild b/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
123	deleted file mode 100644
124	index cb39213529a..00000000000
125	--- a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
126	+++ /dev/null
127	@@ -1,41 +0,0 @@
128	-# Copyright 1999-2016 Gentoo Foundation
129	-# Distributed under the terms of the GNU General Public License v2
130	-
131	-EAPI=6
132	-
133	-inherit toolchain-funcs
134	-
135	-DESCRIPTION="Very good, but slow, deflate or zlib compression"
136	-HOMEPAGE="https://github.com/google/zopfli/"
137	-SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
138	-
139	-S="${WORKDIR}/${PN}-${P}"
140	-
141	-LICENSE="Apache-2.0"
142	-SLOT="0/1"
143	-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
144	-
145	-DOCS=( CONTRIBUTORS README README.zopflipng )
146	-
147	-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
148	-
149	-# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
150	-
151	-src_prepare() {
152	- default
153	- tc-export CC CXX
154	-}
155	-
156	-# The Makefile has no install phase
157	-src_install() {
158	- dolib.so libzopfli.so*
159	- doheader src/zopfli/zopfli.h
160	-
161	- dobin ${PN}
162	-
163	- # This version was erroneously not bumped to match ${PV}
164	- dolib.so libzopflipng.so*
165	- doheader src/zopflipng/zopflipng_lib.h
166	-
167	- dobin zopflipng
168	-}

Gentoo Archives: gentoo-commits