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

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

[Michał Górny]

commit:     87d40c899126a94d8f98749095f65995e338b21e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 07:08:39 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 07:11:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d40c89

dev-haskell/dbus-core: Remove last-rited pkg

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-haskell/dbus-core/Manifest                     |  1 -
 dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild    | 57 -------------
 .../dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch | 96 ----------------------
 dev-haskell/dbus-core/metadata.xml                 | 11 ---
 profiles/package.mask                              |  5 --
 5 files changed, 170 deletions(-)

diff --git a/dev-haskell/dbus-core/Manifest b/dev-haskell/dbus-core/Manifest
deleted file mode 100644
index 9394f30f6b2..00000000000
--- a/dev-haskell/dbus-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dbus-core-0.9.3.tar.gz 216896 BLAKE2B affa443c08cfcc978aeb57a9b73be9afd4f0650e1fa363821688ad7c42439e6446f687f666acef793b95ba65b134bfd7c35968337dbd4c3878c8a8be9b8abe01 SHA512 4eee88958a49a0e0280744b490b9bc71e27f7f7fb32cc8ce34487439a124ba5fe72cb6b006781a03a41e87bdaeb2975fd19374fc19f699f7ad011a9b821ed32d

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
deleted file mode 100644
index 8578e6110fa..00000000000
--- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
+++ /dev/null
@@ -1,57 +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.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level D-Bus protocol implementation"
-HOMEPAGE="https://john-millikin.com/software/dbus-core/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		>=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?]
-		=dev-haskell/libxml-sax-0.7*:=[profile?]
-		>=dev-haskell/network-2.2:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-		>=dev-haskell/text-0.11.1.5:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		=dev-haskell/xml-types-0.3*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# 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)
-		sed -e 's@&#8208;@-@g' \
-			-e "s@&#8217;@'@g" \
-			-i "${S}/hs/DBus/Connection.hs" \
-			-i "${S}/hs/DBus/Client/Internal.hs" \
-			-i "${S}/hs/DBus/Client/Simple.hs" \
-			-i "${S}/hs/DBus/Message/Internal.hs" \
-			-i "${S}/hs/DBus/Types/Internal.hs" \
-			-i "${S}/hs/DBus/Wire/Internal.hs"
-	fi
-	cabal_chdeps \
-		'binary >= 0.4 && < 0.6' 'binary >= 0.4' \
-		'bytestring >= 0.9 && < 0.10' 'bytestring >= 0.9' \
-		'containers >= 0.1 && < 0.5' 'containers >= 0.1' \
-		'network >= 2.2 && < 2.4' 'network >= 2.2' \
-		'text >= 0.11.1.5 && < 0.12' 'text >= 0.11.1.5' \
-		'unix >= 2.2 && < 2.6' 'unix >= 2.2' \
-		'vector >= 0.7 && < 0.10' 'vector >= 0.7'
-}

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
deleted file mode 100644
index 402df007e7d..00000000000
--- a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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

diff --git a/dev-haskell/dbus-core/metadata.xml b/dev-haskell/dbus-core/metadata.xml
deleted file mode 100644
index 54fe8f8c3ff..00000000000
--- a/dev-haskell/dbus-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Low-level D-Bus protocol implementation
-	</longdescription>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 210062a8fdf..2e5d7fde9a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -614,11 +614,6 @@ dev-python/gntp
 # Removal in 30 days.
 dev-libs/liboobs
 
-# Jack Todaro <solpeth@posteo.org> (2020-08-04)
-# Deprecated in favour of dev-haskell/dbus.
-# Unmaintained since 2012.
-dev-haskell/dbus-core
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
 # consolekit is abandoned upstream.
 # People are encouraged to switch to any logind