1 |
commit: 87d40c899126a94d8f98749095f65995e338b21e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 5 07:08:39 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 5 07:11:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d40c89 |
7 |
|
8 |
dev-haskell/dbus-core: Remove last-rited pkg |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-haskell/dbus-core/Manifest | 1 - |
13 |
dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild | 57 ------------- |
14 |
.../dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch | 96 ---------------------- |
15 |
dev-haskell/dbus-core/metadata.xml | 11 --- |
16 |
profiles/package.mask | 5 -- |
17 |
5 files changed, 170 deletions(-) |
18 |
|
19 |
diff --git a/dev-haskell/dbus-core/Manifest b/dev-haskell/dbus-core/Manifest |
20 |
deleted file mode 100644 |
21 |
index 9394f30f6b2..00000000000 |
22 |
--- a/dev-haskell/dbus-core/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1 +0,0 @@ |
25 |
-DIST dbus-core-0.9.3.tar.gz 216896 BLAKE2B affa443c08cfcc978aeb57a9b73be9afd4f0650e1fa363821688ad7c42439e6446f687f666acef793b95ba65b134bfd7c35968337dbd4c3878c8a8be9b8abe01 SHA512 4eee88958a49a0e0280744b490b9bc71e27f7f7fb32cc8ce34487439a124ba5fe72cb6b006781a03a41e87bdaeb2975fd19374fc19f699f7ad011a9b821ed32d |
26 |
|
27 |
diff --git a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild |
28 |
deleted file mode 100644 |
29 |
index 8578e6110fa..00000000000 |
30 |
--- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,57 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-# ebuild generated by hackport 0.3.9999 |
39 |
- |
40 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
41 |
-inherit haskell-cabal |
42 |
- |
43 |
-DESCRIPTION="Low-level D-Bus protocol implementation" |
44 |
-HOMEPAGE="https://john-millikin.com/software/dbus-core/" |
45 |
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-3" |
48 |
-SLOT="0/${PV}" |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="" |
51 |
- |
52 |
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] |
53 |
- >=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?] |
54 |
- =dev-haskell/libxml-sax-0.7*:=[profile?] |
55 |
- >=dev-haskell/network-2.2:=[profile?] |
56 |
- >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] |
57 |
- >=dev-haskell/text-0.11.1.5:=[profile?] |
58 |
- >=dev-haskell/vector-0.7:=[profile?] |
59 |
- =dev-haskell/xml-types-0.3*:=[profile?] |
60 |
- >=dev-lang/ghc-6.10.4:=" |
61 |
-DEPEND="${RDEPEND} |
62 |
- >=dev-haskell/cabal-1.6" |
63 |
- |
64 |
-src_prepare() { |
65 |
- epatch "${FILESDIR}"/${P}-ghc-7.10.patch |
66 |
- |
67 |
- if has_version "<dev-haskell/haddock-2.9.2"; then |
68 |
- # Workaround https://hackage.haskell.org/trac/hackage/ticket/626 |
69 |
- # The haddock --hoogle option does not like unicode characters, which causes |
70 |
- # haddock 2.7.2 to fail like: |
71 |
- # haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character) |
72 |
- sed -e 's@‐@-@g' \ |
73 |
- -e "s@’@'@g" \ |
74 |
- -i "${S}/hs/DBus/Connection.hs" \ |
75 |
- -i "${S}/hs/DBus/Client/Internal.hs" \ |
76 |
- -i "${S}/hs/DBus/Client/Simple.hs" \ |
77 |
- -i "${S}/hs/DBus/Message/Internal.hs" \ |
78 |
- -i "${S}/hs/DBus/Types/Internal.hs" \ |
79 |
- -i "${S}/hs/DBus/Wire/Internal.hs" |
80 |
- fi |
81 |
- cabal_chdeps \ |
82 |
- 'binary >= 0.4 && < 0.6' 'binary >= 0.4' \ |
83 |
- 'bytestring >= 0.9 && < 0.10' 'bytestring >= 0.9' \ |
84 |
- 'containers >= 0.1 && < 0.5' 'containers >= 0.1' \ |
85 |
- 'network >= 2.2 && < 2.4' 'network >= 2.2' \ |
86 |
- 'text >= 0.11.1.5 && < 0.12' 'text >= 0.11.1.5' \ |
87 |
- 'unix >= 2.2 && < 2.6' 'unix >= 2.2' \ |
88 |
- 'vector >= 0.7 && < 0.10' 'vector >= 0.7' |
89 |
-} |
90 |
|
91 |
diff --git a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch b/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch |
92 |
deleted file mode 100644 |
93 |
index 402df007e7d..00000000000 |
94 |
--- a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch |
95 |
+++ /dev/null |
96 |
@@ -1,96 +0,0 @@ |
97 |
-diff --git a/hs/DBus/Connection/Authentication.hs b/hs/DBus/Connection/Authentication.hs |
98 |
-index b909a38..c33d311 100644 |
99 |
---- a/hs/DBus/Connection/Authentication.hs |
100 |
-+++ b/hs/DBus/Connection/Authentication.hs |
101 |
-@@ -25,3 +25,4 @@ module DBus.Connection.Authentication |
102 |
- import Prelude hiding (getLine, head) |
103 |
--import Control.Monad (liftM) |
104 |
-+import Control.Applicative |
105 |
-+import Control.Monad |
106 |
- import qualified Data.ByteString |
107 |
-@@ -58,2 +59,9 @@ data Auth a = Auth |
108 |
- |
109 |
-+instance Functor Auth where |
110 |
-+ fmap = liftM |
111 |
-+ |
112 |
-+instance Applicative Auth where |
113 |
-+ pure = return |
114 |
-+ (<*>) = ap -- defined in Control.Monad |
115 |
-+ |
116 |
- instance Monad Auth where |
117 |
-diff --git a/hs/DBus/Introspection.hs b/hs/DBus/Introspection.hs |
118 |
-index 96ff4a3..da82812 100644 |
119 |
---- a/hs/DBus/Introspection.hs |
120 |
-+++ b/hs/DBus/Introspection.hs |
121 |
-@@ -29,3 +29,4 @@ module DBus.Introspection |
122 |
- ) where |
123 |
--import Control.Monad ((>=>)) |
124 |
-+import Control.Applicative |
125 |
-+import Control.Monad |
126 |
- import Control.Monad.ST (runST) |
127 |
-@@ -176,2 +177,9 @@ newtype XmlWriter a = XmlWriter { runXmlWriter :: Maybe (a, Text) } |
128 |
- |
129 |
-+instance Functor XmlWriter where |
130 |
-+ fmap = liftM |
131 |
-+ |
132 |
-+instance Applicative XmlWriter where |
133 |
-+ pure = return |
134 |
-+ (<*>) = ap -- defined in Control.Monad |
135 |
-+ |
136 |
- instance Monad XmlWriter where |
137 |
-diff --git a/hs/DBus/Types/Internal.hs b/hs/DBus/Types/Internal.hs |
138 |
-index 7f5d9c5..7c73afe 100644 |
139 |
---- a/hs/DBus/Types/Internal.hs |
140 |
-+++ b/hs/DBus/Types/Internal.hs |
141 |
-@@ -5,2 +5,3 @@ |
142 |
- {-# LANGUAGE IncoherentInstances #-} |
143 |
-+{-# LANGUAGE FlexibleContexts #-} |
144 |
- |
145 |
-diff --git a/hs/DBus/Util/MonadError.hs b/hs/DBus/Util/MonadError.hs |
146 |
-index 33b51ed..ef01df2 100644 |
147 |
---- a/hs/DBus/Util/MonadError.hs |
148 |
-+++ b/hs/DBus/Util/MonadError.hs |
149 |
-@@ -23,2 +23,6 @@ module DBus.Util.MonadError |
150 |
- ) where |
151 |
-+ |
152 |
-+import Control.Applicative |
153 |
-+import Control.Monad |
154 |
-+ |
155 |
- newtype ErrorM e a = ErrorM { runErrorM :: Either e a } |
156 |
-@@ -30,2 +34,6 @@ instance Functor (ErrorM e) where |
157 |
- |
158 |
-+instance Applicative (ErrorM e) where |
159 |
-+ pure = return |
160 |
-+ (<*>) = ap -- defined in Control.Monad |
161 |
-+ |
162 |
- instance Monad (ErrorM e) where |
163 |
-@@ -41,2 +49,9 @@ newtype ErrorT e m a = ErrorT { runErrorT :: m (Either e a) } |
164 |
- |
165 |
-+instance Monad m => Functor (ErrorT e m) where |
166 |
-+ fmap = liftM |
167 |
-+ |
168 |
-+instance Monad m => Applicative (ErrorT e m) where |
169 |
-+ pure = return |
170 |
-+ (<*>) = ap -- defined in Control.Monad |
171 |
-+ |
172 |
- instance Monad m => Monad (ErrorT e m) where |
173 |
-diff --git a/hs/DBus/Wire/Internal.hs b/hs/DBus/Wire/Internal.hs |
174 |
-index b386eec..512ff1a 100644 |
175 |
---- a/hs/DBus/Wire/Internal.hs |
176 |
-+++ b/hs/DBus/Wire/Internal.hs |
177 |
-@@ -19,3 +19,4 @@ |
178 |
- module DBus.Wire.Internal where |
179 |
--import Control.Monad (liftM, when, unless) |
180 |
-+import Control.Applicative |
181 |
-+import Control.Monad hiding (void) |
182 |
- |
183 |
-@@ -96,2 +97,9 @@ newtype Wire s a = Wire |
184 |
- |
185 |
-+instance Functor (Wire s) where |
186 |
-+ fmap = liftM |
187 |
-+ |
188 |
-+instance Applicative (Wire s) where |
189 |
-+ pure = return |
190 |
-+ (<*>) = ap -- defined in Control.Monad |
191 |
-+ |
192 |
- instance Monad (Wire s) where |
193 |
|
194 |
diff --git a/dev-haskell/dbus-core/metadata.xml b/dev-haskell/dbus-core/metadata.xml |
195 |
deleted file mode 100644 |
196 |
index 54fe8f8c3ff..00000000000 |
197 |
--- a/dev-haskell/dbus-core/metadata.xml |
198 |
+++ /dev/null |
199 |
@@ -1,11 +0,0 @@ |
200 |
-<?xml version="1.0" encoding="UTF-8"?> |
201 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
202 |
-<pkgmetadata> |
203 |
- <maintainer type="project"> |
204 |
- <email>haskell@g.o</email> |
205 |
- <name>Gentoo Haskell</name> |
206 |
- </maintainer> |
207 |
- <longdescription> |
208 |
- Low-level D-Bus protocol implementation |
209 |
- </longdescription> |
210 |
-</pkgmetadata> |
211 |
|
212 |
diff --git a/profiles/package.mask b/profiles/package.mask |
213 |
index 210062a8fdf..2e5d7fde9a2 100644 |
214 |
--- a/profiles/package.mask |
215 |
+++ b/profiles/package.mask |
216 |
@@ -614,11 +614,6 @@ dev-python/gntp |
217 |
# Removal in 30 days. |
218 |
dev-libs/liboobs |
219 |
|
220 |
-# Jack Todaro <solpeth@××××××.org> (2020-08-04) |
221 |
-# Deprecated in favour of dev-haskell/dbus. |
222 |
-# Unmaintained since 2012. |
223 |
-dev-haskell/dbus-core |
224 |
- |
225 |
# Mikle Kolyada <zlogene@g.o> (2020-08-02) |
226 |
# consolekit is abandoned upstream. |
227 |
# People are encouraged to switch to any logind |