New commits:
commit 608d8497a4bb78b4269bc553c4d3f7b05582953f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-integer-logarithms: version 1.0.2.2
commit 077499093cfe91510932f12f60b5b3812f8c6309
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-haskell-src-exts: version 1.20.3
commit d44d56785fc36fd24cec81f12ef20d0e0b93cfc8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-gauge: version 0.2.3
commit fbaedba4af4547b1eac866ae7952446148cb7621
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-generic-deriving: version 1.12.2
commit 05efe02b21cba30c35db91149558cf184e529791
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-th-abstraction: version 0.2.8.0
commit 5d91438ce01b80597f59777068692253efc1431d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-vector: adapt patch to ghc 8.4
commit 86a20c604aca45f689691c7c893391c2122ccb38
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-exceptions: version 0.10.0
commit f6913f68c0469baaffc9022ccdece45ed6b66164
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-ekg-core: fix compatibility with ghc 8.4
commit 3cfe386e5cb516cfc8fbd3518d64976a4f640c58
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-deepseq-generics: fix compatibility with ghc 8.4
commit 758c03318a1c4b609d9b482939c4dc1c7ca54265
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-cryptohash-sha1: fix compatibility with ghc 8.4
commit 35f192383db2ab365e213970b5e29db4e181cf51
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-cryptohash-md5: fix compatibility with ghc 8.4
commit 2153784434b13d0a4681781f73aa01aa0ab11a84
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-case-insensitive: version 1.2.0.11
commit d372d0025750c7dcac8c9b51a861f7c2825fb1ec
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-blaze-builder: version 0.4.1.0
commit d22daf6250b978dc65a8c2400bf178869ee9ad16
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-text: deprecated in favour of ghc
commit 3c00ed26b93100dc4df688f3a541efda0113984e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-parsec: deprecated in favour of ghc
commit f19179bab86080befa9e8ba92dfe9b90ae43dd7c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-mtl: deprecated in favour of ghc
commit ffd2c5b88902fea4d9fa955523345d6688be3ad8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/POST_REMOVE: adapt to ghc 8.4.3
commit 65f1b411c656e5f6829ccb4cf928183485408d72
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
haskell/haskell-stm: deprecated, is part of ghc now
commit b47f28713f514a722e3c1c143d5f3e092098a5b7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/ghc: add conflict with haskell-stm
commit 9ff21e445052fcc74fbe038a2a61b1624c1b034e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/python-pbr: version 4.3.0
diff --git a/ChangeLog b/ChangeLog
index aca791a..3aceb9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/haskell-stm: deprecated, is part of ghc now
+ * haskell/POST_REMOVE: adapt to ghc 8.4.3
+ * haskell/haskell-mtl: deprecated, is part of ghc now
+ * haskell/haskell-parsec: deprecated, is part of ghc now
+ * haskell/haskell-text: deprecated, is part of ghc now
+
2018-10-02 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/envdir: new spell, Python port of daemontools' envdir
diff --git a/devel/ghc/CONFLICTS b/devel/ghc/CONFLICTS
index 87ba0df..b55c89c 100755
--- a/devel/ghc/CONFLICTS
+++ b/devel/ghc/CONFLICTS
@@ -1 +1,14 @@
conflicts ghc-bin
+conflicts haskell-stm
+conflicts haskell-binary
+conflicts haskell-bytestring
+conflicts haskell-deepseq
+conflicts haskell-haskeline
+conflicts haskell-integer-gmp
+conflicts haskell-mtl
+conflicts haskell-parsec
+conflicts haskell-pretty
+conflicts haskell-stm
+conflicts haskell-template-haskell
+conflicts haskell-text
+conflicts haskell-transformers
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index 8e575f2..024afba 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFLICTS: add conflicts on packages that have been incorporated
into ghc
+
2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS, PRE_BUILD: python3 is required now