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

2020-09-12 Thread Sergei Trofimovich
commit: 0c33e4b0ef40a57a29ef64aaa494b9f8c2d81dc2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 12 21:48:47 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 12 21:57:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c33e4b0

dev-haskell/pcre-light: drop old

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/pcre-light/Manifest|  2 --
 .../pcre-light/files/pcre-light-0.4-ghc-7.7.patch  | 39 --
 dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild| 27 ---
 dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild   | 26 ---
 4 files changed, 94 deletions(-)

diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
index 98343960ee1..34bd1df2bb4 100644
--- a/dev-haskell/pcre-light/Manifest
+++ b/dev-haskell/pcre-light/Manifest
@@ -1,3 +1 @@
-DIST pcre-light-0.4.0.4.tar.gz 15065 BLAKE2B 
5ce576bc77e61265326bda0109ce5b8692f06401630400a5f3e8fc94afe3cf7334c0800774bc5acae251a78d4ffe488a3c3435c67d467f75c9ff58c2d8a33996
 SHA512 
ca5f52a8737b2785b4d3eb7c1463233dc579cf10bdb620397f842d4bddafbe636b992f725f85086e5916f2def163d5d25661acd24a358421e2f7f859a2f876f0
 DIST pcre-light-0.4.1.0.tar.gz 28908 BLAKE2B 
10b24f61d6d4a8669464d2a003fcf3a677fc34f7e0369106d3986e18c97c0cb6509620ac7a545dc0e3246c76e5221ae30e32565c02b5fbdc58b6c2524265f314
 SHA512 
491d9581e4c29d1a5a3b161210b83abbc135c2d0ee4018481f4101f91c95e93d7acf0764cb464a9ffe84bed9bf8fb400f4c68441ae1be03c0aa182a9be26dc39
-DIST pcre-light-0.4.tar.gz 28943 BLAKE2B 
3458990cddf6361c7b67fcc66c8abfb900e6e1efd93c1eb5b8ab9d46337911e5122dc20d5ba9a1cb28a9cafbab64d06bb15e79361d64e06bb4f6c19674fe40ad
 SHA512 
1cbb37743018e0199d3c23f5cda34a41514ecc375650f2a79935c16b12b4411e5ce1d7fc84b29fbb41458a2493998471cbefc54adbf848d59877c6be4d34b6aa

diff --git a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch 
b/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch
deleted file mode 100644
index 2b4181929f6..000
--- a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Text/Regex/PCRE/Light.hs b/Text/Regex/PCRE/Light.hs
-index 80c28a0..7fc9581 100644
 a/Text/Regex/PCRE/Light.hs
-+++ b/Text/Regex/PCRE/Light.hs
-@@ -77,6 +77,7 @@ import qualified Data.ByteString  as S
- #if __GLASGOW_HASKELL__ >= 608
- import qualified Data.ByteString.Internal as S
- import qualified Data.ByteString.Unsafe   as S
-+import qualified System.IO.Unsafe as U
- #else
- import qualified Data.ByteString.Base as S
- #endif
-@@ -193,7 +194,7 @@ compile s o = case compileM s o of
- -- > Left "nothing to repeat"
- --
- compileM :: S.ByteString -> [PCREOption] -> Either String Regex
--compileM str os = unsafePerformIO $
-+compileM str os = U.unsafePerformIO $
-   S.useAsCString str $ \pattern -> do
- alloca $ \errptr   -> do
- alloca $ \erroffset-> do
-@@ -263,7 +264,7 @@ compileM str os = unsafePerformIO $
- -- is returned.
- --
- match :: Regex -> S.ByteString -> [PCREExecOption] -> Maybe [S.ByteString]
--match (Regex pcre_fp _) subject os = unsafePerformIO $ do
-+match (Regex pcre_fp _) subject os = U.unsafePerformIO $ do
-   withForeignPtr pcre_fp $ \pcre_ptr -> do
- n_capt <- captureCount' pcre_ptr
- 
-@@ -324,7 +325,7 @@ match (Regex pcre_fp _) subject os = unsafePerformIO $ do
- 
- 
- captureCount :: Regex -> Int
--captureCount (Regex pcre_fp _) = unsafePerformIO $ do
-+captureCount (Regex pcre_fp _) = U.unsafePerformIO $ do
-   withForeignPtr pcre_fp $ \pcre_ptr -> do
- captureCount' pcre_ptr
- 

