[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-haskell/derive/, app-forensics/quickfuzz/, ...

[Sergei Trofimovich]

commit:     2de6b68d9c3f9a380b0906577b946201b0e087f8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 10:40:58 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 10:43:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de6b68d

dev-haskell/derive: remove package and it's app-forensics/quickfuzz revdep

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-forensics/quickfuzz/Manifest                   |   1 -
 .../files/quickfuzz-0.1_p20160920-derive-2.6.patch |  21 ---
 .../quickfuzz-0.1_p20160920-directory-1.3.patch    |   9 --
 .../quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch    |   8 -
 app-forensics/quickfuzz/metadata.xml               |  20 ---
 .../quickfuzz/quickfuzz-0.1_p20160920.ebuild       | 151 ------------------
 app-forensics/quickfuzz/quickfuzz-9999.ebuild      | 174 ---------------------
 dev-haskell/derive/Manifest                        |   1 -
 dev-haskell/derive/derive-2.5.26.ebuild            |  28 ----
 dev-haskell/derive/metadata.xml                    |  17 --
 profiles/package.mask                              |   6 -
 11 files changed, 436 deletions(-)

diff --git a/app-forensics/quickfuzz/Manifest b/app-forensics/quickfuzz/Manifest
deleted file mode 100644
index d43b77c1c5b..00000000000
--- a/app-forensics/quickfuzz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quickfuzz-0.1_p20160920.tar.gz 1073894 BLAKE2B fdf9cf9f1b3aaf7e21221d62417aa5bd80dd67bab3e09d67344b0eaf8d6a50e9eee585a6d234b1c6472f7c17a9b4057a242ba19f48fbfa859cfd0ef8111c409b SHA512 52068c35cef580e4719f1b7128ae069a80581f176adc4a2abbbdfc7fc48849e4ff1c228d342b7eaddc780e5b50eabb285b398c334753fca0dc70d3d3ec9f55f8

diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-derive-2.6.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-derive-2.6.patch
deleted file mode 100644
index 6e0f25636b6..00000000000
--- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-derive-2.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/DeriveShow.hs b/src/DeriveShow.hs
-index c11dd03..40cc205 100644
---- a/src/DeriveShow.hs
-+++ b/src/DeriveShow.hs
-@@ -1,5 +1,5 @@
- {-# LANGUAGE TemplateHaskell #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module DeriveShow where
- 
--import           Data.Derive.Show
- import           Data.DeriveTH
-@@ -12,3 +12,2 @@ isArbInsName = isinsName ''Show
- devShow :: Name -> Q [Dec]
--devShow = megaderive (derive makeShow) isArbInsName
--
-+devShow = megaderive (\n -> [d| deriving instance Show $(return (ConT n)) |]) isArbInsName
---- a/QuickFuzz.cabal
-+++ b/QuickFuzz.cabal
-@@ -75,0 +75,1 @@ executable QuickFuzz
-+  default-extensions:  StandaloneDeriving
- 

diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch
deleted file mode 100644
index 34e92089b53..00000000000
--- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/Check.hs b/src/Check.hs
-index b38a56a..246bf24 100644
---- a/src/Check.hs
-+++ b/src/Check.hs
-@@ -23,3 +23,3 @@ import System.Posix.Env
- import System.Exit
--import System.Directory
-+import System.Directory hiding (getFileSize)
- import System.IO.Unsafe

diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 0e8abbd9d79..00000000000
--- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/Midi.hs b/src/Midi.hs
-index 2b7a359..8c4eacc 100644
---- a/src/Midi.hs
-+++ b/src/Midi.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE TemplateHaskell, FlexibleInstances#-}
-+{-# LANGUAGE TemplateHaskell, FlexibleInstances, OverlappingInstances #-}
- 

diff --git a/app-forensics/quickfuzz/metadata.xml b/app-forensics/quickfuzz/metadata.xml
deleted file mode 100644
index ed6765a28fd..00000000000
--- a/app-forensics/quickfuzz/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@g.o</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name='archs'>support archive formats</flag>
-		<flag name='codes'>support cource code formats</flag>
-		<flag name='docs'>support document formats</flag>
-		<flag name='imgs'>support image formats</flag>
-		<flag name='media'>support media formats</flag>
-		<flag name='net'>support networking formats</flag>
-		<flag name='pki'>support PKI formats</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">CIFASIS/QuickFuzz</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild b/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild
deleted file mode 100644
index 8699d3f648e..00000000000
--- a/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-MY_PN="QuickFuzz"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An experimental grammar fuzzer in Haskell using QuickCheck"
-HOMEPAGE="http://quickfuzz.cifasis-conicet.gov.ar/"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="archs codes docs imgs media net pki"
-
-RDEPEND="dev-haskell/abstract-par:=
-	dev-haskell/argparser:=
-	dev-haskell/derive:=
-	dev-haskell/linear:=
-	dev-haskell/monad-par:=
-	dev-haskell/mtl:=
-	dev-haskell/parallel-io:=
-	dev-haskell/primitive:=
-	dev-haskell/process-extras:=
-	dev-haskell/quickcheck:2=
-	dev-haskell/quickcheck-unicode:=
-	dev-haskell/random:=
-	dev-haskell/split:=
-	dev-haskell/text:=
-	dev-haskell/vector:=
-	dev-haskell/wl-pprint:=
-	>=dev-lang/ghc-7.8.2:=
-	archs? ( dev-haskell/base16-bytestring:=
-			>=dev-haskell/tar-0.5:=
-			dev-haskell/zip-archive:= )
-	!archs? ( net? ( dev-haskell/base16-bytestring:= ) )
-	codes? ( dev-haskell/haxml:=
-			dev-haskell/json:=
-			dev-haskell/language-bash:=
-			dev-haskell/language-css:=
-			dev-haskell/language-dot:=
-			dev-haskell/language-ecmascript:=
-			dev-haskell/language-glsl:=
-			dev-haskell/language-lua:=
-			dev-haskell/language-python:=
-			dev-haskell/shell-escape:=
-			dev-haskell/uniplate:= )
-	docs? ( app-text/pandoc:=
-		dev-haskell/data-default:=
-		dev-haskell/hcg-minus:=
-		dev-haskell/hps:=
-		dev-haskell/icalendar:=
-		dev-haskell/pandoc-types:= )
-	imgs? ( dev-haskell/ac-ppm:=
-		dev-haskell/memory:=
-		dev-haskell/attoparsec:=
-		dev-haskell/lens:=
-		dev-haskell/scientific:=
-		dev-haskell/thyme:=
-		dev-haskell/xml:=
-		>=dev-haskell/zlib-0.6:= )
-	!imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) )
-	media? ( dev-haskell/hcodecs:=
-			dev-haskell/hunit:=
-			dev-haskell/mtl:=
-			dev-haskell/old-locale:=
-			dev-haskell/random:=
-			dev-haskell/idiii:=
-			dev-haskell/bitwise:=
-			dev-haskell/monad-loops:=
-			dev-haskell/mtl:=
-			dev-haskell/wavy:= )
-	net? ( dev-haskell/concurrent-extra:=
-		dev-haskell/dns:=
-		dev-haskell/http:=
-		dev-haskell/iproute:=
-		dev-haskell/network:=
-		dev-haskell/network-uri:=
-		dev-haskell/unbounded-delays:= )
-	pki? ( dev-haskell/hourglass:=
-		dev-haskell/asn1-types:=
-		dev-haskell/asn1-parse:=
-		dev-haskell/cryptonite:=
-		dev-haskell/hourglass:=
-		dev-haskell/memory:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch
-	"${FILESDIR}"/${P}-directory-1.3.patch
-	"${FILESDIR}"/${P}-derive-2.6.patch
-)
-
-# $1 - target tarball name (not including extension)
-make_snapshot() {
-	ln -s "${S}" "${WORKDIR}"/"$1" || die
-	tar \
-		--dereference \
-		--directory="${WORKDIR}" \
-		--exclude="$1"/bundled/Juicy.Pixels/tests \
-		-zcvvf \
-		"${WORKDIR}"/"$1".tar.gz "$1"/ || die
-}
-
-# As of 2016-09-10 QuickFuzz forks a few hackage packages
-# without renames:
-# - asn1-encoding: stabilised handling of corrupterd data
-# - hogg: more functions are exported directly
-# - juicypixels: more functions and modules are exported,
-#                unsafe functions are changed to safe
-# - svg-tree: upstream, build agains patched juicypixels
-# - x509: stabilised handling of corrupterd data
-# - megadeth: not a fork but has no releases
-# - ttasm: cabalised, renamed module
-
-src_prepare() {
-	default
-
-	# inline dependencies of bundled dependencies
-	cabal_chdeps \
-		'JuicyPixels'   'memory' \
-		'asn1-encoding' 'hourglass' \
-		'hogg'          'array' \
-		'megadeth'      'base' \
-		'svg-tree'      'attoparsec, lens, scientific, thyme' \
-		'ttasm'         'bitwise, mtl, monad-loops' \
-		'x509'          'asn1-parse, cryptonite, hourglass, memory' \
-		\
-		'hs-source-dirs:      src' 'hs-source-dirs: src, bundled/Juicy.Pixels/src, bundled/hogg, bundled/hs-asn1-encoding, bundled/hs-certificate-x509, bundled/megadeth, bundled/svg-tree/src, bundled/ttasm'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag archs archs) \
-		$(cabal_flag codes codes) \
-		$(cabal_flag docs docs) \
-		$(cabal_flag imgs imgs) \
-		$(cabal_flag media media) \
-		$(cabal_flag net net) \
-		$(cabal_flag pki pki)
-}

