[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus/files/, dev-haskell/dbus/

[Sergei Trofimovich]

commit:     4e7033cf62a1b01f4e7fdb3c52a40aada3d5aa39
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 07:23:36 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 07:23:36 2020 +0000
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 <slyfox <AT> 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..00000000000
--- 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.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="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/cereal-0.5:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=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..00000000000
--- 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.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="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/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=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
deleted file mode 100644
index 6473e10b62e..00000000000
--- a/dev-haskell/dbus/dbus-0.10.12.ebuild
+++ /dev/null
@@ -1,40 +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.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="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/cereal-0.6:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[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-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=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
deleted file mode 100644
index 7a5756839d1..00000000000
--- a/dev-haskell/dbus/dbus-0.10.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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
deleted file mode 100644
index 5c2c4c57cbb..00000000000
--- a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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
deleted file mode 100644
index 5fbfa1f6198..00000000000
--- a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-