[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/, dev-haskell/dbus/files/
commit: 41842024943ecb46bcefbd35ea59f2161692d8b4 Author: Mark Wright gentoo org> AuthorDate: Tue Nov 15 03:39:19 2022 + Commit: Mark Wright gentoo org> CommitDate: Tue Nov 15 03:40:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41842024 dev-haskell/dbus: Bump to 1.2.27, patch to allow earlier TH Patch (by me) to allow earlier template-haskell versions. Tests pass with network-sandbox, thanks to eroen for reporting. Fix: dbus depends on nonexistent version of lens #1360, thanks to Hypoon for reporting. Closes: https://github.com/gentoo-haskell/gentoo-haskell/issues/1360 Closes: https://bugs.gentoo.org/575254 Signed-off-by: Mark Wright gentoo.org> dev-haskell/dbus/Manifest | 1 + dev-haskell/dbus/dbus-1.2.27.ebuild| 51 ++ .../dbus/files/dbus-1.2.27-template-haskell.patch | 14 ++ dev-haskell/dbus/metadata.xml | 18 +--- 4 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest index 94a488b3..5e6f09b72982 100644 --- a/dev-haskell/dbus/Manifest +++ b/dev-haskell/dbus/Manifest @@ -1 +1,2 @@ DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9 +DIST dbus-1.2.27.tar.gz 78017 BLAKE2B 396739e7e6af0fe1921c9d3857c0650db9532d00a3fd2eda18042d42ce8336631d93d0c0ce75681b695f9e90c7205e38aea7c4f984544460ecab19c7d5090478 SHA512 2c6b87b4a793b555ef617e3f3f89695116180f0e1df2f84ee3da62c819c05c10a78d328644b84c8c9796354ee6dd1c6ad6b0430a1b9a2d7fe112b251d4606e8d diff --git a/dev-haskell/dbus/dbus-1.2.27.ebuild b/dev-haskell/dbus/dbus-1.2.27.ebuild new file mode 100644 index ..37104d3dc902 --- /dev/null +++ b/dev-haskell/dbus/dbus-1.2.27.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1. + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="A client library for the D-Bus IPC system" +HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"; +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch" + "${FILESDIR}/${PN}-1.2.27-template-haskell.patch" +) + +RDEPEND="=dev-haskell/conduit-1.3.0:=[profile?] =dev-haskell/network-3.1.2.1:=[profile?] =dev-haskell/xml-conduit-1.9.0.0:=[profile?] =dev-lang/ghc-8.10.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.2.0.0 + test? ( =4.16 && <5" "base >=4 && <5" \ + "template-haskell >= 2.18 && < 2.20" "template-haskell" +} diff --git a/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch b/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch new file mode 100644 index ..dab7aaff6aef --- /dev/null +++ b/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch @@ -0,0 +1,14 @@ +--- dbus-1.2.27-orig/lib/DBus/Generation.hs2022-07-13 00:32:15.0 +1000 dbus-1.2.27/lib/DBus/Generation.hs 2022-11-15 11:11:32.291154128 +1100 +@@ -148,7 +148,11 @@ + makeFromVariantApp name = AppE (VarE 'T.fromVariant) $ VarE name + + makeJustPattern :: Name -> Pat ++#if MIN_VERSION_template_haskell(2,18,0) + makeJustPattern name = ConP 'Just [] [VarP name] ++#else ++makeJustPattern name = ConP 'Just [VarP name] ++#endif + + mapOrHead :: + (Num a, Eq a) => a -> (t -> b) -> [t] -> ([b] -> b) -> b diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml index 5063563f544d..4640c75ee040 100644 --- a/dev-haskell/dbus/metadata.xml +++ b/dev-haskell/dbus/metadata.xml @@ -8,23 +8,23 @@ D-Bus is a simple, message-based protocol for inter-process communication, which allows applications to interact with other parts of the machine and the user's session using remote procedure calls. - + D-Bus is a essential part of the modern Linux desktop, where it replaces earlier protocols such as CORBA and DCOP. - + This library is an implementation of the D-Bus protocol in Haskell. It can be used to add D-Bus support to Haskell applications, without the awkward interfaces common to foreign bindings. - + Example: connect to the session bus, and get a list of active names. - + @ {-\# LANGUAGE OverloadedStrings \#-} - + import Data.List (so
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/files/, dev-haskell/dbus/
commit: 826a5068a35ddca24b847e389351cf88706c5227 Author: hololeap users noreply github com> AuthorDate: Fri Aug 5 19:18:53 2022 + Commit: Sam James gentoo org> CommitDate: Sun Aug 21 02:21:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826a5068 dev-haskell/dbus: Disable integration tests These tests try to spin up an instance of dbus-daemon Signed-off-by: Sam James gentoo.org> dev-haskell/dbus/dbus-1.2.22.ebuild| 4 .../dbus-1.2.22-disable-integration-tests.patch| 28 ++ 2 files changed, 32 insertions(+) diff --git a/dev-haskell/dbus/dbus-1.2.22.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild index 58157ba088dc..39a045969ae2 100644 --- a/dev-haskell/dbus/dbus-1.2.22.ebuild +++ b/dev-haskell/dbus/dbus-1.2.22.ebuild @@ -16,6 +16,10 @@ LICENSE="Apache-2.0" SLOT="0/${PV}" KEYWORDS="~amd64 ~ppc64 ~x86" +PATCHES=( + "${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch" +) + RDEPEND="=dev-haskell/conduit-1.3.0:=[profile?] +Signed-off-by: hololeap + +dev-haskell/dbus: Disable integration tests + +These tests try to spin up an instance of dbus-daemon + +diff -urN dbus-1.2.22/tests/DBusTests.hs dbus-1.2.22-r1/tests/DBusTests.hs +--- dbus-1.2.22/tests/DBusTests.hs 2021-12-16 12:34:16.0 -0700 dbus-1.2.22-r1/tests/DBusTests.hs 2022-08-05 12:51:12.447871229 -0600 +@@ -23,7 +23,7 @@ + import DBusTests.BusName + import DBusTests.Client + import DBusTests.ErrorName +-import DBusTests.Integration ++--import DBusTests.Integration + import DBusTests.InterfaceName + import DBusTests.Introspection + import DBusTests.MemberName +@@ -55,7 +55,7 @@ + , test_BusName + , test_Client + , test_ErrorName +-, test_Integration ++--, test_Integration + , test_InterfaceName + , test_Introspection + , test_MemberName
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus-core/
commit: ee1b28979a8b369b027882f8717dd5f25b095314 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Sep 2 07:26:41 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Sep 2 07:31:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1b2897 dev-haskell/dbus-core: use https:// HOMEPAGE Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index c5a98d4f8a8..8578e6110fa 100644 --- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild +++ b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -33,7 +33,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-ghc-7.10.patch if has_version "http://hackage.haskell.org/trac/hackage/ticket/626 + # Workaround https://hackage.haskell.org/trac/hackage/ticket/626 # The haddock --hoogle option does not like unicode characters, which causes # haddock 2.7.2 to fail like: # haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/files/, dev-haskell/dbus/
commit: 4e7033cf62a1b01f4e7fdb3c52a40aada3d5aa39 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Aug 27 07:23:36 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Aug 27 07:23:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e7033cf dev-haskell/dbus: drop old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/dbus/Manifest | 4 - dev-haskell/dbus/dbus-0.10.10.ebuild | 36 --- dev-haskell/dbus/dbus-0.10.11-r1.ebuild| 43 dev-haskell/dbus/dbus-0.10.12.ebuild | 40 dev-haskell/dbus/dbus-0.10.13.ebuild | 37 --- .../dbus/files/dbus-0.10.11-cereal-0.5.patch | 113 - dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch | 15 --- 7 files changed, 288 deletions(-) diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest index f5a1b24969f..5d8457279b5 100644 --- a/dev-haskell/dbus/Manifest +++ b/dev-haskell/dbus/Manifest @@ -1,5 +1 @@ -DIST dbus-0.10.10.tar.gz 73707 BLAKE2B 90903a39d6962fcd3864988215fc74a3f85571509f021a3507f392dd14f2b358d75558dc25269a49426bfcef18eccc53e76c468559b3329367db7ab5904e9879 SHA512 c2faa76c32abb19ab903c015f6fc133beb605bbb4459d018fa544ffe4e04110cc63fc45815d862e8311f5b99de9c180c8eeb8e135fd6c7eb388ff579529a8ead -DIST dbus-0.10.11.tar.gz 74853 BLAKE2B e72838c14906106b2114d9be9d8580295617c33fd322a3139c8c8245849dd77837cc26587c0289982de32442265b477754196f1b600f630d2f05f1c5312941f1 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff -DIST dbus-0.10.12.tar.gz 74960 BLAKE2B b0bf015a761e3bcff8b5b40165f475c0ce00320f95a3f21cad65fed2db6955d982c2c4dbee2e9697f9a67f44b680f12e00c892a1dfa5fd45f745167d39307e66 SHA512 e725adc1b9dbbef4e2f47fd96ae60894f6553a15d5524071f7d6a48ab60cd6c25cda9be3cf84c5f4090f9769810abab7939a7333dcf77f31d1a71690bb6852d9 -DIST dbus-0.10.13.tar.gz 75603 BLAKE2B b1acb541505f0f9afe63fd8d9441114fcee3574e109686b16cd5c506aa940674352d32c14e155d2a2ddbc4bab3485ed70f747f59240b572559d6e649aff3a8da SHA512 e3cbb4153cd9df9308d89662b83659e13f07881f4d652c6f02dc6b6768ac1009552a7cfa9c610ededc9b630d26290eec153a9b08b7a3d70b44a6946af3d030ec DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441 diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild deleted file mode 100644 index eb0ec15878c..000 --- a/dev-haskell/dbus/dbus-0.10.10.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.5. - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="A client library for the D-Bus IPC system" -HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] =dev-haskell/libxml-sax-0.7:=[profile?] =dev-haskell/network-2.2.3:=[profile?] - >=dev-haskell/parsec-2.0:=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/text-0.11.1.5:=[profile?] - >=dev-haskell/transformers-0.2:=[profile?] - >=dev-haskell/vector-0.7:=[profile?] =dev-haskell/xml-types-0.3:=[profile?] =dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( >=dev-haskell/chell-0.4 =dev-haskell/chell-quickcheck-0.2 =dev-haskell/quickcheck-2.4 ) -" diff --git a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild deleted file mode 100644 index 394878470e0..000 --- a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.6. - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="A client library for the D-Bus IPC system" -HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] - >=dev-haskell/libxml-sax-0.7:=[profile?] =dev-haskell/network-2.2.3:=[profile?] - >=dev-haskell/parsec-2.0:=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/text-0.11.1.5:=[profile?] - >=dev-haskell/transformers-0.2:=[profile?] -
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/
commit: 0d293f407447a53329d23c4996a3399f460b98b5 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 2 16:36:12 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 2 16:36:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d293f40 dev-haskell/dbus: bump up to 0.10.13, bug #479892 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-haskell/dbus/Manifest| 1 + dev-haskell/dbus/dbus-0.10.13.ebuild | 37 2 files changed, 38 insertions(+) diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest index 4a375786b19..dcfadd222bd 100644 --- a/dev-haskell/dbus/Manifest +++ b/dev-haskell/dbus/Manifest @@ -1,3 +1,4 @@ DIST dbus-0.10.10.tar.gz 73707 SHA256 cd68c5613fbad01a31be17501e2b4cf242b09625d5fed9474db6c4b5c4f22468 SHA512 c2faa76c32abb19ab903c015f6fc133beb605bbb4459d018fa544ffe4e04110cc63fc45815d862e8311f5b99de9c180c8eeb8e135fd6c7eb388ff579529a8ead WHIRLPOOL 919905324f7910a9b0a4ef77ca418a6610f974b79941141822eab8eb7c2505b918868f0a74c33d5d928612992ba6d03ad6889cd9fd3e726b57181247a252abef DIST dbus-0.10.11.tar.gz 74853 SHA256 73e6b2b2021215dd8b9540d770e5cc353427f37083c7d84ebc244ac48e630482 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff WHIRLPOOL d126478c8d041362b7cee452c17960e620670618905b64bd6697a0895762c8c9bfc03722829a77d20d4a3bdd98525fb994b1264f2b203ac5e8a7d509c3985cd3 DIST dbus-0.10.12.tar.gz 74960 SHA256 f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54 SHA512 e725adc1b9dbbef4e2f47fd96ae60894f6553a15d5524071f7d6a48ab60cd6c25cda9be3cf84c5f4090f9769810abab7939a7333dcf77f31d1a71690bb6852d9 WHIRLPOOL 4063c80318fa6c59ac3e80fe24d19f8bb77c4e3fb127fd30decace452c4094e8d6332f2961bd958545ba95445435b929ccebbba255ef6e7bb6bcf213a0d66f2b +DIST dbus-0.10.13.tar.gz 75603 SHA256 aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca SHA512 e3cbb4153cd9df9308d89662b83659e13f07881f4d652c6f02dc6b6768ac1009552a7cfa9c610ededc9b630d26290eec153a9b08b7a3d70b44a6946af3d030ec WHIRLPOOL e9b2b7243f98f13e8f496c9bb915d15f874efe3900f2817763a2aebe766214765b6850d7afd8506bea9d90dc21699eef7eda9b8b1e9ab0e9a408f30f13b7e02e diff --git a/dev-haskell/dbus/dbus-0.10.13.ebuild b/dev-haskell/dbus/dbus-0.10.13.ebuild new file mode 100644 index 000..b3bfbb4d13e --- /dev/null +++ b/dev-haskell/dbus/dbus-0.10.13.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# ebuild generated by hackport 0.5.2. + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="A client library for the D-Bus IPC system" +HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"; +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RESTRICT=test # don't allow access to running dbus + +RDEPEND="dev-haskell/cereal:=[profile?] + dev-haskell/libxml-sax:=[profile?] + dev-haskell/network:=[profile?] + dev-haskell/parsec:=[profile?] + dev-haskell/random:=[profile?] + dev-haskell/text:=[profile?] + dev-haskell/vector:=[profile?] + dev-haskell/xml-types:=[profile?] + >=dev-lang/ghc-7.8.2:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.18.1.3 + test? ( dev-haskell/chell + dev-haskell/chell-quickcheck + dev-haskell/quickcheck ) +"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/
commit: 6a7a207e2f8a86609e23c45b6894d90fdca030ff Author: Ian Delaney gentoo org> AuthorDate: Thu Feb 25 12:57:23 2016 + Commit: Ian Delaney gentoo org> CommitDate: Thu Feb 25 12:57:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7a207e dev-haskell/dbus: remove leftover entry of proxy-maintainers in metadata.xml Package-Manager: portage-2.2.26 dev-haskell/dbus/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml index 6f1d63a..ffab7be 100644 --- a/dev-haskell/dbus/metadata.xml +++ b/dev-haskell/dbus/metadata.xml @@ -4,10 +4,6 @@ hask...@gentoo.org - - proxy-ma...@gentoo.org - Proxy Maintainers - D-Bus is a simple, message-based protocol for inter-process communication, which allows applications to interact with other parts of
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus-core/files/, dev-haskell/dbus-core/
commit: b30b60e19d49886b714bc4e614fe0cac147e1c31 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Sep 21 20:23:09 2015 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Sep 21 20:23:48 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30b60e1 dev-haskell/dbus-core: port to ghc-7.10, bug #561014 Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/561014 Package-Manager: portage-2.2.20 dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild| 4 +- .../dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch | 96 ++ 2 files changed, 99 insertions(+), 1 deletion(-) 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 index dae07a2..a3dd10e 100644 --- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild +++ b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -31,6 +31,8 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.6" src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.10.patch + if has_version "http://hackage.haskell.org/trac/hackage/ticket/626 # The haddock --hoogle option does not like unicode characters, which causes 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 new file mode 100644 index 000..402df00 --- /dev/null +++ b/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch @@ -0,0 +1,96 @@ +diff --git a/hs/DBus/Connection/Authentication.hs b/hs/DBus/Connection/Authentication.hs +index b909a38..c33d311 100644 +--- a/hs/DBus/Connection/Authentication.hs b/hs/DBus/Connection/Authentication.hs +@@ -25,3 +25,4 @@ module DBus.Connection.Authentication + import Prelude hiding (getLine, head) +-import Control.Monad (liftM) ++import Control.Applicative ++import Control.Monad + import qualified Data.ByteString +@@ -58,2 +59,9 @@ data Auth a = Auth + ++instance Functor Auth where ++fmap = liftM ++ ++instance Applicative Auth where ++pure = return ++(<*>) = ap -- defined in Control.Monad ++ + instance Monad Auth where +diff --git a/hs/DBus/Introspection.hs b/hs/DBus/Introspection.hs +index 96ff4a3..da82812 100644 +--- a/hs/DBus/Introspection.hs b/hs/DBus/Introspection.hs +@@ -29,3 +29,4 @@ module DBus.Introspection + ) where +-import Control.Monad ((>=>)) ++import Control.Applicative ++import Control.Monad + import Control.Monad.ST (runST) +@@ -176,2 +177,9 @@ newtype XmlWriter a = XmlWriter { runXmlWriter :: Maybe (a, Text) } + ++instance Functor XmlWriter where ++fmap = liftM ++ ++instance Applicative XmlWriter where ++pure = return ++(<*>) = ap -- defined in Control.Monad ++ + instance Monad XmlWriter where +diff --git a/hs/DBus/Types/Internal.hs b/hs/DBus/Types/Internal.hs +index 7f5d9c5..7c73afe 100644 +--- a/hs/DBus/Types/Internal.hs b/hs/DBus/Types/Internal.hs +@@ -5,2 +5,3 @@ + {-# LANGUAGE IncoherentInstances #-} ++{-# LANGUAGE FlexibleContexts #-} + +diff --git a/hs/DBus/Util/MonadError.hs b/hs/DBus/Util/MonadError.hs +index 33b51ed..ef01df2 100644 +--- a/hs/DBus/Util/MonadError.hs b/hs/DBus/Util/MonadError.hs +@@ -23,2 +23,6 @@ module DBus.Util.MonadError + ) where ++ ++import Control.Applicative ++import Control.Monad ++ + newtype ErrorM e a = ErrorM { runErrorM :: Either e a } +@@ -30,2 +34,6 @@ instance Functor (ErrorM e) where + ++instance Applicative (ErrorM e) where ++pure = return ++(<*>) = ap -- defined in Control.Monad ++ + instance Monad (ErrorM e) where +@@ -41,2 +49,9 @@ newtype ErrorT e m a = ErrorT { runErrorT :: m (Either e a) } + ++instance Monad m => Functor (ErrorT e m) where ++fmap = liftM ++ ++instance Monad m => Applicative (ErrorT e m) where ++pure = return ++(<*>) = ap -- defined in Control.Monad ++ + instance Monad m => Monad (ErrorT e m) where +diff --git a/hs/DBus/Wire/Internal.hs b/hs/DBus/Wire/Internal.hs +index b386eec..512ff1a 100644 +--- a/hs/DBus/Wire/Internal.hs b/hs/DBus/Wire/Internal.hs +@@ -19,3 +19,4 @@ + module DBus.Wire.Internal where +-import Control.Monad (liftM, when, unless) ++import Control.Applicative ++import Control.Monad hiding (void) + +@@ -96,2 +97,9 @@ newtype Wire s a = Wire + ++instance Functor (Wire s) where ++fmap = liftM ++ ++instance Applicative (Wire s) where ++pure = return ++(<*>) = ap -- defined in Control.Monad ++ + instance Monad (Wire s) where
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/
commit: 591a38af4391d1208b159df9e48eff22bff7d185 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Sep 20 15:18:25 2015 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Sep 20 18:50:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591a38af dev-haskell/dbus: alpha amd64 ia64 ppc ppc64 sparc x86 stable, bug #524790 Package-Manager: portage-2.2.20 dev-haskell/dbus/dbus-0.10.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild index 4cca143..da7da9d 100644 --- a/dev-haskell/dbus/dbus-0.10.10.ebuild +++ b/dev-haskell/dbus/dbus-0.10.10.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="" RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]