gentoo resync : 16.09.2020

4 files changed, 1 insertions, 223 deletions

diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
index ba6103f66475..f6b2153d9a13 100644
--- a/dev-haskell/tensor/Manifest
+++ b/dev-haskell/tensor/Manifest
@@ -1,6 +1,3 @@
-AUX tensor-1.0.0.1-ghc-7.8.patch 6842 BLAKE2B c25daefecd41ffecf07e08d1354cb85fc8f8bf5b1d17010ee5d17f08ae27afa79fb7863b0fe4a2beed20d22c695d2144fc3206761f8cadbfa0d52a3db2d4f8c9 SHA512 4ef5944b9f7217527f11d68e53d13d020ab7a5ba98cadbf7343fd28695bc84be20c7f1a197eed870513d1a5839ac9fdce476e335f4e79b43fb78fa3daf67c27d
-DIST Tensor-1.0.0.1.tar.gz 3314 BLAKE2B 6863127d023ef0cdc449f1a0a79c902f59b8e88892bf8bc2205a6b3239d81ee2bd6e2896732702c75cc180941882cd00cf8f5386206dd706a3800dea9e5da0c0 SHA512 8808d71cb3a3d19991a07c2652751f35bf6c4a4d5dc4090b1ce4835c4cabe29d04b968555663ec7facd93fbb3239031b6540d8afd0661fa4d7b4652a1bf2fd96
 DIST Tensor-1.1.0.1.tar.gz 3281 BLAKE2B 768bf8ab52c17ef8825f83dfa7a7f2e8854305aa2afcdc0a13aa336b20fb6841c470b637d2b29b2acc988669f2ef13d079a667102be1e2d1d03cb981a078937c SHA512 000086bcf160a1ea0a9a3f1aea39ea87979db97203511549e62c5b5161ae178aab0a1e7e0a091e82e66e319dd86c90e8f07ca473027fe7d363f18bfc584c30f3
-EBUILD tensor-1.0.0.1.ebuild 630 BLAKE2B 791d315125d21329f73e3e3b47c86644b86524def08c040c46d58e78fe1448bb4543ae898ecb4afdf7140e1cf7e3a84c4dd48531566f54152f8e3a86b11de318 SHA512 3f06a26b159b89698b483ae510566754a920548d7625f70cec825f6c3c424c6fe8d94c46f5f6f5cc3477036628313523a350ab18f61a830011df2a5b73b5fbc9
 EBUILD tensor-1.1.0.1.ebuild 585 BLAKE2B 791c221d10885bbf5a2d50bd7f18aacfaea261ce4c93e2c147e16b3a1db9ad27a9da9563f17fae8f8b6639d1b1cf366c540c74143237bcdb9198ac4e4be0e8e1 SHA512 01c75745ce1864ae3f3a1f035d134c1537bf973152d508dcd796357be1161301022db8ddec1b03a458d3ea05796ecfe572be88c80630e811c9e178dd2f4da48d
