From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-haskell/dbus/Manifest | 11 ++ 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 +++ dev-haskell/dbus/metadata.xml | 59 +++++++++++ 8 files changed, 354 insertions(+) create mode 100644 dev-haskell/dbus/Manifest create mode 100644 dev-haskell/dbus/dbus-0.10.10.ebuild create mode 100644 dev-haskell/dbus/dbus-0.10.11-r1.ebuild create mode 100644 dev-haskell/dbus/dbus-0.10.12.ebuild create mode 100644 dev-haskell/dbus/dbus-0.10.13.ebuild create mode 100644 dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch create mode 100644 dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch create mode 100644 dev-haskell/dbus/metadata.xml (limited to 'dev-haskell/dbus') diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest new file mode 100644 index 000000000000..c23aeef2c5e0 --- /dev/null +++ b/dev-haskell/dbus/Manifest @@ -0,0 +1,11 @@ +AUX dbus-0.10.11-cereal-0.5.patch 4545 BLAKE2B e6c657d037b0e3d296e5199351179968a536dc493e904b7805384530880fbb423648216d76400ce39045835e8809b7da1506213f07a684c647799400c90908fd SHA512 40b8996d4e5b8f77beeca0947f1f46a969a54fb34a875f7b04766767a1188f83f1f2e1aecc0f82be56146c496ccf2cf2c4d85d6fd48d22581a3a128768eb52ba +AUX dbus-0.10.12-QC-2.8.2.patch 466 BLAKE2B 21e5312a3f931aecdd7a5d906e8cb528919dcdfe9161a9c072b38d2555cfb8d989ea1eb48e5e7d24fbdc4f76d54608ca79df670375d7324e4173f4fd71b35523 SHA512 d1c4da222986b1570a4e9777d39f83d282471039abae1a65ec158b781bcd56fbc02ce1ed2592fa9541814b2943c22697a475c66b526eeda7d95fc67950544d5d +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 +EBUILD dbus-0.10.10.ebuild 1346 BLAKE2B 923a9bf402bbe72e03d2430f5f197382817966a3bb5d59976f50082c75cb872ba3680103a51aaa6000055141a349ab197b34f4d064455a4fe4ed98c8a60a3064 SHA512 8ff25ca95ab099a4c6c1a814c6486c7f721483002b43e80319ab2385e92b0766eb9e88468769671dc1b43ea8ad4412c71034748a818709f0924437bc14300e67 +EBUILD dbus-0.10.11-r1.ebuild 1444 BLAKE2B aecd5b50cf7e9dc7079dc00397f762d5f4d5f598dcdd40b3e4069f6a6ecf5a7530770969a6d44d398c27807abb8a78ef6122a4629497b89c64eefa747bd152fb SHA512 271975c1830e055831b335cfce2a7b1dce5b04816de14fb7e7c74557abed7a4ddfc4c6d8db954a97a5887c280f60d567a30321523b2902b008e05e138b82feb6 +EBUILD dbus-0.10.12.ebuild 1419 BLAKE2B 3db74a7e1b9513622e4c02aad966a60f6a2c0808d3c013e5f0c3a78ae0e0f73d5281c77bd4eae1f23e88131a30e829fa67239ac5b297d6c02b65a5b2fd0b1b14 SHA512 ce25f343860b26a00f5e6ce9b7de6264681036dbe9081245fb571767c3dd375b0ee8cffef29246e4b3084fa3cc46a0d7de0f5e135d934c68d368441759628d6c +EBUILD dbus-0.10.13.ebuild 1005 BLAKE2B 4ef253fa791572d7cb423f9f9d9fec9082a8903b57c7ddf06516bc09538d94f4663fbbe2c5fe6e70f8ba7e7e3f5803e38463def6cc0c2509f4d41e63ede19b7d SHA512 773085e8b23cb2a25b54aedc35e7192481b6c5d5ed1c4a067dec8e439ebde152c6a328a3199e9b9449f84829d07998783fef17404176d75c96e184f1b4ea7717 +MISC metadata.xml 2059 BLAKE2B 6b4337ace7dfef9da556e9effadbf17714b10926a5f8ac738fa31685fe615b9dddbbf1a4e65550477bd75dd44d46081479faeb67d270218d53bd421cc878e94e SHA512 5fe5ada12b86da78282ff30e5bf0c8218ec81a451988695907c82759aba1dc022539d1d852d078023b37263c1f21a58831edc69a02730caca79487a897065a3b diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild new file mode 100644 index 000000000000..7ceb8c0cb097 --- /dev/null +++ b/dev-haskell/dbus/dbus-0.10.10.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +# ebuild generated by hackport 0.4.5.9999 + +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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 new file mode 100644 index 000000000000..bd88e89c19b7 --- /dev/null +++ b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +# ebuild generated by hackport 0.4.6.9999 + +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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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 ) +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-cereal-0.5.patch + + cabal_chdeps \ + 'cereal >= 0.3.4 && < 0.5' 'cereal >= 0.3.4' +} diff --git a/dev-haskell/dbus/dbus-0.10.12.ebuild b/dev-haskell/dbus/dbus-0.10.12.ebuild new file mode 100644 index 000000000000..0aba52d5a793 --- /dev/null +++ b/dev-haskell/dbus/dbus-0.10.12.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +# ebuild generated by hackport 0.4.7.9999 + +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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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.8.2:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.18.1.3 + test? ( >=dev-haskell/chell-0.4 =dev-haskell/chell-quickcheck-0.2 =dev-haskell/quickcheck-2.4 ) +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-QC-2.8.2.patch +} 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 000000000000..c03d412ebff0 --- /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.9999 + +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 ) +" diff --git a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch new file mode 100644 index 000000000000..5c2c4c57cbb0 --- /dev/null +++ b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch @@ -0,0 +1,113 @@ +diff --git a/lib/DBus/Transport.hs b/lib/DBus/Transport.hs +index 8c50ab9..9517212 100644 +--- a/lib/DBus/Transport.hs ++++ b/lib/DBus/Transport.hs +@@ -42,3 +42,5 @@ import qualified Data.ByteString + import Data.ByteString (ByteString) ++import qualified Data.ByteString.Lazy as BL + import qualified Data.Map as Map ++import qualified Data.Monoid as M + import Data.Typeable (Typeable) +@@ -49,3 +51,3 @@ import qualified System.Info + +-import qualified Data.Serialize.Builder as Builder ++import qualified Data.ByteString.Builder as Builder + +@@ -151,3 +153,3 @@ instance Transport SocketTransport where + recvLoop :: Socket -> Int -> IO ByteString +-recvLoop s = loop Builder.empty where ++recvLoop s = loop M.mempty where + chunkSize = 4096 +@@ -156,3 +158,3 @@ recvLoop s = loop Builder.empty where + chunk <- recv s chunkSize +- let builder = Builder.append acc (Builder.fromByteString chunk) ++ let builder = M.mappend acc (Builder.byteString chunk) + loop builder (n - Data.ByteString.length chunk) +@@ -163,8 +165,8 @@ recvLoop s = loop Builder.empty where + -- Return what we've got so far. +- 0 -> return (Builder.toByteString acc) ++ 0 -> return (BL.toStrict $ Builder.toLazyByteString acc) + + len -> do +- let builder = Builder.append acc (Builder.fromByteString chunk) ++ let builder = M.mappend acc (Builder.byteString chunk) + if len == n +- then return (Builder.toByteString builder) ++ then return (BL.toStrict $ Builder.toLazyByteString builder) + else loop builder (n - Data.ByteString.length chunk) +diff --git a/lib/DBus/Wire.hs b/lib/DBus/Wire.hs +index 43ae315..09bf8bd 100644 +--- a/lib/DBus/Wire.hs ++++ b/lib/DBus/Wire.hs +@@ -34,2 +34,3 @@ import qualified Data.ByteString.Char8 + import Data.Int (Int16, Int32, Int64) ++import qualified Data.ByteString.Lazy as BL + import qualified Data.Map +@@ -37,2 +38,3 @@ import Data.Map (Map) + import Data.Maybe (fromJust, listToMaybe, fromMaybe) ++import qualified Data.Monoid as M + import Data.Text (Text) +@@ -45,3 +47,3 @@ import System.Posix.Types (Fd(..)) + +-import qualified Data.Serialize.Builder as Builder ++import qualified Data.ByteString.Builder as Builder + import qualified Data.Serialize.Get as Get +@@ -180,3 +182,3 @@ appendB :: Word64 -> Builder.Builder -> Marshal () + appendB size bytes = Wire (\_ (MarshalState builder count) -> let +- builder' = Builder.append builder bytes ++ builder' = M.mappend builder bytes + count' = count + size +@@ -187,3 +189,3 @@ appendS bytes = appendB + (fromIntegral (Data.ByteString.length bytes)) +- (Builder.fromByteString bytes) ++ (Builder.byteString bytes) + +@@ -275,3 +277,3 @@ unmarshalGet count be le = do + marshalWord8 :: Word8 -> Marshal () +-marshalWord8 x = appendB 1 (Builder.singleton x) ++marshalWord8 x = appendB 1 (Builder.word8 x) + +@@ -282,4 +284,4 @@ marshalWord16 :: Word16 -> Marshal () + marshalWord16 = marshalBuilder 2 +- Builder.putWord16be +- Builder.putWord16le ++ Builder.word16BE ++ Builder.word16LE + +@@ -287,4 +289,4 @@ marshalWord32 :: Word32 -> Marshal () + marshalWord32 = marshalBuilder 4 +- Builder.putWord32be +- Builder.putWord32le ++ Builder.word32BE ++ Builder.word32LE + +@@ -292,4 +294,4 @@ marshalWord64 :: Word64 -> Marshal () + marshalWord64 = marshalBuilder 8 +- Builder.putWord64be +- Builder.putWord64le ++ Builder.word64BE ++ Builder.word64LE + +@@ -441,6 +443,6 @@ getArrayBytes itemType vs = do + +- putState (MarshalState Builder.empty afterPadding) ++ putState (MarshalState M.mempty afterPadding) + (MarshalState itemBuilder _) <- Data.Vector.mapM_ marshal vs >> getState + +- let itemBytes = Builder.toByteString itemBuilder ++ let itemBytes = BL.toStrict $ Builder.toLazyByteString itemBuilder + paddingSize = fromIntegral (afterPadding - afterLength) +@@ -568,3 +570,3 @@ marshalMessage e serial msg = runMarshal where + marshal (toValue (encodeEndianness e)) +- let bodyBytes = Builder.toByteString bodyBytesB ++ let bodyBytes = BL.toStrict $ Builder.toLazyByteString bodyBytesB + marshalHeader msg serial sig (fromIntegral (Data.ByteString.length bodyBytes)) +@@ -573,6 +575,6 @@ marshalMessage e serial msg = runMarshal where + checkMaximumSize +- emptyState = MarshalState Builder.empty 0 ++ emptyState = MarshalState M.mempty 0 + runMarshal = case unWire marshaler e emptyState of + WireRL err -> Left (MarshalError err) +- WireRR _ (MarshalState builder _) -> Right (Builder.toByteString builder) ++ WireRR _ (MarshalState builder _) -> Right (BL.toStrict $ Builder.toLazyByteString builder) + diff --git a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch b/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch new file mode 100644 index 000000000000..5fbfa1f61981 --- /dev/null +++ b/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch @@ -0,0 +1,15 @@ +diff --git a/tests/DBusTests/Util.hs b/tests/DBusTests/Util.hs +index cc83cef..972afb1 100644 +--- a/tests/DBusTests/Util.hs ++++ b/tests/DBusTests/Util.hs +@@ -1,2 +1,2 @@ +-{-# LANGUAGE TemplateHaskell #-} ++{-# LANGUAGE TemplateHaskell, CPP #-} + +@@ -194,4 +194,6 @@ countFileDescriptors = liftIO io where + ++#if ! MIN_VERSION_QuickCheck(2,8,2) + instance (Arbitrary a, Ord a) => Arbitrary (Data.Set.Set a) where + arbitrary = fmap Data.Set.fromList arbitrary ++#endif + diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml new file mode 100644 index 000000000000..ffab7be7b225 --- /dev/null +++ b/dev-haskell/dbus/metadata.xml @@ -0,0 +1,59 @@ + + + + + haskell@gentoo.org + + + 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. + + @ + &#x7b;-\# LANGUAGE OverloadedStrings \#-&#x7d; + + import Data.List (sort) + import DBus + import DBus.Client + + main = do + &#x20; client <- connectSession + &#x20; // + &#x20; \-- Request a list of connected clients from the bus + &#x20; reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") + &#x20; &#x7b; methodCallDestination = Just \"org.freedesktop.DBus\" + &#x20; &#x7d; + &#x20; // + &#x20; \-- org.freedesktop.DBus.ListNames() returns a single value, which is + &#x20; \-- a list of names (here represented as [String]) + &#x20; let Just names = fromVariant (methodReturnBody reply !! 0) + &#x20; // + &#x20; \-- Print each name on a line, sorted so reserved names are below + &#x20; \-- temporary names. + &#x20; mapM_ putStrLn (sort names) + @ + + >$ ghc --make list-names.hs + >$ ./list-names + >:1.0 + >:1.1 + >:1.10 + >:1.106 + >:1.109 + >:1.110 + >ca.desrt.dconf + >org.freedesktop.DBus + >org.freedesktop.Notifications + >org.freedesktop.secrets + >org.gnome.ScreenSaver + + -- cgit v1.2.3