[gentoo-commits] repo/gentoo:master commit in: dev-haskell/extra/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     47e488b42c1e76722f06f6db60250fe9aea8e484
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 09:57:05 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May 14 09:58:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e488b4

dev-haskell/extra: drop masked SLOT=0, bug #561122

Package has badly designed API incompatible with
time-1.5 (comes with ghc-7.10).

Upsream users switched off the package.

Bug: https://bugs.gentoo.org/561122

Package-Manager: portage-2.2.28

 dev-haskell/extra/Manifest               |  2 --
 dev-haskell/extra/extra-1.46.1-r1.ebuild | 44 -----------------------------
 dev-haskell/extra/extra-1.46.3.ebuild    | 48 --------------------------------
 dev-haskell/extra/metadata.xml           |  8 +-----
 4 files changed, 1 insertion(+), 101 deletions(-)

diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index d8ca418..536d1f0 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,4 +1,2 @@
-DIST Extra-1.46.1.tar.gz 19066 SHA256 e95b5bfcc770fc9f54edcf002055690537df7763cd5d78ba190c5660b438f235 SHA512 cf222ccac42e899d6af75980e30e46a6ea41217174262060b41972cb9925f54f15f71050055731f5978c44d7c0eb0d2e32b45e153130b11656590cc132f719b6 WHIRLPOOL 0dc1842de0ab87d9cfdbd98d15582609028c74f0fbc954693404e9c134e6d804cc2a523621288bd88041a9c4cb9c4af3358a60a7e4f07c961d62594181705700
-DIST Extra-1.46.3.tar.gz 19186 SHA256 d0fb7267853f610a9b9e7d5e37ab39f6de2b99f21c15d44bffb6807459babcf6 SHA512 63fad1f1da19303019859e9fa13076068f817a507f7c74e5d1f7fb3f51d54434d6714702c2ce76539b322513cda4c97bd3cd366fb4a028def400e947aa39e6c8 WHIRLPOOL 9f5e4f85c4aa3dccce07c71dffc911055685b0c0b76b13c5fdb8466a965c31ab49287d7d513e39a382f6b420b299bc76871dda0490495ffd7f56c2b70a494da0
 DIST extra-1.3.1.tar.gz 30439 SHA256 94c8cc02b530e589171d2e0520afac066994a1cb48cd4c847496387489230dfa SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5 WHIRLPOOL f8d02f3cd149f3d1dd5e30a5411f3359a2e4590061856f8f0350e63b4baafa961ade1ca142696dd1b1db97dc7ec35dc5481e836a4eaaf62803f55cf66b40caac
 DIST extra-1.4.2.tar.gz 31311 SHA256 0ea699d56bb08ad6e70ee6aaa2069326c2bc76ac347c0f04e94ce38cf3ec30c1 SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409 WHIRLPOOL f8090b12f6412d9a15b115cad88b760053844549e5132a2def334f2ced98c51d3e87d45786bdaa55c862bcafea054211c4d2f3bea81f134b0c8e60a3f81c89c6

diff --git a/dev-haskell/extra/extra-1.46.1-r1.ebuild b/dev-haskell/extra/extra-1.46.1-r1.ebuild
deleted file mode 100644
index 9c3daec..0000000
--- a/dev-haskell/extra/extra-1.46.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Extra"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A grab bag of modules"
-HOMEPAGE="http://src.seereason.com/haskell-extra"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bzlib:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?]
-	dev-haskell/network-uri:=[profile?]
-	dev-haskell/puremd5:=[profile?]
-	=dev-haskell/quickcheck-2*:2=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-haskell/unixutils-1.51:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'network >= 2.4' 'network >= 2.4, network-uri'
-}

diff --git a/dev-haskell/extra/extra-1.46.3.ebuild b/dev-haskell/extra/extra-1.46.3.ebuild
deleted file mode 100644
index 551557e..0000000
--- a/dev-haskell/extra/extra-1.46.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Extra"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A grab bag of modules"
-HOMEPAGE="https://github.com/ddssff/haskell-extra"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/bzlib:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/puremd5:=[profile?]
-	>=dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-haskell/unixutils-1.51:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}

diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index b9cbd50..7bcf2b6 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -5,13 +5,7 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A hodge-podge of functions and modules that do not have a better home
-	</longdescription>
-	<use>
-		<flag name="network-uri">use network-uri package</flag>
-	</use>
 	<upstream>
-		<remote-id type="github">ddssff/haskell-extra</remote-id>
+		<remote-id type="github">ndmitchell/extra</remote-id>
 	</upstream>
 </pkgmetadata>