commit: 0fc39432d9e8de8e14492d29614a5586a82280ea Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Nov 7 08:46:19 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Nov 7 08:49:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc39432
dev-haskell/text: drop old Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-haskell/text/Manifest | 5 -- .../text/files/text-1.1.1.3-deepseq-1.4.patch | 33 --------- .../text/files/text-1.2.2.0-integer-simple.patch | 78 ---------------------- dev-haskell/text/metadata.xml | 3 - dev-haskell/text/text-0.11.3.1.ebuild | 34 ---------- dev-haskell/text/text-1.1.1.3.ebuild | 41 ------------ dev-haskell/text/text-1.2.2.0.ebuild | 44 ------------ dev-haskell/text/text-1.2.2.1.ebuild | 40 ----------- dev-haskell/text/text-1.2.3.1.ebuild | 39 ----------- 9 files changed, 317 deletions(-) diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest index d297203e053..fe114558e9c 100644 --- a/dev-haskell/text/Manifest +++ b/dev-haskell/text/Manifest @@ -1,6 +1 @@ -DIST text-0.11.3.1.tar.gz 126477 BLAKE2B 27c135a5815eeeabd5791e4f0a16cce12def262d427096d7656a8932d59c4fdab91a7b196951b917ff8bd731034d8015e75d8016be1f3f9300fd3d29511a7634 SHA512 78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6 -DIST text-1.1.1.3.tar.gz 138063 BLAKE2B 150151cd991c2e905d75087dde7b889850a5b51bb1d95838c1969dd851f64af5d8594c333d49e4e1fe269479d8e59bf17bca33ad64e7ff36fcf45f529354bd99 SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490 -DIST text-1.2.2.0.tar.gz 148894 BLAKE2B 9a3e2d72f38f10b9e1e021ad7cf5cf182657a32f98fe5889befe1bf9fbd8da5a2a1e405177805774fca911b57279e3db73cd7e0ee22315210cb3c0f728633ad7 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20 -DIST text-1.2.2.1.tar.gz 149888 BLAKE2B 6ef907f42f89f0d1a0b109ef3f277cb3a653fae9564e35a772945f88eca64b3250d7db1d5124d73358046f6c729c0b7f345b4e747383f305af8a66f9f55acae1 SHA512 f0615f7614127d86dbfb3fba5dd1753af3d0774c46e11ee4a99d4510f73b59cf1bd8c73ca0387dba4fbcea3936aaaf0e92561cf6aab1a98d08fcad481d3795e4 -DIST text-1.2.3.1.tar.gz 157382 BLAKE2B 551012a6b7bfc1b1ad838f977d67981a35b9d13f1cd1b568ce0beed3583c50887cf1ceb1033fbeab215806c5a0d0c5ca39ce2f1aa20fd06365440c3324e8a6bc SHA512 643eb3306761c3e29e05dcd7d64abc505789cd00c60f7a4562e5747f63bcc0ae6f0cc54bb5ed92cc85dbf6406942bf40289baf30aca91bf92ac5215af5eddc98 DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3 diff --git a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch b/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch deleted file mode 100644 index 524ebac371e..00000000000 --- a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 4115e196bde073d5deaa3759807a8647f3f3c6fa -Author: Herbert Valerio Riedel <h...@gnu.org> -Date: Mon Nov 17 09:53:24 2014 +0100 - - Add support for `deepseq-1.4.0.0` (addresses #100) - - The default method implementation has changed in `deepseq-1.4.0.0`. - (see haskell/deepseq#1 for details). This simply sets the `rnf` - implementation explicitly to avoid relying on the default method's - semantics. - -diff --git a/Data/Text.hs b/Data/Text.hs -index 3bd34a7..b826acd 100644 ---- a/Data/Text.hs -+++ b/Data/Text.hs -@@ -199,7 +199,7 @@ import Prelude (Char, Bool(..), Int, Maybe(..), String, - (&&), (||), (+), (-), (.), ($), ($!), (>>), - not, return, otherwise, quot) - #if defined(HAVE_DEEPSEQ) --import Control.DeepSeq (NFData) -+import Control.DeepSeq (NFData(rnf)) - #endif - #if defined(ASSERTS) - import Control.Exception (assert) -@@ -346,7 +346,7 @@ instance Exts.IsList Text where - #endif - - #if defined(HAVE_DEEPSEQ) --instance NFData Text -+instance NFData Text where rnf !_ = () - #endif - - -- | This instance preserves data abstraction at the cost of inefficiency. diff --git a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch b/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch deleted file mode 100644 index 349fd79f8b3..00000000000 --- a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch +++ /dev/null @@ -1,78 +0,0 @@ -https://bugs.gentoo.org/575120 -https://github.com/bos/text/issues/138 - -commit 6c69034c81974b3fab9dba2993f22cc0a80f1b9e -Author: Herbert Valerio Riedel <h...@gnu.org> -Date: Sat Feb 13 12:44:20 2016 +0100 - - Revert "Rename integer-simple to integer-pure (gh-138)" - - This basically reverts commit b806d9491c740dfcbf172d2936f1eeb3b72d3492. - and therefore resolve #138 - -diff --git a/Data/Text/Lazy/Builder/Int.hs b/Data/Text/Lazy/Builder/Int.hs -index 6d26ecd..1cb0651 100644 ---- a/Data/Text/Lazy/Builder/Int.hs -+++ b/Data/Text/Lazy/Builder/Int.hs -@@ -36,14 +36,14 @@ import Control.Monad.ST - #ifdef __GLASGOW_HASKELL__ - # if defined(INTEGER_GMP) - import GHC.Integer.GMP.Internals (Integer(S#)) --# elif defined(INTEGER_PURE) -+# elif defined(INTEGER_SIMPLE) - import GHC.Integer - # else --# error "You need to use either GMP or integer-pure." -+# error "You need to use either GMP or integer-simple." - # endif - #endif - --#if defined(INTEGER_GMP) || defined(INTEGER_PURE) -+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE) - # define PAIR(a,b) (# a,b #) - #else - # define PAIR(a,b) (a,b) -diff --git a/text.cabal b/text.cabal -index ffb92cf..5fa1be0 100644 ---- a/text.cabal -+++ b/text.cabal -@@ -69,10 +69,10 @@ flag developer - default: False - manual: True - --flag integer-pure -- description: Use the pure-Haskell integer library instead of GMP -+flag integer-simple -+ description: Use the simple integer library instead of GMP - default: False -- manual: True -+ manual: False - - library - c-sources: cbits/cbits.c -@@ -145,9 +145,9 @@ library - ghc-options: -Werror - cpp-options: -DASSERTS - -- if flag(integer-pure) -- cpp-options: -DINTEGER_PURE -- build-depends: integer-pure >= 1.0 -+ if flag(integer-simple) -+ cpp-options: -DINTEGER_SIMPLE -+ build-depends: integer-simple >= 0.1 && < 0.5 - else - cpp-options: -DINTEGER_GMP - build-depends: integer-gmp >= 0.2 -@@ -181,9 +181,9 @@ test-suite tests - test-framework-hunit >= 0.2, - test-framework-quickcheck2 >= 0.2 - -- if flag(integer-pure) -- cpp-options: -DINTEGER_PURE -- build-depends: integer-pure >= 0.1 && < 0.5 -+ if flag(integer-simple) -+ cpp-options: -DINTEGER_SIMPLE -+ build-depends: integer-simple >= 0.1 && < 0.5 - else - cpp-options: -DINTEGER_GMP - build-depends: integer-gmp >= 0.2 diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml index 707e40e47f2..bbedad4dc30 100644 --- a/dev-haskell/text/metadata.xml +++ b/dev-haskell/text/metadata.xml @@ -34,9 +34,6 @@ <http://hackage.haskell.org/package/text-icu> </longdescription> - <use> - <flag name="developer">operate in developer mode</flag> - </use> <upstream> <remote-id type="github">bos/text</remote-id> </upstream> diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild deleted file mode 100644 index ff3d0140fce..00000000000 --- a/dev-haskell/text/text-0.11.3.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="An efficient packed Unicode text type" -HOMEPAGE="https://github.com/bos/text"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="developer" - -RDEPEND=">=dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( >=dev-haskell/hunit-1.2 - >=dev-haskell/quickcheck-2.4 - dev-haskell/random - >=dev-haskell/test-framework-0.4 - >=dev-haskell/test-framework-hunit-0.2 - >=dev-haskell/test-framework-quickcheck2-0.2 - )" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag developer developer) -} diff --git a/dev-haskell/text/text-1.1.1.3.ebuild b/dev-haskell/text/text-1.1.1.3.ebuild deleted file mode 100644 index 0d88c02eca8..00000000000 --- a/dev-haskell/text/text-1.1.1.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.6.9999 -#hackport: flags: -developer - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="An efficient packed Unicode text type" -HOMEPAGE="https://github.com/bos/text"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" -RESTRICT="test" # quickcheck-2.7 is missing keywords due to new tf-random dep - -RDEPEND=">=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 -" -# test? ( >=dev-haskell/hunit-1.2 -# >=dev-haskell/quickcheck-2.7 -# dev-haskell/random -# >=dev-haskell/test-framework-0.4 -# >=dev-haskell/test-framework-hunit-0.2 -# >=dev-haskell/test-framework-quickcheck2-0.2 ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-deepseq-1.4.patch -} - -src_configure() { - haskell-cabal_src_configure \ - --flag=-developer -} diff --git a/dev-haskell/text/text-1.2.2.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild deleted file mode 100644 index 52ba614581e..00000000000 --- a/dev-haskell/text/text-1.2.2.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.6.9999 -#hackport: flags: -developer,-integer-pure - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="An efficient packed Unicode text type" -HOMEPAGE="https://github.com/bos/text"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" - -RESTRICT=test # break cyclic dependencies - -RDEPEND="dev-haskell/binary:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( >=dev-haskell/hunit-1.2 - >=dev-haskell/quickcheck-2.7 - dev-haskell/quickcheck-unicode - dev-haskell/random - >=dev-haskell/test-framework-0.4 - >=dev-haskell/test-framework-hunit-0.2 - >=dev-haskell/test-framework-quickcheck2-0.2 ) -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-integer-simple.patch -} - -src_configure() { - haskell-cabal_src_configure \ - --flag=-developer -} diff --git a/dev-haskell/text/text-1.2.2.1.ebuild b/dev-haskell/text/text-1.2.2.1.ebuild deleted file mode 100644 index c35028a2526..00000000000 --- a/dev-haskell/text/text-1.2.2.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.7.9999 -#hackport: flags: -developer - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="An efficient packed Unicode text type" -HOMEPAGE="https://github.com/bos/text"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" - -RESTRICT=test # break cyclic dependencies - -RDEPEND="dev-haskell/binary:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( >=dev-haskell/hunit-1.2 - >=dev-haskell/quickcheck-2.7 - dev-haskell/quickcheck-unicode - dev-haskell/random - >=dev-haskell/test-framework-0.4 - >=dev-haskell/test-framework-hunit-0.2 - >=dev-haskell/test-framework-quickcheck2-0.2 ) -" - -src_configure() { - haskell-cabal_src_configure \ - --flag=-developer -} diff --git a/dev-haskell/text/text-1.2.3.1.ebuild b/dev-haskell/text/text-1.2.3.1.ebuild deleted file mode 100644 index 9bc3d4248bb..00000000000 --- a/dev-haskell/text/text-1.2.3.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.5.6.9999 -#hackport: flags: -bytestring-builder,-developer - -CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite -# break circular dependencies: -# https://github.com/gentoo-haskell/gentoo-haskell/issues/810 -CABAL_FEATURES+=" nocabaldep" -inherit haskell-cabal - -DESCRIPTION="An efficient packed Unicode text type" -HOMEPAGE="https://github.com/haskell/text"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="BSD-2" -SLOT="0/${PV}" -# keep in sync with ghc-8.6 -#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" -# break cyclic dependencies, test suite requires porting to >=QC-2.11 -RESTRICT=test - -RDEPEND=">=dev-lang/ghc-7.8.2:=" - -DEPEND="${RDEPEND} -" - -CABAL_CORE_LIB_GHC_PV="PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:9999" - -src_configure() { - haskell-cabal_src_configure \ - --flag=-bytestring-builder \ - --flag=-developer \ - --flag=-integer-simple -}