diff --git a/app-forensics/quickfuzz/quickfuzz-9999.ebuild b/app-forensics/quickfuzz/quickfuzz-9999.ebuild
deleted file mode 100644
index 3b81cfa5194..00000000000
--- a/app-forensics/quickfuzz/quickfuzz-9999.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin"
-inherit git-r3 haskell-cabal
-
-MY_PN="QuickFuzz"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An experimental grammar fuzzer in Haskell using QuickCheck"
-HOMEPAGE="http://quickfuzz.cifasis-conicet.gov.ar/"
-EGIT_REPO_URI="https://github.com/CIFASIS/QuickFuzz.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="archs codes docs imgs media net pki"
-
-RDEPEND="dev-haskell/abstract-par:=
-	dev-haskell/argparser:=
-	dev-haskell/derive:=
-	dev-haskell/linear:=
-	dev-haskell/monad-par:=
-	dev-haskell/mtl:=
-	dev-haskell/parallel-io:=
-	dev-haskell/primitive:=
-	dev-haskell/process-extras:=
-	dev-haskell/quickcheck:2=
-	dev-haskell/quickcheck-unicode:=
-	dev-haskell/random:=
-	dev-haskell/split:=
-	dev-haskell/text:=
-	dev-haskell/vector:=
-	dev-haskell/wl-pprint:=
-	>=dev-lang/ghc-7.8.2:=
-	archs? ( dev-haskell/base16-bytestring:=
-			>=dev-haskell/tar-0.5:=
-			dev-haskell/zip-archive:= )
-	!archs? ( net? ( dev-haskell/base16-bytestring:= ) )
-	codes? ( dev-haskell/haxml:=
-			dev-haskell/json:=
-			dev-haskell/language-bash:=
-			dev-haskell/language-css:=
-			dev-haskell/language-dot:=
-			dev-haskell/language-ecmascript:=
-			dev-haskell/language-glsl:=
-			dev-haskell/language-lua:=
-			dev-haskell/language-python:=
-			dev-haskell/shell-escape:=
-			dev-haskell/uniplate:= )
-	docs? ( app-text/pandoc:=
-		dev-haskell/data-default:=
-		dev-haskell/hcg-minus:=
-		dev-haskell/hps:=
-		dev-haskell/icalendar:=
-		dev-haskell/pandoc-types:= )
-	imgs? ( dev-haskell/ac-ppm:=
-		dev-haskell/memory:=
-		dev-haskell/attoparsec:=
-		dev-haskell/lens:=
-		dev-haskell/scientific:=
-		dev-haskell/thyme:=
-		dev-haskell/xml:=
-		>=dev-haskell/zlib-0.6:= )
-	!imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) )
-	media? ( dev-haskell/hcodecs:=
-			dev-haskell/hunit:=
-			dev-haskell/mtl:=
-			dev-haskell/old-locale:=
-			dev-haskell/random:=
-			dev-haskell/idiii:=
-			dev-haskell/bitwise:=
-			dev-haskell/monad-loops:=
-			dev-haskell/mtl:=
-			dev-haskell/wavy:= )
-	net? ( dev-haskell/concurrent-extra:=
-		dev-haskell/dns:=
-		dev-haskell/http:=
-		dev-haskell/iproute:=
-		dev-haskell/network:=
-		dev-haskell/network-uri:=
-		dev-haskell/unbounded-delays:= )
-	pki? ( dev-haskell/hourglass:=
-		dev-haskell/asn1-types:=
-		dev-haskell/asn1-parse:=
-		dev-haskell/cryptonite:=
-		dev-haskell/hourglass:=
-		dev-haskell/memory:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-# $1 - target tarball name (not including extension)
-make_snapshot() {
-	ln -s "${S}" "${WORKDIR}"/"$1" || die
-	tar \
-		--dereference \
-		--directory="${WORKDIR}" \
-		--exclude="$1"/bundled/Juicy.Pixels/tests \
-		-zcvvf \
-		"${WORKDIR}"/"$1".tar.gz "$1"/ || die
-}
-
-# As of 2016-09-10 QuickFuzz forks a few hackage packages
-# without renames:
-# - asn1-encoding: stabilised handling of corrupterd data
-# - hogg: more functions are exported directly
-# - juicypixels: more functions and modules are exported,
-#                unsafe functions are changed to safe
-# - svg-tree: upstream, build agains patched juicypixels
-# - x509: stabilised handling of corrupterd data
-# - megadeth: not a fork but has no releases
-# - ttasm: cabalised, renamed module
-
-src_unpack() {
-	git-r3_src_unpack
-
-	cd "${S}"
-
-	local forked_repos=(
-		Juicy.Pixels
-		hogg
-		hs-asn1-encoding
-		hs-certificate-x509
-		ttasm
-
-		# not exactly fork. just unreleased upstream library
-		megadeth
-	)
-	local repo_name
-	local repo_subdir=${S}/bundled
-
-	mkdir "${repo_subdir}/" || die
-	for repo_name in "${forked_repos[@]}"; do
-		git-r3_fetch    https://github.com/CIFASIS/${repo_name}.git
-		git-r3_checkout https://github.com/CIFASIS/${repo_name}.git "${repo_subdir}/${repo_name}"
-	done
-
-	git-r3_fetch    https://github.com/Twinside/svg-tree.git
-	git-r3_checkout https://github.com/Twinside/svg-tree.git "${repo_subdir}/svg-tree"
-
-	make_snapshot quickfuzz-0.1_p$(date "+%Y%m%d")
-}
-
-src_prepare() {
-	default
-
-	# inline dependencies of bundled dependencies
-	cabal_chdeps \
-		'JuicyPixels'   'memory' \
-		'asn1-encoding' 'hourglass' \
-		'hogg'          'array' \
-		'megadeth'      'base' \
-		'svg-tree'      'attoparsec, lens, scientific, thyme' \
-		'ttasm'         'bitwise, mtl, monad-loops' \
-		'x509'          'asn1-parse, cryptonite, hourglass, memory' \
-		\
-		'hs-source-dirs:      src' 'hs-source-dirs: src, bundled/Juicy.Pixels/src, bundled/hogg, bundled/hs-asn1-encoding, bundled/hs-certificate-x509, bundled/megadeth, bundled/svg-tree/src, bundled/ttasm'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag archs archs) \
-		$(cabal_flag codes codes) \
-		$(cabal_flag docs docs) \
-		$(cabal_flag imgs imgs) \
-		$(cabal_flag media media) \
-		$(cabal_flag net net) \
-		$(cabal_flag pki pki)
-}

