1 |
commit: e73f93f7990c0785ab693f649571dd87e1d85638 |
2 |
Author: Jack Todaro <solpeth <AT> posteo <DOT> org> |
3 |
AuthorDate: Tue Aug 25 23:20:15 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 26 23:25:42 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73f93f7 |
7 |
|
8 |
dev-haskell/x11: remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org> |
12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
13 |
|
14 |
dev-haskell/x11/Manifest | 4 --- |
15 |
dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch | 12 ------- |
16 |
dev-haskell/x11/metadata.xml | 14 +++----- |
17 |
dev-haskell/x11/x11-1.6.1.1.ebuild | 40 ----------------------- |
18 |
dev-haskell/x11/x11-1.6.1.2.ebuild | 41 ------------------------ |
19 |
dev-haskell/x11/x11-1.8-r1.ebuild | 43 ------------------------- |
20 |
dev-haskell/x11/x11-1.9.1.ebuild | 44 -------------------------- |
21 |
7 files changed, 4 insertions(+), 194 deletions(-) |
22 |
|
23 |
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest |
24 |
index 1e0d42edafb..a3548cf32d9 100644 |
25 |
--- a/dev-haskell/x11/Manifest |
26 |
+++ b/dev-haskell/x11/Manifest |
27 |
@@ -1,5 +1 @@ |
28 |
-DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144 |
29 |
-DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b |
30 |
-DIST X11-1.8.tar.gz 191331 BLAKE2B a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6 SHA512 bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c |
31 |
-DIST X11-1.9.1.tar.gz 190698 BLAKE2B ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4 SHA512 6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7 |
32 |
DIST X11-1.9.2.tar.gz 190757 BLAKE2B cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec SHA512 e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41 |
33 |
|
34 |
diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch |
35 |
deleted file mode 100644 |
36 |
index f1d5c179036..00000000000 |
37 |
--- a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch |
38 |
+++ /dev/null |
39 |
@@ -1,12 +0,0 @@ |
40 |
-Don't persist LDFLAGS into package database. |
41 |
- |
42 |
-https://bugs.gentoo.org/609624 |
43 |
-diff --git a/X11.buildinfo.in b/X11.buildinfo.in |
44 |
-index 6925939..6a18b58 100644 |
45 |
---- a/X11.buildinfo.in |
46 |
-+++ b/X11.buildinfo.in |
47 |
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@ |
48 |
- cc-options: @X_CFLAGS@ @CPPFLAGS@ |
49 |
--ld-options: @X_LIBS@ @LDFLAGS@ |
50 |
-+ld-options: @X_LIBS@ |
51 |
- extra-libraries: @EXTRA_LIBRARIES@ |
52 |
|
53 |
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml |
54 |
index 4c6b85a8182..e9eac3ea967 100644 |
55 |
--- a/dev-haskell/x11/metadata.xml |
56 |
+++ b/dev-haskell/x11/metadata.xml |
57 |
@@ -6,15 +6,9 @@ |
58 |
<name>Gentoo Haskell</name> |
59 |
</maintainer> |
60 |
<longdescription> |
61 |
- A Haskell binding to the X11 graphics library. |
62 |
- The binding is a direct translation of the C binding; for |
63 |
- documentation of these calls, refer to "The Xlib Programming |
64 |
- Manual", available online at <http://tronche.com/gui/x/xlib/>. |
65 |
+ A Haskell binding to the X11 graphics library. The binding is a direct |
66 |
+ translation of the C binding; for documentation of these calls, refer |
67 |
+ to \"The Xlib Programming Manual\", available online at |
68 |
+ <http://tronche.com/gui/x/xlib/>. |
69 |
</longdescription> |
70 |
- <use> |
71 |
- <flag name="screensaver">whether to build XScreenSaver.</flag> |
72 |
- </use> |
73 |
- <upstream> |
74 |
- <remote-id type="github">haskell-pkg-janitors/X11</remote-id> |
75 |
- </upstream> |
76 |
</pkgmetadata> |
77 |
|
78 |
diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild b/dev-haskell/x11/x11-1.6.1.1.ebuild |
79 |
deleted file mode 100644 |
80 |
index 248061d6054..00000000000 |
81 |
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,40 +0,0 @@ |
84 |
-# Copyright 1999-2019 Gentoo Authors |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-EAPI=5 |
88 |
- |
89 |
-# ebuild generated by hackport 0.3.2 |
90 |
- |
91 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
92 |
-inherit haskell-cabal |
93 |
- |
94 |
-MY_PN="X11" |
95 |
-MY_P="${MY_PN}-${PV}" |
96 |
- |
97 |
-DESCRIPTION="A binding to the X11 graphics library" |
98 |
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11" |
99 |
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
100 |
- |
101 |
-LICENSE="BSD" |
102 |
-SLOT="0/${PV}" |
103 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
104 |
-IUSE="+screensaver +xinerama" |
105 |
- |
106 |
-RDEPEND="dev-haskell/data-default:=[profile?] |
107 |
- >=dev-lang/ghc-7.4.1:= |
108 |
- x11-libs/libX11 |
109 |
- x11-libs/libXext |
110 |
- x11-libs/libXrandr |
111 |
- screensaver? ( x11-libs/libXScrnSaver ) |
112 |
- xinerama? ( x11-libs/libXinerama ) |
113 |
-" |
114 |
-DEPEND="${RDEPEND} |
115 |
- >=dev-haskell/cabal-1.2" |
116 |
- |
117 |
-S="${WORKDIR}/${MY_P}" |
118 |
- |
119 |
-src_configure() { |
120 |
- haskell-cabal_src_configure \ |
121 |
- --configure-option=$(use_with xinerama) \ |
122 |
- --configure-option=$(use_with screensaver xscreensaver) |
123 |
-} |
124 |
|
125 |
diff --git a/dev-haskell/x11/x11-1.6.1.2.ebuild b/dev-haskell/x11/x11-1.6.1.2.ebuild |
126 |
deleted file mode 100644 |
127 |
index 5c8d1e671ce..00000000000 |
128 |
--- a/dev-haskell/x11/x11-1.6.1.2.ebuild |
129 |
+++ /dev/null |
130 |
@@ -1,41 +0,0 @@ |
131 |
-# Copyright 1999-2019 Gentoo Authors |
132 |
-# Distributed under the terms of the GNU General Public License v2 |
133 |
- |
134 |
-EAPI=5 |
135 |
- |
136 |
-# ebuild generated by hackport 0.4.9999 |
137 |
- |
138 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
139 |
-inherit haskell-cabal |
140 |
- |
141 |
-MY_PN="X11" |
142 |
-MY_P="${MY_PN}-${PV}" |
143 |
- |
144 |
-DESCRIPTION="A binding to the X11 graphics library" |
145 |
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11" |
146 |
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
147 |
- |
148 |
-LICENSE="BSD" |
149 |
-SLOT="0/${PV}" |
150 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
151 |
-IUSE="+screensaver +xinerama" |
152 |
- |
153 |
-RDEPEND="dev-haskell/data-default:=[profile?] |
154 |
- >=dev-lang/ghc-7.4.1:= |
155 |
- x11-libs/libX11 |
156 |
- x11-libs/libXext |
157 |
- x11-libs/libXrandr |
158 |
- screensaver? ( x11-libs/libXScrnSaver ) |
159 |
- xinerama? ( x11-libs/libXinerama ) |
160 |
-" |
161 |
-DEPEND="${RDEPEND} |
162 |
- >=dev-haskell/cabal-1.2 |
163 |
-" |
164 |
- |
165 |
-S="${WORKDIR}/${MY_P}" |
166 |
- |
167 |
-src_configure() { |
168 |
- haskell-cabal_src_configure \ |
169 |
- --configure-option=$(use_with xinerama) \ |
170 |
- --configure-option=$(use_with screensaver xscreensaver) |
171 |
-} |
172 |
|
173 |
diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild |
174 |
deleted file mode 100644 |
175 |
index 9f9524f235d..00000000000 |
176 |
--- a/dev-haskell/x11/x11-1.8-r1.ebuild |
177 |
+++ /dev/null |
178 |
@@ -1,43 +0,0 @@ |
179 |
-# Copyright 1999-2019 Gentoo Authors |
180 |
-# Distributed under the terms of the GNU General Public License v2 |
181 |
- |
182 |
-EAPI=6 |
183 |
- |
184 |
-# ebuild generated by hackport 0.5.1.9999 |
185 |
- |
186 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
187 |
-inherit haskell-cabal |
188 |
- |
189 |
-MY_PN="X11" |
190 |
-MY_P="${MY_PN}-${PV}" |
191 |
- |
192 |
-DESCRIPTION="A binding to the X11 graphics library" |
193 |
-HOMEPAGE="https://github.com/xmonad/X11" |
194 |
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
195 |
- |
196 |
-LICENSE="BSD" |
197 |
-SLOT="0/${PV}" |
198 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
199 |
-IUSE="+screensaver +xinerama" |
200 |
- |
201 |
-RDEPEND="dev-haskell/data-default:=[profile?] |
202 |
- >=dev-lang/ghc-7.4.1:= |
203 |
- x11-libs/libX11 |
204 |
- x11-libs/libXext |
205 |
- x11-libs/libXrandr |
206 |
- screensaver? ( x11-libs/libXScrnSaver ) |
207 |
- xinerama? ( x11-libs/libXinerama ) |
208 |
-" |
209 |
-DEPEND="${RDEPEND} |
210 |
- >=dev-haskell/cabal-1.6 |
211 |
-" |
212 |
- |
213 |
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch) |
214 |
- |
215 |
-S="${WORKDIR}/${MY_P}" |
216 |
- |
217 |
-src_configure() { |
218 |
- haskell-cabal_src_configure \ |
219 |
- --configure-option=$(use_with xinerama) \ |
220 |
- --configure-option=$(use_with screensaver xscreensaver) |
221 |
-} |
222 |
|
223 |
diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.1.ebuild |
224 |
deleted file mode 100644 |
225 |
index 6f5d9102b17..00000000000 |
226 |
--- a/dev-haskell/x11/x11-1.9.1.ebuild |
227 |
+++ /dev/null |
228 |
@@ -1,44 +0,0 @@ |
229 |
-# Copyright 1999-2020 Gentoo Authors |
230 |
-# Distributed under the terms of the GNU General Public License v2 |
231 |
- |
232 |
-EAPI=7 |
233 |
- |
234 |
-# ebuild generated by hackport 0.6.9999 |
235 |
- |
236 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
237 |
-inherit haskell-cabal |
238 |
- |
239 |
-MY_PN="X11" |
240 |
-MY_P="${MY_PN}-${PV}" |
241 |
- |
242 |
-DESCRIPTION="A binding to the X11 graphics library" |
243 |
-HOMEPAGE="https://github.com/xmonad/X11" |
244 |
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
245 |
- |
246 |
-LICENSE="BSD" |
247 |
-SLOT="0/${PV}" |
248 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
249 |
-IUSE="+xinerama" |
250 |
- |
251 |
-RDEPEND="dev-haskell/data-default:=[profile?] |
252 |
- >=dev-lang/ghc-7.4.1:= |
253 |
- x11-libs/libX11 |
254 |
- x11-libs/libXext |
255 |
- x11-libs/libXrandr |
256 |
- x11-libs/libXScrnSaver |
257 |
- xinerama? ( x11-libs/libXinerama ) |
258 |
-" |
259 |
-DEPEND="${RDEPEND} |
260 |
- >=dev-haskell/cabal-1.6 |
261 |
-" |
262 |
- |
263 |
-PATCHES=( |
264 |
- "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch |
265 |
-) |
266 |
- |
267 |
-S="${WORKDIR}/${MY_P}" |
268 |
- |
269 |
-src_configure() { |
270 |
- haskell-cabal_src_configure \ |
271 |
- --configure-option=$(use_with xinerama) |
272 |
-} |