-MISC metadata.xml 381 BLAKE2B 27c33359d86af5c93547c77dc8c14e14de6f2b2afefa7726514e586b4b2d683a40a842d110508bea566769da26b1f8db030c9a7aa734386a9523a9196a6be81c SHA512 006ec9633cd8840f78485eba4ac7f17288079a22dcdd972616f47a57339b06a79488d3753320c657c319fa583d3a8443ebc358a7891d48b353907fef88411104
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch b/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch
deleted file mode 100644
index 7ef3ed758676..000000000000
--- a/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff --git a/src/Data/Tensor.hs b/src/Data/Tensor.hs
-index a5042df..0ba41f0 100644
---- a/src/Data/Tensor.hs
-+++ b/src/Data/Tensor.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DeriveDataTypeable #-}
- --------------------------------------------------------------------------------
- -- |
- -- Module      :  Data.Tensor
-@@ -32,7 +33,7 @@ import Foreign.Storable
- 
- -- | A vertex with /y/=0, /z/=0 and /w/=1.
- newtype Vertex1 a = Vertex1 a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex1 where
-    fmap f (Vertex1 x) = Vertex1 (f x)
-@@ -53,12 +54,6 @@ instance Traversable Vertex1 where
-    mapM f (Vertex1 x) = return Vertex1 `ap` f x
-    sequence (Vertex1 x) = return Vertex1 `ap` x
- 
--instance Typeable1 Vertex1 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex1") []
--
--instance Typeable a => Typeable (Vertex1 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex1 a) where
-    sizeOf    ~(Vertex1 s) = sizeOf s
-    alignment ~(Vertex1 s) = alignment s
-@@ -69,7 +64,7 @@ instance Storable a => Storable (Vertex1 a) where
- 
- -- | A vertex with /z/=0 and /w/=1.
- data Vertex2 a = Vertex2 !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex2 where
-    fmap f (Vertex2 x y) = Vertex2 (f x) (f y)
-@@ -90,12 +85,6 @@ instance Traversable Vertex2 where
-    mapM f (Vertex2 x y) = return Vertex2 `ap` f x `ap` f y
-    sequence (Vertex2 x y) = return Vertex2 `ap` x `ap` y
- 
--instance Typeable1 Vertex2 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex2") []
--
--instance Typeable a => Typeable (Vertex2 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex2 a) where
-    sizeOf ~(Vertex2 x _) = 2 * sizeOf x
-    alignment ~(Vertex2 x _) = alignment x
-@@ -106,7 +95,7 @@ instance Storable a => Storable (Vertex2 a) where
- 
- -- | A vertex with /w/=1.
- data Vertex3 a = Vertex3 !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex3 where
-    fmap f (Vertex3 x y z) = Vertex3 (f x) (f y) (f z)
-@@ -127,12 +116,6 @@ instance Traversable Vertex3 where
-    mapM f (Vertex3 x y z) = return Vertex3 `ap` f x `ap` f y `ap` f z
-    sequence (Vertex3 x y z) = return Vertex3 `ap` x `ap` y `ap` z
- 
--instance Typeable1 Vertex3 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex3") []
--
--instance Typeable a => Typeable (Vertex3 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex3 a) where
-    sizeOf ~(Vertex3 x _ _) = 3 * sizeOf x
-    alignment ~(Vertex3 x _ _) = alignment x
-@@ -143,7 +126,7 @@ instance Storable a => Storable (Vertex3 a) where
- 
- -- | A fully-fledged four-dimensional vertex.
- data Vertex4 a = Vertex4 !a !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex4 where
-    fmap f (Vertex4 x y z w) = Vertex4 (f x) (f y) (f z) (f w)
-@@ -164,12 +147,6 @@ instance Traversable Vertex4 where
-    mapM f (Vertex4 x y z w) = return Vertex4 `ap` f x `ap` f y `ap` f z `ap` f w
-    sequence (Vertex4 x y z w) = return Vertex4 `ap` x `ap` y `ap` z `ap` w
- 
--instance Typeable1 Vertex4 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex4") []
--
--instance Typeable a => Typeable (Vertex4 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex4 a) where
-    sizeOf ~(Vertex4 x _ _ _) = 4 * sizeOf x
-    alignment ~(Vertex4 x _ _ _) = alignment x
-@@ -180,7 +157,7 @@ instance Storable a => Storable (Vertex4 a) where
- 
- -- | A one-dimensional vector.
- newtype Vector1 a = Vector1 a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector1 where
-    fmap f (Vector1 x) = Vector1 (f x)
-@@ -201,12 +178,6 @@ instance Traversable Vector1 where
-    mapM f (Vector1 x) = return Vector1 `ap` f x
-    sequence (Vector1 x) = return Vector1 `ap` x
- 
--instance Typeable1 Vector1 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector1") []
--
--instance Typeable a => Typeable (Vector1 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector1 a) where
-    sizeOf    ~(Vector1 s) = sizeOf s
-    alignment ~(Vector1 s) = alignment s
-@@ -217,7 +188,7 @@ instance Storable a => Storable (Vector1 a) where
- 
- -- | A two-dimensional vector.
- data Vector2 a = Vector2 !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector2 where
-    fmap f (Vector2 x y) = Vector2 (f x) (f y)
-@@ -238,12 +209,6 @@ instance Traversable Vector2 where
-    mapM f (Vector2 x y) = return Vector2 `ap` f x `ap` f y
-    sequence (Vector2 x y) = return Vector2 `ap` x `ap` y
- 
--instance Typeable1 Vector2 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector2") []
--
--instance Typeable a => Typeable (Vector2 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector2 a) where
-    sizeOf ~(Vector2 x _) = 2 * sizeOf x
-    alignment ~(Vector2 x _) = alignment x
-@@ -254,7 +219,7 @@ instance Storable a => Storable (Vector2 a) where
- 
- -- | A three-dimensional vector.
- data Vector3 a = Vector3 !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector3 where
-    fmap f (Vector3 x y z) = Vector3 (f x) (f y) (f z)
-@@ -275,12 +240,6 @@ instance Traversable Vector3 where
-    mapM f (Vector3 x y z) = return Vector3 `ap` f x `ap` f y `ap` f z
-    sequence (Vector3 x y z) = return Vector3 `ap` x `ap` y `ap` z
- 
--instance Typeable1 Vector3 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector3") []
--
--instance Typeable a => Typeable (Vector3 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector3 a) where
-    sizeOf ~(Vector3 x _ _) = 3 * sizeOf x
-    alignment ~(Vector3 x _ _) = alignment x
-@@ -291,7 +250,7 @@ instance Storable a => Storable (Vector3 a) where
- 
- -- | A four-dimensional vector.
- data Vector4 a = Vector4 !a !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector4 where
-    fmap f (Vector4 x y z w) = Vector4 (f x) (f y) (f z) (f w)
-@@ -312,12 +271,6 @@ instance Traversable Vector4 where
-    mapM f (Vector4 x y z w) = return Vector4 `ap` f x `ap` f y `ap` f z `ap` f w
-    sequence (Vector4 x y z w) = return Vector4 `ap` x `ap` y `ap` z `ap` w
- 
--instance Typeable1 Vector4 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector4") []
--
--instance Typeable a => Typeable (Vector4 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector4 a) where
-    sizeOf ~(Vector4 x _ _ _) = 4 * sizeOf x
-    alignment ~(Vector4 x _ _ _) = alignment x
diff --git a/dev-haskell/tensor/metadata.xml b/dev-haskell/tensor/metadata.xml
index 5a39796adcf0..b7878815d80d 100644
--- a/dev-haskell/tensor/metadata.xml
+++ b/dev-haskell/tensor/metadata.xml
@@ -5,8 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains tensor data types and their instances for some basic
-		type classes.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/tensor/tensor-1.0.0.1.ebuild b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
deleted file mode 100644
index bd41a60d424b..000000000000
--- a/dev-haskell/tensor/tensor-1.0.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-MY_PN="Tensor"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tensor data types"
-HOMEPAGE="https://www.haskell.org/HOpenGL/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-PATCHES=("${FILESDIR}"/${PN}-1.0.0.1-ghc-7.8.patch)
-
-S="${WORKDIR}/${MY_P}"