diff --git a/dev-haskell/derive/Manifest b/dev-haskell/derive/Manifest
deleted file mode 100644
index b475590ca8a..00000000000
--- a/dev-haskell/derive/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST derive-2.5.26.tar.gz 58346 BLAKE2B abf62a7a948cc06f9f19b314f6ff670a6721c5bc1ebaf0d2dcfd068cbe23932b7cf3548e1e2fc574d7fd4ff6afecab380c16cc091aa95d8cef143ceb4af71b41 SHA512 06297c8d5ebe48dabe3a392a60c1fdec8f81c9a443952c361dfe39d7cf61171162c0e766d26f0f79253ed6540fac756a928543374e0741a334af4ff536e6a6c6

diff --git a/dev-haskell/derive/derive-2.5.26.ebuild b/dev-haskell/derive/derive-2.5.26.ebuild
deleted file mode 100644
index 15da4368df2..00000000000
--- a/dev-haskell/derive/derive-2.5.26.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A program and library to derive instances for data types"
-HOMEPAGE="https://github.com/ndmitchell/derive#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"

diff --git a/dev-haskell/derive/metadata.xml b/dev-haskell/derive/metadata.xml
deleted file mode 100644
index 4b41d4a9535..00000000000
--- a/dev-haskell/derive/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@g.o</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Data.Derive is a library and a tool for deriving instances for Haskell programs.
-		It is designed to work with custom derivations, SYB and Template Haskell mechanisms.
-		The tool requires GHC, but the generated code is portable to all compilers.
-		We see this tool as a competitor to DrIFT.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/derive</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 8532a4e2790..376e3d81b39 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -205,12 +205,6 @@ app-crypt/acme-client
 # Removal in 30 days, bug #444470
 dev-libs/ilbc-rfc3951
 
-# Sergei Trofimovich <slyfox@g.o> (2020-12-20)
-# Needs a port to haskell-src-exts compatible with ghc-8.8.
-# https://github.com/ndmitchell/derive/pull/37
-dev-haskell/derive
-app-forensics/quickfuzz
-
 # Lars Wendler <polynomial-c@g.o> (2020-12-09)
 # Masked until most broken packages have been fixed (bug #732648)
 >=sys-devel/autoconf-2.70