[gentoo-commits] repo/gentoo:master commit in: dev-haskell/network-bytestring/files/, dev-haskell/network-bytestring/, ...

[Sergei Trofimovich]

commit:     d05d1f60276df9226ea793fda73593fc11f12f3a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 07:15:19 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 07:16:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05d1f60

dev-haskell/network-bytestring: drop masked package

Closes: https://bugs.gentoo.org/735796
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/network-bytestring/Manifest            |  1 -
 .../files/network-bytestring-0.1.3.4-ghc-7.6.patch | 29 ---------------------
 dev-haskell/network-bytestring/metadata.xml        | 15 -----------
 .../network-bytestring-0.1.3.4.ebuild              | 30 ----------------------
 profiles/package.mask                              |  5 ----
 5 files changed, 80 deletions(-)

diff --git a/dev-haskell/network-bytestring/Manifest b/dev-haskell/network-bytestring/Manifest
deleted file mode 100644
index 4af6b5dce1e..00000000000
--- a/dev-haskell/network-bytestring/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST network-bytestring-0.1.3.4.tar.gz 9182 BLAKE2B d36a2e56aa2c024ef2e42f1580d9f149863b50ec92ff7b50db14ba4fd7d49da5631b989276f9d9efeea411d367d1314a970461e0eb5c95b2c91532ffa4b31681 SHA512 eba844a3d8927c08d119342f196a6cfbb0c54eb194abb4e4da5614cddbdd685923950a339494e17fdae47eae4249896c5f68390d4abb5d0321fb358612cd3a76

diff --git a/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch b/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch
deleted file mode 100644
index 7ba2e0f465b..00000000000
--- a/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Network/Socket/ByteString.hs b/Network/Socket/ByteString.hs
-index 2fbeaa3..adf3116 100644
---- a/Network/Socket/ByteString.hs
-+++ b/Network/Socket/ByteString.hs
-@@ -45,7 +45,7 @@ import Data.ByteString (ByteString)
- import Data.ByteString.Internal (createAndTrim)
- import Data.ByteString.Unsafe (unsafeUseAsCStringLen)
- import Data.Word (Word8)
--import Foreign.C.Types (CInt)
-+import Foreign.C.Types
- import Foreign.Marshal.Alloc (allocaBytes)
- import Foreign.Ptr (Ptr, castPtr)
- import Network.Socket (SockAddr, Socket(..), sendBufTo, recvBufFrom)
-diff --git a/Network/Socket/ByteString/Internal.hs b/Network/Socket/ByteString/Internal.hs
-index c6a835b..eb41194 100644
---- a/Network/Socket/ByteString/Internal.hs
-+++ b/Network/Socket/ByteString/Internal.hs
-@@ -11,9 +11,9 @@ module Network.Socket.ByteString.Internal
- import System.IO.Error (ioeSetErrorString, mkIOError)
- 
- #if !defined(mingw32_HOST_OS)
--import Foreign.C.Types (CInt)
-+import Foreign.C.Types
- import Foreign.Ptr (Ptr)
--import System.Posix.Types (CSsize)
-+import System.Posix.Types
- 
- import Network.Socket.ByteString.IOVec (IOVec)
- import Network.Socket.ByteString.MsgHdr (MsgHdr)

diff --git a/dev-haskell/network-bytestring/metadata.xml b/dev-haskell/network-bytestring/metadata.xml
deleted file mode 100644
index ff0b4d01a27..00000000000
--- a/dev-haskell/network-bytestring/metadata.xml
+++ /dev/null
@@ -1,15 +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@g.o</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast, memory-efficient, low-level socket functions
-		that use 'Data.ByteString's instead of 'String's.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/network-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild b/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
deleted file mode 100644
index 3dc7f2993f6..00000000000
--- a/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
+++ /dev/null
@@ -1,30 +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.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Fast, memory-efficient, low-level networking"
-HOMEPAGE="https://github.com/tibbe/network-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/network-2.2.1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.6.patch
-	cabal_chdeps \
-		'network    >= 2.2.1.1 && < 2.3' 'network    >= 2.2.1.1' \
-		'base       < 4.4' 'base'
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index cedc87b6afe..4a9765b98a4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -648,11 +648,6 @@ dev-ruby/request_store:1.0.5
 >=dev-libs/vala-common-0.49
 dev-lang/vala:0.50
 
-# Sergei Trofimovich <slyfox@g.o> (2020-08-14)
-# Was subsumed by dev-haskell/network. Use that instead.
-# Removal in 30 days. bug #735796
-dev-haskell/network-bytestring
-
 # Rick Farina <zerochaos@g.o> (2020-08-14)
 # Obsolete, nothing depends on it. Removal in 30 days.
 net-wireless/lorcon-old