diff --git a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild 
b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
deleted file mode 100644
index 1b938d18b1d..000
--- a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
+++ /dev/null
@@ -1,27 +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.4.
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
-HOMEPAGE="http://code.haskell.org/~dons/code/pcre-light;
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-   dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.7.patch)

diff --git a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild 
b/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
deleted file mode 100644
index c24b8ef991c..000
--- a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5

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

2019-12-14 Thread Sergei Trofimovich
commit: eda38ded2302359b091f741b33f5074b7b944230
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Dec 14 15:00:26 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 14 15:02:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda38ded

dev-haskell/pcre-light: bump up to 0.4.1.0

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/pcre-light/Manifest  |  1 +
 dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild | 35 
 2 files changed, 36 insertions(+)

diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
index fec1223bb7d..98343960ee1 100644
--- a/dev-haskell/pcre-light/Manifest
+++ b/dev-haskell/pcre-light/Manifest
@@ -1,2 +1,3 @@
 DIST pcre-light-0.4.0.4.tar.gz 15065 BLAKE2B 
5ce576bc77e61265326bda0109ce5b8692f06401630400a5f3e8fc94afe3cf7334c0800774bc5acae251a78d4ffe488a3c3435c67d467f75c9ff58c2d8a33996
 SHA512 
ca5f52a8737b2785b4d3eb7c1463233dc579cf10bdb620397f842d4bddafbe636b992f725f85086e5916f2def163d5d25661acd24a358421e2f7f859a2f876f0
+DIST pcre-light-0.4.1.0.tar.gz 28908 BLAKE2B 
10b24f61d6d4a8669464d2a003fcf3a677fc34f7e0369106d3986e18c97c0cb6509620ac7a545dc0e3246c76e5221ae30e32565c02b5fbdc58b6c2524265f314
 SHA512 
491d9581e4c29d1a5a3b161210b83abbc135c2d0ee4018481f4101f91c95e93d7acf0764cb464a9ffe84bed9bf8fb400f4c68441ae1be03c0aa182a9be26dc39
 DIST pcre-light-0.4.tar.gz 28943 BLAKE2B 
3458990cddf6361c7b67fcc66c8abfb900e6e1efd93c1eb5b8ab9d46337911e5122dc20d5ba9a1cb28a9cafbab64d06bb15e79361d64e06bb4f6c19674fe40ad
 SHA512 
1cbb37743018e0199d3c23f5cda34a41514ecc375650f2a79935c16b12b4411e5ce1d7fc84b29fbb41458a2493998471cbefc54adbf848d59877c6be4d34b6aa

diff --git a/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild 
b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
new file mode 100644
index 000..0f291f743a7
--- /dev/null
+++ b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
+HOMEPAGE="https://github.com/Daniel-Diaz/pcre-light;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+#IUSE="use-pkg-config"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+   dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.8.0
+   virtual/pkgconfig
+   test? ( >=dev-haskell/hunit-1.2.5.2
+   >=dev-haskell/mtl-2.1.3.2 )
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=use-pkg-config \
+   --flag=-old_base
+}



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

2016-06-06 Thread Sergei Trofimovich
commit: 06610c451e6ea0d7bb2c4514644e27a536d371f0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jun  6 20:42:07 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun  6 20:42:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06610c45

dev-haskell/pcre-light: trim DESCRIPTION

Package-Manager: portage-2.3.0_rc1

 dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild 
b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
index 46b0bcf..e185234 100644
--- a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
+++ b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit base haskell-cabal
 
-DESCRIPTION="A small, efficient and portable regex library for Perl 5 
compatible regular expressions"
+DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
 HOMEPAGE="http://code.haskell.org/~dons/code/pcre-light;
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"