diff --git a/Manifest b/Manifest
index 8af16310ea02..43ac6ef7417e 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29440 BLAKE2B 2c2eb0a600c05402c1fed2159e43b893e04bb1c40f86200506b20bacf5f6e6690ffcb762d774622eb2960b4f6b8d1b61619c4f313eeb47d33df6b62e56812ed0 SHA512 92702b05e85947cfc2792cef8a32fb71d3424c2c8549906eac308b9385213d7086ed0dfda003f0165d41a702a8ea3aab09b7d83b6786e66478102ed8382a31e2
-TIMESTAMP 2020-08-21T05:08:37Z
+MANIFEST Manifest.files.gz 29446 BLAKE2B 04f8ea2cbc6a90aca8d6d9762b3d7e828f348c2b7bffa8f2f7593feafedac47734f2a57dfa5779c0c5fcac928741e409e8594d102cfa6f15fc3e65b82ad2b7b8 SHA512 b5492e864b87cd0b30ed44aa9ea419e3f62d43d121089722a30fb00d4d822804b8cd9fcf6ed84857dcd8b32a11d5ed437b44e066906009fb7398deb650240642
+TIMESTAMP 2020-08-23T18:08:39Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8/VtVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9CsKdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBPwQ//Uylv0NyNrn+XfEhpRG9eXs3FF4dRXWPo8yRH5Gj2vq9fbR4Pa21+BNiz
-9myYpkms3LqyQiFENZYi5bN2gAZlB77TMG4R1AhDeZu6z8tJYY+1AP+blhnb8SPD
-SuAHJ/MAeQ7+xieYgB2KDFlMO0Lwexcw347QtFcRE2b34unz7pmDTQFgyaSh3VFF
-PU1IzkKstnrCDo9hRXh3DyTPnRzvjl70yzws5b3GKF2SW/hw+eZ/S4Oh7c6fkvN+
-88jWba3WrZ9FPC808UK7cZYcSu/WmXzDayHRHfEF+l31INSvZ+lv1PFD76LaTj9Q
-hESPNR2uWNvfeURlEB0Vs5uvihZnuojgGKSDUyVqMU4/8cIE9ILYF2GORyR03zN5
-x5ZHPommIRoRgZc8syn4QFULADpb3ttYUDFN81KPJFUrDpuj332zUQnfUboOJeD+
-opIqpJdsOr326YMxMuflQ+9eVQsti5LM6L7Cy+oyaEd+AgzGj7nER9ImMYvykEfa
-nXW8sf/SGy7E+aAejrOQsjEs4UP2+/D3Z6lJRwWS3yjfrNnetueAPE9Q8p/H9kex
-c4AFtSdmt3mzXu0b7dfsUHN6lPC05Y5kGITHp5QvsrzJKe3+eofB8b6/C8Yl7KBp
-9PjdOgQOiF4Ozy2t/hqpQm+aodGOluXx8NfYvWkJIZosuYvhfEk=
-=kByS
+klAZJw//ThRbxZaGZrrD6rBe81kQtoqtg1ah0PS5RAS7/DxYRPvK97x+Sj3WKNkl
+233OcE2xI1GhFlVhXi5P6pbbgytF/5nkR0eC5gU6a0s7Ju4x7zdrvlKdWDJ1v3OX
+2QD9QTHk0bvXIsXJuP/6J0u/SeNLK3mqBtQaAfEydWUZLwPeXbYJQhrCYMUsBYyk
+mqYy1KIa2Co6h0E9AlZtvZLvQlXYh/JXRMKlwHLTelXr2fgbkBzZATrf6HdZgjGt
+oB8TkNmdI3rSUkAHl9CeG+qticPdAcCV087UVR3YYDy1d5c6xp7NwBm3+Ebtvr3H
+D17MUwNrA0BFzNUSyNExm9WSijnf7yLXgUlHjTVe2MmlbHzCM19dCXeRHEsGEy23
+6a4OZkDPOmiokPAchA9wCx0cHkrgCDxsZ5Tp3dpgcQkaeYHNYUle5jIsQcB0JJ2x
+S7EcvI+9OgR4cFy5DYIbtOsNxTi/quBlgrQ2Z+FCr7IC2AVtst5334K15d/yjim6
+J4QVC/sWPskK5d+oR/Nyh2Ex234SMmNoYyLESy1DtPplNARXvtuN5epLKgkzDXgr
+Qy9IeMZQPRMjCEJc8zuaxHRb92KH/nneNxm+f3fWIeZhTKxKSvqSj/NLQi6J2859
+uQ/AwJ6Puk1H+2xzExEoZsd6S/1ZNF2VGTornis2UVKqbHxEYs8=
+=MXaS
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d13177fa5612..bc8b38d2ec2a 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 9479b545b5fc..e469b8a3c8d0 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/named/Manifest b/acct-group/named/Manifest
new file mode 100644
index 000000000000..d10664a9bbac
--- /dev/null
+++ b/acct-group/named/Manifest
@@ -0,0 +1,2 @@
+EBUILD named-0.ebuild 145 BLAKE2B f2dcf872885c94761dcaedca38434160ae93d9f28c17b80f3591ad2b5afc59319e215ccd73cec6e6d23585fbe6cae2a1e00a254ec0278ae3e14e89720aec0c4f SHA512 a243157555f25dde112ba4850cacc94d4d9a0f67545c4d72d6d68fc5596fafb81412f00e2f235307cf791c8b8473f511b7857418657c9cf2b78f73d1f265a791
+MISC metadata.xml 357 BLAKE2B a0ca815201f02418710730f3c650f40e11fd191cf0d8b84b34ee43fc8e4b87d20ea6f80fdc3055e95962d4f3a0bfd798949cb953471d1cd84b52ec224e977438 SHA512 3a935e590c59ac1997acd00e1c85c70ef9b9fc1659de8ad78274e9d30e2f0c69bf985481950f3fc05bf24955caedd7e53c4ee615a08688adbd6ffe28cf6b28ff
diff --git a/acct-group/named/metadata.xml b/acct-group/named/metadata.xml
new file mode 100644
index 000000000000..ba1f1d99d449
--- /dev/null
+++ b/acct-group/named/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ idl0r@gentoo.org
+ Christian Ruppert
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-group/named/named-0.ebuild b/acct-group/named/named-0.ebuild
new file mode 100644
index 000000000000..fb6bcdd96000
--- /dev/null
+++ b/acct-group/named/named-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=40
diff --git a/acct-group/sanlock/Manifest b/acct-group/sanlock/Manifest
new file mode 100644
index 000000000000..d8fc98ade7ce
--- /dev/null
+++ b/acct-group/sanlock/Manifest
@@ -0,0 +1,2 @@
+EBUILD sanlock-0.ebuild 188 BLAKE2B 01843c38209950c66a3544e313809cc257abfa8cfb1aba2acf6ef98c19a6899fa45a4ac63d47001d766a7ef89bbf099e7447272ac3ba1a9711ad73bc7ab8f805 SHA512 95708c292555a3defa7bb66c153b979f14f15816f196e28e04e214c2de9ae6e0ed8fe06b5d02ccb6c7069234142b54600da63bd8383b5d935f3a6d70819c18ee
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/acct-group/sanlock/metadata.xml b/acct-group/sanlock/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/acct-group/sanlock/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
diff --git a/acct-group/sanlock/sanlock-0.ebuild b/acct-group/sanlock/sanlock-0.ebuild
new file mode 100644
index 000000000000..c0d196eb8395
--- /dev/null
+++ b/acct-group/sanlock/sanlock-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="shared storage lock manager"
+ACCT_GROUP_ID=340
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 6c95d76db3a3..b5ad44bb5eb6 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/named/Manifest b/acct-user/named/Manifest
new file mode 100644
index 000000000000..e629e529fd3c
--- /dev/null
+++ b/acct-user/named/Manifest
@@ -0,0 +1,2 @@
+EBUILD named-0.ebuild 285 BLAKE2B b78aeea9adcb92f2c459e3ba0fe02bce50f09a329f9375eb8ce7a723fb5dc2ce11f94c33d398abfba8464eba8f6b6dc3b96f2ea395cb36fb530c6464f6d995d8 SHA512 694035814bd7b60323b31ae7deaa25a79aeb13a0213c594a609236865bb809f0e3cc5995cb3ce2dacd2c83b0cfefa1f40476b106408ee9eea016dce29a4e2555
+MISC metadata.xml 357 BLAKE2B a0ca815201f02418710730f3c650f40e11fd191cf0d8b84b34ee43fc8e4b87d20ea6f80fdc3055e95962d4f3a0bfd798949cb953471d1cd84b52ec224e977438 SHA512 3a935e590c59ac1997acd00e1c85c70ef9b9fc1659de8ad78274e9d30e2f0c69bf985481950f3fc05bf24955caedd7e53c4ee615a08688adbd6ffe28cf6b28ff
diff --git a/acct-user/named/metadata.xml b/acct-user/named/metadata.xml
new file mode 100644
index 000000000000..ba1f1d99d449
--- /dev/null
+++ b/acct-user/named/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ idl0r@gentoo.org
+ Christian Ruppert
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-user/named/named-0.ebuild b/acct-user/named/named-0.ebuild
new file mode 100644
index 000000000000..103b3149f63d
--- /dev/null
+++ b/acct-user/named/named-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-dns/bind"
+
+ACCT_USER_ID=40
+ACCT_USER_HOME=/etc/bind
+ACCT_USER_HOME_OWNER=named:named
+ACCT_USER_GROUPS=( named )
+
+acct-user_add_deps
diff --git a/acct-user/sanlock/Manifest b/acct-user/sanlock/Manifest
new file mode 100644
index 000000000000..ee76db091929
--- /dev/null
+++ b/acct-user/sanlock/Manifest
@@ -0,0 +1,2 @@
+EBUILD sanlock-0.ebuild 263 BLAKE2B 5107420ae062c4f5e4c5fec6443ca372ed7d67f325fff933445923c6fca718a1237a5076999eae01119ad1ebe3e6d0df68565fbbca472fc0468f80da69c3f12f SHA512 e84c2244ffee49ce192cfd1bfe4f4f5a06458ea46749972a47cf663aa5d3e237d23aebc38bfc7fad1e36a6e770629c2e419b3ef266fa6521f3892b6a7bf988cb
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/acct-user/sanlock/metadata.xml b/acct-user/sanlock/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/acct-user/sanlock/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
diff --git a/acct-user/sanlock/sanlock-0.ebuild b/acct-user/sanlock/sanlock-0.ebuild
new file mode 100644
index 000000000000..839e34bd9bc5
--- /dev/null
+++ b/acct-user/sanlock/sanlock-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="shared storage lock manager"
+ACCT_USER_ID=340
+ACCT_USER_HOME=/dev/null
+ACCT_USER_GROUPS=( ${PN} disk )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 7dea78f0f308..324e1ec7db28 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 0a5e7e3ff69a..bb416e8fcac4 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -2,5 +2,5 @@ AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed
DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
EBUILD speech-dispatcher-0.8.7-r3.ebuild 2667 BLAKE2B f060b83425cdcade72424fd4ba45cb7f853bdd98585bdd11836ea9d273c725867798abc6fc7772054ba62926544e6bd8a43598651f937c0592b14193e8c671ae SHA512 a9a2a4974d51741ae01217e413af49b01ddf388eafea99668e8f43111275cceeaf8860c1a7d0abe7ad0baf1fdb91326e426734985652d47f66895d72bd5ed274
-EBUILD speech-dispatcher-0.9.1.ebuild 2798 BLAKE2B 8c8756695d50e32c3b1bc7a9cad9ecf32f1ee1de56c65f55c0d759e4a5d55047bc4f77063931d46b90182b9cf40f0430fde974eaa7472061d44b8b618f1d707b SHA512 2d7d079c587a7ba980c993f2583d5af6aef81edf1acbed9c82b8271912eba464a521ef44c2988c1d123d0863713b474eecd6f49ab47e08788d63076be352e61e
+EBUILD speech-dispatcher-0.9.1.ebuild 2796 BLAKE2B 1f8785b6c2f04e3f920b75901f6e50914ce52bb9ca666c827d8e83ce739d3fc2cb96b87cb9899b482fd35be0ce3a4d795384051a51f4e9ed0227d1347b93d3d6 SHA512 5bc3b4d391cb3a60c2679f0239be240ba5b881e68a386f9c91fcb8bf4ce089d7e26ab715d438694aa71ba5d6f5072895466cdb67d3ec32dca1ef9407e01867a2
MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
index 082ac0dcff85..52ea0cd451a2 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="alsa ao +espeak flite nas pulseaudio python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 0179460d073f..e989ac7810de 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,6 +1,9 @@
AUX speech-tools-2.1-gcc7.patch 612 BLAKE2B ded8216c1e7c49821fd1bd738f1c0d508afbd07115d98d3149d31eb402611c1dbe70c07d4885e82beef94bfdfe8a9261722eaf7ea43f3704cee27eb5055f7488 SHA512 6d4c9c43821f571b5fa8f476f740ee276b9a05dcb8a39cfc32f5b3a87548acf051a1abf75f3be5a8563b03c5302b9208ce894a5065899b0f43ba9d2ffe7a65db
AUX speech-tools-2.1-underlinking.patch 565 BLAKE2B 1be43841d09fe456874323a02d63253dae37dfe6f6969f7d9941c8a39d0ad9127e8fd1b87f5b6e59fcc505f2c9e2bc988b4f572ccbb01418d11ca0fda88b262d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47
+AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d52c447b0183cc59146ec892b86d360f16fccab0a85667743c6e0f31a07f20983cce604d3202756c16eae4eff2eb88b1079407c SHA512 ae34fadda5f92dfade923af07222c1ed35b8b39bafc7604a86cebd7196888b2cf9a41fe2686e5210a556309a9c2e71076d22e3f56f1ccec0aca3d4a7bd18f3c1
DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
+DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
EBUILD speech-tools-2.1-r4.ebuild 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e
+EBUILD speech-tools-2.5.0.ebuild 3711 BLAKE2B f3a9e139161f7c35e6159b4ba751e11958d269f18336bcb0576f3cc989ac54054e252d9be4b7461adf35f433ee314a7b2648a0f467856351969016d21b7b3d54 SHA512 1aed28cb7292d4a2e52bacb4ece1667ae9bebc123bf7c9f14b1bfe588a04fe3b139dd06fe2d630b6daa2cf2d334c70d6e25031332d187b9093a8d8d2dee3f575
MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch
new file mode 100644
index 000000000000..de34f4fdbc76
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch
@@ -0,0 +1,22 @@
+From b3a1f6e778c0dad12ce65f9f1fb25354e2667ef6 Mon Sep 17 00:00:00 2001
+From: Peter Levine
+Date: Fri, 29 May 2020 21:18:55 -0400
+Subject: [PATCH] Remove erroneous declaration of editline_history_file
+
+An extern qualified forward declaration of editline_history_file is supplied in editline.h and its definition/initialization is supplied in siodeditline.c.
+---
+ siod/editline.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/siod/editline.c b/siod/editline.c
+index f6eb5c6..138f476 100644
+--- a/siod/editline.c
++++ b/siod/editline.c
+@@ -73,7 +73,6 @@
+ /* modified by awb to allow specifcation of history size at run time */
+ /* (though only once) */
+ int editline_histsize=256;
+-char *editline_history_file;
+ /* If this is defined it'll be called for completion first, before the */
+ /* internal file name completion will be */
+ EL_USER_COMPLETION_FUNCTION_TYPE*el_user_completion_function = NULL;
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
new file mode 100644
index 000000000000..184920c28003
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r3"
+
+DESCRIPTION="Speech tools for Festival Text to Speech engine"
+HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
+SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
+ https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nas openmp X"
+
+RDEPEND="
+ media-libs/alsa-lib
+ sys-libs/ncurses:0=
+ nas? ( media-libs/nas )
+ X? ( x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/speech_tools"
+
+DOCS=( README.md lib/cstrutt.dtd lib/example_data )
+
+PATCHES=(
+ "${WORKDIR}/patch/02_all_gcc42.patch"
+ "${WORKDIR}/patch/03_all_GentooLinux.patch"
+ "${WORKDIR}/patch/05_all_sharedlib.patch"
+ "${WORKDIR}/patch/06_all_gcc43-include.patch"
+ "${WORKDIR}/patch/09_all_remove-shared-refs.patch"
+ "${WORKDIR}/patch/10_all_base_class.patch"
+ "${WORKDIR}/patch/81_all_etcpath.patch"
+ "${WORKDIR}/patch/91_all_gentoo-config.patch"
+ "${WORKDIR}/patch/92_all_ldflags_fix.patch"
+ "${WORKDIR}/patch/94_all_ncurses_tinfo.patch"
+
+ # Fix underlinking, bug #493204
+ "${FILESDIR}/${PN}-2.1-underlinking.patch"
+ "${FILESDIR}/${PN}-2.5.0-fno-common.patch"
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+
+ sed -i -e '/^CXXFLAGS =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \
+ config/compilers/gcc_defaults.mak || die
+
+ sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
+ main/siod_main.cc || die
+
+ #WRT bug #309983
+ sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
+ "${S}"/config/systems/sparc_SunOS5.mak || die
+
+ sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \
+ -e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \
+ -e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \
+ config/compilers/gcc_defaults.mak
+}
+
+src_configure() {
+ local CONFIG=config/config.in
+ sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
+ if use nas; then
+ sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
+ ${CONFIG} || die
+ fi
+ if ! use X; then
+ sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
+ fi
+ econf
+}
+
+src_compile() {
+ emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+
+ dolib.so lib/libest*.so*
+
+ insinto /usr/share/speech-tools
+ doins -r config base_class
+
+ insinto /usr/share/speech-tools/lib
+ doins -r lib/siod
+
+ mv include speech-tools || die
+ doheader -r speech-tools
+ dosym ../../include/speech-tools /usr/share/speech-tools/include
+
+ for file in bin/*; do
+ [ "${file}" = "bin/Makefile" ] && continue
+ dobin ${file}
+ dstfile="${ED}/usr/${file}"
+ sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
+ ${dstfile} || die
+ sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
+ ${dstfile} || die
+ sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
+ ${dstfile} || die
+
+ # This just changes LD_LIBRARY_PATH
+ sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
+ done
+
+ exeinto /usr/$(get_libdir)/speech-tools
+ for file in `find main -perm /111 -type f`; do
+ doexe ${file}
+ done
+
+ # Remove bcat (only useful for testing on windows, see bug #418301).
+ rm "${D}/usr/bin/bcat" || die
+ rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 24c1b3ecd1c0..abcc8e13ed75 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 7126683d0548..07691833a1ea 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,6 @@
-DIST ansible-2.9.10.tar.gz 14237929 BLAKE2B 52230b18efa94dbcbd6e4fba3d0915e2375fc8de7412944eaeefc054f50ea888a1aeb86b688a7ae97184b1a8a10180e67a7004d48906235ce4e1b83976d10e9a SHA512 c0d5e26491f52d1eb8d1c3755903bb6a8d50634df5fb50a970076d49d99cfda424fa60c258a6a5821e01c435a8ef077d46ced4b2f8c4f4a8d381737e6f14afb4
-DIST ansible-2.9.11.tar.gz 14243995 BLAKE2B afd60d69f53c79c778f122db902ba149030fd995650566f6edcfa41178e92d56cf200089b76de3c6999a824725c793e57c222733ed5b9d9c401bccea942cde5b SHA512 b157a5cfb5ba7cb651c7afc0dc92cfe3b8f9eebd06de6d7a1e4917ffca3c542c5207c8e1820acc5be840190c8754f111e2501304ad7e64867247e5b973aec81e
DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
EBUILD ansible-2.10.0.ebuild 1883 BLAKE2B 0760346b3069ef22ef95fdedc724d4a184093dcde221df1222b29bec1012386d1a25f79e5c04aee920d0248b021a64c7ca392923afb624ef2df1d3ef61da60dc SHA512 4945d7b0263547f492b4f428aab8972f18fc7c1b540ed3b3f8f5c0c0cd3911120fd7fff9949e6eff6478eeda46de09f511b854f9617ab76b14764b4a31b0a7bf
-EBUILD ansible-2.9.10.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
-EBUILD ansible-2.9.11.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
-EBUILD ansible-2.9.12.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
+EBUILD ansible-2.9.12.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.9.10.ebuild b/app-admin/ansible/ansible-2.9.10.ebuild
deleted file mode 100644
index 2a5dea9c0317..000000000000
--- a/app-admin/ansible/ansible-2.9.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
- )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-
- dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.11.ebuild b/app-admin/ansible/ansible-2.9.11.ebuild
deleted file mode 100644
index 8c8b3a948043..000000000000
--- a/app-admin/ansible/ansible-2.9.11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
- )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-
- dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.12.ebuild b/app-admin/ansible/ansible-2.9.12.ebuild
index 8c8b3a948043..2a5dea9c0317 100644
--- a/app-admin/ansible/ansible-2.9.12.ebuild
+++ b/app-admin/ansible/ansible-2.9.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index bd9039b696f6..aeaa0490c336 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -5,6 +5,6 @@ DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb
EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc
EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
EBUILD sudo-1.8.31_p2.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
-EBUILD sudo-1.9.2.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
+EBUILD sudo-1.9.2.ebuild 6929 BLAKE2B 948fdcbe5caf74d63fd11480ba55c30bd3b02c27800535c4022f83eb17ef4f0313fe0c10f76c5d85af395ada58bf9e57bee0be71f751b36c2b7a59487e286a8a SHA512 afa68f7077fc674a20242fc7bed81a31c1d46b6ad4b443f1c3a858290b196b82d3ce4df918efecb9b3b2ff3a6771e9febfba541fc03f96c3811fe2d98f127264
EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.9.2.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild
index d0873828489a..301a917d9637 100644
--- a/app-admin/sudo/sudo-1.9.2.ebuild
+++ b/app-admin/sudo/sudo-1.9.2.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
fi
fi
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index bb94965548b3..0e74740676d1 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -5,7 +5,9 @@ AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c4
DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
DIST supervisor-4.1.0.tar.gz 459020 BLAKE2B 0c4bdc2c89f54c08ad536b43852941f1aadb0173013e0f73337302f500b779023bfa0fcf8cc3ace4968cfc724998a08ea5a63680e290051d13c7cd8ac788dd24 SHA512 1ae343293707ebf33d0a0c0bda2c6cc78278e12737940a79e51b2365e7a20b07d9f5e50134ed2abbf8e7af1ebd8f1746002a159cde1cfc35e83fda0a77dae9c5
DIST supervisor-4.2.0.tar.gz 456056 BLAKE2B 51b66cfc34505b937c47c9b510d81bcc777b9372fdeb2e08fc25153d2718cd2682258b812630160954587ceb992e1a528cdd5bf0d270139f7ffac9463ac2f015 SHA512 626d806f4b03be7cbff795afd1bdb3ff5ca5ecf44f035909ea1aa9360da9fa3047b2fe05543190bf1442f01dcdd403be19fcd907519bf7e26615900bc4bf9d0f
+DIST supervisor-4.2.1.tar.gz 460935 BLAKE2B 0c65f904599c1e8a04cd3a71085e2b2a5460691c2bfd790d3b7c10449cae08472bcd72a870cbe611801434624f405ea3e245f156cab93f25a8df784b58d948d7 SHA512 c560ef959f8d580fb20c1812aa2a838c9feaeb3726a754e8084fa8c7406ff9258139b55b081558b8d8f33e4672cdfad40695170f55412a5e85a6c1aed0f11657
EBUILD supervisor-4.0.4.ebuild 1889 BLAKE2B 742a09c3881070eb8bb8356521a8064689341055dd23b449bfe150449c4fba4d0e60800c329fc3b2c1ad2f84f34ddac293d698183999b3ccd7814108a60d0916 SHA512 dd02e46bf2d19adc95da5ff836851e900a636d8f9b41317a5fbe3d39485391d8a597d4af1522884a5c6cedf8986f0e8338f46a7e160c6c66d702df26550b1849
EBUILD supervisor-4.1.0.ebuild 1479 BLAKE2B c6ce3863be2f873514d1c170c9140bb5288c65729c83a81f8620a64780db2f84a659ddd6d5978cdea9f6df683026cb444ca1f920be8cdc234558a8d206e8b8fe SHA512 bcb297829bec3c8bfb8b2b41813a4e2f30ca8b92400e1cd286a4c69ab051bc52045198a1bbfdae824c20f58e6c82d6b5e86bc9b2ce556a68069b50c5aabaaca8
EBUILD supervisor-4.2.0.ebuild 1717 BLAKE2B 3b43ad7862ec2b40aa3249ee2614eb47e3d07236d6c4f5b48f6337cd45e36c1449d5f7f4ec69550cb15473affdc759adcc144312fa766e95d365b9fb25dcf889 SHA512 a5d045834c67f084034be38ecbdfdb079b358786e932b3a19aba1552f7b68a96aeb0fdfee49e754765331b4a3b5ac14096f237ce90c54d3aec345227c305ece6
+EBUILD supervisor-4.2.1.ebuild 1481 BLAKE2B 550b341dbf20cc142ba747f8bef222edbd9b173f21e12c9549677488ead4df4d187efab4969dc6dd1250bb2568b1bc92a95ae20f119942e115c0d070bdba1b4e SHA512 0d279ffb60ade7fffee94c8b857b9ba6b3015f556e165b005eaf1e09c954b7eaf1a997635728f6b0054d19f3cb29c8b79d006f83cdb56549cdb0ef03a676e41e
MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.2.1.ebuild b/app-admin/supervisor/supervisor-4.2.1.ebuild
new file mode 100644
index 000000000000..9cf38eee7a6c
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 systemd
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="acct-group/supervisor"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ newinitd "${FILESDIR}/init.d-r2" supervisord
+ newconfd "${FILESDIR}/conf.d-r1" supervisord
+ dodoc supervisor/skel/sample.conf
+ keepdir /etc/supervisord.d
+ insinto /etc
+ doins "${FILESDIR}/supervisord.conf"
+ keepdir /var/log/supervisor
+ systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+ fowners :supervisor /var/log/supervisor
+ fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+ elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
+ elog ""
+ elog "By default, only members of the supervisor group can run supervisorctl."
+ fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b11197511abe..52409c5cf8c0 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index a10b40dd9a90..6e613620815c 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.10.ebuild 1115 BLAKE2B ed94cbae4407cf1cf89a4e6a965cd0d3d9ef476656cab6fc1ae430cbf9c6817e497f9ef079480eea5e8dac418d62ecbc627a5a8258e1f722d67aae4e421814ac SHA512 9732ed967c33052539fb81ba751c3723383bb7482adffe5e32c179231561d1b77290ca943894d6f0accaf994f064a6f1d87ea9477517862038eb11c0dc411479
+EBUILD gzip-1.10.ebuild 1114 BLAKE2B e7a59a52e3aa289a70ed4c45e47678d282f8d6f917b3dd4640ea1f35502041fdb6f896c5ab2465117170d27d1def7051000390914901d67c83657846a5cc03e0 SHA512 197123e0c917d92b5e35cca30d26602e3fe6ead26dc4a75b9b279067acd8e3f68c95c2ec55be28d44d953c892dece1b746895de99283367bdc496293f8c1f1ea
EBUILD gzip-1.9.ebuild 1152 BLAKE2B 35ed002a9ae553747b0cd64af53b183c9144def81d3c0220371daa5c697fcbaec8de2410f984825fb792d8352b985ecd03a05251b9f0ba230aab695744c09625 SHA512 d677cd25d67ed2300750ec6177d6d19c0d1b73ea1c6ca0f104ee1c53fc39ee9f4dbac4c6497a42ae5403fcafe05cd2d6d677fe4526cb34bb46af0edd02d44146
MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index 50b225433ab0..6819b4b49362 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pic static"
PATCHES=(
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 3cd798c4301b..0523a4135803 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -6,5 +6,5 @@ DIST unrar-5.9.3.tar.gz 229917 BLAKE2B 6ab2141970535753197d3ed74521f80d3b20ecc2a
DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
EBUILD unrar-5.9.2.ebuild 1885 BLAKE2B f83a1dc3eafefa33bf4ec25740e2a76c7e4afa7c9b497b8ab9be85bcd388db0e8bdc4cb5d3d36911b68591395f7513b51eb304b36fdc5c27d046f66ff74a3658 SHA512 7ca8fcd06c42689f6b3190795bd420d1492af1aa00006f449e0b8c9f89b4a55722bb83d6d8471e7b8307393a75b590c23c837a05a57da3bd7d30ccc58ac19587
EBUILD unrar-5.9.3.ebuild 1893 BLAKE2B 0399f2fd6e2dbfa76b5f9590428657c0ff4e2ff6b4d02e4da409991eabde522913d41bdd8a8cc49db1727b90f936ca4f15de003a0f7793dfa7245301064d5126 SHA512 b31e6054332cf318893dbf6306bbc1cc34f6b601f03a1b7d687f2dabe6f347faed57365569182739bbd302c62d18bc90ef900125a3515111d80fc42cce8e232c
-EBUILD unrar-5.9.4.ebuild 1893 BLAKE2B 0399f2fd6e2dbfa76b5f9590428657c0ff4e2ff6b4d02e4da409991eabde522913d41bdd8a8cc49db1727b90f936ca4f15de003a0f7793dfa7245301064d5126 SHA512 b31e6054332cf318893dbf6306bbc1cc34f6b601f03a1b7d687f2dabe6f347faed57365569182739bbd302c62d18bc90ef900125a3515111d80fc42cce8e232c
+EBUILD unrar-5.9.4.ebuild 1891 BLAKE2B b3eb3f23463760f6bd477c8616197dbf0c8f8efd60773afc6ea7548797a06bc10122d5e45e9d2bf65d8cf008529a6070505abab376a66c811ff532590d3e8479 SHA512 bd968de2d9bdad07d3ceb9a73b39d521fdf51cdde8f774a1fe43a094a785a9bd820e7f5a52d5b39871991c247e001c0451c8e999cd6d2aa79594ad9eb84295b7
MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.9.4.ebuild b/app-arch/unrar/unrar-5.9.4.ebuild
index 7a4b90b3f3b7..40d68a7cd57c 100644
--- a/app-arch/unrar/unrar-5.9.4.ebuild
+++ b/app-arch/unrar/unrar-5.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 00f698c6c3f3..3b8fb53463d0 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,6 +2,6 @@ DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb08920
DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
EBUILD xz-utils-5.2.4-r2.ebuild 2684 BLAKE2B 914c3043b4d07614db0d77d61fa9de508ffe5df5bb64753d9d8e15da14e147bd7f76d0259fef404dba0b2d98ea76aa25e89fbb9ca6621a310e75bdd12b41c1bd SHA512 04ec2a56f2aabf58891f4db02c8375451ee5f8a925d12092ead17674d09f1467cb4d6cb09e38292a4d5bc0c5adfc0a340a92593ae9cb3fb539898d0b35e7549d
EBUILD xz-utils-5.2.4-r3.ebuild 2618 BLAKE2B 551ef4b45317a49e63da1454adcd1d15e806fa543d0326e644de3ce9a57a508e569bd927214df0c9003c7cf461c3eadde74beea271454af0b48414a94705eb2c SHA512 b7ed40e81541eff5bfb9f193f4d8179f2f6b2fded0186321b8da6fee96e5fcfa119788aa7eb1a064416bae49e3511627e962ca7662ff5130f5c76df73c2dade8
-EBUILD xz-utils-5.2.5.ebuild 2805 BLAKE2B 4d6a91b14fc4688c02abce64ed70d7b3d8ccb93aeefa5c4f6ca77f1a0c78341cd1c400128bda0aa3ba22b0882746cbb08d309301ba6ef67c75ec9d6f9eaf668d SHA512 e7b563a13fe43204f5e8fd8d5e78736c2feedf727163ca5302837338c496df0e86b28d5f62621496a189f98d3b3a15c7a960f7b0a13e9a5b59886737f52ceac9
+EBUILD xz-utils-5.2.5.ebuild 2803 BLAKE2B 023e657fe7ce2874110983652d2d1bb1538977022a346cf146daa492714f4097ef67887cbf3de70b582354891629c944d73e34fb85f7ace472e4031380509187 SHA512 b74d1c64cbc5bb67013bb4cfa178d8aae1d94b0062bcf1771e682360a7598549c22d1570238caacfb26fbcbc41f57f80a2976bef2f05d87ca34cf3897b909766
EBUILD xz-utils-9999.ebuild 2805 BLAKE2B 4d6a91b14fc4688c02abce64ed70d7b3d8ccb93aeefa5c4f6ca77f1a0c78341cd1c400128bda0aa3ba22b0882746cbb08d309301ba6ef67c75ec9d6f9eaf668d SHA512 e7b563a13fe43204f5e8fd8d5e78736c2feedf727163ca5302837338c496df0e86b28d5f62621496a189f98d3b3a15c7a960f7b0a13e9a5b59886737f52ceac9
MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
index cae7bc97c8e9..8da89c79360e 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 1997f59ca54e..a117d0ba1f1d 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 9f47c0f9e76a..5e06f0ac6587 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d
-DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79
-EBUILD stress-ng-0.11.17.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8
+DIST stress-ng-0.11.18.tar.xz 473268 BLAKE2B 1a10fab7fc98dad72f59f871e148980b3a7ea29d62badcc7a41ae72598cd99b880da10927a8809b5785040aaaf93a4776801304a43bf3d7bcfbbf19d5b488cd2 SHA512 c6871cfb6b72fae83ad2d8a4877363b81e5674d1670faa24c7a54951020f177f9a81033506207032a0b2bf39269fb09c6d8a6842d41285ee75135a37ad8e781c
+EBUILD stress-ng-0.11.18.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8
MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
similarity index 100%
rename from app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 1ea29cca1301..103715d6071c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 94d7c28147e7..741b1437cdb9 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,4 @@
AUX tpm2-tools-4.2.1-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4 SHA512 4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
-EBUILD tpm2-tools-4.2.1.ebuild 930 BLAKE2B 45b35129e0551cedd898d62118a11cb93bbd44fedcf02a76579e890e6c0eebb6b89b4045e6f2ca9a7a98495ea58771e83755e6997c483e4491644a5d435ca682 SHA512 17145939f7dab63047a6ee355be78198abbdd172defb18be2d77d17574d64d3c879c45261a3546d8c804dbe57fab38aea7ac8938dbca6dbed52952e39db067b0
+EBUILD tpm2-tools-4.2.1-r1.ebuild 920 BLAKE2B 59f32bcbb807f20891c5205a03b437c849878131f436090b309907c431b1b2ab57be199d1a3979df7dbd98ed3d60126ab33bc6631238b7ce9d3dac43e89299b1 SHA512 71efa17243b2831214d292e210e05d12ae4049f6b9c28070daf4184d4edab8b028e3da769072238095dfa9fba9d9667a58e285ac600dd82ea1000a6c47df9ba0
MISC metadata.xml 525 BLAKE2B 5fa89e3cfb69fe00abe745690aafc6e45b8394e1673521049ae2bb834454f3100ef65d4080010c4fed7265bcd6c9dd6cb9015a159674bb71622646d5dd5dd57b SHA512 533cc4a3dc31600a948c931d144eeee3cdb265286677966ed7bf26953deec79f1c9e0c2c7152e1a5ef3bc067bbc3d88a7ae0678b9395be3a7b01d76976a9a4d9
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
similarity index 94%
rename from app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
rename to app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
index f791854a95a5..ea91b076cb65 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="+fapi libressl"
RESTRICT="test"
RDEPEND="net-misc/curl:=
- fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
+ >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
DEPEND="${RDEPEND}"
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 3c58f6594e72..d7ee938eb0ec 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -9,5 +9,5 @@ AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de6
AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
EBUILD trousers-0.3.14-r2.ebuild 1636 BLAKE2B a7d811322ebc0e5e61b7b4ae53d24a138e1e801782cc8f9b7a0ee3448163a422b92ee648f7df98d79d61ee143b012d85b74ab78e63c3a6251cd6e704bc8f46aa SHA512 2f99e83739a57b8e5114e87064e9975dd6d401842a03a08743ea115037c7847c80b5ed41f729947914304fa2a2c54db0a5b2613f449a45384503851aa5136feb
-EBUILD trousers-0.3.14-r3.ebuild 1678 BLAKE2B ac6521d24af0ba2399c68f98f69a84a805696ffcf894aa936cec4c4909ccd0524577ac415a1f2ef4c2c582095d7e09260c6f7dcf4a033831acd9ae31868e861b SHA512 851d2215b25ea3cc2f2ab335814d5743eb9562df246bcd5e88454c1ae5fa00a3883d68e4651f562ae40a5b57419ee1437d69d4cf00cca97be512ea48a664dfdc
+EBUILD trousers-0.3.14-r3.ebuild 1674 BLAKE2B 7fc07533a3b2f624d599b7ddce616f82cd2540cc5cf5e40c510165930a806ad85e60c1abf604295703dc21f9e3325288fce686857310800397a7e6fb4cf6c6e4 SHA512 c5d2710f08e5f7e4f8bdd5533f6b5c3eaeb752f4c0f3674abcd4ef4269de71a573d619291d85793b516442ec5095f1465ad397ba8b6c3fb58d6b5c68e05999aa
MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
index c9d9cece1f9d..bad268a44f8c 100644
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
LICENSE="CPL-1.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 x86"
IUSE="doc libressl selinux" # gtk
# gtk support presently does NOT compile.
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7b3464f625f6..c844c2e90fed 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index fb063ce8e1ac..aff840aff492 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,4 +1,4 @@
AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-EBUILD bluefish-2.2.10.ebuild 2734 BLAKE2B 58f70f1855bcd0aef08ac8ef4e51ae84e76c3af3ec4e3dd27063b849c8069fe3874edc5b42ba23c9986432ed07a64c05b9887e41fa4cb7eb8d253f0fa3c2dcd1 SHA512 f3687a84043c9fa6e9caa798cb1dcb6f4f3006a30c2cf9746e0e572dd765e2f3c6b171cc2bd759f365c987e2bdada2bb91f47c5b5278049e42bc825ff34ee22f
-MISC metadata.xml 462 BLAKE2B 71ac5de5f71ae32c79122cfefd6179047db2fa0cf758a5807b20985133364e798d440707abab3b0a5893227ad9d005dafb474b479e3d798343d9e92f7799d6bd SHA512 f861be3bcb1034ee6154f5b1327406ddc45c17bec3d328d8d1489a9747160bfd349aabf86c3a90ed94c1662494a25014a0ec9730a7f9789014a10754b777ad98
+EBUILD bluefish-2.2.10.ebuild 2556 BLAKE2B 910fea9618911f35362e3162fb4c16e1eea08c954898500bf30256b49c194513aef6185b506d91fa1996b795d9dbfc96a4b14411ab677c364c4bf3bf176a6598 SHA512 e84bd7bc879ec41696fceb944a525d8d6b7ffbe0a339f1c6da3c20cd96bbfa551a832800095d794a4c0837aeeb359371db6d7698de01130459be375dd855eb04
+MISC metadata.xml 386 BLAKE2B d8663af89654394ea695c309c2ebbf2d3beba02463b2e57a0f91d7699af0e6457fa0ef0aa238f76359d3531bf4831475978fdd8ab4eb943dccc295e294b2eb4d SHA512 589c6c5db0ad2b93d2b44284faa19845b48e790252ecf5983fb3ba2c2b749894a382eea6dffe053413c0b29b86063a8906b88ae6f165b1cc9fc79742ae2fc188
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
index dba37b3e1c68..324637670ba0 100644
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.10.ebuild
@@ -3,9 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils python-single-r1 xdg-utils
+inherit autotools gnome2-utils xdg-utils
MY_P=${P/_/-}
@@ -16,8 +14,7 @@ HOMEPAGE="http://bluefish.openoffice.nl/"
LICENSE="GPL-2"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+gtk3 gucharmap nls spell"
RDEPEND="
sys-libs/zlib
@@ -26,7 +23,6 @@ RDEPEND="
x11-libs/gtk+:3
gucharmap? ( gnome-extra/gucharmap:2.90 )
)
- python? ( ${PYTHON_DEPS} )
spell? ( >=app-text/enchant-1.4:0 )"
DEPEND="${RDEPEND}
dev-libs/libxml2:2
@@ -48,8 +44,6 @@ pkg_setup() {
ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
ewarn "Disabling charmap plugin."
fi
-
- use python && python-single-r1_pkg_setup
}
PATCHES=(
@@ -71,7 +65,7 @@ src_configure() {
$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
$(use_enable nls) \
$(use_enable spell spell-check) \
- $(use_enable python)
+ --disable-python
}
src_install() {
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 98078743b336..52c7b2542143 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -5,7 +5,6 @@
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b73f405f02b8..d24842d56bba 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -14,7 +14,7 @@ EBUILD emacs-23.4-r18.ebuild 10977 BLAKE2B 8e44c5f9f219081485ad0e923400e31cac34f
EBUILD emacs-24.5-r7.ebuild 10764 BLAKE2B bb9a3be1061b105c1c4eee45ce983e80b0a914dd3848951bac2ae4ace4b7b7a830741169d1e75ea85753247310eae94066a739da76dfeb0bcf6c43b7b1418a3e SHA512 5079762e2e811379dfa5ab124b0574d93aa2c2a01998426e92bec83ed2fcae5b11a7efd49ffb23f95ed3dad5ee5b8d2cd60261c716ee4bce4082499acadcf273
EBUILD emacs-25.3-r6.ebuild 11106 BLAKE2B 9e929e3ac144808109478312fb4977c472df10c677551ed9e69d43bf2ced0090df2dd0c6dee97a7491db64228e8972e0f00f2faba755425efaf64c9b15c6ccd2 SHA512 9249376d8b20d553ee6c09a7610315dc6a4c3c845d9e67505b54ddc4b21cf8b9502d30aa57255b109d0c28e8f18b5ca9e66f8b470761241a5de497eb4d0daee7
EBUILD emacs-26.3-r1.ebuild 11893 BLAKE2B c51762efee73ded3fba50816ef9ca156b319af2325f9c88998fb4f3ca90248140f375b5b21f282cd8d49dc2d4fe474c788fc307029d10419c6b63cb4f476b942 SHA512 06ba725741f39b884dce1b183384173407f78dd72ecf3acad6900c1a2c49ec3dd0818ba3ce69a8aabc60d98498839002224f0cc7ee0caa6447e2ce59290924a4
-EBUILD emacs-27.1.9999-r1.ebuild 13011 BLAKE2B 4f12ca56e82ed3bb5c796e47974be1211bd27f29a03bd542cb8767aba962ea318c9088fc681e8e7542ff1d057df48e3e0de8949c83469fe15583bb090633f706 SHA512 8288aade5cea11faffe8a69ee028b41aa860e69c6489245b7ede9c5d69de5400487b2abeaa1630e797115f5d2eee0db7095d193daca0be16534659320136b25f
-EBUILD emacs-27.1.ebuild 13050 BLAKE2B 12861516a6f3b3c5c4198ba0f14cfa2184e80de911739dc2907bf37978039f623134d9705789d26c0562cf3e1c3e91a025a6af83b1d611c3a7efc1282b3dabef SHA512 6f991515fb84c7dec9b1b26c2a40b272c04e7b9791fb862e1edd01677e0d6c9f46e0f08f3ef17ee291403c840e516dc8fbd9485f01d94593f685a469ec8c9373
-EBUILD emacs-28.0.9999.ebuild 12982 BLAKE2B 1c99295ee44daf109a1016c4f6a031ede1ae779d13bbee243152ecf05ff48813fd78bbd3fa7158d1d1d6a63dd5ce52f99110804922125263325cb56a6168a504 SHA512 b96495d8be509397970a47f4163e45850efb5098517ffd99c875693054a2ef42482a52a241912b4e379f028af687780e9c911a041e0a2eb1f285d3d448c4d88f
+EBUILD emacs-27.1.9999-r1.ebuild 13402 BLAKE2B da1272c9cf8c419c078958f6256312572c0027d4a712a72075351f8700e51939853448989539cbddb21eec5c83ceb53b15fa40d3673ffd218d6638e7aeb59ec5 SHA512 cc08d78ee2fa1cb62e241490fbc225066683d84ce862523dbe619bebd3add1c8fbf6c55992681329fd82556d3a5f5a447c2c63101af1612b1221f321b2e96a82
+EBUILD emacs-27.1.ebuild 13445 BLAKE2B b6f97454b4678468d5c02b1c9b90ce453816329e90b02b48b5974dbd5194be7e9375bb1beda83c32d20fac36cd3f205b400dadcbd035460f1b1905df3abc31cd SHA512 2cde3a39baa1fb6ce36bde553f45c70b7d280409fd60e9838f107bad25d485a9a6bfca882d37689cd383d5d2ada220ebc8e3fea7639fa966735796dbc88aa4cd
+EBUILD emacs-28.0.9999.ebuild 13373 BLAKE2B a874c9d10df48c2b4b2b151686d5099902be4d7c53e4d62ab2c4151ce4c355d3338faed03509dabfecf6f57ef0338ffc61b39874e345c1a338ce68ef41828b77 SHA512 48fa433032d421a1cd64bb1188e6265748f0946c71a732a80f8c52fa87cfe89b7bd438785fac849f8bfa160db52ad924c318b1eff962a5a58520d6fa7fc05cce
MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index c74b9b7bf954..78fc06dd7e03 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then
EGIT_BRANCH="emacs-27"
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
+ SLOT="${PV%%.*}-vcs"
else
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
@@ -18,12 +19,20 @@ else
FULL_VERSION="${PV%%_*}"
SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
S="${WORKDIR}/emacs-${FULL_VERSION}"
+ # PV can be in any of the following formats:
+ # 27.1 released version (slot 27)
+ # 27.1_rc1 upstream release candidate (27)
+ # 27.0.9999 live ebuild (slot 27-vcs)
+ # 27.0.90 upstream prerelease snapshot (27-vcs)
+ # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs)
if [[ ${PV} == *_pre* ]]; then
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/emacs"
elif [[ ${PV//[0-9]} != "." ]]; then
SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
fi
+ SLOT="${PV%%.*}"
+ [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
@@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RESTRICT="test"
diff --git a/app-editors/emacs/emacs-27.1.ebuild b/app-editors/emacs/emacs-27.1.ebuild
index ffbda3f182ba..9258d36369f9 100644
--- a/app-editors/emacs/emacs-27.1.ebuild
+++ b/app-editors/emacs/emacs-27.1.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then
EGIT_BRANCH="emacs-27"
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
+ SLOT="${PV%%.*}-vcs"
else
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
@@ -18,12 +19,20 @@ else
FULL_VERSION="${PV%%_*}"
SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
S="${WORKDIR}/emacs-${FULL_VERSION}"
+ # PV can be in any of the following formats:
+ # 27.1 released version (slot 27)
+ # 27.1_rc1 upstream release candidate (27)
+ # 27.0.9999 live ebuild (slot 27-vcs)
+ # 27.0.90 upstream prerelease snapshot (27-vcs)
+ # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs)
if [[ ${PV} == *_pre* ]]; then
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/emacs"
elif [[ ${PV//[0-9]} != "." ]]; then
SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
fi
+ SLOT="${PV%%.*}"
+ [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
@@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RESTRICT="test"
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 93b9e4833923..8137dcdd89b8 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then
EGIT_BRANCH="master"
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
+ SLOT="${PV%%.*}-vcs"
else
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
@@ -18,12 +19,20 @@ else
FULL_VERSION="${PV%%_*}"
SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
S="${WORKDIR}/emacs-${FULL_VERSION}"
+ # PV can be in any of the following formats:
+ # 27.1 released version (slot 27)
+ # 27.1_rc1 upstream release candidate (27)
+ # 27.0.9999 live ebuild (slot 27-vcs)
+ # 27.0.90 upstream prerelease snapshot (27-vcs)
+ # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs)
if [[ ${PV} == *_pre* ]]; then
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/emacs"
elif [[ ${PV//[0-9]} != "." ]]; then
SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
fi
+ SLOT="${PV%%.*}"
+ [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
@@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="28-vcs"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RESTRICT="test"
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index e4174833a4d2..4f05be6b503a 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,5 @@
DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0
+DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390
EBUILD gnome-latex-3.32.0.ebuild 1134 BLAKE2B d339878e8113de26c5f8bab86e471f5aea90bd294d6aeac745c70547089ed96a70f59354f28b29f5838508370d32f3458e21aa4aaf2b70c3a382f443db84d102 SHA512 d1b8e7bb41903bf47c7a87543c3dab4566a19fc51ce9edf1be7e90af2aa17bdfa3a43bdde308f33918941f022122897269718895ebb32bd4b182c934495f7400
+EBUILD gnome-latex-3.36.0.ebuild 1136 BLAKE2B 301468830700638517ca08a35987ed7a9a329695c7afdee46c3b5e0adb1a08f3435b6575d19dba9cfddf857684006bf4b7b057a33cf92ac246043d1abd8fecdf SHA512 44933d836eb35570141c26e1bb7a788d8a7af65e287c550facfa45d596ced1fb7e20a51b52471be8eb9a621c5619697fed053ea91c8fb4a8f8806637e9e0b6a9
MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
new file mode 100644
index 000000000000..6f67a58c26fc
--- /dev/null
+++ b/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+COMMON_DEPEND="
+ >=app-text/gspell-1.8:0=
+ >=dev-libs/glib-2.56:2
+ >=dev-libs/libgee-0.10:0.8=
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/gtk+-3.22:3
+ >=x11-libs/gtksourceview-4.0:4
+ >=gui-libs/tepl-4.4:4
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+ gnome-base/dconf
+"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ x11-themes/hicolor-icon-theme
+ latexmk? ( dev-tex/latexmk )
+ rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.50.1
+ dev-util/itstool
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --enable-dconf_migration \
+ APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0
+}
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index bd6e7567b233..68e971a87d8d 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,11 +1,7 @@
-DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
-DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
-DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
-EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
-EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
-EBUILD scite-4.2.1.ebuild 2940 BLAKE2B 17e953bc8efaf403ad7d00beff04386dd3f9b8204fb243eddb243d696b4d39b07a7d351271e6ca3aad641154e35a98b2256f34543770290c3e39ce1716397144 SHA512 e0cf697468ce209fc8552f702196e689045fb2af46f41957444338be50b4f9840dd03ebfc0285710a6f81f3ecafdc137bf74b745d10719ee5ae49a8b6f9d4440
-EBUILD scite-4.3.2.ebuild 2824 BLAKE2B bf682868c83293e9af524157bdac3fdf585a604ae9bc250e5af7befc905c5a84392f919a08893bfc26b5eacbb2fb4d925fd9ce8d430d8b80c85ac6049d7f37f4 SHA512 7e94a32030d4bf858288906901dadff3c533faa42e8f8e6c1823f560f8d1cacfff44f5b4abfd9346b8221691bc62e81b69b0a8379b1247218d7febb187568c35
-EBUILD scite-4.3.3.ebuild 2824 BLAKE2B bf682868c83293e9af524157bdac3fdf585a604ae9bc250e5af7befc905c5a84392f919a08893bfc26b5eacbb2fb4d925fd9ce8d430d8b80c85ac6049d7f37f4 SHA512 7e94a32030d4bf858288906901dadff3c533faa42e8f8e6c1823f560f8d1cacfff44f5b4abfd9346b8221691bc62e81b69b0a8379b1247218d7febb187568c35
+DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
+EBUILD scite-4.2.1.ebuild 2972 BLAKE2B 670cbed1ba766c7bbd3aae02dffd4eb6e78491b85f49f5353f3de5173717b4a9386e36d26e4a32a6db05938b9e7ea572b466753c24efdd50b172c57ec5dc02b8 SHA512 8f91f1ccd3ab9fc6ee30c6811a64b30c93f2b7a4b2feb1d2d192b2178ea2aba3b41d6d90a3380276302d117a414c7f13e0478ad919b5c2d74398cb82dab406ab
+EBUILD scite-4.3.3.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
+EBUILD scite-4.4.4.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.1.3.ebuild b/app-editors/scite/scite-4.1.3.ebuild
deleted file mode 100644
index 01cbf1b36376..000000000000
--- a/app-editors/scite/scite-4.1.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils toolchain-funcs xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
- dev-libs/glib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3=
- x11-libs/pango
- lua? ( >=dev-lang/lua-5:= )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
- if tc-is-clang ; then
- # need c++17 features
- [[ "${MERGE_TYPE}" != "binary" &&
- $(clang-major-version) -lt 5 ]] &&
- die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
- ($(clang-major-version))."
-
- elif tc-is-gcc; then
- # older gcc is not supported
- [[ "${MERGE_TYPE}" != "binary" &&
- $(gcc-major-version) -lt 7 ]] &&
- die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
- else
- die "Either gcc or clang should be configured for building scite"
- fi
-}
-
-src_prepare() {
- # remove hardcoded CC, Optimizations and clang unknown flags
- sed -i "${WORKDIR}/scintilla/gtk/makefile" \
- -e "s#^CC = gcc#CC = ${CC}#" \
- -e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
- -e "s#-Os##" \
- -e "s#-Wno-misleading-indentation##" \
- || die "error patching /scintilla/gtk/makefile"
-
- sed -i "${S}/makefile" \
- -e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
- -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
- -e "s#-Os##" \
- || die "error patching gtk/makefile"
-
- # repair and enhance the .desktop file
- sed -i "${S}/SciTE.desktop" \
- -e "s#text/plain#text/\*;application/xhtml+xml#" \
- -e "s#^Categories=\(.*\)#Categories=Development;#" \
- || die "error patching /scite/gtk/SciTe.desktop"
-
- # add the ebuild suffix as shell type for working with ebuilds
- sed -i "${WORKDIR}/scite/src/perl.properties" \
- -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
- || die "error patching /scite/src/perl.prperties"
-
- # it seems that pwd here is ${S}, but user patches are relative to ${workdir}
- # Bug #576162
-
- cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
- eapply_user
-}
-
-src_compile() {
- # prepare make options
- local emake_pars="GTK3=1"
-
- if tc-is-clang ; then
- emake_pars+=" CLANG=1"
- fi
-
- if ! use lua; then
- emake_pars+=" NO_LUA=1"
- fi
-
- emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
- emake "${emake_pars}"
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- # we have to keep this because otherwise it'll break upgrading
- mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
- dosym scite /usr/bin/SciTE
- doman ../doc/scite.1
- dodoc ../README
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.2.0.ebuild b/app-editors/scite/scite-4.2.0.ebuild
deleted file mode 100644
index fecd4f286206..000000000000
--- a/app-editors/scite/scite-4.2.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils toolchain-funcs xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="
- dev-libs/glib:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3=
- x11-libs/pango
- lua? ( >=dev-lang/lua-5:= )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-pkg_pretend() {
- if tc-is-clang ; then
- # need c++17 features
- [[ "${MERGE_TYPE}" != "binary" &&
- $(clang-major-version) -lt 5 ]] &&
- die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
- ($(clang-major-version))."
-
- elif tc-is-gcc; then
- # older gcc is not supported
- [[ "${MERGE_TYPE}" != "binary" &&
- $(gcc-major-version) -lt 7 ]] &&
- die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
- else
- die "Either gcc or clang should be configured for building scite"
- fi
-}
-
-src_prepare() {
- # remove hardcoded CC, Optimizations and clang unknown flags
- sed -i "${WORKDIR}/scintilla/gtk/makefile" \
- -e "s#^CC = gcc#CC = ${CC}#" \
- -e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
- -e "s#-Os##" \
- -e "s#-Wno-misleading-indentation##" \
- || die "error patching /scintilla/gtk/makefile"
-
- sed -i "${S}/makefile" \
- -e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
- -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
- -e "s#-Os##" \
- || die "error patching gtk/makefile"
-
- # repair and enhance the .desktop file
- sed -i "${S}/SciTE.desktop" \
- -e "s#text/plain#text/\*;application/xhtml+xml#" \
- -e "s#^Categories=\(.*\)#Categories=Development;#" \
- || die "error patching /scite/gtk/SciTe.desktop"
-
- # add the ebuild suffix as shell type for working with ebuilds
- sed -i "${WORKDIR}/scite/src/perl.properties" \
- -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
- || die "error patching /scite/src/perl.prperties"
-
- # it seems that pwd here is ${S}, but user patches are relative to ${workdir}
- # Bug #576162
-
- cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
- eapply_user
-}
-
-src_compile() {
- # prepare make options
- local emake_pars="GTK3=1"
-
- if tc-is-clang ; then
- emake_pars+=" CLANG=1"
- fi
-
- if ! use lua; then
- emake_pars+=" NO_LUA=1"
- fi
-
- emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
- emake "${emake_pars}"
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- # we have to keep this because otherwise it'll break upgrading
- mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
- dosym scite /usr/bin/SciTE
- doman ../doc/scite.1
- dodoc ../README
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index 6b9aa913c832..648761d8d38b 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -47,18 +47,20 @@ pkg_pretend() {
}
src_prepare() {
+ tc-export AR CC CXX RANLIB
+
# remove hardcoded CC, Optimizations and clang unknown flags
sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-e "s#^CC = gcc#CC = ${CC}#" \
-e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
-e "s#-Os##" \
-e "s#-Wno-misleading-indentation##" \
|| die "error patching /scintilla/gtk/makefile"
sed -i "${S}/makefile" \
-e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-e "s#-Os##" \
|| die "error patching gtk/makefile"
@@ -72,7 +74,7 @@ src_prepare() {
# add the ebuild suffix as shell type for working with ebuilds
sed -i "${WORKDIR}/scite/src/perl.properties" \
-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
- || die "error patching /scite/src/perl.prperties"
+ || die "error patching /scite/src/perl.properties"
# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
# Bug #576162
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
index 186e3d50d591..9878fd6a6b64 100644
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -50,18 +50,20 @@ pkg_pretend() {
}
src_prepare() {
+ tc-export AR CC CXX RANLIB
+
# remove hardcoded CC, Optimizations and clang unknown flags
sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-e "s#^CC = gcc#CC = ${CC}#" \
-e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
-e "s#-Os##" \
-e "s#-Wno-misleading-indentation##" \
|| die "error patching /scintilla/gtk/makefile"
sed -i "${S}/makefile" \
-e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-e "s#-Os##" \
|| die "error patching gtk/makefile"
@@ -75,7 +77,7 @@ src_prepare() {
# add the ebuild suffix as shell type for working with ebuilds
sed -i "${WORKDIR}/scite/src/perl.properties" \
-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
- || die "error patching /scite/src/perl.prperties"
+ || die "error patching /scite/src/perl.properties"
# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
# Bug #576162
diff --git a/app-editors/scite/scite-4.3.2.ebuild b/app-editors/scite/scite-4.4.4.ebuild
similarity index 94%
rename from app-editors/scite/scite-4.3.2.ebuild
rename to app-editors/scite/scite-4.4.4.ebuild
index 186e3d50d591..9878fd6a6b64 100644
--- a/app-editors/scite/scite-4.3.2.ebuild
+++ b/app-editors/scite/scite-4.4.4.ebuild
@@ -50,18 +50,20 @@ pkg_pretend() {
}
src_prepare() {
+ tc-export AR CC CXX RANLIB
+
# remove hardcoded CC, Optimizations and clang unknown flags
sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-e "s#^CC = gcc#CC = ${CC}#" \
-e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
-e "s#-Os##" \
-e "s#-Wno-misleading-indentation##" \
|| die "error patching /scintilla/gtk/makefile"
sed -i "${S}/makefile" \
-e "s#^CC = clang#CC = ${CC}#" \
- -e "s#^CXX = clang++#CC = ${CXX}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-e "s#-Os##" \
|| die "error patching gtk/makefile"
@@ -75,7 +77,7 @@ src_prepare() {
# add the ebuild suffix as shell type for working with ebuilds
sed -i "${WORKDIR}/scite/src/perl.properties" \
-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
- || die "error patching /scite/src/perl.prperties"
+ || die "error patching /scite/src/perl.properties"
# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
# Bug #576162
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 53b0f0d3c349..5318d8dfa860 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -14,7 +14,7 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
EBUILD xemacs-21.4.24-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0fed4b7fbba798b1746e177a727f5f82b69b897971995ed5fd40665224597f373ac244ad3f24e79966575464e65ca3 SHA512 0b66741feed43ec4d01f33fb557b5fb5e8d20a6b06d7be28271dd2492731c71ae54029929271dcdd26eea733db6420b843283dbf279c9433734c6688d2200f88
-EBUILD xemacs-21.4.24-r2.ebuild 7084 BLAKE2B 5ad628434539d73f609c18b2bee3866a88c17cdf2b1f4ca01ea168460c0223f48ea4b5c32ad50f2a808db71e1c2b108fbec8e85d70cee223c7b51007b7cc36b6 SHA512 85ad9e396b56404c093d340e6eecdbc5825b6004e14fd46a3c446a3d41dffd504f3d7b5c8fb335e04dfc77190e7003d3cc9cdffbfda3e92367d376e6632c2d84
+EBUILD xemacs-21.4.24-r2.ebuild 7081 BLAKE2B 4de65ac9ce0b9a0fbd71c955c75466eac766572ce7690c9db54a3d87a7f2878c318b17a353f3fce87d27a9a6553c1d59395c980782fdfb7e6a4a01a66533b328 SHA512 65b6a1d677ac7cf00137b3f1dfb96b226e928eab99f1865751e426c096d399a3afb8467640f573831a7fce79d81b41fbf688801df04ebce6289904f4d8a95fd7
EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186
EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
EBUILD xemacs-21.5.34-r5.ebuild 7347 BLAKE2B 37cbdbddeb0f4609c714970f17f5ec5b32e32acb6191be0e7625ece1bef06266cf4621024aeab1f1d1b0f0443ebb0aeeab8fc7c2680eb41dad4862ab2a35dbaf SHA512 b68abd3d69128022037db816b1fa03241238579bf9086263724687a717138a8599f9cd997c9fc93b3e5f039e3d5a944769c47cba8284af6ca4f403450b192e5b
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 7f388ef35791..1276e477e5f5 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 sparc x86"
IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2d42544dbc19..88d5025874cb 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 8968f7835104..664ceb621d43 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -2,7 +2,7 @@ AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb927
DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
DIST ddskk-16.3.tar.gz 1252772 BLAKE2B 133685fc0587e10c89145eeaf014c8e0d1ce0dad63b9207559030598f521aee00facbca9550753493e579d5acec10e8b36c1499087d1b6c05317754c434b9b69 SHA512 47624690851269ca818bed5cfdfdb21bbbd3152c0a7c64a114ab595a92d2e79600fe738953e6a73a26b0195102eb1e9e03ad4f6bfca1bc4d3e3732bf59aa8a27
DIST ddskk-17.1.tar.gz 952635 BLAKE2B fae34e37f972250d5e48f316fb90418b4b902684431c6ed18f44f3b5155556ceac1b04c8f8542c5651233e36085f864bac41381069dd70e841fdd9eedf7273ed SHA512 e0b924111a6289acd29ee5a5d94ea70730fe8f4e1dd5ed279520263efab0c69a6940e5b1b6182e45ed30c0b1ddca9e44ff75b7b3fdab5c8a3e1b2b9f82cc20fa
-EBUILD ddskk-16.2.ebuild 1524 BLAKE2B 5b668f6465218c172e244b0e8c21a0ddb328fc3ab6ed980197d6e31d55ef7ad4965b11d139e40b7945c748b5f37653a282ae728fb112b4b16d6741108d818a91 SHA512 d5a4a6fdb39b331406f2a5e2a9074e5631c2b90ee1f45f761e8da86cf9bf3c682283fb3941ac7a67841a66bad874b663988ccdf9ca0fdb4662e37b8c033df63d
-EBUILD ddskk-16.3.ebuild 1571 BLAKE2B 2650ded323718c4aa059a38e67150bde683acaf6e88b66971d13bbcf5a354f20e0e1f42e3995de582667f83685f3d9b7997066c6c33dce995f508deda3e46503 SHA512 45ff64a7a49581e0a6858002446d2a02a38ee0f16b1662eccaffd9c7dac72454d9c048a9a339813ce94d290fad7580e64e16a4c4ee46ed1c9321d2c5300c9a6a
-EBUILD ddskk-17.1.ebuild 1566 BLAKE2B 996f3eec9f0e211a00d7ea5c76d49bb5373048cdae273f5fbc53805b7c85c994f3715ed771616e9ff8d8d154134086181f1f06e6686e880365e6bb4633e9d484 SHA512 f73c954e70122310d573bf82df6eb94ece90e63e523a89bd55a093c08721fcd8554ace77f126cd7759f8321f628f8547b5b5b6e16b620a56b6fad0b216784d81
+EBUILD ddskk-16.2.ebuild 1538 BLAKE2B 93884559326df13e481bded668c5c049c917826ba806761cc25d2160b09f35945ecac23a85e53ea61354ac8e06f868b01ea9d3fc8146d0968388bf37f5729a82 SHA512 78f60376cfc74c8b64fdda191fe4a1d96fc210e01c3af1617902ddea5c194f31e8b0747ae8e03532d87802ca142b130ce2f15194e8c60f0ff8e9d58cac8811c8
+EBUILD ddskk-16.3.ebuild 1585 BLAKE2B 46d25c0ea8057d1f859d1462e722427f1c26c0e29788996601e34fda34c4ee6bcf29b6917703c5a5b02cb72800f7870dc2f52c720fb4921cfdd04645ccb56d67 SHA512 48c557008dd3702a37765e4169bcb1f986790e4e542e1eb5147667423f383fcd59f9c6fac40fe296d11a78a5ce672f2a518d8dc82d201dafa85dabfc5439095a
+EBUILD ddskk-17.1.ebuild 1580 BLAKE2B f3f7b7c24bdbd38cf23a50fd0cebd7f99a431dfcaa3a72abeb5f8186b6285a5433c7a6a6540520e25332e5f22cc8247e567b35ddaf5ee30c5f4b43b2852714f5 SHA512 76940787fa14389a6eda96c0439ccfc141947fd62f31889f7a19a6334dd10510507a886a8621d9409dc4d976d4ccf2c98e59c9c047255dadcd1ea572bcf62902
MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
index f8d30680a19e..3fbcc4fac46f 100644
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -35,9 +35,9 @@ src_prepare() {
rm -f skk-lookup.el
if use ruby; then
- mv bayesian/*.el .
+ cp bayesian/*.el . || die
fi
- mv tut-code/*.el .
+ cp tut-code/*.el . || die
}
src_compile() {
diff --git a/app-emacs/ddskk/ddskk-16.3.ebuild b/app-emacs/ddskk/ddskk-16.3.ebuild
index 2183d225909f..396611aca952 100644
--- a/app-emacs/ddskk/ddskk-16.3.ebuild
+++ b/app-emacs/ddskk/ddskk-16.3.ebuild
@@ -35,9 +35,9 @@ src_prepare() {
rm -f skk-lookup.el
if use ruby; then
- mv bayesian/*.el .
+ cp bayesian/*.el . || die
fi
- mv tut-code/*.el .
+ cp tut-code/*.el . || die
}
src_compile() {
diff --git a/app-emacs/ddskk/ddskk-17.1.ebuild b/app-emacs/ddskk/ddskk-17.1.ebuild
index 82e9b951cdfd..c36507bd934b 100644
--- a/app-emacs/ddskk/ddskk-17.1.ebuild
+++ b/app-emacs/ddskk/ddskk-17.1.ebuild
@@ -35,9 +35,9 @@ src_prepare() {
rm -f skk-lookup.el
if use ruby; then
- mv bayesian/*.el .
+ cp bayesian/*.el . || die
fi
- mv tut-code/*.el .
+ cp tut-code/*.el . || die
}
src_compile() {
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index ebbf03d77c01..ca8513d69c92 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 38440d6a4a32..8fd4c881d835 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,50 +1,3 @@
-DIST install-crossover-12.5.0.bin 55089470 BLAKE2B 13c30717c5dcfb802f97df5c5a83a4ba00b769bcc361ba24f9834910392b5ba3ad9eb0c03bea9ac827f1526078e1142aef5d36b76c6576a35edaf1f6f96e092f SHA512 85dbf37b76dd63ba761f6f8efc8c294f38bdb2a443fbed7a7f7f37652b377046f7bd27588600fc456e7fa8040d06a1673475bfc6a7b7a110a16a678efcc5c764
-DIST install-crossover-12.5.1.bin 56658131 BLAKE2B 540678f4905d012c45aee4033d5b056b3415535a05f3d9c0f7aba875ab2fb88fd311fec9b64085b57b07bf06bfd9b0f90e8c3bb0cfafde3f8ccbe114ae51ac82 SHA512 0f71a06f3a028698c4b076b205d807e193282c10c7cfb8e62e4697e9b3bd7549947c02c15f82d959d6963630677e6c72a5f8468d35d66ccb3ff6814ed2173c72
-DIST install-crossover-13.0.0.bin 58807581 BLAKE2B d93a92db09777c3108342428bcd0d4de59921a8e7569b8e501f7b706c462a39b5320d98e69fb3d97c215d290e0c1950f42586fefa37b50c6df29014607f42a6b SHA512 fcf5dde6da1f2fb1eb402bd588baab5e951f8a0ad7959b06a4b7a42f250beb74f9c8d95f26f6fcd4ced9ce0bc4b484ad9a045a485f82028bf8ab7f2abf7ace33
-DIST install-crossover-13.0.1.bin 58567182 BLAKE2B 49e0f7201b2501036883ff9b9ef81f997aaff781b8c01f4992243dc728c2298a3c9cfb2932dd7e4da8e6750e837394184b14e2828f0b763e86fcb5abe6955878 SHA512 e43e3e92d4ac36546fafdf68d61b4fd5af412f83e301b232230589247ed052cb958f0d4eb7667fd616797b8f8c3b4f7acbfa7a9f1206204c5a98e456113a380b
-DIST install-crossover-13.1.0.bin 58678679 BLAKE2B 910f7e7f630aee966d304d46755eb83e642a859b3feab7d08403f277fbd2d5458ec3e1150da8c5489e83b7a20992ebd7d51611a675baaf0944c3a637a8c2692f SHA512 1f2b5625c826bbf16231e1b3ea8694bcda24cf3a7a90347a29b9d97f654ce35df26aff2b8166e8c517e85785d4ea2b5fbdf1bcb82263fa0e8715846fd1668d15
-DIST install-crossover-13.1.2.bin 58730543 BLAKE2B dcd0eec9c0e2a8a4cd96dd8351c43402feac367eca731c5196d11f75ffc88606c199fb856d4df21aebd6d686831070df2cccaf5f3da4699cc8b8da9799218bd0 SHA512 5944db06162a67f68fa4a1ab14f7fbc41f114c63adebecf4c0c50967245f81bb42e58dbe66d33fbfaaeae232aacb2b534fc4367d592eaa6f1cc75e32ec0d23b3
-DIST install-crossover-13.1.3.bin 58768110 BLAKE2B 11406c1f1b53c5f97a566693c6bc588e72be71d9e20665723b44f3cc258416b0a27a4e51a9ea648da90e309656d5764f7d7bcca790f31eb52be8d9dbce8e08d3 SHA512 091a70e777f8311f818d227f26850f256d6acc7f50c93855f72857f2e21298524262d490fcc8a97342faea1a261ab042b0064d112aacb6c30e9ab5301f89eabe
-DIST install-crossover-13.2.0.bin 64625581 BLAKE2B a8f732a2091576d83ca5cf47b239c8bc3737336bbb4c8fb1f48631db63ba00a4dcb23217b8464d412298d546b4b1e03e676fc1805df042bb9297a923c9d60f34 SHA512 1f582eeca8db02c15d98d519b2d24f65b8dcddd90ff270915a4e6dbd24e135b074c5a20dd824c3d8c8f35cef79610c02423b5558db205a6e80630f69191e051b
-DIST install-crossover-14.0.3.bin 68080015 BLAKE2B 8fe46c3e61de02b03598320ba004ed11bde974d06d3cb97e61d63745ade919332acf321ae36e610f5fbfed9e963670a5fbf1912a5383eb08023b04f27a8ad587 SHA512 86855e112f5b5d7621e0d4c644abe570de0270e678dc9666482025c948733de02c66fcf67999079a8ba99537695b36d4fb61aee90a59c319edad5fb477a0f902
-DIST install-crossover-14.1.4.bin 68463678 BLAKE2B e5b718fb90a2812dded7aec0768175d1c78ba82ef84c6e5efc08fd79021c5899901bf2043a8d1643440cd52c3b071ef4059a5a106ec15ad98b158c7746381723 SHA512 2078d9e8fc10c526085aef0bfa0cedbcc1a96ec59ade934ea10e7f10062f1a58f5647e9aed59653d4a1253699a08e9ef6f01548010e960af24d0d3546549fb91
-DIST install-crossover-15.0.0.bin 80995834 BLAKE2B 63809a9f39e48cd51b9b0b97cdc1cebb8e99d992bdc8a9d3a0d5f48bab3c828d60b8aaf8e8829933a0d5fd1370d318395c01c708c3353597b74ce3ed6442a592 SHA512 597262b760c7cfc3c42cdb0b846802c6c47d4fcd5af06b53d0c63c80e4890e14af8ff0eaaac74a08f4f5d55e166a480d199b185efe685f7c42abca3d62fc2a0d
-DIST install-crossover-15.0.1.bin 81027541 BLAKE2B 2cb838aad4363d910897a76cf1d03f031d2a14f494fef3f4db082c303c46f5964fac20096bd1d596285a4bef152af1ba7864b3205a3ee35efc6ff6d5ac7565c7 SHA512 a35188ccebeee8d456e73fdcbb8e8d4f0aff41bb89d92767d2e2e78e7cb25c8e48a150393c1c9abeb9760fbc873314e301c0a364ba27acfe08e0980bb5eedb03
-DIST install-crossover-15.1.0.bin 80623685 BLAKE2B 77125ce567c997ee718f546c3b68077a3d59e6a0f5711968bb5cb72cc0b2c7dd22182d7e8c8864c5eef0b6e833159a4534fc81db7234ea8bf757b5a465df1abc SHA512 177e70baff3d99e808834c8e6f626f09d9c262babd6d5a3b51ea79a5a68a157cdfd4fd60ad6939d110f2300670e4973d9fd43a3a132ff9a2367dedb782e5c05c
-DIST install-crossover-15.2.0.bin 80734561 BLAKE2B e8b4ee0ab2c5a8463c2757a756a008886071a35114e5ee1b5590907ad42be3c6777bc024cb2c3c41f215e6e29b69d08d46c47dbea0629f542c098b957d124106 SHA512 9633e29b26f8fa99d1c34347b8e1f2e89b84370994a1ab3bba7061b75224f3a907d1c364207312dde1995e5a59180f8699558a96a4c99b157257ab9c21013b2e
-DIST install-crossover-15.3.0.bin 80774063 BLAKE2B 2f0aa184f77120c241656d8d9990c5cfe177ab847061e023f0f08b52d804a1f832a18b1f2e82fddf9dde8313e717d3c92104ab46d95dc50c5935c57f878b6716 SHA512 8e5a6fa40a0af0976d794436ac69edf61f73d4f1f128503a6372c4ae804eb977438a98062bc064f25dbb93015fa0776b9e5d572a98e887980214d3ccb93fd4c7
-DIST install-crossover-15.3.1.bin 80774288 BLAKE2B 3d3fd83ee426a66ead3c88f4ca584408117e9a0f9a1af6d2cfe0623db398caaeb2dc1b285f8edbf9a700c3281bd5bdd81542df9ef0457be036727b756121d99d SHA512 3f4da41a7b255263012e70ed833a134425e464847acc69ba79f73989c0bfc5f98869cf5858c1e2d16422a8220296695157b942f275b861b3ee0dcc2d90f7da7d
-DIST install-crossover-16.0.0.bin 197872657 BLAKE2B d500ed4f6a426154b376ead6c2b50eb21a403303561078dc51982a5147af23261dda9892717c16c6e2f3b2a30ffc84e73070cd330bea70ba89c79180c4933297 SHA512 184533679ddf3918ab5fc00b01452d868c694fbc7ccb5484c88822cc52da067fd1a0be0387e4050e40d9b367052158faec27dc06f6a371a044b5a1782950e780
-DIST install-crossover-16.2.5.bin 198336730 BLAKE2B a11252dab552846fe0a1527cd59cd62907142385062b744591cef6707213d03945879fc5da6bcfaaa315967c51ae15159ad14d8519407542b82f0eb53c5fd02e SHA512 17cb711e7257f094e9ccf939edc1ca6be362f18b86078fe307b7e1337850e182d02fde087789f13ea2bf96ca89736f941c1a7bd93ff1b37a78fe8f846a1d5e22
-DIST install-crossover-17.5.0.bin 198287744 BLAKE2B c594192927874e5a80626ad110f0089f2bf8b7385a16ff7755923d63ebb0559b1aa505ec4e8b6f85253ac13736b7f9af178c64ed042a515d31cd4565295db163 SHA512 8592d2c91c437d62d1fd5fecf6230eeabfe56c38f49ea795bf4d3b51d8ae4399f1b01801d60dcccb94caeb4dd662675c2739f730f39ef178db32dd4f72182197
-DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf26144375dd559bcd58af3ef05364cfb7a00b8cd68d879e6ef31e92b165876e4c3f85ebcb823dd6585c3edcb8e4cafb76d8e59 SHA512 d1e41c5290c56bbb23a6317e91800d7c23d2b4389ebf08ef4416718103aa06b05b33c655d3ef413fe76773dd3599d8fe3d4ea64274fcc18518923990f980bf2a
-DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
-DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
-DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
DIST install-crossover-19.0.1.bin 227349999 BLAKE2B 3f43c9ad1bc6e2ca77404eb69894b34fab04002c41b33551a01272201e15b5523049d7e7abe87c741f5913f18a45714ff2b83fda6c375dff68c7648d5e7c26bb SHA512 aedf2d3a071facf15a4aec9280a10c99229825fd3e5412e3949a0e1d85c235625a04d4453e7b8e182659f7500c864bab168c225f51cb0a839b08a96ef36596dd
-EBUILD crossover-bin-12.5.0-r2.ebuild 3874 BLAKE2B e8617f6fc4da436e9dfc5c4429210c0fc49879d1b50ce22325ad86259c859f3a4ef8bfe71fae6a73d3cc37a6981809d1fd0a98790f74aa1dc039c6f44b681485 SHA512 0fd826845aef6878a00be0733b778b18aaa4813125d6d652e4e508e8399bc2554c7d3ba2420e47b72aec3df8f0821c64260aed65d26923fc568441c2bfbe10ad
-EBUILD crossover-bin-12.5.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-13.0.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-13.0.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-13.1.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-13.1.2-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-13.1.3-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-13.2.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
-EBUILD crossover-bin-14.0.3-r1.ebuild 4250 BLAKE2B 5ba671b023732d87d880744ec61735620553079c5e7c227ead81fd020b9826db8a8c65f4b702e2626845f9e2609e196a091fad0c6592539b7447feaa7f68a5c5 SHA512 3dd72bf59db3ba1ab8437c323c0a37c91250e7b728350961cce1e0c866120ecd7451b87e8d05c303946b2ee36e86a83ee99f4e4924d95ca671fe3e225a9178e1
-EBUILD crossover-bin-14.1.4-r1.ebuild 4251 BLAKE2B bc35e256c22a584b83bf7777c1638db8eb3dc80879a9ba02aee17241052f406ff89c81fe1c3e2b52a33ccc86d1c3ae205c3ae2a43fb88e11a1fd0afd143bd423 SHA512 26eaf71bacc1e102aa7fd6cac605dd1603c4479068d620394d1a9916f6a69b6b887d5e699a3e64316ed11565c46ceeab83af56079c6d560c285a3f99b046eeef
-EBUILD crossover-bin-15.0.0.ebuild 4581 BLAKE2B abd895ab70c16ce31aa0772937556439b368a159fd9d7c919a7286b7cc2215619a3efc433147b3472156974c014299386083ff8c6169f58b2c3bc97b78e64bad SHA512 2a3c45a4c9110b591156b16bcaaecff36fab44868b5155174ee93c0d17e9e816d08030bf3581c20c4d7bd9e23f5080e825d88fdb166737192140844436634ae6
-EBUILD crossover-bin-15.0.1.ebuild 4753 BLAKE2B 33444ddd659cb923903c33f2189598a47f8d16a709bfcc0a74d9a0694f2057deff60a62480d6fb6dae5614a724edbffeb17f99c0e970082576d9ab71c422279f SHA512 2c3bd78577d9783451de7a171557b3ca3bd9c080f8b748f700259ef9c27860ba836c0ef5f97c2d1245f21f8a61757b6292580a9c485d5e6b1bced0303b7a822f
-EBUILD crossover-bin-15.1.0.ebuild 4753 BLAKE2B 33444ddd659cb923903c33f2189598a47f8d16a709bfcc0a74d9a0694f2057deff60a62480d6fb6dae5614a724edbffeb17f99c0e970082576d9ab71c422279f SHA512 2c3bd78577d9783451de7a171557b3ca3bd9c080f8b748f700259ef9c27860ba836c0ef5f97c2d1245f21f8a61757b6292580a9c485d5e6b1bced0303b7a822f
-EBUILD crossover-bin-15.2.0.ebuild 4928 BLAKE2B 51fe78f65173665f9e18d8bf25b7022fc3934191101b2fe72bf9f9ec5d4c4c89582bd9dd3a1b0726b0ce36eaf655ba28d406a8f4b5fdd3bb73c82503d9443140 SHA512 45abaea9496c4c76e61b19d3469546e68b0ee430278b294bf682227649dd1ba3b1d56a7bddbc6f28021fee68cad28255a2d77f10801165c0e54a57f9a4dfeb25
-EBUILD crossover-bin-15.3.0.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
-EBUILD crossover-bin-15.3.1.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
-EBUILD crossover-bin-16.0.0.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
-EBUILD crossover-bin-16.2.5.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
-EBUILD crossover-bin-17.5.0-r1.ebuild 4801 BLAKE2B 8269c5fea9dfaba93ab03a3da7470385afef34ac1a132da76b385365e3bdaa6f9bec56a97cc2ab4dcac9f0ada2061a397375064e45af7013e21ef7f7cee40150 SHA512 af3d6aec254edd49cd057a8e741e38856dc9af86681ef44d8100d4addf72337aab97169fe1d62167c41566830162706c1bce34fcdbb8301f65a7a026e1032e79
-EBUILD crossover-bin-17.5.0.ebuild 4767 BLAKE2B 371b22e6af826da7eb67f12949aa4fbce816033224eb0670c36bd0957ab9a265939ea37b1d047a6a84fb1290983068f54a8eb3cd4d4225b2e5aed180d6e36b19 SHA512 1a660015123602db39efc766189bcd502fad6d0ffe497032db27241c04a11d48a87c0d53939a87440f7c137827ad9ba779aabb68d0728c05aa61d38e4b9b60cd
-EBUILD crossover-bin-17.5.1.ebuild 5315 BLAKE2B 55b93a199734ddc6ef85069d1889ac92202e39a8293bc4f018dd3ffe8c2ee94b5deb207fe81206f619c1fdc34be5a7be5d43b1759d7b351ae248bf3c61bd6851 SHA512 47e7090c299d605bf52c8ef2614e6ac7e6c50c667455e84ba74a904d160354d5d4017350bb6be717a3850d65319841e258e5b9a3c86927001f3996aaf7223ca9
-EBUILD crossover-bin-18.0.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
-EBUILD crossover-bin-18.1.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
-EBUILD crossover-bin-18.5.0-r1.ebuild 5800 BLAKE2B ff3272e3f8c8054b57c3c88a6ec94580d3e5d539d2035fbca88858f16db866b9eaaaf620cab2c7350e9be5c2996aff18035b018be40c5e4e29ad5c172cc42108 SHA512 daf4a588a52fe2ff28b3aa510aacc533f1b7be47ea22f489ba95be16b82e829ccb4356c38a3f0cc9f74a0bb79653929f34c15dd4b825b1f7d7acdb35b3c2d3cb
EBUILD crossover-bin-19.0.1-r1.ebuild 7728 BLAKE2B aaf5ffbc0e41f9e4bdb6fc329223cd8c0f78abc012a1ba163fb09096a875c7634859fe563dcccd33f68315dc8c76d048854a0aa913a4ee42a114fb5dc4177075 SHA512 11fa2f78352abac1ddcc91952e73c91fa427fe2ccf72dd601a66afe1dd4e42e8766df3cbc0b64e36a0911f2be152663d3785df88e101fe18b15e13e7af1234ab
MISC metadata.xml 570 BLAKE2B 3939d88434eae718567a9a63f3eeb936c601e75543c0e35231e3b7035e50c2a259338c115ac7fe905e9709903c2fe3332d0bf0cf8fd69da5b08a685ec8950cce SHA512 485431a76b4622cdfb7c7c61c02b2d71783ba9866e03d3c8a92c092c81dbd9b1f32bb27b2ff6a152bdafa51b2e32da0fa496a3d79f2a8d9a64ee5237fac9aa54
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
deleted file mode 100644
index 78d5be269b3e..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support"
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
deleted file mode 100644
index f9d540708656..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
- sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
- || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install requisite directories for menus
- dodir "/usr/share/applications"
- dodir "/etc/xdg/menus/applications-merged"
-
- # Install menus
- XDG_CONFIG_DIRS="${ED}etc/xdg" \
- XDG_DATA_DIRS="${ED}usr/share" \
- "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
- || die "Could not install menus"
-
- # Fix menus
- sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
- || die "Could not fix menus"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
deleted file mode 100644
index c96c8632eb57..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i -e "s:\$link=\"\$xdgdir:\$link=\"${ED}\/\$xdgdir:" "${S}/lib/perl/CXMenu.pm"
- sed -i \
- -e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
- sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
- sed -i -e "s:${ED}/::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenu.pm" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
deleted file mode 100644
index 7b3f30280c50..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist fetch test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i -e "s:\$link=\"\$xdgdir:\$link=\"${ED}\/\$xdgdir:" "${S}/lib/perl/CXMenu.pm"
- sed -i \
- -e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
- sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
- sed -i -e "s:${ED}/::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenu.pm" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
deleted file mode 100644
index f5a9ee2ded65..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:\"\$xdgdir/icons/hicolor/\$size/apps\":\"${ED}/\$xdgdir/icons/hicolor/\$size/apps\":" \
- "${S}/lib/perl/CXMenu.pm"
- sed -i \
- -e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- cp -r ./* "${ED}opt/cxoffice" \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
- sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
- sed -i -e "s:${ED}/::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenu.pm" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
deleted file mode 100644
index 71dba5bd4ed3..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
deleted file mode 100644
index 71dba5bd4ed3..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
deleted file mode 100644
index 35a162c94cac..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
deleted file mode 100644
index b70ac3a77fd0..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
deleted file mode 100644
index b70ac3a77fd0..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
deleted file mode 100644
index b70ac3a77fd0..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
deleted file mode 100644
index b70ac3a77fd0..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- "${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
deleted file mode 100644
index d3cb1e980327..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
deleted file mode 100644
index 5096405e6199..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
deleted file mode 100644
index 96a7c42364fe..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="opt/cxoffice/lib/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- "
-S="${WORKDIR}"
-
-DEPEND="dev-lang/perl
- app-arch/unzip
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- >=media-libs/freetype-2.0.0[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Konqueror in its infinite wisdom decides to try opening things for
- # writing, which are sandbox violations. This breaks the install process if
- # it is installed, so we ninja edit it to false so it so doesn't run.
- sed -i -e 's/cxwhich konqueror/false &/' "${ED}opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- # Revert ninja edit
- sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
deleted file mode 100644
index 170b56d9e884..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
- opt/cxoffice/lib/.*
- opt/cxoffice/lib64/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/wineserver32
- opt/cxoffice/bin/wineserver64
- opt/cxoffice/bin/wine64-preloader
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxdiag64
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- opt/cxoffice/bin/wineloader64
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- app-arch/unzip
-"
-
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- media-libs/freetype:2[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]
-"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- default
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}/opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}/opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Konqueror in its infinite wisdom decides to try opening things for
- # writing, which are sandbox violations. This breaks the install process if
- # it is installed, so we ninja edit it to false so it so doesn't run.
- sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- # Revert ninja edit
- sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
deleted file mode 100644
index 170b56d9e884..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
- opt/cxoffice/lib/.*
- opt/cxoffice/lib64/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/wineserver32
- opt/cxoffice/bin/wineserver64
- opt/cxoffice/bin/wine64-preloader
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxdiag64
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- opt/cxoffice/bin/wineloader64
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- app-arch/unzip
-"
-
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- dev-util/desktop-file-utils
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- media-libs/alsa-lib[abi_x86_32(-)]
- media-libs/freetype:2[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]
-"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- default
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}/opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}/opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
-
- # Konqueror in its infinite wisdom decides to try opening things for
- # writing, which are sandbox violations. This breaks the install process if
- # it is installed, so we ninja edit it to false so it so doesn't run.
- sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- # Revert ninja edit
- sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
deleted file mode 100644
index ccf4360c42cf..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms ldap +mp3 +nls +openal +opencl +opengl +pcap +png scanner +ssl +v4l +vulkan"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
- opt/cxoffice/lib/.*
- opt/cxoffice/lib64/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/wineserver32
- opt/cxoffice/bin/wineserver64
- opt/cxoffice/bin/wine64-preloader
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxdiag64
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- opt/cxoffice/bin/wineloader64
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
- dev-lang/perl
- app-arch/unzip
-"
-
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- !prefix? ( sys-libs/glibc )
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- ')
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- pcap? ( net-libs/libpcap[abi_x86_32(-)] )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
- dev-util/desktop-file-utils
- media-libs/alsa-lib[abi_x86_32(-)]
- media-libs/freetype:2[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-)]
- media-libs/tiff:0[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]
-"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- default
- python_fix_shebang .
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files
- rm -r license.txt guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}/opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}/opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
-
- # Konqueror in its infinite wisdom decides to try opening things for
- # writing, which are sandbox violations. This breaks the install process if
- # it is installed, so we ninja edit it to false so it so doesn't run.
- sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- # Revert ninja edit
- sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 8b518ba238ed..bffcf1992e41 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,6 @@
DIST diskimage-builder-3.1.0.tar.gz 434813 BLAKE2B 7a9fa54353f9b7edc2f1f1dab965b8241cb8b046ef56f12ed3562c04a8c6e236a7be41fbe75c385b48c4f2b8b30e961d8b86499e79999c391dde9c2f294f1193 SHA512 0b8a0b6cee9c7fcee08d8e5d706add2e54dfe1b7726b169f357022a48a37e351b159a7426771a001b703ca4360905f318ff91d0e72cb2d92e3486607186d03c4
-DIST diskimage-builder-3.2.0.tar.gz 448407 BLAKE2B 505aec0375b1adab03362025e5f391b771e128bf3fd21fe312bdf0a60be7e5ef5768f61778425f24471d6943788ade98929949623142923548e37a8fef65dd53 SHA512 675f1d733c82a15862db2db1c7362fe50058b89b834bffa46ef936af450e41796c06f32f2677ac787100fc2b285f6f7befdd7344a4463841b0ca581499018849
+DIST diskimage-builder-3.2.1.tar.gz 446827 BLAKE2B bec2f225681f333b9dfded90dd7717119805ea46cc6c48e48d1f63242fa271ca3653fd67be0c5bd3876cd6db9506e2579ad14b4f7e573ea56311c6b85277fdb5 SHA512 acdac97e510a68bd30b81ab7ebce729c4c4bbfdd86e56dfa41b50558ccac942caae76a66dc4442854fbab6fb7440a9ebf74b5872e9d35793b2e4243cb28cd5a7
EBUILD diskimage-builder-3.1.0.ebuild 1089 BLAKE2B 682f155597d8ae0544dd10123e75efc93e9c50e5cf11ba4678e9076473f4655c6bc7d3597aba55664ffc71f2190c97fc729dc8c4e4590f8de70f420a738bae5c SHA512 51e82abb2e0bb401d7a21f005be00f9c9ebb4d389a673b9aaf6bc1f87254253fb3bf865d91f2e9f15434b03cfb8a322bdd360d4f292d7b0c7832a1910603cd07
-EBUILD diskimage-builder-3.2.0.ebuild 1133 BLAKE2B 9afdb7d3d275712e8269bb56603671fbe5dab3a396efa1af3c1f72140ad7342753db7c0f78cb4d5a678c04b6ea0f457d25fe363d5fca611a56a31185a2c0db06 SHA512 75d15457af15c15acf162ea1b409f25944926c530832eac9ad5542d04696d0c11b26bc31eeb5167d0284b213c39b21efb37b5fdedb01bec0b8c1f9a73b4e4caf
+EBUILD diskimage-builder-3.2.1.ebuild 1133 BLAKE2B 9afdb7d3d275712e8269bb56603671fbe5dab3a396efa1af3c1f72140ad7342753db7c0f78cb4d5a678c04b6ea0f457d25fe363d5fca611a56a31185a2c0db06 SHA512 75d15457af15c15acf162ea1b409f25944926c530832eac9ad5542d04696d0c11b26bc31eeb5167d0284b213c39b21efb37b5fdedb01bec0b8c1f9a73b4e4caf
EBUILD diskimage-builder-9999.ebuild 1133 BLAKE2B 9afdb7d3d275712e8269bb56603671fbe5dab3a396efa1af3c1f72140ad7342753db7c0f78cb4d5a678c04b6ea0f457d25fe363d5fca611a56a31185a2c0db06 SHA512 75d15457af15c15acf162ea1b409f25944926c530832eac9ad5542d04696d0c11b26bc31eeb5167d0284b213c39b21efb37b5fdedb01bec0b8c1f9a73b4e4caf
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.2.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
similarity index 100%
rename from app-emulation/diskimage-builder/diskimage-builder-3.2.0.ebuild
rename to app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 350773742d79..a05d47c15424 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -3,17 +3,16 @@ AUX docker-compose-1.26.0-setup-py.patch 2410 BLAKE2B c04145747e7a770646687008b6
AUX docker-compose-1.26.1-setup-py.patch 2460 BLAKE2B 502198ab7807ab6dc37e1dc671c72b980d5e1cffc7c6c3efe2281687ba47f0286027b19b781d340e7ba0f9b50bc27393542713301e17d6f4f10ed82b067a45b2 SHA512 2588fb55595e62a1d601f4e723ba2178fb4a9ad8d7ff6f0b1d1b62b0e3d273635665c3b6c257adf6c3ff64bdff7f4706e1bfe81e538723900740e17a3eb19fae
AUX docker-compose-1.26.2-setup-py.patch 2411 BLAKE2B 76e6c2037148a08c46ac1758d58cdaf10785d4b06cd70afc850d30792b49ca7c1d38a305b2d5023eafe64f7271c6f4639aaf008a951b949ade555fc0b48974d1 SHA512 225dbbca638fead6fd0b87da6a185388e3045bee0643337c93686e19b2d3a92996033c5af4c989d60e98b79b68c45ef6aa683b5183ebf9de7468cd210d831c89
AUX docker-compose-1.27.0_rc1-setup-py.patch 1841 BLAKE2B 148e3ba6b8d283113e719d82f96590d522c8476cb3d9ae1031009e2ddf6575831a30236898fce516a858d5e534f8034c2247cecfb5d691e74a1320ad4bad7cb0 SHA512 5d481418570702348adbb1e3de6eca073b42d7d3ba9c850e2cb2f4607de4243bb57dcb702aabd24938e62a2e04612099e65946db44a0b0675b990df23ad9e263
-DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e
DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25 SHA512 b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a SHA512 e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3
DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
DIST docker-compose-1.27.0_rc1.tar.gz 308050 BLAKE2B 347dc4b38feae1d045770ff981a289d9919d47cf7ecf3b46e0c7b996bb3ef6d50a7e36751ca5f996dbe8afbeb0d6fc0967945c3abda05b71024a15efae35fb6c SHA512 ae952deeee7c20f4f506c2f0126e504c2cff432056ac45547c40273d6113fe2c51d87c363f0943247989db3dcb20059c7a7839b2c5328d71a41a15cf12db6062
-EBUILD docker-compose-1.25.4-r1.ebuild 1934 BLAKE2B a4e65f590d80a4e73fbe6f9a2b65d544169ba4d3a6224edf3d82bd4f39b4d59239a6aa574f853357f57e09c1cf3b168c41a7ca63404fc363f333a2825dff0688 SHA512 7a0a69eb6f572a3a09f4812473f4ba7719bc7930d29426cde5eded09d70ee36fe7f29f3a1435a5f87aa4773044b0b3b20e49007d9bd88cb3058b7f3a58abc068
-EBUILD docker-compose-1.25.4-r2.ebuild 1936 BLAKE2B 1e10965c9122e6e9a01e479b1cf58c929011c065e3994376c05f6f5a295d82579e83d717a1dd11b6b6ffef6846e137a299a77c89c2c8def0780c8c3dcf46786f SHA512 26059b485b70fe81b65588be4ae93d35bcc03ad19f48fb7ea9f362207f1901fa5e9c212243f0240ed476f69c1eb96230409ea56543ab08636d32077182478694
+DIST docker-compose-1.27.0_rc2.tar.gz 308129 BLAKE2B f057d9754040375f71810bbf09cd6a88c9ff05665b4629e0cf45c457b10ff9c4bde1b7a608addb160bcc183d8559a8cb2397f7a2215c1b14ae39577bdb67826b SHA512 556a3b10144ff37996c6e3cd1562ba3fdde2618757d305ead4f861c6614f27bad0cf539885535ca61abaf9e9739bbb1c2b41c489ba87ad75f947213d4cdace19
EBUILD docker-compose-1.25.5.ebuild 1935 BLAKE2B 1290c12b6cad7e41f6450c68a5284f17acfa505fa3d0dbc1a7489a0d07d960fd1624c273f3fe57ded1c8098b1f69020d8eb3f1c2babff8f63f2b9ba008600579 SHA512 9ceb962c7acb6beaf2a2c5005380be0b2685c6a802cd00795f734034b5a8a43e9272ed665c7d11184ad5247f4d9d76a20f49fe724e901f4d735524c0f1938930
EBUILD docker-compose-1.26.0.ebuild 2075 BLAKE2B d0e7b3869529fc9ee471ecae8a3e3b74a49d119992771dd773b587047677a6e98f206e8f450798a5bba1fd84bd297c499cd9f98cbaf105e8291a1a1899378689 SHA512 ec30e3d9c6f43001dee3b75227b7d4d5d99877fe420d486a3c060f49329b0d10f51be1f49722984f84b81f0b66967b436ea1654e7a9bd7f8120ec7fac47dd633
EBUILD docker-compose-1.26.1.ebuild 2075 BLAKE2B 6fbfe7a1d33817e5de2f20b25d6268a6121733c744120591b971e9c392a9fe183ded1c1603e01da0e9c9eccec0fd8a3543bba6b3b7d9581b7042db4d36b84db8 SHA512 cc9827e7089b7a6fa26905d3b2f52f7b491ab0360093300418752c24820c3b733bcdb6c4e99392b87daefbf61f14d5117d55dbba6ccde641955db4627270887c
EBUILD docker-compose-1.26.2.ebuild 2075 BLAKE2B c8e6bcdd6a79366828d9c4a0993398b56c95681ad61e5114d31065a222005ec53bb2d8afa00ccca215d9e1e46c3ac3e728719f2867dfd5c907913c68aa577a1d SHA512 56c3ef2e46b5b48d691989a424e91cb16d6ba2397254da61e358faa6173c1572bb72c83b2fae78c14c9a5e81672819f09b07551b32d39f59ef4cf06ea0c0a8be
EBUILD docker-compose-1.27.0_rc1.ebuild 2101 BLAKE2B 2decaaa0488e24e773dc3aedde2bfcc6fc528382517247e01fd24d8569df64e81495a0f228c2618df00077e20f02f2c82fcedacd4041779dbd9c21030d06cb7d SHA512 4e4e4c9b04ab2449bb00d185d9d4c3c3634ddcbda659f84833364a5bc72381571f7239e36fe684e60528f784b53c308b23efc920e85f7f7cfda0ee479669de48
+EBUILD docker-compose-1.27.0_rc2.ebuild 2101 BLAKE2B 23448e65a7048256ba744408fa044e96c6930e4c4fee859c647aae74fc7011aa78beb22632f28f5605380fc01be1100bb3fe6c81d56d1d78cd4eeeed2330db16 SHA512 8df3aa342a7e57c9b9baaabaec28bb8d5d459d1da835f482e5c952d475e18c140f78655a18d80fb541a2ccd4bdcd64a09a55892af8c6bda003500ec0c785838d
MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild
deleted file mode 100644
index 5931b1c8e4a8..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
- >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? (
- ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -20,9 +21,11 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
dev-python/paramiko[${PYTHON_USEDEP}]
>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
@@ -35,17 +38,19 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
DEPEND="${RDEPEND}
test? (
>=dev-python/pytest-5[${PYTHON_USEDEP}]
- dev-python/ddt[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
)"
-S="${WORKDIR}/compose-${PV}"
+S="${WORKDIR}/compose-${MY_PV}"
PATCHES=(
# Bug #679968 -- https://bugs.gentoo.org/679968
# Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.25.2-setup-py.patch
+ "${FILESDIR}"/${PN}-1.27.0_rc1-setup-py.patch
)
+DOCS=( CHANGELOG.md README.md )
+
src_prepare() {
# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index d6822f54f55f..6a8afafb41d2 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,3 @@
DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3
-DIST docker-19.03.8.tar.gz 17477887 BLAKE2B f9c50fb376b37b19de79f52f10425432f5042bdc25a581e1f2cf7524d2e89dd6bd5ac8181f23a7ee00e36b07e3ce62b631aff28844963f8b05e21ce7671bfe6c SHA512 2e2266d4cc832c2c2afb7c0fba92ffd39b92cce988c9bedd40430eb87fa97c32dcf97d8e4c651ceda7c292c904f83c49a12e39861a9a69c9c9e6d54770f95d02
EBUILD docker-19.03.12.ebuild 8404 BLAKE2B 592424738f7faa2033904c135b9c2710208262414e677e94b0b45391ddbfb2430d46be641a703bc23645c0635d47685a5e3704460e971ad419467386fa460c9e SHA512 5121e71b234370ce920960e1e0c09fb21074d69518a3e87fd11d636e8f3aba0c2a47d420ccce580b0802d0eef0147c9c63d2fa51717cb1a95f7f572ab9eb7f3d
-EBUILD docker-19.03.8.ebuild 8401 BLAKE2B 45402601322a6703605ea3f638585fe605cdcfc90b525bec9284bbb2af59e1b00d1e7657291e6b0f8f20e5bd1602d9df357c6193692a7ebc7fbaabb013fa1feb SHA512 cba4ff2acab7f8ea0c07580a392e8ba39cb0108459207af9feb68bef8674ee3efbfe7cdd9aad866d26f322453c70b1c72ff273adb4c10e83ee8d6819c90f514d
MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa
diff --git a/app-emulation/docker/docker-19.03.8.ebuild b/app-emulation/docker/docker-19.03.8.ebuild
deleted file mode 100644
index bbd322f7478e..000000000000
--- a/app-emulation/docker/docker-19.03.8.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
- # Docker cannot be fetched via "go get", thanks to autogenerated code
- EGIT_REPO_URI="https://${EGO_PN}.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
- inherit git-r3
-else
- DOCKER_GITCOMMIT=afacb8b7f0
- MY_PV=${PV/_/-}
- SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
- [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
- inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-COMMON_DEPEND="
- acct-group/docker
- >=dev-db/sqlite-3.7.9:3
- device-mapper? (
- >=sys-fs/lvm2-2.02.89[thin]
- )
- seccomp? ( >=sys-libs/libseccomp-2.2.1 )
- apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
-
- >=dev-lang/go-1.12
- dev-go/go-md2man
-
- btrfs? (
- >=sys-fs/btrfs-progs-3.16.1
- )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
- ${COMMON_DEPEND}
- !sys-apps/systemd[-cgroup-hybrid(+)]
- >=net-firewall/iptables-1.4
- sys-process/procps
- >=dev-vcs/git-1.7
- >=app-arch/xz-utils-4.9
- dev-libs/libltdl
- ~app-emulation/containerd-1.2.13
- ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?]
- ~app-emulation/docker-proxy-0.8.0_p20191011
- container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
- ~KEYS
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER
- ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
- ~IP_NF_NAT ~NF_NAT
- ~POSIX_MQUEUE
-
- ~USER_NS
- ~SECCOMP
- ~CGROUP_PIDS
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
- ~BLK_CGROUP ~BLK_DEV_THROTTLING
- ~CGROUP_PERF
- ~CGROUP_HUGETLB
- ~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
- ~VXLAN
- ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
- ~IPVLAN
- ~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
- if kernel_is lt 3 10; then
- ewarn ""
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
- fi
-
- if kernel_is le 3 18; then
- CONFIG_CHECK+="
- ~RESOURCE_COUNTERS
- "
- fi
-
- if kernel_is le 3 13; then
- CONFIG_CHECK+="
- ~NETPRIO_CGROUP
- "
- else
- CONFIG_CHECK+="
- ~CGROUP_NET_PRIO
- "
- fi
-
- if kernel_is lt 4 5; then
- CONFIG_CHECK+="
- ~MEMCG_KMEM
- "
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
- fi
-
- if kernel_is lt 4 7; then
- CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES
- "
- fi
-
- if kernel_is lt 5 1; then
- CONFIG_CHECK+="
- ~NF_NAT_IPV4
- ~IOSCHED_CFQ
- ~CFQ_GROUP_IOSCHED
- "
- fi
-
- if kernel_is lt 5 2; then
- CONFIG_CHECK+="
- ~NF_NAT_NEEDED
- "
- fi
-
- if use aufs; then
- CONFIG_CHECK+="
- ~AUFS_FS
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
- fi
-
- if use btrfs; then
- CONFIG_CHECK+="
- ~BTRFS_FS
- ~BTRFS_FS_POSIX_ACL
- "
- fi
-
- if use device-mapper; then
- CONFIG_CHECK+="
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- fi
-
- if use overlay; then
- CONFIG_CHECK+="
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
- "
- fi
-
- linux-info_pkg_setup
-}
-
-src_compile() {
- export GOPATH="${WORKDIR}/${P}"
-
- # setup CFLAGS and LDFLAGS for separate build target
- # see https://github.com/tianon/docker-overlay/pull/10
- export CGO_CFLAGS="-I${ROOT}/usr/include"
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
- # if we're building from a tarball, we need the GITCOMMIT value
- [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
-
- # fake golang layout
- ln -s docker-ce/components/engine ../docker || die
- ln -s docker-ce/components/cli ../cli || die
-
- # let's set up some optional features :)
- export DOCKER_BUILDTAGS=''
- for gd in aufs btrfs device-mapper overlay; do
- if ! use $gd; then
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
- fi
- done
-
- for tag in apparmor seccomp; do
- if use $tag; then
- DOCKER_BUILDTAGS+=" $tag"
- fi
- done
-
- pushd components/engine || die
-
- if use hardened; then
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
- -i hack/make/dynbinary-daemon || die
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
- fi
-
- # build daemon
- VERSION="$(cat ../../VERSION)" \
- ./hack/make.sh dynbinary || die 'dynbinary failed'
-
- popd || die # components/engine
-
- pushd components/cli || die
-
- # build cli
- emake \
- LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
- VERSION="$(cat ../../VERSION)" \
- GITCOMMIT="${DOCKER_GITCOMMIT}" \
- DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary
-
- # build man pages
- go build -o gen-manpages github.com/docker/cli/man || die
- ./gen-manpages --root . --target ./man/man1 || die
- ./man/md2man-all.sh -q || die
- rm gen-manpages || die
- # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
- popd || die # components/cli
-}
-
-src_install() {
- dosym containerd /usr/bin/docker-containerd
- dosym containerd-shim /usr/bin/docker-containerd-shim
- dosym runc /usr/bin/docker-runc
- use container-init && dosym tini /usr/bin/docker-init
-
- pushd components/engine || die
- newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
-
- newinitd contrib/init/openrc/docker.initd docker
- newconfd contrib/init/openrc/docker.confd docker
-
- systemd_dounit contrib/init/systemd/docker.{service,socket}
-
- udev_dorules contrib/udev/*.rules
-
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
- dodoc -r docs/*
-
- insinto /usr/share/vim/vimfiles
- doins -r contrib/syntax/vim/ftdetect
- doins -r contrib/syntax/vim/syntax
-
- # note: intentionally not using "doins" so that we preserve +x bits
- dodir /usr/share/${PN}/contrib
- cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
- popd || die # components/engine
-
- pushd components/cli || die
-
- newbin build/docker-* docker
-
- doman man/man*/*
-
- dobashcomp contrib/completion/bash/*
- insinto /usr/share/fish/vendor_completions.d/
- doins contrib/completion/fish/docker.fish
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/_*
- popd || die # components/cli
-}
-
-pkg_postinst() {
- udev_reload
-
- elog
- elog "To use Docker, the Docker daemon must be running as root. To automatically"
- elog "start the Docker daemon at boot, add Docker to the default runlevel:"
- elog " rc-update add docker default"
- elog "Similarly for systemd:"
- elog " systemctl enable docker.service"
- elog
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
- elog " usermod -aG docker youruser"
- elog
-
- elog " Devicemapper storage driver has been deprecated"
- elog " It will be removed in a future release"
-}
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 7054e84f1449..11b3154f3c7b 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,6 +1,6 @@
AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e04a46ea14fe983859f00c0aa33ec73dc24a03805579b84b57a2528857994943bb999e2f38c6f652404fd661e SHA512 423a7ebd8284c475d226109e0af9d867753b75ff1d1a9100d948c91e71dbc76bd8d8973e4ecf3fdb8fab5555da6339484459c623f028f7091e9d010395f24970
-AUX 0.5-flags.patch 852 BLAKE2B 22423ccfcfcc111a52a3daf2c46f4e7e39d08f63d59c8c85ba3f8be97d972b1e251d4328e8ea8c123cbf7b403d0a94f84b97b9c16df2b1d5d14e82a44b36f2a6 SHA512 696069c9b70017be64dea6607ea67d49fa53057508cc75124161a44f0b8dc52053698612a8ba63ae2060c1dcfa80a57eb7e1546e2bf35be988871ce4e794cb90
-DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78
-EBUILD gallium-nine-standalone-0.5.ebuild 2771 BLAKE2B c9578cb82b0320c1c1a7c47a6d7e2e540c1ecb75ab407a6e816bc9ef15fcdb80e6d52508ae322fb7dd3d8402fda4f15400d9d81f9208b87f539ed9efe51d4bd3 SHA512 91d7ee72c8e9360a6f145ed0190ef459a84a904f42509a516bef6869cc888a60439caa96c27a0a87433ac9d553f331df5cfb147a69070a54716c1f89a189e882
-EBUILD gallium-nine-standalone-9999.ebuild 2771 BLAKE2B c9578cb82b0320c1c1a7c47a6d7e2e540c1ecb75ab407a6e816bc9ef15fcdb80e6d52508ae322fb7dd3d8402fda4f15400d9d81f9208b87f539ed9efe51d4bd3 SHA512 91d7ee72c8e9360a6f145ed0190ef459a84a904f42509a516bef6869cc888a60439caa96c27a0a87433ac9d553f331df5cfb147a69070a54716c1f89a189e882
+AUX 0.7-cross-files.patch 924 BLAKE2B f272fe2034d2b17db3ac19e93a5f121970dcc3a0a76bb9ceb0f38bf63632f379f83c86dff70677ece94965658c029d0761ad55133fe58fb576305fdcaee2f3b5 SHA512 94ad1b8806be083c1fae89f3601c2881f696538266c8c4159c4dfb3507737fd03c6cbac08d07bfd8a4d965011b28298e14dbdc5c51fba9ba6ba952d74171012c
+DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
+EBUILD gallium-nine-standalone-0.7.ebuild 2872 BLAKE2B 26287c4c3284ac76bc75052682796b9dde89e8d5628c1f28fe76eb4a31d02c1771cc33d92dbbd35c0316d36824fef79cb1ab5140349e6420d666f24caddcbfca SHA512 b6697499f1c807f378bbf16d8cfbfd576729e7aca85332cd9af448f547a898dab965ff5b21ae5e8db4a5a75d0f9013e1fd295ac342ee81ea83998afd0d855233
+EBUILD gallium-nine-standalone-9999.ebuild 2872 BLAKE2B 26287c4c3284ac76bc75052682796b9dde89e8d5628c1f28fe76eb4a31d02c1771cc33d92dbbd35c0316d36824fef79cb1ab5140349e6420d666f24caddcbfca SHA512 b6697499f1c807f378bbf16d8cfbfd576729e7aca85332cd9af448f547a898dab965ff5b21ae5e8db4a5a75d0f9013e1fd295ac342ee81ea83998afd0d855233
MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
deleted file mode 100644
index 7c0e883d697d..000000000000
--- a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
---- a/tools/cross-wine32.in 2019-09-25 13:25:24.000000000 +0100
-+++ b/tools/cross-wine32.in 2019-09-30 23:05:00.121344967 +0100
-@@ -5,8 +5,8 @@
- pkgconfig = '@PKG_CONFIG@'
-
- [properties]
--c_args = ['-m32']
--c_link_args = ['-m32', '-mwindows']
-+c_args = @CFLAGS@ + ['-m32']
-+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
- needs_exe_wrapper = true
-
- [host_machine]
-diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
---- a/tools/cross-wine64.in 2019-09-25 13:25:24.000000000 +0100
-+++ b/tools/cross-wine64.in 2019-09-30 23:04:57.340283350 +0100
-@@ -5,8 +5,8 @@
- pkgconfig = '@PKG_CONFIG@'
-
- [properties]
--c_args = ['-m64']
--c_link_args = ['-m64', '-mwindows']
-+c_args = @CFLAGS@ + ['-m64']
-+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
- needs_exe_wrapper = true
-
- [host_machine]
diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
new file mode 100644
index 000000000000..fed5c0403688
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
@@ -0,0 +1,34 @@
+diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in
+index bfbe410..0064cf8 100644
+--- a/tools/cross-wine32.in
++++ b/tools/cross-wine32.in
+@@ -5,9 +5,10 @@ strip = 'strip'
+ pkgconfig = '@PKG_CONFIG@'
+
+ [properties]
+-c_args = ['-m32']
+-c_link_args = ['-m32', '-mwindows']
++c_args = @CFLAGS@ + ['-m32']
++c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
+ needs_exe_wrapper = true
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+
+ [host_machine]
+ system = 'linux'
+diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in
+index 5e19023..06b1f2a 100644
+--- a/tools/cross-wine64.in
++++ b/tools/cross-wine64.in
+@@ -5,9 +5,10 @@ strip = 'strip'
+ pkgconfig = '@PKG_CONFIG@'
+
+ [properties]
+-c_args = ['-m64']
+-c_link_args = ['-m64', '-mwindows']
++c_args = @CFLAGS@ + ['-m64']
++c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
+ needs_exe_wrapper = true
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+
+ [host_machine]
+ system = 'linux'
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
similarity index 94%
rename from app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
rename to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
index 1cede2d14203..3e96326a2fc8 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,7 +38,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/0.5-flags.patch
+ "${FILESDIR}"/0.7-cross-files.patch
"${FILESDIR}"/0.3-nine-dll-path.patch
)
@@ -67,6 +67,7 @@ src_prepare() {
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+ -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
${file}.in > ${file} || die
}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 1cede2d14203..3e96326a2fc8 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,7 +38,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/0.5-flags.patch
+ "${FILESDIR}"/0.7-cross-files.patch
"${FILESDIR}"/0.3-nine-dll-path.patch
)
@@ -67,6 +67,7 @@ src_prepare() {
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+ -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
${file}.in > ${file} || die
}
diff --git a/app-emulation/pcem/Manifest b/app-emulation/pcem/Manifest
index 893271121111..39fdb6a7cf4a 100644
--- a/app-emulation/pcem/Manifest
+++ b/app-emulation/pcem/Manifest
@@ -1,4 +1,4 @@
AUX pcem-15-respect-cflags.patch 300 BLAKE2B 4531829e43d43501fe889b34381fc056ffa2734ca499686558cf39ef245f3808e6488c32d6938487d018175ab8a370a28e491cc957406ea6e430a9afff44dae2 SHA512 7800d9056fc1ab4b38f97a6021da7288b990ab9c562846be1ae4ec6636c888fd444c635076f070c50f39681202995a41575823a225c77017d389638feaf1a93c
DIST PCemV16Linux.tar.gz 1859892 BLAKE2B e388031e661b9320cc783e6400bdb7c191a2f946d9c207d9a58daa9270115b32ed55ac6a0b87227b51d10168e7d161bb03811eb83f5405ed1a71f7bfc6fd8aa5 SHA512 97d33ae1c4b59f281abe553ed4297c0d6c3956cf32b44474bfd5773700dd5c4ea6c209c679b9add5d4a7cba61748ee9794afa3c59af3230fa2a15812e13fd1c5
-EBUILD pcem-16.ebuild 1614 BLAKE2B d43aa0b6b658e2f2255e0af121df179c4c7633891fe964a32dcb37d4179174153f55980b67f0db2aa6fe8ee87dfe788e39f85ed84d8b61f3883f18f548896d1f SHA512 2102dcd12f2478f42ea393fb75995e52c5225de6d339cabc2dee93e85407e08d9b660030bc32d125d4d84828c03468df5afca571979421f1a17bc20691c6f50a
-MISC metadata.xml 856 BLAKE2B 628963f0f0d30b7d95b5f7b9f23907fa37129397a5470bde252df40d4c40e57f6657db0d02c935414707537bbe995386c158d5ada56c32e4dd6f53b13a1e2fbb SHA512 e1bb08b4e216ab48ad0d52a59b38dba0db566104ffbb73c2e6cb5d12eee66f78bfaf32caa564aecbcce9ecab21d98d5514ff828dde734671b2c34523137a356e
+EBUILD pcem-16.ebuild 1615 BLAKE2B e9141f45d86ba205df78881ecb97cfbffe38d110d217721c9a85a39f2925aa43d80bf84d8a50cd330cc12237cd27764ea419db4d8b581cc2c4971175c8e4529b SHA512 b728aec270e313973fd2ce461c0524557c37d26e9b1392f8f74f9938723368b0ec37cd79d56fd70794454da000c1abb9f96f0a4d4d9de6893e4beb814b2daa95
+MISC metadata.xml 857 BLAKE2B c678e4578dca5c14416690cf8a421d4d1d8887237a4600580aad48d1d4ea6b641cc3c1f47c6c00be44344b760aa87c2b9bbded7625e0ccaedd0c8c2cb14dd057 SHA512 e610d16662365ae271fab8a2364e5781ba4be7a841d36759bc4e319b7f87a589c02131aeea83f194eabf940c0c4439459127468c0a65a72e3e2e91c74c0d409d
diff --git a/app-emulation/pcem/metadata.xml b/app-emulation/pcem/metadata.xml
index d949dbdb3e6e..b25ac367e489 100644
--- a/app-emulation/pcem/metadata.xml
+++ b/app-emulation/pcem/metadata.xml
@@ -18,6 +18,6 @@
https://pcem-emulator.co.uk/phpBB3/viewforum.php?f=2
- pcem_emulator/pcem
+ sarah-walker-pcem/pcem
diff --git a/app-emulation/pcem/pcem-16.ebuild b/app-emulation/pcem/pcem-16.ebuild
index 8b2b9258363d..605cd74eded3 100644
--- a/app-emulation/pcem/pcem-16.ebuild
+++ b/app-emulation/pcem/pcem-16.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
HOMEPAGE="
https://pcem-emulator.co.uk/
- https://bitbucket.org/pcem_emulator/pcem/
+ https://github.com/sarah-walker-pcem/pcem/
"
SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2520d0360b13..63d71aa0fd1c 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
index 0e7a48126eb5..60402fad68aa 100644
--- a/app-i18n/canfep/Manifest
+++ b/app-i18n/canfep/Manifest
@@ -2,6 +2,5 @@ AUX canfep-posix-pty.patch 1674 BLAKE2B dfeda6e249501ed6b5a8bd185dbd9df735bd9f08
AUX canfep-termcap.patch 6533 BLAKE2B c8e9ffa84390bac88e6ad1fc30e47d237a6fc10d3f8b727a730358faa69d76a24ddb9b1467d695eed691ceb9e1b5558baf12d45178e44b642fb3fc7ff0f9d36d SHA512 7ebaf5745bdc8b1aa1bd07879fe51c3c6410c1475f9e44535bf863f9ab0b7ee6ac0f3dca852c22036ae2ecfababfd976a0c3027ad9d33e3aae7e289c00bd60bc
DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
DIST canfep_utf8.diff 7152 BLAKE2B e3848d5119b01d3296c93b5ed8495c6f93ecb1ef39f168d6e1685636055295b8f7277c6b680cadb648fe6847c92e3b038a9b5a9a58f23fe3490dcbe675bcc96f SHA512 32d946b8b78efd3b95736738497fe46a7d0e2383f2b665c8af79270d7b0d1404ca051e63fc67375f0b953b8f604475c8d6b2d683089bc97b098fa9524b89208c
-EBUILD canfep-1.0-r1.ebuild 1031 BLAKE2B 16b99431b99360d69531b9010728e68125500d0472113cef35c537dd3a5a629c3aea6ea5155b50004cf19ac77fed9d32e9524f5584f58b7d10eef2dbf3b425a3 SHA512 8034eaaf43e525387d2d075e6edb13bc3d6c7784fd96f0d99ccb0f1fc456c01f1825f13d45a78e81f15a1fafc7d5297b7d21f3c646d7f0be4a272bc4cbe148cd
-EBUILD canfep-1.0.ebuild 946 BLAKE2B b60052718ff7194e5b8bf68b93eb4addea73116e6a57659a2c0f57f8f008d3d1cbcb8bd4ed05910800c1015b1f0b28d08324a776251e75006ac1992861d7ddce SHA512 fb707bfbe2c03d34c635538442fc20008bb52a09c13e7c7199025e5b95d21c3b534b83ff8c47ecb669eccc1e108ec63b67752805a219fcc358dc23baa7fe6c17
+EBUILD canfep-1.0-r1.ebuild 1030 BLAKE2B 9b7c52e4f3c81cb16b202d4af35dcb18ca074df89f4fd8b8fbc82f3bbd10fb9f3d6b678bd8d08fb20010064dc5a827928c9e4975f8f57b3f2d8c6a7e3543568b SHA512 4ab9f1dae9fcf24bf1f1727c61e82f86d7332165ae3df89d4f160262f95cff748976e268c19c32ec58c6acbcd778143e66ec3b1a9eb72153ca92846639829d99
MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
index df6da3e787de..4b2531818834 100644
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ b/app-i18n/canfep/canfep-1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="canfep"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
IUSE="unicode"
RDEPEND="app-i18n/canna
diff --git a/app-i18n/canfep/canfep-1.0.ebuild b/app-i18n/canfep/canfep-1.0.ebuild
deleted file mode 100644
index b2f558da0647..000000000000
--- a/app-i18n/canfep/canfep-1.0.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"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
-#HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz
- unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
-
-LICENSE="canfep"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ppc ~sparc x86"
-IUSE="unicode"
-
-RDEPEND="app-i18n/canna
- sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
- sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
-
- default
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCXX)" \
- CFLAGS="${CXXFLAGS}" \
- LIBS="-lcanna $($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
- dobin ${PN}
- dodoc 00{changes,readme}
-}
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index ff3d68a76c7c..324a3f31a912 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r6.ebuild 598 BLAKE2B 9c42e9bc2f8ecaa3dfade024ef12090f37905fa2d796aa7168620996b1e20b6bc1ab10da0e2b4b5793d8b0c247624ed08faa4c0e304777e1c70a9c72a31403fa SHA512 0e47634b15a80ed9b5ce49fc8f62e434f805aeda61e04c679a6d6a458aa58aa87b83543f537460ca8ea28d4cba9fdffe2a6b86ba0f5f15a31b4199ec5fd29932
-MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
+EBUILD tomoe-gtk-0.6.0-r6.ebuild 629 BLAKE2B 236e1b56c61c80bbb5cb687e45dcbab9ce3bc7b2c40bbd36e68fbc0ce883caab022f5df4acc821c0014ed03972b86fa22b882496ecee764933005bb136735f21 SHA512 ec741125c8de534e68679d086347a639a0a0f9fdcd9d93f8529349c7cdcc7ad0d449eb0e9ab0dae55bceaa2ed573fd709674350a52d435ca10a0f026d666672c
+MISC metadata.xml 362 BLAKE2B 52104e738a77f5ffe31b935cb6a99baf992ebfbf782a63672e3d4557aa1e7d53cc08806ce9c073e71608eb0d48608a5c4537ab3e66e111c115e07a1513d3f91c SHA512 ee2b0243cf25ad86443193d0cae4d06535b4b5487cb3e977e8a9d70dcafe3d0ac7b91cbc7b0e7daeeb8985a131e23f92eed40578e9e9ce1f0187435bf22354f1
diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml
index b26c59a53cf3..bb5bed5adfa2 100644
--- a/app-i18n/tomoe-gtk/metadata.xml
+++ b/app-i18n/tomoe-gtk/metadata.xml
@@ -1,12 +1,12 @@
-
- cjk@gentoo.org
- Cjk
-
-
- tomoe
- tomoe
-
+
+ cjk@gentoo.org
+ Cjk
+
+
+ tomoe
+ tomoe
+
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
index 24fcbb8f3374..24a7bebf2397 100644
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
@@ -1,20 +1,21 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
DESCRIPTION="Tomoe GTK+ interface widget library"
HOMEPAGE="http://tomoe.osdn.jp/"
SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="app-i18n/tomoe
x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
dev-util/gtk-doc-am
sys-devel/gettext
virtual/pkgconfig"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6c69155f1e4e..e11a6dae6c5a 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 40abf7b91cb1..7d1169d4c2d2 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,3 +1,5 @@
DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
+DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
EBUILD graphlcd-base-1.0.2-r1.ebuild 2214 BLAKE2B 9ad78dfc2f604d56584924debf66a9fc3d2dd0aa69f1973afc9904e305872cb00debcf7f8f727719b0199374d459f171f778b502a8fc7c0a4e4a0fb24fa7ece4 SHA512 72af5113f2132a857ee53a17a129cbcc2508e5932caff3f5d6461fe529162ecb7ab269b134afb58d1f8b7187a0d451f2e6825774c84264cd671e15c1d136d6e4
+EBUILD graphlcd-base-2.0.0.ebuild 2203 BLAKE2B a4cc16b6ca862c9d7ce465a8cd8ebc703934394b66911d1f986d98fcee8bb21ebe0d1abc0dd1c833e0da34c8de32013f18b4d3bf7f07bf0b90df43ae533da50e SHA512 784bc5fb63bae7b310ff7f32e6a4e67485508b6640f42dfd4939e9ed43f1a6e4d0ee0f0be02d46cf82b82deca709e646680a15ebdcbaa228485ad68eecabd1a5
MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
new file mode 100644
index 000000000000..ddb8aac8b96d
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs udev
+
+DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
+SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
+
+RDEPEND="
+ dev-libs/libhid
+ net-libs/libvncserver
+ freetype? ( media-libs/freetype:2= )
+ fontconfig? ( media-libs/fontconfig:1.0= )
+ graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 )
+ imagemagick? ( ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index 2af49c701d9e..b86ecb6300b8 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,3 +1,3 @@
DIST pram-9.tar.gz 8206 BLAKE2B cf490edd53d307e5d9c715d0ca68e38d04ebd5a1dc75f89232605ac5cc9cbc9567b3895b1e2445a14c5acf119f054dc2b982ea7b9949177519a70062e648272b SHA512 a9e718ca0cdc93a67f442f2db5dd6a854357aa493ad7836e5d75ede68c3fad06d2343f1ee34f00bb66203d41575c7773999772f9251a9a2d6fc74702ce875c4d
-EBUILD pram-9.ebuild 566 BLAKE2B e979bbdab1105c86ee30c0ca769933dae8caa8474df6e671fad0bf6876627a9265a14a3ccd48697f7c544e1a4f7e6e2cb051e32203a7cbfe339535dae0a49627 SHA512 a3998fad041581202a601f84bc85666916a858d94a1f005e590a9af925034a6fd8f165fdf810af57d98dc7963172b37ac8c3b08db56270411039d2bca11b452c
+EBUILD pram-9.ebuild 572 BLAKE2B beef0bf65c487bfa734fefcd8cb173d6c9f8588614e70817afa94ea87b77178812ac7444ed1f99cad30cbc79b7d2d538990225e567df6fdf0f5dafb76f3b40c0 SHA512 d2019131959d4a8ed8da53cae76af7b2d7b562b23554b157d55dcf7011aaeca379d2063de63167f5b9c620f86741101ea129709244238b17dc6c8cee0051a5a8
MISC metadata.xml 521 BLAKE2B 666d2a5e1366b0623f3ee47cae65ec248612729ffd0d39b009f0bb95ea79fefb1b0fa3343eff98841d2b1b0f6ccf03c6579370415cb4240441cff5f942557ed5 SHA512 36326936f659a738a0a7a0d1e7b6388820e4f19acf29dbd9efa646cdeb7ad65814b509f9619dddb822fc012ea8b2e06258d2887c5825283db6c77365a6fdc77d
diff --git a/app-portage/pram/pram-9.ebuild b/app-portage/pram/pram-9.ebuild
index c60e887a7327..bf227cb8aae6 100644
--- a/app-portage/pram/pram-9.ebuild
+++ b/app-portage/pram/pram-9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7fe903f9198e..25b81ea37f77 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 731250a62b8c..be9a23cacceb 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -402,5 +402,5 @@ EBUILD bash-4.2_p53.ebuild 4319 BLAKE2B 38bbc2970101a2828ed508e7e0ad4574389eeac1
EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f478c0bbb8d9868db7bf8378fecca1216cb539f857400bcdabde08d34c159f2f32fdcb05e6c059574ca8a366ee3d SHA512 e4ade3179cbffd11e928be37b721d9d42aa29287035efbdae230ac5340173988712aeff3beca1c5a937270f9092b9ceb71589e5e41199b8608503e739c7111f9
EBUILD bash-4.4_p23-r2.ebuild 5678 BLAKE2B 9d8b60a26838050aa18131b6967c6a196559b9521789d1a82f1ebf8dd42eb6a1ad0c4a0022c4046021aa120b7b3b9dff15c91f0b2ebd601a01d7878cc82bfa31 SHA512 608c289575ba3eeb3417c69557888b317da4b9189551db87a5e3484274201b3a4ceb5c61cec01fdfdd0374d6eb46420eec4471ef46430dfdf56475ac43ea3d35
EBUILD bash-5.0_p17.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
-EBUILD bash-5.0_p18.ebuild 7312 BLAKE2B 3805c5443aa6774976a465aaa83690eb851d480484a1ed484fa87bee973e883a4b9ff85d276492110dab74cc82b138ed1dcd6c7cee4a7db42bd1e03ee405d6e4 SHA512 8ffde7c61d201159ba776232f54d6c8c2562dc96f86a6861581ca9b7c0f6c83ee571030236c064e2ebb89c3620e476f8ded95cf45760675f601bf79900a473c6
+EBUILD bash-5.0_p18.ebuild 7306 BLAKE2B b111ba0b0faecfff6d237c13b98ee080e1b72c694d3406387ae1426ee0dc27ad01545d3121eb0d5667c2568446fd4092b7feac0de09f0e980ef0cd41cc75ebf5 SHA512 2ab3b03d7f180f66de35c2bb44275179a8dfc8009306223d57ac37fd1c78d3ecd1f8428b307e04028485e30e560364a6c134166c86906429aa3ed5903dac4993
MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index 6f6fa4bb6e82..b001a72e609f 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 7b4cbbb75112..b1829ebb6d4f 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -4,6 +4,6 @@ DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b
DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1
EBUILD dash-0.5.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
-EBUILD dash-0.5.11.1.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
+EBUILD dash-0.5.11.1.ebuild 1524 BLAKE2B 61e65acdde52d2d8ef6076b23f4b635760f818a0c8efccd019b7519d4b8e461b34ad8567797c12e98600f17e2fc4c237715c48150d832caca96219e3b048aa3f SHA512 99050808032d7641373293b183294e9a863801bc7c1cd4c872f3f263c5650f9149bcf256442c54a536337a0f40c4a6bfab8c0cc5d2a8203f317afb852a0fd603
EBUILD dash-0.5.11.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild
index 9482c8379d58..d4176f23f384 100644
--- a/app-shells/dash/dash-0.5.11.1.ebuild
+++ b/app-shells/dash/dash-0.5.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit static"
BDEPEND="virtual/pkgconfig"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ad54f7a45ca4..afdef760a7c0 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 39ff4986ae5c..39543d874869 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,15 +4,11 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
-DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820
-DIST calibre-4.21.0.tar.xz 36937392 BLAKE2B 7797e1b99eefa795a84a1ce913b7739ce6961d58ea28c68e3f5a1b756bbec20c206bd7cab25f1ffacc33f39fed2cc4acf99b5bb90ba88b0607987801770d8b30 SHA512 d2e711d2dec77b41a7930cfd39a7597d1b56fdd57bad44686efdf4be66321565622f42e20dfd844c90cc5f2d6625c17b4e8997b9b4592648af1664fda341bf27
DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423
DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5
DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-4.20.0.ebuild 8550 BLAKE2B fcaf2c66cd59bbe0017ab5ead307bb532ac1ae8f5fcc9c0b4e015ec652646f8faed0d108ccbf29675384265f07fb6720634abe757faa6653a73146c685caa7f4 SHA512 01f6b7944e0ae5ffdf420b8046a104200217f958fcdeef057ba5e81a06bc04ffb9b1b2a8bcddcc3b50bd2d3dfd27b738df9084454d2bd7ae51ed28ab7b78d714
-EBUILD calibre-4.21.0.ebuild 8557 BLAKE2B ea05c2f7c8b91bbbb2fbc43cd1edc0db8c6f06e6c07195dd0f473a08c911373e26021a7585f8e19c995f8ab6c5492910359682a403954aa95b16f3fb1257b0e6 SHA512 b4e496d9b1769b772cf90b92c3b774900b01c1bc0b155a396864efbd6e739ffad557151fe36c124e95e0ede6532e7bb7e780f5ba8d2f91e74f033dcda2ad2411
-EBUILD calibre-4.22.0.ebuild 8693 BLAKE2B 801670e378f91ed060eb61c80ff7c42d9e85ce25b900c70c4b5358d20ecd0e95c022a13916bdd898b484e6416c79b9e92e0554a889ba2b71bd93b41444545a08 SHA512 aad2c4e52354d397002762ee694ec069e8b4959118d2f729d2f9b95b2b9f3c8c738c8c1ca692eb4755b57406022f86062eaefdd06c97bea4b53262e3fed97aa5
+EBUILD calibre-4.22.0.ebuild 8692 BLAKE2B 7d394fc987120030e3ca6dfc593ddaf103a52983f13bb95e02c063da6ca9c3500f6c1d60148040bb8c19e70d731145b1ef086493f2817b4512b036c95daf8a1d SHA512 4fbd12df71e6ad2371540595b4aeeed833a465d5c9b6bff70d20949d27671a875e209e5d98a84cad0d16176879d8f4c1b7f7dd46427f5e32a7c9fc600d508955
EBUILD calibre-4.23.0.ebuild 8735 BLAKE2B dcec79565840c0fca422ea5a973072e46a5233b5440c6eaa2db8049151e4110a1dadc8af8c65e43bd2d1010f7dd63a0f39d30192e4fa1bf28a5141753f923363 SHA512 6fde8b0929df69346aa619e2398ea7f43d03984eef2db967e3047e490c22845641883b78b049c59be62b9053f4ba77a29e325138d7c5c3820456d063fbe7b0ee
EBUILD calibre-4.9.1-r3.ebuild 8980 BLAKE2B 1df8fd4d5840923c95640475b81805b8b700da66b3980d3f85040291f92e885b6658408426d06f39f1b578048b77051d927af0a0bfff600b83516bb3967eed6f SHA512 1ea1265dea6574b3e2392fd2e2ba3b1173fba9c698ddc636ea8da18a46b219ba66f1d5fb656adafd9b8c2cd73017c6cba45dd2766e0ac88e30d03e2f10ce0d81
MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.20.0.ebuild b/app-text/calibre/calibre-4.20.0.ebuild
deleted file mode 100644
index ae82240de8bf..000000000000
--- a/app-text/calibre/calibre-4.20.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
- dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
- >=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
- dev-python/regex[${PYTHON_MULTI_USEDEP}]
- dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- rm "${ED}/usr/share/applications/defaults.list" || die
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.21.0.ebuild b/app-text/calibre/calibre-4.21.0.ebuild
deleted file mode 100644
index 320b6df32ed2..000000000000
--- a/app-text/calibre/calibre-4.21.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
- dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
- >=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
- dev-python/regex[${PYTHON_MULTI_USEDEP}]
- dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- rm "${ED}/usr/share/applications/defaults.list" || die
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild
index 70a2d513853b..7dca7d16c3d3 100644
--- a/app-text/calibre/calibre-4.22.0.ebuild
+++ b/app-text/calibre/calibre-4.22.0.ebuild
@@ -31,7 +31,7 @@ LICENSE="
OFL-1.1
PSF-2
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
SLOT="0"
IUSE="ios +udisks"
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 882efa4c2f03..5f4f390587bd 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.5.2.ebuild 639 BLAKE2B da1c384bd58b0d582ef88bbc934123ba559cd542e30221f1c08003551de578e668ba922851a0325b8c98140d8a22cc3b75c6c03e4fd243ba661ad22159ab2987 SHA512 4d369d94d623d0896d691f105a5426b8ec66c25b87887ffc9a74d5a0d914d3e1009d7972cec91cb35b6507400d7f475dde0a60d09aca834ad9f2e0906abcca6d
+EBUILD grip-4.5.2.ebuild 658 BLAKE2B 8e3699b7ed73f09f7d4e6afdde09a8aa997cf900c8bb77317735fb6ba294571885b7777ae4bfa8d1a6730dca1c33260746dab4bb78d5aba7927f7985c8733918 SHA512 6dc6956688886056b307361feab24abc9c27667e55b00d10dc36a923c74255b8d53501c9bf0cb35299325744ca5015373ab9b14965529a027596d922b5a116ff
MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.5.2.ebuild b/app-text/grip/grip-4.5.2.ebuild
index f268c25ab592..529c0af1c38c 100644
--- a/app-text/grip/grip-4.5.2.ebuild
+++ b/app-text/grip/grip-4.5.2.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="amd64"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
+ !media-sound/grip
>=dev-python/docopt-0.4.0
>=dev-python/flask-0.10.1
>=dev-python/markdown-2.5.1
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 8160893a1e98..03f9b63f8ce3 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,3 +1,5 @@
DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
+DIST gtranslator-3.36.0.tar.xz 2121776 BLAKE2B 745ae74a9a1a47af609b30712f5e6e99474081da9136cc15ecf0bd121e0dd01d326574466ddf4551df7255247a6a895dd468b085cee91735fe8883e4feb16c97 SHA512 63393a33db031ea549763113d6bc55cd00c081e671a31654d225968d8d31d671ca7e577b4df8336603fe2c769c5c443e9ebf69d558c888438d194a503e044044
EBUILD gtranslator-3.32.0.ebuild 1009 BLAKE2B 6a7af19f1b6b4656b8f74f5d1d8176009f9de0333d52d4e6dea5214c88fc4c9576eebf8b96078e2eef5d6f525972f7938f2f07f78375f624ab5ba56bbdb01b7b SHA512 b4efe029a73ba4b6f0ac9438b97860c97a87ae534fcb8e10be079863bc0cdac208c56b167446b502514983c9be9e6f99ff769d079e25ca0752ac949b62c3945f
+EBUILD gtranslator-3.36.0.ebuild 1049 BLAKE2B 2d156ac8a71d119308e49067f0b44b293a9ab17d064639fdb7941885e7ac0d02d917a84f2bff03eea50cf3ac89e298fa03015344608373bdbfb97c70da6472ae SHA512 2a62730aeece9f337e259e6525caa0aced0c17ad312b0d0e4c771d49df8b704feccc22cc65e24f73d7e9c381c018cd7474af0f7f3698e0e8b3cc65e4ef356a56
MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
diff --git a/app-text/gtranslator/gtranslator-3.36.0.ebuild b/app-text/gtranslator/gtranslator-3.36.0.ebuild
new file mode 100644
index 000000000000..e8faa15bacc0
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-3.36.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk-doc"
+
+RDEPEND="
+ >=dev-libs/glib-2.36.0:2
+ >=x11-libs/gtk+-3.22.20:3
+ >=dev-libs/libdazzle-3.33.90
+ gnome-extra/libgda:5=
+ gnome-base/gsettings-desktop-schemas
+ >=app-text/gspell-1.2.0:=
+ >=x11-libs/gtksourceview-4.0.2:4
+ >=dev-libs/libxml2-2.4.12:2
+ net-libs/libsoup:2.4
+ >=dev-libs/json-glib-1.2.0
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.28
+ app-text/docbook-xml-dtd:4.1.2 )
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtk_doc)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 79a6f1a02fee..b26616d34c65 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -10,7 +10,7 @@ DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579
DIST poppler-20.08.0.tar.xz 1635372 BLAKE2B ca8829fe031bc9565baea71dd7a565d16160aa26645fdd6b30fa0d26c427f8b9d966766df95ca0c1e98552af2e3104c45721f7111db0bcd47f9f29620d1b37ed SHA512 e3d7d85356c854e298bb96ac8a563d9b97174e07d220eb5e7fe0372354a9105a3a1f6ea16e2a34af09d65c61f5fb349412fa7100e7fdda3c98e5030d82b48679
EBUILD poppler-0.88.0-r1.ebuild 3393 BLAKE2B 3ab052ad53eaf884e6ae388010b8273c4e801b316490f040786dfd10cc115f420e00fba9a3e8449b89b8ac3f76c5e530601d9ca7f69eb4a57691407289dd9bbc SHA512 4dcd8052f9d6c4bc95c7670090e67de51b85329a91f39d266e9c92870b0931d91eb7c6f6d18039052416a1449b59cb7bded9b3b840db34d8a28b9d96ff234292
EBUILD poppler-0.89.0.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
-EBUILD poppler-0.90.1.ebuild 3383 BLAKE2B f67d666840e792a5ef9a17ac60255a28e42fd382d3af05d17a1185f196778997c88e1a5ab4c6ebd7f4162651abe32772c0960c243e657a181ad6cf0f64398d34 SHA512 290e31dd011f3efb5b4ccfae118a0d2013b109afc3bb76f2f1492a1d10934bb02aa0066a68680732c44ea9195551461f9a4e02a44da5263575ad7fd5c53b36e4
+EBUILD poppler-0.90.1.ebuild 3381 BLAKE2B ece60d6f8a145530998b7ea2cd73c95c688ef643104e04adfe798f89c7dd11bb815d14225bfa314c4c2213d233ac99dc1e6850d318f51f9d49ec162901df67d6 SHA512 66aee158da18605d577c4ef9c97d5075f7a4c10aafdd28c439f48ce63545c6f26e36beff54656115e97f94f54889f799a006db70914d3e45fa2a4a2bcf76b605
EBUILD poppler-20.08.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
EBUILD poppler-9999.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.90.1.ebuild b/app-text/poppler/poppler-0.90.1.ebuild
index 41cf49269b78..4c2c2787fc42 100644
--- a/app-text/poppler/poppler-0.90.1.ebuild
+++ b/app-text/poppler/poppler-0.90.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/101" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index f1b02dac5f62..eef0e36fb48b 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +1,5 @@
DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580
EBUILD pytextile-3.0.3.ebuild 1025 BLAKE2B 7f99559324e89b88bd6f901d9083d1b6d8eec90e5f87d13779de82f1664866e98e9d729944f46f73e80c594f43e8ea99a6935761cbdb76f18acb0feea46bfac5 SHA512 df1939e9580235a9131f3b3ff519305e7c49e339f2497f77df7ccc9969f3be27f8b5391a9780089ddb7b82842afde289f392887a0cb862f84b4d95974ae07116
-EBUILD pytextile-4.0.1.ebuild 1218 BLAKE2B bea70e5c8aaeea377a1421c3ced0a254c187711aa9f3bc43a37b3b8bd0c56f5e67cbd7fa53c8acf69fe548811deeaf933f90401b31c1485f87cbb6f6a3f44b7d SHA512 204477aa61b6dcbfeefc9e7710a18c1962d9a97e98eee5b40e2953be63a638fb0a672817d0d129cc24da187192a32c0b1bb051bbf2e4c19577c12b0985875ae7
+EBUILD pytextile-4.0.1.ebuild 1217 BLAKE2B 70bf37067119bcbb924796d2d2d36770461fbd12013b2fd42e107b56b40dacbba63f8c50de664a1905ca3943f01292ba5ece07db2d5e7b562d5665f0f550b8ae SHA512 1fa5a8d51e10334662361e142880c0f7a19722cd8dac9a58dd8deee5485ea4fd2017d8fb02fc2e6c7f930a46c69576836e472bfb50dea2ae7435069bcf0aa136
MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-4.0.1.ebuild b/app-text/pytextile/pytextile-4.0.1.ebuild
index fb9312910fa8..1d920065c305 100644
--- a/app-text/pytextile/pytextile-4.0.1.ebuild
+++ b/app-text/pytextile/pytextile-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 2abdb85a4397..8bcd4df9bd2b 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,8 +2,10 @@ DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febb
DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
+DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B e6431300b0eeea58f502e8475225830986573e839441f1701cf9387c1ad53bf2bc838d08aa823c65f93d62c94501def769602b4772d714cf2d9396a052c61c50 SHA512 a22cbd4bf3a7ea46c0a60b7a1884af858f09464928f90d63e0526385e5fc6cad123446d59affe1efbad286c883c1bc125b5f6f7fb6a8b224f9b242ddcfd13a98
EBUILD xapian-omega-1.4.14.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
new file mode 100644
index 000000000000..f76f70d1acab
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+ dev-lang/perl
+ dev-libs/libpcre
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Protect /etc/omega.conf
+ echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+ doenvd "${T}"/20xapian-omega
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+ # Directory containing Xapian databases:
+ keepdir /var/lib/omega/data
+
+ # Directory containing OmegaScript templates:
+ keepdir /var/lib/omega/templates
+ mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+ # Directory to write Omega logs to:
+ keepdir /var/log/omega
+
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+ keepdir /var/lib/omega/cdb
+}
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 29c9bf53bc83..aacdb2a7a584 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index f7163ffe5c2a..60abd8a46afd 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -2,4 +2,4 @@ DIST ebuild-mode-1.50.tar.xz 35440 BLAKE2B 281719a0a686ef1c80c8391cc118d14085ac6
DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
EBUILD ebuild-mode-1.50.ebuild 1001 BLAKE2B 5cfd46db07183e4a042b09072272acadba4c698baddb1022583d4f80b76a07f176bec9d58f348dd888c7b805ceb380a5bd99bc810b6e259d0b0924d95e1ef2d3 SHA512 5770a49c1af09516ee92468db7c7151fd817581836c84a289a936e4f63eeff2b002bd369ba9790d831807c759eabffaa5ce4fb74cda9cf7778ea507a86345fc5
EBUILD ebuild-mode-1.51.ebuild 1003 BLAKE2B e76043e9362be1acd83b83a0f93d13d5e5d908fe06272c9f8264bf26de424ad473b676b176dd29937ff893958b1dfd54675474b0c91ace9db81ec3a8c65da70a SHA512 78786c63ebc48b9fedcfbace39f9094cb4cff52826e93e05790b834c63b55160502b639af17233d238089047bd06d113bd9640251c6d00ad7437e0a600861fb4
-MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
+MISC metadata.xml 442 BLAKE2B 4ebee7ad84527b95636d2d3015859a08f57924ab1be858fc51c71a7fc54fae0be2b61bf680d6fb7a9bd905e224e6ccacce09ed03dde99a3736a261b2f5d4cce3 SHA512 a18d82336c06dce67c811dcf80a8fc90f01be6a4a535d85cd8aaa8474593c32a26a6f80540419da8c0b5c1575e6a00a62712e5fab8d50301407d3a13896898ad
diff --git a/app-xemacs/ebuild-mode/metadata.xml b/app-xemacs/ebuild-mode/metadata.xml
index bf4f894f5fe3..f476c1377e40 100644
--- a/app-xemacs/ebuild-mode/metadata.xml
+++ b/app-xemacs/ebuild-mode/metadata.xml
@@ -5,6 +5,7 @@
xemacs@gentoo.org
Gentoo XEmacs project
+
emacs@gentoo.org
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 05cfb5c5cad9..fcc6ed981f4c 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index dc9cc4e88dd6..d652de0e26d9 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -3,5 +3,5 @@ AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d
AUX mysql-connector-c-8.0.21-libressl.patch 13288 BLAKE2B 5aad519f99103e579356d89ae92dda1e2496268cebdfe8dd3797138a5efe03370365225581399bb2373b847f61e2b4be726d940cde624d3cdda94b5c69904a3a SHA512 f4d057ce159153133e100c71c65f75bd558ba1ea914cd878023dc4e4a628d63b60d0ac671a97d26863b3f48c3dc8984317bb09362378c3b96b8ed47f08c1f6ea
AUX mysql-connector-c-8.0.21-survive-malformed-charset-files.patch 580 BLAKE2B 76ea04058e14dce1cdd057b51e17d358ff582c82f27a537fb47aa66d58c88327231ca10755a6e02d0c1dab5c67d6eb92d9e9d5d74038595a203b65d3372d4577 SHA512 d8075a712bf12697499b1da2df7f43662bcce073113193e4b29261f965f10af43b1d529f1fe14ffed6c7c9bda3d3b0a61a2b3462e865724496d3d80f10c5264e
DIST mysql-boost-8.0.21.tar.gz 278292192 BLAKE2B 9e5a14d1401f58f6f620c8691d2d4d3ada122a79a4e081380050961f0add93bf32b682c60ea2a6e58f50a4fcedbd323d8efe2d5f3e1f2bba5010e201a2df5d44 SHA512 18128edd7d9604ea69bd308f372d6663ef3629503969148e3a2117175c4ef625358b31b96e0e1b8d10a87037719e3cb61d5c71eee1e26ab0e0a1731977a2d7c1
-EBUILD mysql-connector-c-8.0.21-r1.ebuild 2904 BLAKE2B 26bbddb7c912af07ce745123cc39259fee2d1aae962e6a29c34232c379b44a926c2823b1a121884f1724accbdf8b3a0373a40f5a00809d974857a431f0714b6d SHA512 4adaaf56eb7334ce71bfd9252c99664fcb72b662ac248f9259eb5e122c24f8e503a20b274d553bcdfc3c35eb47f128335010ac724c2f63a960a2be90d1daf499
+EBUILD mysql-connector-c-8.0.21-r2.ebuild 2962 BLAKE2B cc89d07ad97a187579d47a2a6e083e7c435ed3c6d382a0af30c979f12cc3104e630870500213009d293182ef4f085e0d294486e94f93dff625048017737b213a SHA512 eeb26407f7dc006d184d59c36bbfb755c22fd1f79fbf6e4aaeecca614b0a51edc0847d3edc725c01745f5c1d0894744828fe40ad8646e2979b106a8a5fbdf4c0
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r2.ebuild
similarity index 98%
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r2.ebuild
index 2cd9add19642..f5621fe4b1e3 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r2.ebuild
@@ -20,6 +20,7 @@ IUSE="ldap libressl static-libs"
RDEPEND="
>=app-arch/lz4-0_p131:=
+ app-arch/zstd:=
sys-libs/zlib:=[${MULTILIB_USEDEP}]
ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
@@ -84,9 +85,11 @@ multilib_src_configure() {
-DWITH_DEFAULT_FEATURE_SET=OFF
-DENABLED_LOCAL_INFILE=ON
-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
- -DWITH_ZLIB=system
- -DWITH_SSL=system
+ -DWITH_LZ4=system
-DWITH_NUMA=OFF
+ -DWITH_SSL=system
+ -DWITH_ZLIB=system
+ -DWITH_ZSTD=system
-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-DSHARED_LIB_PATCH_VERSION="0"
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d1d174e6b622..c905dfe757ca 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -23,5 +23,5 @@ EBUILD mysql-5.7.30-r1.ebuild 30683 BLAKE2B fb6c808884b175e231c782c80e7fb6993ee6
EBUILD mysql-5.7.31.ebuild 37543 BLAKE2B 7f6917087e7adc41aebf4957a3cdfdaefd0dcf0c9fc5d039acc56cba70f4c31c0fe26e534e5c8a3d6d8e14505f4e797c8b102f8f24709bca4a6661323f88502f SHA512 b708b8901ae990765a94c31b2362bec5f2178684573caad7a7805f1f50f1f4b947b2cf23cc42d42275fd7f301ce065b35e0089bea5f8940bcdbbce8046252f2c
EBUILD mysql-8.0.19-r2.ebuild 37949 BLAKE2B c0ae41237387d4c58bac1f0f218fa467eba25a79e44605489f3835a1508c94423ea31c7d7d3f39e00f91a56a2320ffcca4fd968a425a3f898c9b7c2b9713f902 SHA512 434b40517a183a8bbb877ad79661ccc3ee1a89d40a374823c8778d87f75593f295c7a635496be1cb6376036da9c3acd5f82bfa2b62a88165b9c4b4b0ffd6469f
EBUILD mysql-8.0.20-r1.ebuild 37217 BLAKE2B 2aef6bce1bd7f8e5e55b64caa304b427c84fcd365e265a6ce0d2458491349cd8c04c17a50644d1be7fca9218e17ad748b9307fe7b32270c6ba936077e2746d9b SHA512 ca65ad63a374696e4adc2d73176de71a0b27e267b91dfba20641303c4b9e8cfa1241375c7cd69af660b2d2632c629ab0658d1ed6e2454032a689f2995a2c505c
-EBUILD mysql-8.0.21.ebuild 38128 BLAKE2B 19838cf91f6215d8c27453851d8e5e486c1899edc4fb14cc9dc7ed43703177756be29c587575cd2d3ed1cd805d07ec475ef45a077bb3cdef13acfa8c634a0fa6 SHA512 09f2152fcbd606fac5350b08e30ac22b5f3da6123362bd3ee8943ceba31dbf17f3753a6b35b9d02b24d6314d822cdeaf1394c7d26d243066b2ddbb661e198ed6
+EBUILD mysql-8.0.21-r1.ebuild 38166 BLAKE2B 8ccb2b69f0073fe4f4ebbcd6ebe3ea40a3459c91a5b38af9136631b5aebab07dce9a7ab61ae4e7febaeabc24a239b09e9fb71f86c728610e057d63c6044f0c4a SHA512 473a44a1e5f7333d6e7683da0396384e3f1b800211ce851d094504f8864f77dfd436ccef3f740464dda729ef211df6023e17e8e8ae8d1f6abd2168a406a74091
MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-8.0.21.ebuild b/dev-db/mysql/mysql-8.0.21-r1.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-8.0.21.ebuild
rename to dev-db/mysql/mysql-8.0.21-r1.ebuild
index e1dfe8462938..be1a0381245a 100644
--- a/dev-db/mysql/mysql-8.0.21.ebuild
+++ b/dev-db/mysql/mysql-8.0.21-r1.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/mysql"
# These are used for both runtime and compiletime
COMMON_DEPEND="
>=app-arch/lz4-0_p131:=
+ app-arch/zstd:=
sys-libs/ncurses:0=
>=sys-libs/zlib-1.2.3:0=
libressl? ( dev-libs/libressl:0= )
@@ -267,6 +268,7 @@ src_configure() {
-DWITH_LZ4=system
# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-DWITH_RAPIDJSON=bundled
+ -DWITH_ZSTD=system
)
if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
diff --git a/dev-db/sadisplay/Manifest b/dev-db/sadisplay/Manifest
index ed7aa4fc217a..17239dc43694 100644
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@@ -1,3 +1,3 @@
DIST sadisplay-0.4.9.tar.gz 9536 BLAKE2B 0265eb470ab600b761cf6d0e1872c3225e863de8aa602fbcdb1839c33ced8825318d4e4f8ee24de420847c077d1830af069af37ea8d3e3e6c76f47dc2335e1b3 SHA512 30fe8dd2a6247328bc4d7640e5a34b15a062322729cb8a2ffb66c740145475a95ac924f752017fda8f347268ce598957cfe78e8fd6f80413267c72b143b3e8b8
-EBUILD sadisplay-0.4.9.ebuild 491 BLAKE2B de7c684280c9b262d2b7c2b3e0ebf6a1572db7313974776e899c6312980fd3fe6e0e36b4582e2ef3f9e4c7935a3477466f282e0230697f06d4c1e94326067716 SHA512 8f29053f89b23810d38226d818d30ee983d0d88cde05059cdc2d9bfced5b62a195a6de56e1c2e56c241d7f7437542f6f81ae498eb5cfda5b23d172c41312efe7
-MISC metadata.xml 723 BLAKE2B b68188d1029ee8525109cbfe77acc40eb086ca55d1a6dd7dbb09ecba629d6b212535f130d52248c04010e7723c1a0e6fb85a0936d1ce1376331c1da9719b6180 SHA512 956c5292c44d4c4567bc000e81a5469e6cf31e38eb6e4f4f66ef7a4def68f919708d6a4fa974d087f0550756e52af1a27c1c35e73d8c3e958106c25b7e95cb84
+EBUILD sadisplay-0.4.9.ebuild 478 BLAKE2B 1dfb1391b9810585a9c2871406b30f5f346cd85c0d5ac099a9d2d0ff5c8d91d70a749e38dfc39bc344a49654314f7bbb8e8913224ca283e03cd0ada8d218b0a3 SHA512 72942ef43fe427729fcb92091fdc8f9361b0a6e530f8d5edbfa0766c0dc138523e93639c2acd72d8a1216a36d7e7fda7f8d58c28e40c98db0398b2254ebbe8f5
+MISC metadata.xml 712 BLAKE2B 27421648f5f7843cdb0f3503cb6406d684a6236c51e80452c405a09682dc76ad09949d19dc7770f41cc3c406d7a1dcbbc606004e304d38d7c02e2d0df0c7519f SHA512 e8cdf8fb80041fe55731ebed4f797e0ec84e61bc59f4acf567a251fe3974aacb574bbe0d339ff01dc29b43ec4c8a2fffcee1406200ad0cb7807ccf97f3517251
diff --git a/dev-db/sadisplay/metadata.xml b/dev-db/sadisplay/metadata.xml
index fb7b2ca77d10..a55deabf108e 100644
--- a/dev-db/sadisplay/metadata.xml
+++ b/dev-db/sadisplay/metadata.xml
@@ -16,6 +16,6 @@
Supports mapped class inherit.
- estin/sadisplay
+ sadisplay
diff --git a/dev-db/sadisplay/sadisplay-0.4.9.ebuild b/dev-db/sadisplay/sadisplay-0.4.9.ebuild
index 648efe4ed064..e942723c8a79 100644
--- a/dev-db/sadisplay/sadisplay-0.4.9.ebuild
+++ b/dev-db/sadisplay/sadisplay-0.4.9.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="SqlAlchemy schema display script"
-HOMEPAGE="https://bitbucket.org/estin/sadisplay/wiki/Home"
+HOMEPAGE="https://pypi.org/project/sadisplay"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 64173052307d..27127f46eb5a 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/aeson-compat/Manifest b/dev-haskell/aeson-compat/Manifest
index 0b2c9f3303b5..06425ae20555 100644
--- a/dev-haskell/aeson-compat/Manifest
+++ b/dev-haskell/aeson-compat/Manifest
@@ -1,5 +1,3 @@
-DIST aeson-compat-0.3.6.tar.gz 8956 BLAKE2B 82a201543c2719e2bffbca1682e4181980ea5a26b7f0df782b5a5db7f99cbd60c477988d011ef8149f9f93fe8740935ef1fd174881cff62431d830b82da08708 SHA512 2d2bd172a1335886894df73fbb999ce5b8ae5ff710866560278b4bcf27a5ef4a2ff025a0a97cc4f764e85819bf6a9771bdaf7acbd830f1baee5f3133ff5c185d
DIST aeson-compat-0.3.9.tar.gz 7441 BLAKE2B c370023ca56ddcd1f60cd4ee57e29299178bb04f9fad274e3109424df926c357faeab4e22416938b71f5f3109cf90ed8b3282fe14250ac17c872ea887998a8bc SHA512 84da7cbace32527d0e20d32415ba770d14417ad4dd9ca0f86e8b5f100449af8a51a7b32c7dfdd7b3557764bd7dfc9ae4aa0a95999bc34b074f49d243a4f4bc46
-EBUILD aeson-compat-0.3.6.ebuild 2117 BLAKE2B 7bff5d6e8ccf25eae9541c2031e4d7a7594a33a785480ff2999fa6dd3c897a0c6e6d8af0174b9af8584f146f03c3f306d84fff37bde510226eaab2e99ac49569 SHA512 bb6e1730791b3f42c9eceb1cffbf48a711790d5afeb52a5ec1a445ed865f3ea5f01eb25ac3c926ff14475326d7387e757f360b984aaa0f0323e5d68c4b3460ec
EBUILD aeson-compat-0.3.9-r2.ebuild 2633 BLAKE2B fef286f819dde479ecff9f2607c5ead6d5815e29759ea00943e354a944a8831028747505395222aaa3f3555956d2d1003699f1a19803e6eef6b27a33c93fda49 SHA512 1c71693bc6fa9fb10b02b4e912769659dd16c55f25c6e13d382181a386e012d5d442c16a99ef8b80358a50498052e9da654c80df2943e9bf3647fea69eabe982
MISC metadata.xml 406 BLAKE2B 1c0f6ca620c1db4eccc6f1cc9f681e86ec441b2319b1f634b6c4d6317da0446820e5aa7a3ba51b7e9d3068286f1af8eea8df1c78517a514870b9bbb66666dc55 SHA512 9e9212d62d26253da1ea61274f831d6e799d32b0d888be0b341df2dbda4edac71023beba570ac3b58f244359736ec51f9e20053962e6995696f824a247fe5283
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
deleted file mode 100644
index 00a02581e95a..000000000000
--- a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
+++ /dev/null
@@ -1,50 +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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility layer for aeson"
-HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] =dev-haskell/attoparsec-0.12:=[profile?] =dev-haskell/base-compat-0.6.0:=[profile?] =dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/hashable-1.2:=[profile?] =dev-haskell/nats-1:=[profile?] =dev-haskell/scientific-0.3:=[profile?] =dev-haskell/semigroups-0.16.2.2:=[profile?] =dev-haskell/tagged-0.7.3:=[profile?] =dev-haskell/text-1.2:=[profile?] =dev-haskell/time-locale-compat-0.1.0.1:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/base-orphans-0.4.5 =dev-haskell/quickcheck-2.7.6
- >=dev-haskell/quickcheck-instances-0.3 =dev-haskell/tasty-0.10 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.8 =2.7.6 && <2.9.2' 'QuickCheck >=2.7.6'
-}
diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
index e089afdab32d..1d5ddde1da9a 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -1,13 +1,3 @@
-DIST aeson-0.6.2.1.tar.gz 110417 BLAKE2B 718321a0042771672e0e713ac35572f00e4e8feb1f9a4ed5e44c1b9e483aea6c6690f2c0107d8d1c23638308a14779efd5f90b7e0d026e23d49a9806d0ab5ae6 SHA512 01bd894f09a7e09ceb8cf3112dcb2dc290886d042c85f6db464526118767a1159ba94296f0419e500ab4059d7dc4f3a4e3a5e46aed0e032cc2e263ae207cc0ad
-DIST aeson-0.7.0.6.tar.gz 141565 BLAKE2B cad9f7826ee36241414341a50ad3bc5f2540412f667096cb0a3a6c8ac266c68a74bc887c58f89ee265693f2a60e096b016dcc21c99e0479dd6f27950e0476bd4 SHA512 68a34188e3fb3a4c99a9b2380b5b0e294c2e4a11321162cda7fc6b73c81e6706d51f77c069df4ada68e372867891fdee9ca2443993f802b06aa5137170e613ea
-DIST aeson-0.8.0.2.tar.gz 143850 BLAKE2B 23c8167d29d9ce82b43ca07904ba21bb6e6c8fba8a0bd2cc4a94bdc6869b338f728238d5a824425b2438515b39f0aedcf3d105d0a37315bf955c0f1cd623ea0f SHA512 fb5a976302b1422c11b0d20848dfa6b9f596874e59dd325868269fd61f4b2ee2b4bf12683c3758d7f24566564cfddb6426e64fb1f159bb8feb2eb35fb223caf0
-DIST aeson-0.9.0.1.tar.gz 154482 BLAKE2B 4ad5b665b1659279f5788c8a665916adc487bbd74138886b0dbf71eecfeba47d65734173e54062bcbee051f41bd7a536cd331c5f8b57c64a2b3aa4881f314df3 SHA512 04de524b10843fb12f8d51e72560d67a94e761edb515c472d891a61b56ab867c8fd8ed26d5fd7b2dc637a9b7ac1705e764a104e9253342984b755bb0f0e9128c
-DIST aeson-1.0.2.1.tar.gz 241837 BLAKE2B a8a4e0c9315c0e3b1a35ea9f87945200a324383e0cdcaf941809fbfb55f4c5d9e94206059d1457a3e825c2a52fdad16544e0b3aba09c35957829a15b28972199 SHA512 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e
DIST aeson-1.4.7.1.tar.gz 277911 BLAKE2B bffac6e82e7220f270fce44055859b27a97740b6f012f4e51d0970acd38a7bcd40d9bc3c4f1ba1df0df4d3d38dac0b8731dfdfe1f902b07a38efeaea842587d2 SHA512 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705
-EBUILD aeson-0.6.2.1.ebuild 1114 BLAKE2B f8d22044d1160ef1f7bb77b0fc559acf766b8fe285dfe30bb15393923f76a0f35086ee9ef8bc26c516630a1532d56766a5a5b36e69ce19cc273905794ce59464 SHA512 350d826aa92e6767998bf997bb9d7b39166cf153eb4e075416451e38dff0778bf652ae353b6c1004e97ff33e9db4616473a3c44d68ee79e4ca73890103d7ec4f
-EBUILD aeson-0.7.0.6.ebuild 1385 BLAKE2B 756b7db8ebf3bc596e0ba0297049c2d709ba092c55f4e9ec689d52e5d9eb496aa4e2c9a0be150dc32f67277baf49fd3fc32f0906b5be70d3408df1c4d24d3a1c SHA512 76f7e13df2819569b4c0efef85956ddfa1f33f483d7d0479d7689e49d456db2feaf4a344b5245908c6b754773caae983c075367af299e1e4f356c5052c441299
-EBUILD aeson-0.8.0.2.ebuild 1242 BLAKE2B 027f008fddcb0ac697639bd5199fe5eaa41d811ba8f85a4a18f7d7983c02da4d34b2bcd6b31b224acd6afed6e25a07df2393451bf26e8c23d9cf62a701b5a210 SHA512 3ed770a19261043fc044fe86b1486014a2957129c875f7d46a5ed58e21268264415cd038da10c5449b2511945ab8ba9498f0221a71ff0aa4de0a082cf4efedd2
-EBUILD aeson-0.9.0.1.ebuild 1316 BLAKE2B 5341afe4664de7330cd810cbf1c6951284ea5e24acdba2abe554d67959d35e36bcbe21ca381001ce168b6754bdfed6140882e13940089ebb6dfff43c9f3c067d SHA512 fc9545bfa6aadaeb6c10e621406895115f919cdc55f41fa43d63770f4b2d35e1c78f62117e422e90a33fce44a81444f915b4eff67de4b73cfc59e3350a2b2a56
-EBUILD aeson-1.0.2.1.ebuild 2054 BLAKE2B b397e7d0f41615308fce5ae011d7384080c48a5047d940f41a9f46c67dd56178df713d77eb5d6ecde815ad126bcab7c98e76130f927da9b33a21908f2eb47abe SHA512 1d1082708aafe189d84f17ffbacc4ce6f27cdb5b86c0b89df27a620842c2bd045fd6f12432f4d4991ded9bd7b568dce47bf6eba2076bb7b799ffe71fea69b761
EBUILD aeson-1.4.7.1.ebuild 3016 BLAKE2B cca901c7d0e1e3892d8f6feeec1f6466fb4b3383b29e47b4f7c39cc7a139b5dede445f2de99190ba4666be57bceb58b640a6c0da9f422b4d1b2380bd97091447 SHA512 65c1366c1d7548654a1ff11d6975cc7536ef2ef3a62fc70e63e451140d6f8ca8f2511d27d8e2eb5cef3b31e37284c0c1fd20e856c4272dacab18111f7dc957ec
MISC metadata.xml 2436 BLAKE2B 87b05446d30b70594247fd2bd04a9773236556816386c2fa4fd091640d83db60b816ec6fd44cb214fc6641d6063275f276507c07d0650f49f804d99032e1b165 SHA512 a59e16e85998fdcc3de3445928901365682af5af422a3b38f5470a67ae41a33a386532b66ac153383c978cedee1735fd98f1d385cf3f4d56041dbd5a805bc01d
diff --git a/dev-haskell/aeson/aeson-0.6.2.1.ebuild b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
deleted file mode 100644
index 4497b45385f6..000000000000
--- a/dev-haskell/aeson/aeson-0.6.2.1.ebuild
+++ /dev/null
@@ -1,42 +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.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
- >=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
- >=dev-haskell/dlist-0.2:=[profile?]
- >=dev-haskell/hashable-1.1.2.0:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/syb:=[profile?]
- >=dev-haskell/text-0.11.1.0:=[profile?]
- >=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8.0.2
- test? ( dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.7.0.6.ebuild b/dev-haskell/aeson/aeson-0.7.0.6.ebuild
deleted file mode 100644
index 764ae3414fb2..000000000000
--- a/dev-haskell/aeson/aeson-0.7.0.6.ebuild
+++ /dev/null
@@ -1,49 +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.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
- >=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
- >=dev-haskell/dlist-0.2:=[profile?]
- >=dev-haskell/hashable-1.1.2.0:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] =dev-haskell/text-0.11.1.0:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/attoparsec
- dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
- dev-haskell/text
- dev-haskell/unordered-containers
- dev-haskell/vector )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.8.0.2.ebuild b/dev-haskell/aeson/aeson-0.8.0.2.ebuild
deleted file mode 100644
index 1dcae51bc9c9..000000000000
--- a/dev-haskell/aeson/aeson-0.8.0.2.ebuild
+++ /dev/null
@@ -1,44 +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.4.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
- >=dev-haskell/dlist-0.2:=[profile?]
- >=dev-haskell/hashable-1.1.2.0:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] =dev-haskell/text-1.1.1.0:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.9.0.1.ebuild b/dev-haskell/aeson/aeson-0.9.0.1.ebuild
deleted file mode 100644
index 8e312c3bb82d..000000000000
--- a/dev-haskell/aeson/aeson-0.9.0.1.ebuild
+++ /dev/null
@@ -1,46 +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.4.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.0:=[profile?]
- >=dev-haskell/dlist-0.2:=[profile?]
- >=dev-haskell/hashable-1.1.2.0:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/old-locale:=[profile?]
- >=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] =dev-haskell/text-1.1.1.0:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5.0:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-1.0.2.1.ebuild b/dev-haskell/aeson/aeson-1.0.2.1.ebuild
deleted file mode 100644
index 344aade92cdc..000000000000
--- a/dev-haskell/aeson/aeson-1.0.2.1.ebuild
+++ /dev/null
@@ -1,56 +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
-#hackport: flags: -developer,-fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
- >=dev-haskell/base-compat-0.9.1:=[profile?] =dev-haskell/dlist-0.2:=[profile?]
- >=dev-haskell/fail-4.9:=[profile?] =dev-haskell/hashable-1.1.2.0:=[profile?]
- >=dev-haskell/nats-1:=[profile?] =dev-haskell/scientific-0.3.4.7:=[profile?] =dev-haskell/semigroups-0.18.2:=[profile?] =dev-haskell/tagged-0.8.3:=[profile?] =dev-haskell/text-1.1.1.0:=[profile?]
- >=dev-haskell/time-locale-compat-0.1.1:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2.5.0:=[profile?]
- >=dev-haskell/vector-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/base-orphans-0.5.3 =dev-haskell/generic-deriving-1.10 =dev-haskell/hashable-1.2.4.0
- >=dev-haskell/hashable-time-0.2 =dev-haskell/quickcheck-2.7 =dev-haskell/quickcheck-instances-0.3.12
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-developer \
- --flag=-fast
-}
diff --git a/dev-haskell/arithmoi/Manifest b/dev-haskell/arithmoi/Manifest
index 09a99cf82b9b..feae10841948 100644
--- a/dev-haskell/arithmoi/Manifest
+++ b/dev-haskell/arithmoi/Manifest
@@ -1,6 +1,8 @@
+DIST arithmoi-0.11.0.1.tar.gz 188071 BLAKE2B 0958f4dc0ac1f37a02c9c5e4908ba8a29df3aafe4e060c79076c9c86d9ed11242ab19aa6a4c7dd732fd620b0513b1056d70fcc984dfa3d6b6a5ef99f7e887728 SHA512 8140d9b035290faf9aa044f11f42c101e4a02f1346d5237f46338355828bb6b8bf44f3f8454abfaa6a88e381c2e5476d8512c6edf251dbaf8ba3d776ea68a641
DIST arithmoi-0.4.1.3.tar.gz 66196 BLAKE2B d576f3cace1ea39a55b6e9bcc3e3e6d941fe8ec6a0b31435f404bb0151a4170d4079cad96eefbb319c08ecc3aae5ab6141500b75925617b5fa4e6c86539fe93c SHA512 abc5939207e502dffd91b3a4e2b9c688eef388a6b9354576fcb4badf4625da1cad0e9698cb42b293b37cc29427ad2679170452374fbf6cd5e614d53db34cd9f6
DIST arithmoi-0.4.2.0.tar.gz 84676 BLAKE2B 971b2ba5cca0e2af9944a06f02f02b5ff2c0e613a3c3f6963fdd906c4d617ab19ceabc8bc16f8c7fe12d6fd540c439b1af138da7bed75494cdb3d4f41993e255 SHA512 687f12aef8baf98c778498b9a0bb33f0ac3175d009ba8dcd14d6ff8bb13252120f6821e80932410a1413637b591f81b92e0ecd25cd7870464e1629f3d0bf866c
DIST arithmoi-0.4.3.0.tar.gz 93661 BLAKE2B ff815ab9bcd8bd5ccbfcdde134049e98aebaf3c41b693b56c8048d918cc778fcb4ab321486d20b4084a61e340c0a00ae45541c12da4f8d19c7e28df81168a4a7 SHA512 0c67237a84a2c7e2abc1bbc78176e64e7f6ac23399c765dba316d429391f351734eacb924960d69d4fc603b17a4df1b40985bcbc8bbb7c51805eb72a0346b545
+EBUILD arithmoi-0.11.0.1.ebuild 1504 BLAKE2B 4ab2f6d416353799c5189b4b4e217fefa76acfcc42f6f27888b933cff2a212af9113a39d2c6068176e081b08e55d1ab8700db9ad7609307b3eab325e12e162c5 SHA512 1d580e0b228dca2fa6b3507ff5fb064798927462889a2e063b2059ea723e1f5d035f223d7c565de5810ba6be7984b52a4747cd5d361ef05f2cc73821ca330548
EBUILD arithmoi-0.4.1.3.ebuild 852 BLAKE2B 1230c36daa4c9e5601fbaf72ff518d83ca5ecbc09f2a15588d4a0d701ed5359f1895e0eb37d5f5de5e70fa74a923d8855fa33e93f01c9618bf87e29df9a1537e SHA512 7f5ab7e4cdafde89f41d192778d82317efda0701869cefa776914f55bbb62285814b830185a692e3ad10fd3c2fcb20cd8ce699aee220034296fa85f10c65865c
EBUILD arithmoi-0.4.2.0.ebuild 1219 BLAKE2B f756fe1889e9acb09ec080d00c5d807861fd264df980e3e21f69e3f446ac1cfd1dc6b6290ccc013900753de0301eb2eb9f87261f93247775e2220038fb373b6e SHA512 52f0f37defca1dc16d8817636e4a8e12f7e2b7fb79276fba507a4c2804a13e19e385bb05bde72fc2d993981326d8c1ab7cb8f9cf763bc291710e4cfc9f3b2f74
EBUILD arithmoi-0.4.3.0.ebuild 1376 BLAKE2B 91c16b5b4ca9aa9f2750a9c847c386adec266e593cbc9687d2529a212c308e0a7af8b8b1ff1aebfe92dc4d4edae4a9d4b0998ec4b6d357acd4c5b8273418a769 SHA512 008a4f4c4d5f594c8fa948d92255a3d3bdb7287218b8add5a5c3639f414d9c2d9ce1ffea0ad93df1d0bc16f18a7929a0f65eff6b10fc575603e5b5c33eeeea9b
diff --git a/dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild b/dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild
new file mode 100644
index 000000000000..96a95a839f5e
--- /dev/null
+++ b/dev-haskell/arithmoi/arithmoi-0.11.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+#hackport: flags: -check-bounds
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
+HOMEPAGE="https://github.com/Bodigrim/arithmoi"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/chimera-0.3:=[profile?]
+ dev-haskell/constraints:=[profile?]
+ >=dev-haskell/exact-pi-0.5:=[profile?]
+ >=dev-haskell/integer-logarithms-1.0:=[profile?]
+ >=dev-haskell/integer-roots-1.0:=[profile?]
+ dev-haskell/mod:=[profile?]
+ >=dev-haskell/random-1.0:=[profile?] =dev-haskell/semirings-0.5.2:=[profile?]
+ >=dev-haskell/vector-0.12:=[profile?]
+ >=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0.0.2
+ test? ( >=dev-haskell/quickcheck-2.10
+ >=dev-haskell/quickcheck-classes-0.6.3
+ >=dev-haskell/smallcheck-1.2 =dev-haskell/tasty-0.10
+ >=dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.9 =dev-haskell/tasty-rerun-1.1.17
+ >=dev-haskell/tasty-smallcheck-0.8 =dev-haskell/aeson-0.7.0.6:=[profile?] =dev-haskell/case-insensitive-1.2.0.4:=[profile?] =dev-haskell/hashable-1.2.3.3:=[profile?] =dev-haskell/nats-1:=[profile?] =dev-haskell/scientific-0.3.3.8:=[profile?] =dev-haskell/semigroups-0.16.2.2:=[profile?]
- >=dev-haskell/tagged-0.7.3:=[profile?] =dev-haskell/text-1.2.0.6:=[profile?] =dev-haskell/text-binary-0.1.0:=[profile?] =dev-haskell/unordered-containers-0.2.5.1:=[profile?] =dev-haskell/vector-0.10.12.3:=[profile?] =dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] =dev-haskell/void-0.7:=[profile?] =dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/quickcheck-2.7 =dev-haskell/quickcheck-instances-0.3.11 =dev-haskell/tasty-0.10.1.2 =dev-haskell/tasty-quickcheck-0.8.3.2 =0.16.2.2 && <0.18.3' 'semigroups >=0.16.2.2'
-}
diff --git a/dev-haskell/binary-tagged/Manifest b/dev-haskell/binary-tagged/Manifest
index 744c45e187cd..03a4bfd01722 100644
--- a/dev-haskell/binary-tagged/Manifest
+++ b/dev-haskell/binary-tagged/Manifest
@@ -1,5 +1,3 @@
-DIST binary-tagged-0.1.4.2.tar.gz 9318 BLAKE2B 19a3878d755a57fbeebed38451c55c5695637ee136491ded830a127dcb4f33106bbaf7efb3d3101dc0c37f752e30e93c2ec1216a33343093431d0144c0dcff48 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706
DIST binary-tagged-0.2.tar.gz 9570 BLAKE2B 06519bc4862da1ad4804c487f5b250600e20dff479d47db88dc0b83030a08078b41d1a6691a7b9dc2de62defb797d30bc8081158e722a6c564e08e1a89287971 SHA512 03bcf80b39d5f8e1256ac45b557904d6750d1786f4b4da0c1b9e5c004503d5375699480f89426145a3eea103555c5f4fc820cb87053a2b6ccf4c7e1d6faf7120
-EBUILD binary-tagged-0.1.4.2-r1.ebuild 1750 BLAKE2B 459423322f53157aabe4e212fd3e29d63aa01a3ea1735c93b0d5161e70de1f94d271a2babd4f3108f37ca71e78c2e84b69d8012b42a3d9571c8d3a1aa1de7f42 SHA512 0a8a3f62ee66433eeca76e6e5dca3c534fca05d3d27ba8275c18ba8722af16125e4af89af01f6dc783a188cd51fe205fad6e7147440daf18f1ba1b74d7b88ece
EBUILD binary-tagged-0.2.ebuild 1867 BLAKE2B 18c29fac1c2a545aef83b1c3ab03e61a0b00882a1b9b3c9e13d968ab7bbeee8a3746a9d9ecd0ab9d927a4c256e3ea44f78ceb874a1282410c6eb843a52230d25 SHA512 6dd4ae5a216601dd235496368543c21b393500da4ca647fe288630bbd02ca85cb401339675d893896185cbfc15bde897956a6b5671a7cf6126ea5d291b90d35d
MISC metadata.xml 368 BLAKE2B 4a2cfcab1db7331b6fb7a0af0a836cb4120311fd32945e54e38d15e2b41c660fe77ccb3ca06f0bd603925454df743d0009ff35306c588af05a8e4b256a4f5de0 SHA512 350883a8527ece2449b4eb86d119faa19ca697fd8c74967710dace371b04c3bda09df8870394c6fdb606aa8d07d9d7b36da355a21bd6abef67cd42ccecdd05ae
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
deleted file mode 100644
index 885f31709904..000000000000
--- a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
+++ /dev/null
@@ -1,48 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Tagged binary serialisation"
-HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] =dev-haskell/base16-bytestring-0.1.1.6:=[profile?] =dev-haskell/generics-sop-0.1:=[profile?]
- >=dev-haskell/hashable-1.2:=[profile?] =dev-haskell/nats-1:=[profile?] =dev-haskell/scientific-0.3:=[profile?] =dev-haskell/semigroups-0.16:=[profile?] =dev-haskell/sha-1.6:=[profile?] =dev-haskell/tagged-0.7:=[profile?] =dev-haskell/text-1.2:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/bifunctors
- >=dev-haskell/binary-orphans-0.1.1
- dev-haskell/quickcheck-instances
- dev-haskell/tasty
- dev-haskell/tasty-quickcheck )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'generics-sop >=0.1 && <0.3' 'generics-sop >=0.1'
-}
diff --git a/dev-haskell/bytes/Manifest b/dev-haskell/bytes/Manifest
index c24d3f1bd117..d712859d1f41 100644
--- a/dev-haskell/bytes/Manifest
+++ b/dev-haskell/bytes/Manifest
@@ -1,5 +1,7 @@
DIST bytes-0.15.2.tar.gz 18834 BLAKE2B 18f0e2618a3ed7f4eefaabd0c4b4ca6b99e4493ae0b73dee9a7f0fe1c2e980a4e8714e50198177a657d6ac06c08227350dc342178f5565444ea9f23904d01585 SHA512 339da2fe49a6acd307057bfcc79e7ac09eefb9a93ec60cd52a8d425337e7bf355ca8aa42f304863df773b0ef2c459b53571920611cf1ef8f98e78d112cc6ad29
DIST bytes-0.15.5.tar.gz 19354 BLAKE2B cd6845be4c541a231d52e985532379c166a84346f57687f6407716ed0c9ea17b0fe10dc2f5cf500898398dea8227ec2277967847a8eec49e49e21236d14a1b62 SHA512 c9c6b2978345e4e8eb3b12e0600e286f73a419db403fb3fe003b637cd045b1d52207f8ab06d8fcb583fd094095e62de81e4066c851b3a419c0731534a645c7f6
+DIST bytes-0.17.tar.gz 19794 BLAKE2B 12ed44aced19c62e5a78673ca01cdbc0b42d3d265b0254ced120c95ffaa1264be53db3bcedc9a84ad7a0ebf443f40ba6693d04774b307033944d4c9709a06469 SHA512 1114bfb8db6a870b1edb1a77d9234ce0bdac38a5d12708de537d09bca2a3580d16755031b704b9fdceaa0a531009b7e7f392a6f1ee173eff9720774038f675a1
EBUILD bytes-0.15.2.ebuild 1616 BLAKE2B 19e5960818467c840418c0431391378053e155dc42083ec46b5a5aca9874d61447212cb519e6a3a7e0391c065bb680b0647ae4372a646737f251556b14330f30 SHA512 76378492743de8a7ed68ce03898b441dfadb5cc30644670514841b1baf863d95abc76e435129b093de859ed0e4d16e8b60773dffa4399f3444973f59eae658a2
EBUILD bytes-0.15.5.ebuild 1745 BLAKE2B afde13a66c44ccc9bb31fd1b61ae5b5d0ab22a7c1ccd834925381f585c3a0942ab1d22886e35c24c29ce99aa8f5bcb6e4c148b52c7471feae1c75be4ec03f283 SHA512 751b935091825309dd22a52b7429dd6f85a9a62b3517a59ad828e3b234caa477a3ca6b8487481c285c671959ede48bec7dc6831301bf18017d016b94acd90ca1
+EBUILD bytes-0.17.ebuild 1798 BLAKE2B 103202689b5959ff87f729606845b27cf42c8c7363fcb9fc817881979d55e94abb139b77fd0da40c8d092f8e7305804d4b889a18d391215fa2c851370bdb4002 SHA512 158dd0e81cd113c7a00af327015cc867cd93a20814073182ec467f23736340bfd991eea4837e0d515ab79061388a7e87874f84862afd74839acc2d7377e51b4e
MISC metadata.xml 546 BLAKE2B cad0bd3e287b2b7837e477aefdd4a2e7fec6acc0ac4c9be876a089f48c31bd507c5fa6a037289153774b1d55adaff81926327e1ce6001dc5bb0ca790228a211a SHA512 1f54179d87820c310fb26f4b168bcb2cfbc5d668d6893867e19015a8def8afb08d6f40482b27237a858e80d6252ad793230e43a467a84d9ae8e87501b4acdca7
diff --git a/dev-haskell/bytes/bytes-0.17.ebuild b/dev-haskell/bytes/bytes-0.17.ebuild
new file mode 100644
index 000000000000..5707b82636dd
--- /dev/null
+++ b/dev-haskell/bytes/bytes-0.17.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Sharing code for serialization between binary and cereal"
+HOMEPAGE="https://github.com/ekmett/bytes"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+test-doctests"
+
+RESTRICT=test # fail to doctest
+
+RDEPEND=">=dev-haskell/binary-orphans-1.0.1:=[profile?] =dev-haskell/cereal-0.5.2:=[profile?] =dev-haskell/fail-4.9.0.0:=[profile?] =dev-haskell/hashable-1.0.1.1:=[profile?] =dev-haskell/mtl-2.0:=[profile?] =dev-haskell/scientific-0.0:=[profile?] =dev-haskell/semigroups-0.5:=[profile?] =dev-haskell/text-0.2:=[profile?] =dev-haskell/transformers-compat-0.6.5:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/void-0.6:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-doctest-1 =dev-haskell/doctest-0.11.1 =dev-lang/ghc-8.0.1:=
+ representable? ( dev-haskell/adjunctions:=[profile?]
+ dev-haskell/distributive:=[profile?]
+ dev-haskell/mtl:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( >=dev-haskell/quickcheck-2.10
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck
+ dev-haskell/tasty-smallcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag representable representable)
+}
diff --git a/dev-haskell/chimera/metadata.xml b/dev-haskell/chimera/metadata.xml
new file mode 100644
index 000000000000..317b99f5cc7f
--- /dev/null
+++ b/dev-haskell/chimera/metadata.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
+ There are plenty of memoizing libraries on Hackage, but they
+ usually fall into two categories:
+
+ * Store cache as a flat array, enabling us
+ to obtain cached values in O(1) time, which is nice.
+ The drawback is that one must specify the size
+ of the array beforehand,
+ limiting an interval of inputs,
+ and actually allocate it at once.
+ * Store cache as a lazy binary tree.
+ Thanks to laziness, one can freely use the full range of inputs.
+ The drawback is that obtaining values from a tree
+ takes logarithmic time and is unfriendly to CPU cache,
+ which kinda defeats the purpose.
+
+ This package intends to tackle both issues,
+ providing a data type 'Chimera' for
+ lazy infinite compact streams with cache-friendly O(1) indexing.
+
+ Additional features include:
+
+ * memoization of recursive functions and recurrent sequences,
+ * memoization of functions of several, possibly signed arguments,
+ * efficient memoization of boolean predicates.
+
+
diff --git a/dev-haskell/criterion-measurement/Manifest b/dev-haskell/criterion-measurement/Manifest
new file mode 100644
index 000000000000..119e22195f7e
--- /dev/null
+++ b/dev-haskell/criterion-measurement/Manifest
@@ -0,0 +1,3 @@
+DIST criterion-measurement-0.1.2.0.tar.gz 16650 BLAKE2B ec4379e6ea016d23e5ee4b0c61404421bf3ba207ecc29063e426f136e1a56ef93a5c5e6f404f17796088e773ab9c4a0e971a587977c57d8ecd3edf33ba72b23d SHA512 d82196d0b4a501795e8f3498b17db89c5febf6cfd2131da262aacc7b268248bb21c7d4e6530789a40a47c4e74e28e34ab5ff3477b2e28f54ddafd01e7cd5993a
+EBUILD criterion-measurement-0.1.2.0.ebuild 762 BLAKE2B 1a96d0b61c2ab9e31259ead654ae766aae8812755c0869631d6d7c2010c1fbd3ae8d5b985ac2be7d37cf52cf80642cf5584d3b5394a99de3e8089a1b6dbd8da0 SHA512 a2b0b61f5a4e13722a6d2d2500514bacffbcea9043aecb351f8a87dba100007cf333c1627a9e55ac4ae4a76ed5301781122e51fef9db471a547820971690be1b
+MISC metadata.xml 446 BLAKE2B 25d79c6267fb72acfb477497fc0642a03345b18684f46f675aba3beeb328ac897334c5c9912871a9e438884df56dcb95c55f5d3492d39e6a8e7003c25183af1f SHA512 e48694fda51232fcc25bab83653fdd1e907eab571a3bce0c5aad325674459b9522ad20aca647f6b81ee1252228c85604e1f68eee2a560642d099de6f583c4297
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
new file mode 100644
index 000000000000..3c10a5145290
--- /dev/null
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Criterion measurement functionality and associated types"
+HOMEPAGE="https://github.com/bos/criterion"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+ >=dev-haskell/base-compat-0.9:=[profile?]
+ >=dev-haskell/vector-0.7.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-fast
+}
diff --git a/dev-haskell/criterion-measurement/metadata.xml b/dev-haskell/criterion-measurement/metadata.xml
new file mode 100644
index 000000000000..60db1a96a0ae
--- /dev/null
+++ b/dev-haskell/criterion-measurement/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ Measurement-related functionality extracted from Criterion, with minimal dependencies. The rationale for this is to enable alternative analysis front-ends.
+
+
diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest
index 9cc9f711ea57..85d86f54f10b 100644
--- a/dev-haskell/criterion/Manifest
+++ b/dev-haskell/criterion/Manifest
@@ -1,11 +1,3 @@
-DIST criterion-0.8.1.0.tar.gz 155095 BLAKE2B a5bd4a6c0cb7b3866199ae2f7fdb9d7e3e501af628c71873f23504ae5b4d9cb39f7e14c5b45c6310ea1c2dd2751aba44db9e5b26509a55d8d3fb350c170775fb SHA512 96dd101dfcbb4cfea446235137d163e9bb806b8dbc6ca7cdb19f380dc8c6ad0169f22b08acb638c0e731be659b1f761cc4f3d33154c5cda3f44bf6f854b1b485
-DIST criterion-1.0.2.0.tar.gz 1003368 BLAKE2B 7281cc53a3e9ef0d91bc8730bf6d43b864fb164a5b2e556c9809414a89db880d15eb20c759a9925228b5fdd0df368025a4287efd094b4a500b86e42e9ee5f602 SHA512 35063822e12bca0b8ad41d2e6fd2c6ddfd58432467d9fee7ca537e03fb0100dcf6c11565abd21c11c0736bc0e2c9977f248a559eec7c8b049c27ff54ea58f01a
-DIST criterion-1.1.0.0.tar.gz 1004534 BLAKE2B ad6697171457e20b6ce52cfeb36d472977adf7cb931a2bb192e66557265a31658a0b90dda59a0fbf264f8d2d0581b14b963797140166aabdbf32f443abd4a537 SHA512 959635b49fbe9aeaffb8eb072e9998934732028311031debf5dc3bcbe7ea89ea3a330fe6656272888896ee9ee5e324d1ea72b25fbc0b5c466eb060d654ca61b6
-DIST criterion-1.1.1.0.tar.gz 866254 BLAKE2B e750fdc50c7b6629761bbdf3642ccd64ebc08c2bff5798225a53fab26a72c441be7481d9372cedc6cfa39fae2a2ce8da4855a806318b9a1b52bb5926762b4210 SHA512 964b81cc160c7c402ece1de57fddbd8ae454934fe4d3ca30da9f0d8f036019a14e462a0b4a63a4c38992e295002e3fb2dd082960c4934a19b36463157ef3594a
-DIST criterion-1.1.4.0.tar.gz 119945 BLAKE2B 0064eb86a9d6b9298cb17cc7a4e45374e0e8ef2a7b4c2f5dbadc38ca7a75da940152479bd64ff15768f76db6c02c20833dd9fd5faac33196208e6f352b2a7485 SHA512 b503bd50cfeccfe6222ac1af91ad6d10b600cc9609a107d3b46c9e470ec39f2ce24d6debc730045b178b2c599575710c29940dc5c595ffb28e9243e02f624f0c
-EBUILD criterion-0.8.1.0.ebuild 1037 BLAKE2B 9d6e1648437a3c614a8c54f8107dff0dc2270fe31c46843097f3a24620d353549b806d0bd44cd87d03ad3a87d5b163efd9744720ebe859cd8c412fd2273478fe SHA512 794c46e261019aef2c06f0d159902aea27147180b9fe9e34cd0d3613e8a56fd711c7f54811138bb6a8434bc210b8cfbfeccfec5c9b66cba8c1001e571866d3ad
-EBUILD criterion-1.0.2.0.ebuild 1401 BLAKE2B f1b2149fee92adb629412e0ce9df4c715c6907098af0356dd9ef4249591d8a268eb8d3c80e2a9c89950ebd19d5d4fc4c7b70b48ec69cafa7b13c4abfff2d66d7 SHA512 ee416adfe5f4b058f317e1ac60453e0b8366bfe03d5fb1be2fc32738b41b10689209c95185ba1ea9d9f12f03c637a9d4f6204c6984099225656595ebc8032baa
-EBUILD criterion-1.1.0.0.ebuild 1430 BLAKE2B 4463ca2c32b23f6128bca7cb836e23d31b8a40910275515a29090e9feda5ab7f90dbe27f443f2cc1f4db78c84e131bc24cee0b0a1fd8268553d5723bd3fceec8 SHA512 24ba6f65f7b629ca766433989f8fde59dd8f3777659be7f587afacf52d26d8228fa640267d2d3e78d2f61e965473f67fc30ad890c6f885b10da29e312788658b
-EBUILD criterion-1.1.1.0.ebuild 1430 BLAKE2B a65d4032c82cf3043fa6bcf6139bdb854e3f3b8e044a43e818669d0b39067839a570b659075b4de3b60a8afb47c2fd789a0aafa1346a1168d53a34d72c112d53 SHA512 253ae87e0a8435f3e42eb00719b26c42697754d4c6ec8ee1a3ecf0fd5d57534aa1b15a4f1c798fd56ed7899e4494c02981c456db205fbb03c0e498ab4faf9b08
-EBUILD criterion-1.1.4.0.ebuild 1546 BLAKE2B cf89acd2bdba8823fa6e85581e37681fe66e5b7c9e5d26bda308f31aed1ffb07d49998f97793eba8329a0d80673a00ca1cbebdcf7970f53119ecb839fa93388a SHA512 3c47d6c49840e5ed596f52b952a466d3daa77c46c4549c4ad4a8bddcff39e13b1af5092af16018fa63d64a62eb6829a36bbec15757480d16114d05918b4dcaa9
-MISC metadata.xml 755 BLAKE2B fc08f1348bf25a9baf4c39e499f54c977af78a505e735b2e092e64b902558d80c71d57d9b91404577ecf45fef428c92652d02ed786dafcddae805e9ee9707c36 SHA512 5e4f4147f5fb4f4101646d869d6d76557cf313cb37b0079e64cfa00530578689c8f5c90cea95f9f55cb216fed10ca498663e0e60a81fe5b1a19ed812ec673e49
+DIST criterion-1.5.6.2.tar.gz 120212 BLAKE2B cd21eb95013eb4eb80ecbf13cdd599efc6f08e26522ed876fda54b97744a75330fbf2bfff8b626feadb2627d0445749aea0d6412ff5d901a922433a88b952ee8 SHA512 48e4c0803480fa21830342ff7fd016e15de1b598fb8c4541710c6a9d81e4919bfcb22bc5fbd1ac417e79df902f1154f20aa3e3081efcf6a9af872f00142c3af0
+EBUILD criterion-1.5.6.2.ebuild 2238 BLAKE2B adc4b745f8abf0aaed7ac65384a3eb097cc7d800c2642b39860bb8322ced6a9b118fdb46e860a7239a4b1b3a210d51f82ed2661075710dbed034ce79666c612c SHA512 943e3a5bd1a2e2436ab998a6a84b5fad13647216ef52315d00bf7567ff23c50bab9b771ec8d282046e1fb7b21ae632eb39412123415ccedddac2b12f9b7eaf50
+MISC metadata.xml 873 BLAKE2B a7cce41d5ff03f5d53161a9813ff73570b8d2905f58e9d1c4a8a58628855c1a3f015db3a39eb275db60a4846edc161025e73b2b9aab0936fb565f8b41d77f901 SHA512 1657a1bca96c4e0b9183c5576327e039787e603d69e107a322ee378657a69bf1d2fc6e552c04807b86da4bbd4286f401398315bebf545c6a7a1a0821f0fc3897
diff --git a/dev-haskell/criterion/criterion-0.8.1.0.ebuild b/dev-haskell/criterion/criterion-0.8.1.0.ebuild
deleted file mode 100644
index bdb1e5227df0..000000000000
--- a/dev-haskell/criterion/criterion-0.8.1.0.ebuild
+++ /dev/null
@@ -1,36 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="https://github.com/bos/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.3.2.12:=[profile?]
- >=dev-haskell/binary-0.6.3.0:=[profile?]
- >=dev-haskell/glob-0.7.2:=[profile?]
- >=dev-haskell/hastache-0.6.0:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
- >=dev-haskell/parsec-3.1.0:=[profile?]
- >=dev-haskell/statistics-0.11:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-haskell/vector-algorithms-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/criterion/criterion-1.0.2.0.ebuild b/dev-haskell/criterion/criterion-1.0.2.0.ebuild
deleted file mode 100644
index 67bd2a16b403..000000000000
--- a/dev-haskell/criterion/criterion-1.0.2.0.ebuild
+++ /dev/null
@@ -1,45 +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.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
- dev-haskell/ansi-wl-pprint:=[profile?]
- >=dev-haskell/binary-0.5.1.0:=[profile?]
- >=dev-haskell/cassava-0.3.0.0:=[profile?]
- dev-haskell/either:=[profile?]
- >=dev-haskell/glob-0.7.2:=[profile?]
- >=dev-haskell/hastache-0.6.0:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
- >=dev-haskell/optparse-applicative-0.11:=[profile?]
- >=dev-haskell/parsec-3.1.0:=[profile?]
- >=dev-haskell/statistics-0.13.2.1:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-haskell/vector-algorithms-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.4
- dev-haskell/test-framework-hunit
- >=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.0.0.ebuild b/dev-haskell/criterion/criterion-1.1.0.0.ebuild
deleted file mode 100644
index 189ff62eb5fb..000000000000
--- a/dev-haskell/criterion/criterion-1.1.0.0.ebuild
+++ /dev/null
@@ -1,45 +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.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
- >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
- >=dev-haskell/binary-0.5.1.0:=[profile?]
- >=dev-haskell/cassava-0.3.0.0:=[profile?]
- >=dev-haskell/glob-0.7.2:=[profile?]
- >=dev-haskell/hastache-0.6.0:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
- >=dev-haskell/optparse-applicative-0.11:=[profile?]
- >=dev-haskell/parsec-3.1.0:=[profile?]
- >=dev-haskell/statistics-0.13.2.1:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-haskell/vector-algorithms-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.4
- dev-haskell/test-framework-hunit
- >=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.1.0.ebuild b/dev-haskell/criterion/criterion-1.1.1.0.ebuild
deleted file mode 100644
index 717002631465..000000000000
--- a/dev-haskell/criterion/criterion-1.1.1.0.ebuild
+++ /dev/null
@@ -1,45 +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.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
- >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
- >=dev-haskell/binary-0.5.1.0:=[profile?]
- >=dev-haskell/cassava-0.3.0.0:=[profile?]
- >=dev-haskell/glob-0.7.2:=[profile?]
- >=dev-haskell/hastache-0.6.0:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- >=dev-haskell/mwc-random-0.8.0.3:=[profile?]
- >=dev-haskell/optparse-applicative-0.11:=[profile?]
- >=dev-haskell/parsec-3.1.0:=[profile?]
- >=dev-haskell/statistics-0.13.2.1:=[profile?]
- >=dev-haskell/text-0.11:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?]
- >=dev-haskell/vector-0.7.1:=[profile?]
- >=dev-haskell/vector-algorithms-0.4:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.4
- dev-haskell/test-framework-hunit
- >=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.4.0.ebuild b/dev-haskell/criterion/criterion-1.5.6.2.ebuild
similarity index 55%
rename from dev-haskell/criterion/criterion-1.1.4.0.ebuild
rename to dev-haskell/criterion/criterion-1.5.6.2.ebuild
index 0b9207692521..23f8a110dba2 100644
--- a/dev-haskell/criterion/criterion-1.1.4.0.ebuild
+++ b/dev-haskell/criterion/criterion-1.5.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-# ebuild generated by hackport 0.5.1.9999
+# ebuild generated by hackport 0.6.4
#hackport: flags: -fast
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -16,30 +16,38 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="embed-data-files"
RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
+ >=dev-haskell/base-compat-batteries-0.10:=[profile?] =dev-haskell/binary-orphans-1.0.1:=[profile?] =dev-haskell/cassava-0.3.0.0:=[profile?]
dev-haskell/code-page:=[profile?]
+ >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] =dev-haskell/exceptions-0.8.2:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/glob-0.7.2:=[profile?]
- >=dev-haskell/hastache-0.6.0:=[profile?]
dev-haskell/js-flot:=[profile?]
dev-haskell/js-jquery:=[profile?]
+ >=dev-haskell/microstache-1.0.1:=[profile?] =dev-haskell/mtl-2:=[profile?]
>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
>=dev-haskell/optparse-applicative-0.13:=[profile?]
>=dev-haskell/parsec-3.1.0:=[profile?]
- >=dev-haskell/statistics-0.13.2.1:=[profile?] =dev-haskell/statistics-0.14:=[profile?] =dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/transformers-compat-0.4:=[profile?]
+ >=dev-haskell/transformers-compat-0.6.4:=[profile?]
>=dev-haskell/vector-0.7.1:=[profile?]
>=dev-haskell/vector-algorithms-0.4:=[profile?]
>=dev-lang/ghc-7.8.2:=
+ embed-data-files? ( haskell@gentoo.org
Gentoo Haskell
+
This library provides a powerful but simple way to measure the
performance of Haskell code. It provides both a framework for
diff --git a/dev-haskell/data-default-class/Manifest b/dev-haskell/data-default-class/Manifest
index 19ed2fca5ab6..c411b62204ba 100644
--- a/dev-haskell/data-default-class/Manifest
+++ b/dev-haskell/data-default-class/Manifest
@@ -1,3 +1,5 @@
DIST data-default-class-0.0.1.tar.gz 1461 BLAKE2B 59bdb47ee92796b1ec6b46eccd93da9928b7208ed47cb4f1f97dbc8374f4bdd89a30c28ac23bde0d084d2eecfe6c58301a64b73223a7667c722b3dad8da0ea98 SHA512 f9960deb48938bf0364273762662e56ad0dba3d5db005bf0a00b8eff11cfa2e94c5b5c1d2b2af2622a680dad4495cb31445a17074cfe752cbcf3de7b91e0e313
+DIST data-default-class-0.1.2.0.tar.gz 2522 BLAKE2B b6449a9bfbd9fa352a7cc453540f3b8eb69c0f144635d573d6073ed950b7289f3e71aecada5f8d85faed7293b1203133a9239dbeb9e5e6b286404b0b6948a67c SHA512 293c899cb2b5cded58baa086251110e4c5e7a15477f1864c33be30be8d16d6fadb55e1b5fa8117f4c47ac5c86ac09abb2f7f8b3b4fb658d1492eadd099f6f7b2
EBUILD data-default-class-0.0.1.ebuild 591 BLAKE2B 35dcd277267cc07e1ef3d188c9d2e3a3098f6b55d2f481b70fa917831a04e7baf68f094ebcebb8a0906f926092494cbb43e2808f1df6d98fd75413e662a617d2 SHA512 dad5f73197cad1d607e828f52800028a3026091a632c08faae8cdf5e9c31a99264a4e860c4ad4665f6c50bb4b900f0c44c7e295ed3ca4c488ebc3a9bc1d8cd17
+EBUILD data-default-class-0.1.2.0.ebuild 588 BLAKE2B 5736871abc9ad85de7c7ed57d098c3cd1efc66a180bec9d3aa6f4f0bfcb9b375bff3ff5e250950e10228b8a994a1cba193f8a0ba530a6ad0abdf3a23dd185220 SHA512 e0f4b849d52345ad7e11757e40fb332388d9fa66b5a8b16afb269a6fcd3cba91d90a5255d1a96624177b3eb77ee1925d8ec9a93c3c828a2a34c7eed408284b53
MISC metadata.xml 329 BLAKE2B 43b0027f4eac9c823695630e0f414b99bd0460e9958141ee7f3aa4c6615a57722b3958dd9fb96288a3c88c8da98f150bd2ac5e0d2c5f567e24d6b82358835af2 SHA512 c0cf6ea5636d8e9b5c038d4ed8eb81ed2698a56e30050d3aa28b55a65dcce1aa8258bc4f4d6456ba546627be96a7f3588cdc02978774eeef8ecf49ca0ebf6d9e
diff --git a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
new file mode 100644
index 000000000000..40887e49f0ab
--- /dev/null
+++ b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types with a default value"
+HOMEPAGE="http://hackage.haskell.org/package/data-default-class"
+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"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-instances-base/Manifest b/dev-haskell/data-default-instances-base/Manifest
index 1000e15875ca..ef860cab6593 100644
--- a/dev-haskell/data-default-instances-base/Manifest
+++ b/dev-haskell/data-default-instances-base/Manifest
@@ -1,3 +1,5 @@
DIST data-default-instances-base-0.0.1.tar.gz 1930 BLAKE2B 61faf28f84aeb2fccf07845072a7480ec14f30744fa310bec74cc1e26d2fba1c55872380c417b8b7697656e81bb0b90ee9b6da60af8395b19dfc13eb45520ee5 SHA512 e5598ef3d940b9512b0e18bcc526d41ca08df3d8b0a640717914ff7c510de68b6a8aa1299d0681062f510b31be3f62f6f318dc305e2797879739e19a8c871728
+DIST data-default-instances-base-0.1.0.1.tar.gz 1554 BLAKE2B 3dd2c2dd09790e96ca0921af32f2c384b40a9ae9978f25843e32710545be1715b19b2bc25324c8a541986bf1b620d8aeef879ad282e0124d48bbc45daa5378a2 SHA512 32d25a84dc22be5fc0145a32eb4bb8879c4ab43ec08cba9a6e48084e668ca704b1fa69b82f756759a467c23958878c0dfe00620a6a8763e95e319ef71dcbb46d
EBUILD data-default-instances-base-0.0.1.ebuild 642 BLAKE2B d1c988a2b4c00d466016ee8195441935204622b7832869006a5d7134465a82107105415f19b94b3aea1af4fc6aba0030b5496453f27e7f951b770db9e39bdd32 SHA512 6f55af0c4432409e9ac5d2e1b7ab6c047df7f1ab87b3af13bf710a43f1315747da4b91b5aaef3e525c35f80e74477a88a5065c381070b79dc2981ee9f7b4f440
+EBUILD data-default-instances-base-0.1.0.1.ebuild 648 BLAKE2B d46e0731c2eda81dedf2392731e9a9190cb68b6e76578dbf34b6848de8685a35c709f7c03e807b6e0473b1b154e4c71d2670ac183e009c6dbbc69f92f82391c5 SHA512 6d192b345b3abba1d59837a7342f780d3054ac988fff41cb2056c73c26a399e75ddfdcbaad73cc6ab79bf3805b3f0c992cf19eb5ba3eaee6f547a8e4e8cca510
MISC metadata.xml 326 BLAKE2B a53bded82cab952d7f6dcf8d5c714023a308a6bffb03c15942e7a4ff7ddc3432fb5cbe465b15b33d7b70a1c5a79e25f61a3cdc79511f5178f4140db5844a1dc2 SHA512 79bb1f0f9f4ea2cce2c3c806eae5eb3b0035d7d649c550528f8aac9bfb824ef8f017e9c56f59b884558dbdc1bdd350990adbb4bdf99eef3107d1e8ac08d5de8b
diff --git a/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild b/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
new file mode 100644
index 000000000000..4ec2b2aa0921
--- /dev/null
+++ b/dev-haskell/data-default-instances-base/data-default-instances-base-0.1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Default instances for types in base"
+HOMEPAGE="http://hackage.haskell.org/package/data-default-instances-base"
+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"
+IUSE=""
+
+RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index dda10397bc69..620a618f34e5 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -1,15 +1,3 @@
-DIST DAV-0.4.1.tar.gz 18631 BLAKE2B 503b2746100668e9fa230029b34c8659bdaf504a3b966a6abaddc909ace2686d876c53808d038aeff4061d128643bc10e782b6295f9e0c5a52c90146784b1980 SHA512 280aef7ab401df1a8b724a6ba610257085fa1829b38860dfc676c4764a95ea3a9e53d6c18007a66bad0caff931891138c9512361d2d21107582a44e534cc98ff
-DIST DAV-0.5.1.tar.gz 18657 BLAKE2B 0638bd6f1b860163f0261035d638f78af557d9998917fdea152e8d38c0e9e6c45f8031154081d9ab4ff70cd6dfab313153b3c1c8a8fb2481b3ad73517fb4176b SHA512 b72d757c2dc94d328b144fd3b9d2601d3adf3795bff6b49b436684306abc0f147aaedf1e782303bfdfe1803d6821cf19215caa5faaf5184822f6887a008f91ff
-DIST DAV-0.6.2.tar.gz 19039 BLAKE2B d00443cdf7e4305ea0b424f292e44b2cbefe5b388b70ede36a29fc28d97bad9ac25df2995772d2190357e6ff6c4bb1c07391f14be1c91db5e8db93b96a09a747 SHA512 2342bd0d1bca3e0fcbe459ad1dda74265e728d2524781989165895ae49b610c5ce96576968555b5d9d049157553684539fc4cbfcf4527dd231bef13855d47ad3
-DIST DAV-1.0.7.tar.gz 19768 BLAKE2B 923f1c20db5325527798bfc6c0b02f02aa051e3e7969e90c43bdf6bbc804918e88c0c5784295060afccf29d095e67a73d76a8a3cd3c610af5172caec7c81ca52 SHA512 3f4cdd5c708793a3c9542cb89845cc8de6a456ba55bc564bf7227ca2c3243807e3e85d6995581ad7662c994d65a0a9cde6f3c0d0a7fbe8ac7c8a07e338b039a8
-DIST DAV-1.3.1.tar.gz 20003 BLAKE2B ae4227b845761092a7435dc2c5a82640c3abf547587bc3b0a0ed3af2a2dd3b96498f45ab299abf7e85711b55ef233efc3be0e4e311f9204aa2196048281eb953 SHA512 d9f502e52c6d6de774b6b25426f1231c02e1a522ea2b991266ddb56778fd34c3a2dcafc81fdf55332895df4b9ca717e3df30cdf39b707589224b646f1895a621
-DIST DAV-1.3.3.tar.gz 20524 BLAKE2B 23eeaddac4e9bbc5e969caa978f2b806c025fa8cda7337c81956950644d564d20e37a6ee468baf07ac2ffcffcbc7be8f7165360548753ecede6b876f1d6d012c SHA512 bbc9a4d685e25ac763c05dd8dc72d7db39196dbbb0cd898b66f644abc8333cd82950439fd446770c5aae737fd863afe881129ce551dadf9d0f75ef52df738fae
DIST DAV-1.3.4.tar.gz 19884 BLAKE2B 84993b24cb4db897c76c964e8600bb3f882523792545e8d22468a7e435d53a2a2f05716595d73df3ec3f05f3e30a9d56c31bb446fc28e00126b5a853486c9206 SHA512 95bb567488bed2fef3813597ea9c080781bbc25117995901ff7264c0f04bf4db1bad6c9c94c4d1fbea968245041752b2b720d4c42b4c23191eda5e3dc0c292b6
-EBUILD dav-0.4.1.ebuild 1187 BLAKE2B 7c9303727be015279330bbb7e1aec42b4a00a6ea3fec78c209f4329908dfd774d48084f3b95d1912d68396b9cf1e53250557b78644ab934d65a91e703a94f45b SHA512 9c932745b5c0ff97c4740cf6693ab66279e4ecc4a32f6c40e29f762628235dae4151ed89b2410a29c3e2c1630daf316ddc59355e8336a877e53c668b2ad72adf
-EBUILD dav-0.5.1.ebuild 1216 BLAKE2B 1bd2ff41970c28ae5f3914504c5061852867bc1d3581ff3182de091ff0c02f524be594bfb098ac6a2cbe07bd05f1d400a31b8057b204a6a9417703b6d60e1535 SHA512 c1616b1a379117ee26dd23e65fbc783e5a1a69c186649811f29c4dbe01d2a44be1fec21cef980cf7a904332ad866cdef6576f028ae0fd0d147ff96bc04fba3a9
-EBUILD dav-0.6.2.ebuild 1340 BLAKE2B 1cd86d146e9cfd301a3a101d8b7d954ec80abf0f1c308d9f053db7772264785b0e7647318932ea13829cc90d636101d754fe7b3b4672a1ccd31e5c08775fe8e3 SHA512 575e91245fc592a7c7a66ed789a11dbfaf1c4349f1a5e6d579db44df70deaa9fc133901e618e70ba517f64919e4911234d32561533b6d71c7ecb7f554022cde3
-EBUILD dav-1.0.7.ebuild 1550 BLAKE2B 658f4b33ee7925ec873a1c13ad47b9ff814b8a8764480d9ba8e4b17b279fd66df316dd1b93d244313d82e9a03e5d2b5fc46686b3aef0c7b7054fbc8ce2dbeb00 SHA512 2c11cc77aeca791519dece66fc10f0c198b2000d4206ba8064605c117ee6c77a4049a07a2e370f149062826e0fe10a13b0dc1f3a3d756b8e68c31f12c2515881
-EBUILD dav-1.3.1.ebuild 1618 BLAKE2B 070c28bfcf97fbbf55fa9f9a15076a095e52e1f67140df8f850f9b58d8f4559f0cbd88478a42932731361c508d79843d5d5e82a6d5a1512ade891c938562a5a0 SHA512 92724303f76f84c5998539ecf4a9d5761ac06ccf620b7c6fd2e4c5be4c87aca8d3136ab5be54463a52f9f209361df496ec66c60ffabd16d05a91005ed2d831b1
-EBUILD dav-1.3.3.ebuild 1574 BLAKE2B cd5f655e788ba3c0d96ecde7b96f350bf91a146cca659dcf25aa0573a3a070e425dc6fcaec4aaeeb838c96c397278e30b40617d644fa34b6f67a26ffdd4ab3f3 SHA512 d2da0a23c267e52562b617d6e28563e3a00cf54dea5112660db86d715f2062c709b53b02f90b53ef40c1f7c07b2b6ca09624e4dd0b88c0b30c40b16d3fcfad7a
EBUILD dav-1.3.4.ebuild 1407 BLAKE2B a33507ec5994d7bdfeff11072fc14f8cd07b250d446de4f557f316779bc3e0bec79f5ade0bbc7d029ce7f6981d6f8fe2519830ddd0ac9404a866f94b1d8782d1 SHA512 63932672f1e5d77bdb5bdc3ea5ae705b2b2d151f1467c638b2c37bf3f0945af58fb3f6309c9a53e4793998cc37778fb55a9662c025e1827bcf4b4045b2203cfb
-MISC metadata.xml 650 BLAKE2B c387958eada84c6abeb2c338a51d77a6070c9abfe4a30a9b32e0385b0cdbe2019505f8762390ec0d39961ded95f859f8238c7e04d61d4b85c61551fd0d4b948d SHA512 0d4eb14205b9b25fd1821ad4c43f905b5cad5ff376491fe0e9b1e6758dbbb5930cead0552dd9ba0af0a9d35a9d60c015874427e9ee51665913831d217bbfe957
+MISC metadata.xml 555 BLAKE2B de3664fa86739e49eef772e97a133b9da7abbfeb9b105290b7ee3874bc6be8ae8007e28261afa0b48f1c3ba7e63591f41b22770c7f9cbc979a82577cfa881eef SHA512 b7038424e956aab3e8122c97ea27bf8860cf9ff9784efe87f53a7c9a6dce4470669a6e2b52e3e44d5cab6bab476c12494b5a1d9f09c504809813fa4b8f5c558d
diff --git a/dev-haskell/dav/dav-0.4.1.ebuild b/dev-haskell/dav/dav-0.4.1.ebuild
deleted file mode 100644
index 333bdbb7c291..000000000000
--- a/dev-haskell/dav/dav-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +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.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
- >=dev-haskell/http-conduit-1.9.0:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lens-3.0:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?]
- >=dev-haskell/network-2.3:=[profile?]
- dev-haskell/optparse-applicative:=[profile?]
- >=dev-haskell/resourcet-0.3:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?]
- <=dev-haskell/xml-conduit-1.2:=[profile?]
- >=dev-haskell/xml-hamlet-0.4:=[profile?]
- <=dev-haskell/xml-hamlet-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.5.1.ebuild b/dev-haskell/dav/dav-0.5.1.ebuild
deleted file mode 100644
index 491ff6061a00..000000000000
--- a/dev-haskell/dav/dav-0.5.1.ebuild
+++ /dev/null
@@ -1,42 +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.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
- >=dev-haskell/http-client-0.2:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lens-3.0:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?]
- >=dev-haskell/network-2.3:=[profile?]
- dev-haskell/optparse-applicative:=[profile?]
- >=dev-haskell/resourcet-0.3:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?]
- >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.6.2.ebuild b/dev-haskell/dav/dav-0.6.2.ebuild
deleted file mode 100644
index d647c38710c2..000000000000
--- a/dev-haskell/dav/dav-0.6.2.ebuild
+++ /dev/null
@@ -1,45 +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.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
- >=dev-haskell/either-4.1:=[profile?]
- dev-haskell/errors:=[profile?]
- >=dev-haskell/http-client-0.2:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lens-3.0:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?]
- >=dev-haskell/monad-control-0.3.2:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?]
- >=dev-haskell/network-2.3:=[profile?]
- >=dev-haskell/optparse-applicative-0.5.0:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?] =dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-1.0.7.ebuild b/dev-haskell/dav/dav-1.0.7.ebuild
deleted file mode 100644
index 4d7f151c2314..000000000000
--- a/dev-haskell/dav/dav-1.0.7.ebuild
+++ /dev/null
@@ -1,52 +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.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/either-4.3:=[profile?]
- dev-haskell/exceptions:=[profile?]
- >=dev-haskell/http-client-0.2:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lens-3.0:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?]
- >=dev-haskell/optparse-applicative-0.10.0:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?]
- >=dev-haskell/xml-hamlet-0.4:=[profile?] =dev-lang/ghc-7.4.1:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.3:=[profile?] =dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.1.ebuild b/dev-haskell/dav/dav-1.3.1.ebuild
deleted file mode 100644
index 6ed19403d7f4..000000000000
--- a/dev-haskell/dav/dav-1.3.1.ebuild
+++ /dev/null
@@ -1,54 +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
-#hackport: flags: -mtl-compat
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/exceptions-0.7:=[profile?]
- dev-haskell/haskeline:=[profile?]
- >=dev-haskell/http-client-0.4:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lens-3.0:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?]
- >=dev-haskell/optparse-applicative-0.10.0:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?]
- >=dev-haskell/xml-hamlet-0.4:=[profile?] =dev-lang/ghc-7.8.2:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.3:=[profile?] =dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-mtl-compat \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.3.ebuild b/dev-haskell/dav/dav-1.3.3.ebuild
deleted file mode 100644
index 4bb444abb2b3..000000000000
--- a/dev-haskell/dav/dav-1.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -mtl-compat
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/exceptions-0.7:=[profile?]
- dev-haskell/haskeline:=[profile?]
- >=dev-haskell/http-client-0.4:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lens-3.0:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?]
- >=dev-haskell/optparse-applicative-0.10.0:=[profile?]
- dev-haskell/transformers-base:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?]
- dev-haskell/utf8-string:=[profile?]
- >=dev-haskell/xml-conduit-1.0:=[profile?]
- >=dev-haskell/xml-hamlet-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.3:=[profile?] =dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-mtl-compat \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/metadata.xml b/dev-haskell/dav/metadata.xml
index 8dcb4ff8ac22..5c3e82b05960 100644
--- a/dev-haskell/dav/metadata.xml
+++ b/dev-haskell/dav/metadata.xml
@@ -13,7 +13,4 @@
In addition, there is an executable, hdav, which can be used for
command-line operation.
-
diff --git a/dev-haskell/dense-linear-algebra/Manifest b/dev-haskell/dense-linear-algebra/Manifest
new file mode 100644
index 000000000000..5e9236b47c0e
--- /dev/null
+++ b/dev-haskell/dense-linear-algebra/Manifest
@@ -0,0 +1,3 @@
+DIST dense-linear-algebra-0.1.0.0.tar.gz 6285 BLAKE2B 22cfbc68a2511ae4ed946c7b3c99dc171b515f0fa929ee5b4a8b01a6c6a707b3a66e0168104b37a49882880658119ea0d9fc5c1bc9d562eecd2f9349eadd90b0 SHA512 bcc70b42c3ea59aa3a739e2b189b9a1018d3dc27e65f5016502a2068005f480c296960ba7758a810cb22bfde53b5a597a66a3e1dd7bb732e54fe5daa1be08aa0
+EBUILD dense-linear-algebra-0.1.0.0.ebuild 924 BLAKE2B 78d13d1d532d2fa6ff5d7fb7c047cfd1034e17a90536217d5aeb8ffedf2bc6fb3401703ea48726c2fa813f46d683988fac3f846078e5e2cd72948817e5a46b6b SHA512 4b078f237b25570b7bf716214818083af33f080c6ae365e9945ddb831da2fde3e5ea7f9ded8011be23f709197fc17fbd6bf2aa739c58cd01104af22a4e50da7f
+MISC metadata.xml 391 BLAKE2B befcddae61e2057cae51eb4008f84d20ef9f791f682ec9ab2cc8cbfeb6ca7768beab03de81480980e66dfb63707cb5539290a26bae324ab5cd8cb51a9b8a2c1f SHA512 b55c19a1840ba222dd5c6e45f3698fd003feadc25e6c985d28743a5d237f5e55cc6d344abfff3eada702a42c9d37b2e61e8af32e1270a791ce59106996f3281c
diff --git a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
new file mode 100644
index 000000000000..50c1580601fc
--- /dev/null
+++ b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 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="Simple and incomplete pure haskell implementation of linear algebra"
+HOMEPAGE="http://hackage.haskell.org/package/dense-linear-algebra"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/math-functions-0.1.7:=[profile?]
+ >=dev-haskell/primitive-0.3:=[profile?]
+ >=dev-haskell/vector-0.10:=[profile?]
+ >=dev-haskell/vector-algorithms-0.4:=[profile?]
+ >=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
+ dev-haskell/vector-th-unbox:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/hspec
+ dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/dense-linear-algebra/metadata.xml b/dev-haskell/dense-linear-algebra/metadata.xml
new file mode 100644
index 000000000000..7989b5244d08
--- /dev/null
+++ b/dev-haskell/dense-linear-algebra/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ This library is simply collection of linear-algebra related modules
+ split from statistics library.
+
+
diff --git a/dev-haskell/ekg-json/Manifest b/dev-haskell/ekg-json/Manifest
index a2bb3eccf7b6..6111f7f09750 100644
--- a/dev-haskell/ekg-json/Manifest
+++ b/dev-haskell/ekg-json/Manifest
@@ -1,9 +1,3 @@
-DIST ekg-json-0.1.0.0.tar.gz 2969 BLAKE2B d16870858a80ae7a95bfce3e948dfc2e7b8f1501e3246a448486087a38fced0f36cac3f732c5b4f73a0a3102955685f0d9902b01a82c40c377e3e3a515dad871 SHA512 6d9d2a5f7d8893cc9076b6817bf433fa3e525fe08e2686c7e21f0a58d8c0699f4a16859f3042e4d3aa0e79416301d43cac21fe80b767934ab9f0309f02558c51
-DIST ekg-json-0.1.0.1.tar.gz 2966 BLAKE2B 3656c910ce6fdd84e13027314c4334a641808fc4b0e42007ce9cd1b1954198395845161f09076207269b2270b955a4849b3b1a654742ba914cda98ab4df86f6d SHA512 c1ec9c0feedffdc7ff50997b5a851237507e0f9d2e841fa9cae5785dc26318abe1a3a0de9c433e3554a686869fa26a756a85d1cdae4bce6af198cfc641c1d508
-DIST ekg-json-0.1.0.3.tar.gz 3069 BLAKE2B 6683dba514dd62608cdbf3e5291a0216ec4aaec89d2e652721b8fa06819138dfa409d05ed364a18c3113bf2a04c7ed7f24e0e019e29b3eb62505fc01b59c026b SHA512 52f03c9758396a627a4b5c9a92aacb84e5f082ff5ecbfba2a5f870c0abe9d7c81d65a7a8f0ce16558634a3cc6fdd4834efed8dc95c73fed9a1b2aea049660ff9
DIST ekg-json-0.1.0.6.tar.gz 3094 BLAKE2B ea5755f2cabb8c898a6632fdf0cebca99a8eccc4a9ba2e3f844781d029b5c11d618c67bbcadbece93a69e092c03cfedef7e435fbed2998497ab44ab034a82a34 SHA512 c1996214f3d41202dd51a3bf335fa6c67488a3b3625acba196839bef36eff1443907c010b6887845cf759addc769b45d1bcc648554bb2a7942a13337cf40c60e
-EBUILD ekg-json-0.1.0.0.ebuild 727 BLAKE2B 8039cb268c79b1f65e8f348a45d7d89572fb19a2a399e20fb55a2b34a49aa2752a2638779db81e730026a54e3e8a2f5027e97ab81c0bbf444c4006d013c3ae6c SHA512 b8dab818048e6aa149ee9cce8d1cc8347e7f40bd0c7b5bddd94c535c46c183f3ed0ac82050c3956fe12a807bdefcc6290954d319fdea3b75dfea873a4a267104
-EBUILD ekg-json-0.1.0.1.ebuild 727 BLAKE2B 1645b2868930086c0b464755165a26c9256ef7f90f1bc1a3fe9391ea2333671c8503790c2041ea1fa65908884e7378db9636ac0dc2d709c800c040c140cb9e54 SHA512 1867df8b316119c0db05a4463fc4659cbb7d67ba96cdaecd4c0366abd99648ead984bebbef44887d4b1c377ff7283cc9d3a573909d6327b3b8e2bfc97e50afa0
-EBUILD ekg-json-0.1.0.3.ebuild 760 BLAKE2B 0872effeb12fae48af1ff75c98047ba96b7bd28d7e1858e6fa04d620d1ffe25048c4aeeee7f3d5d97c381ea409ac4b00221ce38c6389ec1f0680729b0583c0f4 SHA512 c4d70f5bc956af1e2092b543ecb0508710dabb83a3053d4f680d73de1392ea89e06bfa5ccf1403e0362e1737d250e9a4c2e07cf115c395f978bd10ea038191c9
EBUILD ekg-json-0.1.0.6-r1.ebuild 853 BLAKE2B cb1d0e3e1bb35e5d92a8f4bc355b6dd2d40effbfefa44836942423556fc3bde1c00f55e770c5ff7c767be330e081d250d5697066e91238c6cf9a79b3d6932167 SHA512 a55e956aeca183d59c0289bd80585c245081fce9f2070b87f22250324ad9fec77acab2d842439f2c8e2a0515529e8ecd7280917fc66fa95a0385b444a590af9f
MISC metadata.xml 553 BLAKE2B 37267e45c49b74117cebe6da3f2e18e26a1326339e91c420b0650ad05483f6c6c2fe6b694be9177de8e533cb04f967eaaf83ee5658b4127bcf184afee6e1e3b0 SHA512 82cf11540942ca0bb5a8ae7dd6ea26eedd91376d4250c42fa54b130b9fd55826781f8ffea89a70e33b7bda67f2fb9a20782e566927a4184aedef86ab4e665254
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild
deleted file mode 100644
index 81a5f5ce0c2d..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild
+++ /dev/null
@@ -1,28 +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.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/ekg-core-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild
deleted file mode 100644
index dc557c5b9b99..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +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.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/ekg-core-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild
deleted file mode 100644
index f55f77a14905..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.3.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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?] =dev-haskell/ekg-core-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/esqueleto/Manifest b/dev-haskell/esqueleto/Manifest
index bdbaeb9be6e7..c3a445b7f739 100644
--- a/dev-haskell/esqueleto/Manifest
+++ b/dev-haskell/esqueleto/Manifest
@@ -1,6 +1,4 @@
AUX esqueleto-2.4.3-persistent-2.5.patch 6114 BLAKE2B 594cb0dfd2f6e6fb5ac28df75a1e6451bee2483036f5e465fbcb6bcbc98a10214fa7ec534558022b60096b849e68440060f8c1b4f95c235691a4b32b4d2e05d7 SHA512 a229ebc9e9f513102324e78641a4eb4e86d9fa87764f2f88fdf8512d96c6eb223ad870d20dcd0c7805d3a695cebb7e03bb3912421fa25cd7647d804b21320b65
-DIST esqueleto-2.1.3.tar.gz 33024 BLAKE2B 3d028c495f44ba3757ee5b9df463d35c4fad382ad4cb980877cd6589981dd0e2fb219944830e0a3d1f5426e9773416178b3781b1aaee340cb8b491549689af15 SHA512 b0508daec0f248458581155c731d307f039d04fae7e76697d2a8bb8498a5072b31499d1d3b041314b34b4034e4357e10323483d04f7ce3218da7489a00683fbc
DIST esqueleto-2.4.3.tar.gz 39664 BLAKE2B 03f56caca53815bf751503eaba55d0c6c225d9bcd2751371aeadaa1244c90649babf7cc2f05f8dcc2206fc5a7e235de14c11cde3f246c1fb78967defe566cc88 SHA512 50ad774bbd83c587775887320e24b329b575c9b3dad5aed920d83da7b8e5fa259624c38a40c457a3c12258e2b34cce39042c1b33002a06dcd3020bf370a06cbb
-EBUILD esqueleto-2.1.3.ebuild 1425 BLAKE2B a85d442d410b47bfc3eb4b6f941fe92e67ee32bd5e5e88c601bec5deb7185a38a100b1111d3587b939765c3bf694b55f9b6dff46eefc11fbd92a94fcee4de98c SHA512 c3d655b74866174c552be119c9bdbee49618dfbf914f11fd254b43c13ec68276a49fa303b3f4a530f875867ebccf883460bf31d14a120256cdb7c0b3f8ee9609
EBUILD esqueleto-2.4.3-r1.ebuild 1372 BLAKE2B 3d042c033ea9a939f27d1e72e39dbcd45546b699a2c2555fe53e7e41e0ac4adef9e796b5fb4a3ee7fbf9f0fc4b02f38ad4cfdcaeb26fc8696a4e8b47961b8863 SHA512 69cf8a6a1bb11697a21288316ef6424075efc3e75fb22eb4d39dad4d31598f90d938cf42eee9d10c16b6b67628c5bc137f7519dbd93ac568b2206bcb34c957f7
MISC metadata.xml 2043 BLAKE2B 7b418084368f204d12010f088f55544feed211ed193787a9698a45c891f5c5c579a9e9b583cc606401ff43975755fbe73725588ebcf27e8dcfd77b3344534596 SHA512 162af6c274fb74b5df2c040c8dc8de89ab08bf5839f6c80b099a7c906e4168c92a1c49a09ecae0dda69e45239002625abdf70fa323ab1258d55c314931875599
diff --git a/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild b/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
deleted file mode 100644
index 42e87d5e7c41..000000000000
--- a/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
+++ /dev/null
@@ -1,48 +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.4.5.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/prowdsponsor/esqueleto"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests hang
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
- dev-haskell/monad-logger:=[profile?]
- >=dev-haskell/persistent-2.1.1.7:=[profile?] =dev-haskell/resourcet-1.1:=[profile?]
- >=dev-haskell/tagged-0.2:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hspec-1.8
- dev-haskell/hunit
- dev-haskell/monad-control
- >=dev-haskell/monad-logger-0.3
- >=dev-haskell/persistent-sqlite-2.1 =dev-haskell/persistent-template-2.1 =dev-haskell/numtype-dk-0.5:=[profile?]
+ >=dev-haskell/semigroups-0.8:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/quickcheck-2.10
+ >=dev-haskell/semigroups-0.9 =dev-haskell/tasty-0.10
+ >=dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.9 =0.10 && <1.2' 'tasty >=0.10' \
+ 'QuickCheck >=2.10 && <2.12' 'QuickCheck >=2.10' \
+ 'base >=4.7 && <4.13' 'base >=4.7'
+}
diff --git a/dev-haskell/exact-pi/metadata.xml b/dev-haskell/exact-pi/metadata.xml
new file mode 100644
index 000000000000..2a02051ec531
--- /dev/null
+++ b/dev-haskell/exact-pi/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ Provides an exact representation for rational multiples of pi alongside an approximate representation of all reals.
+ Useful for storing and computing with conversion factors between physical units.
+
+
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index f1337aa700fd..e0d1d682cac6 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,12 +1,3 @@
-AUX extra-1.4.10-QC-2.9.patch 680 BLAKE2B 40ad2e352f72a4c69aeb7450a42eadc8cde75af6525ab5e4b15e41b22041c46975dd021632e1b16872cc1b464d6db8c2e269febc7c6ea9c738ab3440f0badf7b SHA512 cf6702f2ab99967c23f04ae859bbc38a4d905676e3e87e6bbe4901033735f4e13804626fc820c4876e195b6f48c0f519c2004328a0716dc23529edf9307db6c9
-DIST extra-1.3.1.tar.gz 30439 BLAKE2B d1a550e8e09376490c25497ace158418679a971e3d0113f727b3815f80b20b20a85ed87349302d6065d5af7c930adaba2f26fb939952ff06b01cfa2355025ad7 SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5
-DIST extra-1.4.10.tar.gz 34981 BLAKE2B e1601f3d6f782a3b0138fa47929afb2bd2fef74305c4e6f8d41aea9eb12c00975da9a3edb200f4ff4e613c049f08239c993ebc11eca600992d831ed54a59058d SHA512 16b7bbe3944d7013a54dfe629f997bb46a24c9b933a6be9570cd86f6b1bace9c001acb0b5b8d92ddf50aa21ca67d5694d3705029116644012345d20f1e3386fd
-DIST extra-1.4.2.tar.gz 31311 BLAKE2B 4039e3c0ca573d782a4bc6db2d892d22ffcc5e012e752f065c9f98d6e580a5b43e772e49345681bb9a31ef9679295d459aceadbca9bf79b4f496b8a1a7b08e8e SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409
-DIST extra-1.5.1.tar.gz 35989 BLAKE2B 637533fd0b175892c58b341d5dc8c3d97a28291a638f2cc185a7338077d2f6ced21a1efe0859ee8f4e9fa1636c3f8ef4423c83a0a683a9accd25efd70cafdac9 SHA512 c3a0d7abc589e4a175c5c090b4a850751b0f231a3934db3bb87f4a11044acfcb161aa366789b3c6b5415778578ca126c3469f648fa326fa5ebec0889c59005e8
-DIST extra-1.7.4.tar.gz 42476 BLAKE2B e27eb047546b5fa378916d6c65daea2e40c313a49afb7c78d935b27dc693fbba1e7b82c54d2cc6387eb6808dfef0de51b6b6768e2e91b93d590409a32d308569 SHA512 3161834ea25d3b485432dcab9f4a385a2552fa8d69b5ec198152b3dca08f6ac0ffd42a467e69210c2a1ac5bef7f1c6ff15c61459cb447c125ee240563a748d15
-EBUILD extra-1.3.1.ebuild 642 BLAKE2B 7713cfbc608082f1d97dc747b62c7ca3100f888d52a0b21bca24f6190213bda2800919bda39ae0db258cce035d7bf519c839b99a0f383fd41db6e0fd069bc924 SHA512 bca675453a2695c6590ff13f27924a0ca109aa95d7d1b555110bd7729ab8c07ad301593bf4f1a6ceae5a9a8683265788f6102f4145c77006156d989600bf8638
-EBUILD extra-1.4.10.ebuild 614 BLAKE2B bc93a77c5815439594e5bfdafb43fa0a6009ed70223ccd71c58759af7235cd341f23a2d947bf8f35e1a4c4c7097572c9b68fd1b6d5b1e2e26d4251fcc3f1fca1 SHA512 a6fe5dac82744aa28888bbeb18a538728371148bf1ba57eef88ed18930ca098474b247554b86eb14e11379abf63cde1f6b26a163762aab6f64599deeff230ec2
-EBUILD extra-1.4.2.ebuild 637 BLAKE2B a5072e3f78ffc7624b6206235a016843c1c3caa21913b4a67aaa95bc53649ac341373a32557cab3b19cd284ab303701a7ca6a87ba1585b3e20fe2cefbe4afd18 SHA512 64c6b133aca2d7eed1cc68cf723e161f54587d673442ea752da116edce8b1ab9b18425ae675b9b4be0185dbdcdbcc2a486764e6bd30cde0f3200dbb1266570c1
-EBUILD extra-1.5.1.ebuild 616 BLAKE2B 80541aeb7d492e8e890b16305168438539021c73ecd12a28a581d98f41749b6bf5b1e06410f44db22fe5360120fe659137e2b478472efaf56e814143565fc8ad SHA512 b8bdec9038c989984f8668f02ba4c29297ed6ed8f01f4fa5bb03d00580e4a70158ccc74307c0c0e1c0e4dcb21ecd981f1a5d4e89817249e2892375e2bc4e7247
-EBUILD extra-1.7.4.ebuild 665 BLAKE2B 20c4301a2b1ca1728bd2808e8503ef7436cdd6eecb198836499eab6a345fb3b3d22355a5ed784eb67213859cf57f2a7cf1211a3b65c61f8edc05bc6af804ea60 SHA512 e970136619dc538961b8afe0ec354579e18073bed68aa93a34fb4e77c594c77f37b4d4bbab9bd24069cae73877e6577ed1f50be8ce9f5abcf3cfc56a3b72cfd4
+DIST extra-1.7.6.tar.gz 43033 BLAKE2B 96b7c541b238bbec81b3f51342466559eebb935479020b03947273f21d35038d5c235cdb5a51b6d60f09aafeb559e72926014394944b2a0e34997b7391aa8341 SHA512 1b8bdab361807aafe3ea0048904d17984330f4b3ac137053d95957de89b4ed00e1e52c8828e26cbdd4ddb216244a21b0dc07f0c0f56b7cded96a9dd527443699
+EBUILD extra-1.7.6.ebuild 665 BLAKE2B 7e91cf5448516b4d71a1cda4bd3319136a6d33107870294abb603dbd1627730aa273207db5d2b5f5769c56547c84fad05e96e7a54544c34eea8344badaed757e SHA512 9a3639fa362538e0954df1695ca4b73d3c45aaac8f2719c882b03c7851f905eb0c09b25b2c89871a181bbbe9c697c33f5df8c7800ae34a850c9d1445bcf3b3a4
MISC metadata.xml 330 BLAKE2B 02bc69029c346d132aca400cfbc70f13d9bffaa36fcafd9c01a7f8213c27623b9fc19ae9c9a8c75ca898c5a251d5f5189239f16b805316a2edb32f7eef5424b4 SHA512 67832d58fae9b3c4ad5d3943f35135a20f2d26af7debff66857e36316ed9e697f5cfb285d2e67da2422c626dcac38c8bfbf1e1320237ead4cfb10514a6d1df4c
diff --git a/dev-haskell/extra/extra-1.3.1.ebuild b/dev-haskell/extra/extra-1.3.1.ebuild
deleted file mode 100644
index f22664d3679f..000000000000
--- a/dev-haskell/extra/extra-1.3.1.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
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-# this package has nothing to do with extra:0 (aka Extra on hackage)
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/extra/extra-1.4.10.ebuild b/dev-haskell/extra/extra-1.4.10.ebuild
deleted file mode 100644
index ada0019eb1b3..000000000000
--- a/dev-haskell/extra/extra-1.4.10.ebuild
+++ /dev/null
@@ -1,27 +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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-QC-2.9.patch)
diff --git a/dev-haskell/extra/extra-1.4.2.ebuild b/dev-haskell/extra/extra-1.4.2.ebuild
deleted file mode 100644
index 5b0daf5218d5..000000000000
--- a/dev-haskell/extra/extra-1.4.2.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
-
-# ebuild generated by hackport 0.4.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-# this package has nothing to do with extra:0 (aka Extra on hackage)
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/extra/extra-1.5.1.ebuild b/dev-haskell/extra/extra-1.5.1.ebuild
deleted file mode 100644
index 9e12544fa3f4..000000000000
--- a/dev-haskell/extra/extra-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( >=dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/extra/extra-1.7.4.ebuild b/dev-haskell/extra/extra-1.7.6.ebuild
similarity index 93%
rename from dev-haskell/extra/extra-1.7.4.ebuild
rename to dev-haskell/extra/extra-1.7.6.ebuild
index fdfa34438d33..4acec8c5bc8e 100644
--- a/dev-haskell/extra/extra-1.7.4.ebuild
+++ b/dev-haskell/extra/extra-1.7.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-# ebuild generated by hackport 0.6.5.9999
+# ebuild generated by hackport 0.6.6.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
diff --git a/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch b/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch
deleted file mode 100644
index 14b861060b18..000000000000
--- a/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/test/TestUtil.hs b/test/TestUtil.hs
-index 87f3417..cda262f 100644
---- a/test/TestUtil.hs
-+++ b/test/TestUtil.hs
-@@ -72,3 +72,5 @@ instance Testable () where
- property = property . (`seq` True)
-+#if ! MIN_VERSION_QuickCheck(2,9,0)
- exhaustive _ = True
-+#endif
-
-@@ -76,3 +78,6 @@ instance Testable a => Testable (IO a) where
- property = property . unsafePerformIO
-+#if ! MIN_VERSION_QuickCheck(2,9,0)
- exhaustive = exhaustive . unsafePerformIO
-+#endif
-+
-
-@@ -107,3 +112,5 @@ instance Arbitrary DiffTime where
-
-+#if ! MIN_VERSION_QuickCheck(2,9,2)
- instance Arbitrary Version where
- arbitrary = makeVersion . map abs <$> listOf1 arbitrary
-+#endif
diff --git a/dev-haskell/fdo-notify/Manifest b/dev-haskell/fdo-notify/Manifest
index f3392576220d..a2879a51cf20 100644
--- a/dev-haskell/fdo-notify/Manifest
+++ b/dev-haskell/fdo-notify/Manifest
@@ -1,3 +1,3 @@
DIST fdo-notify-0.3.1.tar.gz 4882 BLAKE2B 9ebf5bed4b17601b4deabc523e1ad529b95856ff6c0e6e83966fdee0373a37f8432c0fa34a6322157da1b3a93b12d10de2ff97da83c8ab9b2659932050083757 SHA512 d9193899d5eebd7c36e9464571827bd5b560fcc156e89822877b3b67a1f376c7abea9958f7e0aa6f79da06ad5f35a8738ad30a40d447b64ad557ed341054e6b6
-EBUILD fdo-notify-0.3.1.ebuild 572 BLAKE2B 534f13e4fe9ad040291465234a48964c0e95b5136b55aa4d80c28c2b2cb4091f64bc1105388eea91b780aa8251df12f040ea5f473e2a577a1ad4f41f95a1de6c SHA512 6f971b78a436a094d96bb1351387c8c56d2b1a6684b52dad188b8c0c6289ecb8a57000a292ac2e2b7dd1b1b2c627a0036f78614166081ff9c35dc0ef33d8d442
-MISC metadata.xml 536 BLAKE2B 31be543a7693f10bd9c173f228721cb2aa7f66d22fd49cee45d18b66ae9d9745b370e21063da38ac702b48de65e7fb09d83e2bc1c3c357c6c6a80f756314fae7 SHA512 eac2da57fe1ef122fc1ecd76a8d8bb683cac15ba94efc917819866927cf493e990100628da025016aa48facee67a9e09bfaf83ae5ac3f3c43277cf1d710fbe67
+EBUILD fdo-notify-0.3.1.ebuild 579 BLAKE2B 17d90bd17e3512b9b94491507a57b17f0eb2a84c966acaeae39ba34151d6fd09285d28d228c397ba633558e9df004e504557fe8854197ff90a006fe2bbdc5fe1 SHA512 dffa714da506c990b427f9a3b97ceff234751c322ae9e77e916baa29d9e4900a53065d229bc10f60fa58c1a698cf96cc8adfab77c3cece9382eb3e7cf09f83b5
+MISC metadata.xml 452 BLAKE2B f4d0c3fa79053d9a7b444dd7bf4dc37310f5891eba6005c5babefa183f10d5e4328008fe4f15bcdc7eca191fc9d786e258a4a5b1ec6b7e874ecfd031d655108c SHA512 6cbe7ad76497cbd43328a240d6dc2328bc864c302925533b2fecbdcf79908e83f6cfc7906b7bb556e46677c0b7825998fecf7edba24517bbf6c3d0b67ecf8dad
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
index 5c61b57a2dcb..3d94cc7eb01d 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Desktop Notifications client"
-HOMEPAGE="https://bitbucket.org/taejo/fdo-notify/"
+HOMEPAGE="https://hackage.haskell.org/package/fdo-notify"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml
index 55d3ac445104..cc48e3a1090d 100644
--- a/dev-haskell/fdo-notify/metadata.xml
+++ b/dev-haskell/fdo-notify/metadata.xml
@@ -10,7 +10,4 @@
Notifications protcol. This protocol is supported by services such
as Ubuntu's NotifyOSD.
-
- taejo/fdo-notify
-
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
index 6fc14d467223..7530b7bd785f 100644
--- a/dev-haskell/gtk/Manifest
+++ b/dev-haskell/gtk/Manifest
@@ -1,4 +1,6 @@
AUX gtk-0.14.10-glib-2.62.patch 501 BLAKE2B c402ff8bca84a4cc5bb02ef534da715e1b2edc0c675b219f08fe8a268ed22192192a5596816b35ad514851b9ee6ae105eddb2f9f37f9bb6974ee187f5d5292a7 SHA512 2d34480a33d60038627bfe3a490a35b52918c4b772cc398058c9efc3321e8415b29e8224d011a362b67ac0d75eb5e0b250da410eed40a3c7dc53403be213edbf
DIST gtk-0.14.10.tar.gz 677787 BLAKE2B 536b4ce1bdbb17c662342bd8cb8086354a31842e1fc39e4bb2e4c2e505fb03f4e1ad0b689fb48dcf24d61c280cf659d8f30ac0fe77083e9887054cc8ed5feb75 SHA512 857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
+DIST gtk-0.15.5.tar.gz 678555 BLAKE2B 6110bd1a44d4b276deca20dd69580b8b0442ffca11f84b36fc19c068f4bcc1eb515cba63c98b55bd3bcd5310967d94e053b5466f25729ffb8116dc9e076c3b70 SHA512 3d0a75fd1eebcd0fa7c7bf5a0a2dfd622e28b3ab8f69e0f152e10dee9fb8e13b0f6ce7da3a9f304c3f2233cdf432a6d099afc89b47ce3fb4d1cb96c25d6da26b
EBUILD gtk-0.14.10-r3.ebuild 1551 BLAKE2B 87f1aedf13de4afddd3d256a2455c9c97614d4ac39df5c8d744442a0b6d1d74a5337ef92a10d8bfea84ddc102a3dfcad96bc590c08d2e0599cf71b34314f1d6f SHA512 d53a6b38e5dd29b8a7862d1bafe7ee37b8f5376510c82ed35690b686aff12f3d95922c21333b219968025b096601c7baa580bf59f4436cac428591ff7bd98d92
+EBUILD gtk-0.15.5-r1.ebuild 1399 BLAKE2B cd564ffdd2d0e3784cc9757a67651b446484202ed0a0c77980af125888c2e8bd81bbc0b5a4dc6ffe812b657f6a91cc35e207cede93e7cf72c4bdca0660bc12a9 SHA512 421ba97ae530e33242629ef52708062fff8e795af288d75d34a22dda4257e4d9d60dbe1f6285efd5c0f8a9f0f6e6bb69ca6ce7e34ecef240df7369323b2da784
MISC metadata.xml 783 BLAKE2B 03cf02ef8216abd88b601f79acf0301d104c8c788c63138378cf7cd19a5adcd6a50a4d9dcd2ea95032acd9466a7be7e81123a35c60dcd5e0b5a41457f18801f6 SHA512 9da50d73780cdfb09196111d6abc5ad9b58ac08a7e2a0ace9b55626209512b4df2812b8de969c4d3b16b4d00b82f1be5c0bf1152050d77285a2dbda09e0240b1
diff --git a/dev-haskell/gtk/gtk-0.15.5-r1.ebuild b/dev-haskell/gtk/gtk-0.15.5-r1.ebuild
new file mode 100644
index 000000000000..b3b8ef283c19
--- /dev/null
+++ b/dev-haskell/gtk/gtk-0.15.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: have-gio:gio,-have-quartz-gtk
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Gtk+ graphical user interface library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+deprecated +fmode-binary +gio"
+
+RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] =dev-haskell/glib-0.13.0.0:=[profile?] =dev-haskell/pango-0.13.0.0:=[profile?] =dev-haskell/text-0.11.0.6:=[profile?] =dev-lang/ghc-7.4.1:=
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ gio? ( >=dev-haskell/gio-0.13.0:=[profile?] =dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0 =dev-haskell/aeson-0.7:=[profile?] =dev-haskell/http-conduit-2.0:=[profile?] =dev-haskell/http-types-0.8:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag test test)
-}
diff --git a/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild b/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
deleted file mode 100644
index 027127aaccd9..000000000000
--- a/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
+++ /dev/null
@@ -1,35 +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.1.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication client"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] =dev-haskell/http-conduit-2.2:=[profile?] =dev-haskell/http-types-0.9:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/unordered-containers-0.2.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-test
-}
diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
index 8e664590655c..fc2fe618bab3 100644
--- a/dev-haskell/hsql/Manifest
+++ b/dev-haskell/hsql/Manifest
@@ -1,3 +1,4 @@
+AUX hsql-1.8.2-ghc84.patch 886 BLAKE2B 67507e8fe5e335238df8139d6dfe20acfcd2e895a27c3f574c9b706e898509839022d4858e4fd4e977363d6b38741aeda8441038da59c34424814985a947c55d SHA512 63caa5dbfd6c0333c04cc83658b44df4847015a3002d700ac45e883c4e4986fc8dc4e633ec761eb9d725d9accfc78eacb570336ade7d9d183f8ad50349d39dd9
DIST hsql-1.8.2.tar.gz 10568 BLAKE2B 9890847e6ec5c78feb414e247098a108bf0d6135f8795e9efeb4934fb1b5ad76ab3fb8e78f14016007932b2c51bdda635551078c391db5ccb758b1ddd25632b1 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6
-EBUILD hsql-1.8.2-r1.ebuild 808 BLAKE2B 37a5a145b639e2f1acc4416612ff37194d59915f02269030760bc550fb565a7a5e048f9528a2a5b84c0d318f1a0e672349c3598e4fe4f0fca29224d77cbe7b38 SHA512 6099371a3f22002b672770da27bd7a3d5bab5acc662fce01fc21be2ed70dadae9b9a0a48d08ae9e4a47648ca9de9f051eaee096c6875f6d74780f1aa331361a0
+EBUILD hsql-1.8.2-r1.ebuild 855 BLAKE2B a298ae922ae074c170047ac01e384d37221dcb8e7ab1b36233c5fd21f31d7675bc1b7c5cd9977a00973f199d2f4fe44a9fcd90d68783028073fd1be3344686ba SHA512 a16444bae69d827c8d3477e82ff945aae91556e7cf921b60f5f7a3f345a98fd662e466d27a17b1625743aa624481f1ed0ac5ea72e73e4f1a3f3373a18b0f3346
MISC metadata.xml 339 BLAKE2B 0f227505e5d36cc98afc1d9e770c9cfde26195ff4e32321fcf2996774df9319777f216a4c363c673fa1698c7bae4e312b6f7df1674b7895ef9f3a36b2cc2fe6d SHA512 9eed48b011c1e92d73780819bc36bd99a57369569dc4923c6f6fdf49095ddf0fdf170a15cdb610cc0ec2bc72464ab16fd543d94565dab1c7bc4ff713ba0e4b18
diff --git a/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
new file mode 100644
index 000000000000..8f90d43393e2
--- /dev/null
+++ b/dev-haskell/hsql/files/hsql-1.8.2-ghc84.patch
@@ -0,0 +1,29 @@
+--- a/DB/HSQL/Core.hs
++++ b/DB/HSQL/Core.hs
+@@ -7,3 +7,3 @@ import Control.Exception(Exception,throw,catch,handle)
+ import Control.Concurrent.MVar(MVar,withMVar,modifyMVar_)
+-import Data.Dynamic(cast)
++import Data.Typeable(cast)
+
+--- a/DB/HSQL/Error.hs
++++ b/DB/HSQL/Error.hs
+@@ -7,3 +7,3 @@ module DB.HSQL.Error(SqlError(..)) where
+ import Control.Exception(Exception(..),SomeException(..))
+-import Data.Dynamic(Typeable,TyCon,mkTyCon3,cast)
++import Data.Typeable(Typeable, cast)
+ import DB.HSQL.Type(SqlType)
+@@ -32,14 +32,3 @@ data SqlError
+ | SqlClosedHandle -- ^ referenced handle is already closed
+-#ifdef __GLASGOW_HASKELL__
+ deriving (Eq,Ord,Typeable)
+-#else
+- deriving (Eq,Ord)
+-
+-instance Typeable SqlError where
+- typeOf _ = mkAppTy sqlErrorTc []
+-#endif
+-
+--- | The `TyCon' of `SqlError'.
+-sqlErrorTc :: TyCon
+-sqlErrorTc = mkTyCon3 "DB.HSQL" "Error" "SqlError"
+
diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
index 5d1559a6e3a1..53a5a9d3ae0b 100644
--- a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
+++ b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
# ebuild generated by hackport 0.4.6.9999
@@ -24,8 +24,12 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc84.patch
+)
+
pkg_postinst() {
- ghc-package_pkg_postinst
+ haskell-cabal_pkg_postinst
elog "You will probably want to emerge one or more HSQL backend."
elog "These backends are available:"
diff --git a/dev-haskell/integer-roots/Manifest b/dev-haskell/integer-roots/Manifest
new file mode 100644
index 000000000000..264b7967e73a
--- /dev/null
+++ b/dev-haskell/integer-roots/Manifest
@@ -0,0 +1,3 @@
+DIST integer-roots-1.0.tar.gz 54399 BLAKE2B 72584c0beb74546e87867efbf54259ad236a7fde5fd239e8389e4ea4d15b292abac926319e96c04072a8fb123e0347bee986c1887ebfd642e7192fdb5163a08c SHA512 62f78ef6dbf55fe2e0487dcade557d345ae13e6b2432fc50ecd2c4998bafa0b0c033d58c6c7f4b7999f552da13a55a7a128ff4cc42859ea55da06e34440fa4f0
+EBUILD integer-roots-1.0.ebuild 923 BLAKE2B 347c661fe757f8823bdb71d255e82f5b39cdebc0f1b403e7d49e0155d4fa584c2a82a00205f0ddacd92545508ec2360f0b525d27e1af8961f1fa75688cf2663a SHA512 1563cd0a3f0ed32d1e70d595e2da81a4484d4b41df0f9a47015587e0b1270dd52783659c787084eedf974cf68b5006cfd9ec27a04b20a68713eeabd30103fed8
+MISC metadata.xml 457 BLAKE2B f483c889dca73b585ce80c3ee107159ddf90ab54f31cf27bc9b3f8ad1f0f71ababa5733b9591f1c94342124d752d99c391ab7d5558d6de8268498116712f4f83 SHA512 1c727b190d8198cb2ac7446dbed0f882226c2ee2fc31f286d46abcce1946b1dcff74a3215e3e252ebeb00bc154d411fd4d70853dadc94d71b4649fa96eaba5db
diff --git a/dev-haskell/integer-roots/integer-roots-1.0.ebuild b/dev-haskell/integer-roots/integer-roots-1.0.ebuild
new file mode 100644
index 000000000000..5a314b54245b
--- /dev/null
+++ b/dev-haskell/integer-roots/integer-roots-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integer roots and perfect powers"
+HOMEPAGE="https://github.com/Bodigrim/integer-roots"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires porting to smallcheck-1.2
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+" # test? ( >=dev-haskell/smallcheck-1.1.3 =dev-haskell/tasty-0.10
+# >=dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.9 =dev-haskell/tasty-smallcheck-0.8
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ Calculating integer roots and testing perfect powers of arbitrary precision. Originally part of <https://hackage.haskell.org/package/arithmoi arithmoi> package.
+
+
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
index f26d3de6644b..8a7a2cc87abf 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -1,17 +1,3 @@
-DIST lens-3.10.0.1.tar.gz 455039 BLAKE2B 8be7cb75d2576dd65be0f91ad0e7f0b56ef1ccbc6cac8383f0043a567e514f7c2fb1c6f6fcee7925b67e68db79503313b6577c482c96f9040230e30b6e9d9693 SHA512 3dbb1f547a63196bc37dc891e7cff63656a8f662404767bca53d4d722d1669034fada995518db1a4535e7e142552ee8ad9121db6029fe22509b7de8a44aea923
-DIST lens-3.9.2.tar.gz 454678 BLAKE2B 0c637a1a00279339a697b04d8204c14f598882e0cf222ab6d5e45cd096fe34f132cd0ab1133770ffcc857b4b02c7c1987d00b46ec0f6ef72c44801c78ff8b8af SHA512 63e3a39d0d0ad16d27a8e2319163f333b67bc9df2d89d1b7fbc4dd9944cd098f0ba4a571a66939a640143c86c2f3008d5db3619af14f11a8cbcc07c424349f7a
-DIST lens-4.11.tar.gz 964787 BLAKE2B a3fefd1dc8fa3667c28b35ecef29219dd299e103d1138aa888fe610c4c1fe9b90802dc1dd43c3d8b3df34aa30cb3b0c9994550c6c6d745b7336320b6f959275c SHA512 9dc49c7a4c5cde508a5021522b41cdbb3c32b9de4be706fed189d16435828c03382cd6f069b4a17d13bcd0af390787e9f3343eea14e98662c3de3bbd5333143a
-DIST lens-4.14.tar.gz 972873 BLAKE2B 4fdea38830b8d1c4b08f5818ef5a81e7534dc31e3a07a9dc64c91b6b1ecbca8b3fc3ce561abdb8a85bf57c63f4f092687d67780d6a48a0febbbd9ad1983ca2c1 SHA512 d27999472d281832bbf56c3dd762e1a6c310d07a21af4351e64a53d7cd197e538f30955aa108ba2f56bbfbe8612ba4b844a41667e36497f03c14797e23c9c01f
DIST lens-4.19.1.tar.gz 704985 BLAKE2B ddb9f660ff6a1930f356ce915f653f81dfa4814f4956e89d1df213dd57e2cab85eeea7be9efb46553c36448b01579319e8bf1d4c739cdc3bc13608d54f9e43f0 SHA512 50a596ce919abc93b453189453abdbf0f455e0531e5b83397d1e61308842222433fd7d4c6c6f5ec74f98d8dd26eefe861a0d88d5faf56a7b896a0b083b920a10
-DIST lens-4.2.tar.gz 767603 BLAKE2B 2ea1d21ba0f5a4f741869aa7aebab8999c28bf14339fbaf1ed493e8f2035217f0ca62502cd5b11d1c3bbb1e577ed45d807b61b6ac363a60cbaec04add64fa32b SHA512 b1e583d3400c076f1e3648aa758b0d30d6a4e3fd9776eb9e115fbd7372b990c3aa3e5d8119de827b132e0e69a255b3532f3f044e936ac4d320cc146a6d04f7bf
-DIST lens-4.6.0.1.tar.gz 767614 BLAKE2B 96e328e8b248de223cfda1df01d418aaf2e05edc2a70556805a408b32227c9246a69479e16085e7ac3abe632c702157cb31b07c94b4c92aae4346d855b06127a SHA512 0dd233ade1c5f0e3872711ecd378b69ff98353caa33cdbf1ec87bbf0356cd54842fc83870bb51b913abbb2dfd767414ebe79cec0e058cce16c29468a69880662
-DIST lens-4.9.1.tar.gz 964188 BLAKE2B 3efe4f86e592d997804c1976c7c3cfdde5cc52ef2379d531a7f4c4c43b6c834d4aaeec86309d73b5074d961d681aca36f8d0bb12f9953fd1f760a9bca72bd27c SHA512 f77d1c46a53b65e65bec4c993db087cee720e5a63f17d8beec38fe49b713bf36f4c4ff1564c6533044b8dfaaf5f5729ec98dbb55687f70fff1344e5112e8857b
-EBUILD lens-3.10.0.1.ebuild 4046 BLAKE2B 8f620168be0c48ead8aaab519c4b0671e7dc4445fc452c329bb85afc17f3a1f2fa793b876618ee7e14c536ac6295d77f0842e5991d6608f6457e13b74a2b0b63 SHA512 4e6c384e2a9544d04b43312a794153d1b8d5b8c7425c968e325043f99a3e3ab1674e0a20077d0e21cd697d75476cb200c9c5d3d02a75914360153755930e533b
-EBUILD lens-3.9.2.ebuild 4325 BLAKE2B 424fdb8e8d3f5819ddac761acaa8db0c16ead618bb80797d9530ce099757da185a7dec2fbb03a914b7943df18680b854a7313150f478fef5fdfedb0a69bfb7ac SHA512 356b6269cc6a8d47782afd80d88985aa32da3c9ccef7d6f5a9d0505cb324b50e332f049a80cd1f7ad067e05b67c9619d0cc6f9e18810a829865e31cd6c3e0169
-EBUILD lens-4.11.ebuild 4327 BLAKE2B 8048390a91fdeeca8fe7548cddd33b05225973fd1d6241bf57828f0d6173718aada0dfd6d9379a76c4a1be60b8cf941380c1e2fd88363b2eb1c8943b59e03f09 SHA512 f9699acc7a94e279ce0ebb1dd85ecaabf4c6ff16db8814475927bfcf06fda4961ddfd87c4f694fbe90b8d507da56a6ddee405f1440aed3e43bc99e2fa9db2de4
-EBUILD lens-4.14.ebuild 3409 BLAKE2B fdf038ae58abc8647a9355ea9c3ad3d12be28dbc3bf8707ac17931427d2c5883bb5bd39d22a4d106f69f0abeec0b29afe32f12afb91441dd1b4cbb48a3bbc7f6 SHA512 5156d91329aa58d80256013699ef224db1bc90e00cb8b7efa21b158519d86a0a8bb475838ab2731d2783632330f0a8c1ff7f8cea8893691363a44343d5f9f431
EBUILD lens-4.19.1.ebuild 3812 BLAKE2B 5e66709f4a5fac199a05d4518e765f40fc50304e3c21342d92f2d96c5f66ba0b9095126bf8f492ef6eab803cb969cba884f8d1403a03967bb413294969f73ffc SHA512 4604209b82e270587c2c7ee593bef145e6ee51d45407b015a17e57e93dc07008672973ec6a9e4775f56a199fa72c34eeeb33cf7374c4541a5fde5a3fafe67c72
-EBUILD lens-4.2.ebuild 4697 BLAKE2B 71759c879bda8b7ce3a57ccbf94c05e19d9e391d3cb9428b899e4f78e83d36607e385d41ee523a76ec565bef8b3db19a97ee90f68adb641794aaff8f713f21b2 SHA512 50a37a77dfa8dcae665cd412ac0c7b23297f3c5c8a99806b4ecf8d7c5857d2795399440ee355c6c69cac24f99af57cd0398521e9c36d5b8e2c6f2d14f817e718
-EBUILD lens-4.6.0.1.ebuild 4398 BLAKE2B c064fca5ddad33e15d0c8b7c8dfd71a69a2c381a29c9eb3cf74bb0ed057a7b0810e6752cbe862c637a29a5d2a06588542af0ec674701290efcbdfa3c38f107b5 SHA512 a10fe37d6e8be409529e03e6e2b0fdaa25cb8eb309858fb4783f085bb31e8593f0aa003fba1e042b1b893693a632f399e600fa9b2bb3ffc8056a40a05cb8499d
-EBUILD lens-4.9.1.ebuild 4337 BLAKE2B 089157379a489ae88be495d33ca2e5bb7082141de065724a9386d2639472852f321afdf15116dfc495db9326fd861c8dc2ad4fbbde540e36e66d663622a15f3e SHA512 2e9bf72439b29468268a6912569a6db96d9a0a9a3b07efbe1717b76b2230800bc25be46e6b19eba967a4c2935917aab95c4c34393b660e4c55eec0c7ffeb584c
-MISC metadata.xml 4924 BLAKE2B 0d937d25157349422abd09755aa6b90b31aab051e838188045fa774b5fa6c428c8ba1b5d6cf6d812441a59ac83ea46e467c21e097ea95ec420ef1c7fad3cef1f SHA512 54ee64d40c56b8ab2857b051ab8e1abf6dd7c68f3f5d539e636518f0c94bcaa34a3e5b038610b067a6473080a23cc2928b61c4405b0e3a2f0823313f6dbdb386
+MISC metadata.xml 4596 BLAKE2B a45f6f80d686ab0d2b57ca0a9ff7d89184c98101b15b8d49ca6919b4245b46898ed345211ef3a0af8229faf05e62c2bcaf406510223f2048d05425150bad8e8d SHA512 8893b9987ac5842ab81c4b283f15c88490322fc6c79df801a32f90eeb6b69472bd491ccf982fb7885db5edceae632c4d1e6a9e9ebdb15cb289907f51d52461fa
diff --git a/dev-haskell/lens/lens-3.10.0.1.ebuild b/dev-haskell/lens/lens-3.10.0.1.ebuild
deleted file mode 100644
index 609f9849d663..000000000000
--- a/dev-haskell/lens/lens-3.10.0.1.ebuild
+++ /dev/null
@@ -1,83 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-0.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/generic-deriving-1.4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/monadcatchio-transformers-0.3:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/reflection-1.1.6:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.1:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10.0.0
- test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/nats
- >=dev-haskell/simple-reflect-0.3.1
- test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) )
- !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) )
- !test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) )
- !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag lib-werror lib-werror) \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- $(cabal_flag test-hunit test-hunit) \
- $(cabal_flag test-properties test-properties) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-3.9.2.ebuild b/dev-haskell/lens/lens-3.9.2.ebuild
deleted file mode 100644
index e94fe831a83e..000000000000
--- a/dev-haskell/lens/lens-3.9.2.ebuild
+++ /dev/null
@@ -1,86 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] =dev-haskell/comonad-3:=[profile?] =dev-haskell/comonad-transformers-3:=[profile?] =dev-haskell/comonads-fd-3:=[profile?] =dev-haskell/contravariant-0.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/generic-deriving-1.4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/monadcatchio-transformers-0.3:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/profunctor-extras-3.3:=[profile?] =dev-haskell/profunctors-3.2:=[profile?] =dev-haskell/reflection-1.1.6:=[profile?] =dev-haskell/semigroupoids-3.0.2:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.1:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10.0.0
- test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/nats
- >=dev-haskell/simple-reflect-0.3.1
- test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) )
- !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) )
- !test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) )
- !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag lib-werror lib-werror) \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- $(cabal_flag test-hunit test-hunit) \
- $(cabal_flag test-properties test-properties) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.11.ebuild b/dev-haskell/lens/lens-4.11.ebuild
deleted file mode 100644
index 288ddf949b50..000000000000
--- a/dev-haskell/lens/lens-4.11.ebuild
+++ /dev/null
@@ -1,90 +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.4.3
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-0.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/exceptions-0.1.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/kan-extensions-4.2.1:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/profunctors-5:=[profile?] =dev-haskell/reflection-1.1.6:=[profile?] =dev-haskell/semigroupoids-5:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/generic-deriving
- dev-haskell/nats
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
- test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
- !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag j j) \
- --flag=-lib-werror \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- $(cabal_flag test-hlint test-hlint) \
- $(cabal_flag test-hunit test-hunit) \
- $(cabal_flag test-properties test-properties) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.14.ebuild b/dev-haskell/lens/lens-4.14.ebuild
deleted file mode 100644
index 172b0cd65b8a..000000000000
--- a/dev-haskell/lens/lens-4.14.ebuild
+++ /dev/null
@@ -1,75 +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
-#hackport: flags: -test-hlint,+test-hunit,+test-properties
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] =dev-haskell/bifunctors-5:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-1.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/exceptions-0.1.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/kan-extensions-5:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/profunctors-5:=[profile?] =dev-haskell/reflection-2.1:=[profile?] =dev-haskell/semigroupoids-5:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] =dev-haskell/unordered-containers-0.2.4:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2
- test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/generic-deriving
- dev-haskell/nats
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1 ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag j j) \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- --flag=-test-hlint \
- --flag=test-hunit \
- --flag=test-properties \
- $(cabal_flag test-templates test-templates) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.2.ebuild b/dev-haskell/lens/lens-4.2.ebuild
deleted file mode 100644
index fbc32e782f63..000000000000
--- a/dev-haskell/lens/lens-4.2.ebuild
+++ /dev/null
@@ -1,94 +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.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j lib-werror old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] =dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/bifunctors-4:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-0.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/exceptions-0.1.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/primitive-0.4.0.1:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/reflection-1.1.6:=[profile?] =dev-haskell/scientific-0.3.2:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.1:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-haskell/zlib-0.5.4:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/generic-deriving
- dev-haskell/nats
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
- test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
- !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag j j) \
- $(cabal_flag lib-werror lib-werror) \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- $(cabal_flag test-hlint test-hlint) \
- $(cabal_flag test-hunit test-hunit) \
- $(cabal_flag test-properties test-properties) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.6.0.1.ebuild b/dev-haskell/lens/lens-4.6.0.1.ebuild
deleted file mode 100644
index 68466d8661b0..000000000000
--- a/dev-haskell/lens/lens-4.6.0.1.ebuild
+++ /dev/null
@@ -1,91 +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.4.4.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-0.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/exceptions-0.1.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/primitive-0.4.0.1:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/reflection-1.1.6:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/generic-deriving
- dev-haskell/nats
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
- test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
- !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag j j) \
- --flag=-lib-werror \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- $(cabal_flag test-hlint test-hlint) \
- $(cabal_flag test-hunit test-hunit) \
- $(cabal_flag test-properties test-properties) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.9.1.ebuild b/dev-haskell/lens/lens-4.9.1.ebuild
deleted file mode 100644
index 82ced8d8e4d3..000000000000
--- a/dev-haskell/lens/lens-4.9.1.ebuild
+++ /dev/null
@@ -1,91 +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.4.5.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-
-RESTRICT=test # slooooooooooow
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-0.3:=[profile?] =dev-haskell/distributive-0.3:=[profile?] =dev-haskell/exceptions-0.1.1:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/hashable-1.1.2.3:=[profile?] =dev-haskell/kan-extensions-4.2.1:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parallel-3.1.0.1:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/reflection-1.1.6:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.8.4:=[profile?] =dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.9:=[profile?] =dev-haskell/void-0.5:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
- dev-haskell/generic-deriving
- dev-haskell/nats
- >=dev-haskell/semigroups-0.9
- >=dev-haskell/simple-reflect-0.3.1
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- test-hunit? ( >=dev-haskell/hunit-1.2
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-hunit-0.2
- >=dev-haskell/test-framework-th-0.2
- test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
- test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
- !test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
- >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) )
- !test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
- !test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
- >=dev-haskell/test-framework-0.6
- >=dev-haskell/test-framework-quickcheck2-0.2
- >=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag benchmark-uniplate benchmark-uniplate) \
- $(cabal_flag dump-splices dump-splices) \
- $(cabal_flag inlining inlining) \
- $(cabal_flag j j) \
- --flag=-lib-werror \
- $(cabal_flag old-inline-pragmas old-inline-pragmas) \
- $(cabal_flag safe safe) \
- $(cabal_flag test-doctests test-doctests) \
- $(cabal_flag test-hlint test-hlint) \
- $(cabal_flag test-hunit test-hunit) \
- $(cabal_flag test-properties test-properties) \
- $(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
index ffb64447adda..480622bff29c 100644
--- a/dev-haskell/lens/metadata.xml
+++ b/dev-haskell/lens/metadata.xml
@@ -94,12 +94,8 @@
Build and run the doctests test-suite.
Attempt a parallel build with GHC 7.8.
Build and run the doctests test-suite.
- You can disable the hlint test suite with -f-test-hlint
- You can disable the hunit test suite with -f-test-hunit
- Build the properties test if we're building tests
Build the test templates if we're building tests
Assert that we are trustworthy when we can
- Turn on ghc-options: -Werror
ekmett/lens
diff --git a/dev-haskell/math-functions/Manifest b/dev-haskell/math-functions/Manifest
index 65fdffff3fb6..a91ce96905ac 100644
--- a/dev-haskell/math-functions/Manifest
+++ b/dev-haskell/math-functions/Manifest
@@ -1,5 +1,7 @@
DIST math-functions-0.1.5.2.tar.gz 28490 BLAKE2B 70dbe8673442e0103311f913d486acd0953823d852b33c1dbbd2e3072c61e19c75366d48fd29346e33895cc038cf6deb7f995db927c41cee1e9c0cde9b8f7d80 SHA512 7723400ef7eaf3996babc4cacc1b02b7ee46837b8c4105abf0aa69f896e97ce3fc9fae6e527a0513688d66810a05ce2f5bef527d04b54bedd82c16fe2bbe342b
DIST math-functions-0.1.6.0.tar.gz 30734 BLAKE2B 445bbfefa7e4a67922ad0fcdac65b1458115285ac5d7c38a0ea6f32ab3658a9720cce164bbb6473a608e7466e67dc9743e719b24c2b5f3e5755af9c3ba105f85 SHA512 b1f0df7b7b99bb41e6ca232bfabd0f0db07b98be1bb3d9c64235b283efd3a5441f02829e637e71cccf70917413e7145afd0dc23686732d4797ab7351c3d3e060
+DIST math-functions-0.3.3.0.tar.gz 424169 BLAKE2B 8b53c657fb5eba8d3ab54d5ba29f7d316e8c2f4803d0587a1071fd9b6c0cf0d8a17c4dadc903280faf028622207ab84db5fb628c8826af0e615524ef45b625c5 SHA512 f6ac6f9fb604207c11d7888fa375a52b544732dd8e811c3b9bf74237bbc0dc83839eb83c11c5ef0dd88666cff4919d4e06236e14d84da7065b4dc75717ceafad
EBUILD math-functions-0.1.5.2.ebuild 868 BLAKE2B ad2fc4548bf9e5091fe2032248b8806232f54a6e6ddf0496f0dd42cd8565734cca201065877d26f3fe28238e2d9ca26afb617907fed04900446f7cb0aacdeadb SHA512 072a8fde470a17d52d2e0807494d88980f1f9f025ec925cbba2e0bf377529472796e2f7bf643f1a69983b2b9658deff2e9cb7bdc4d202baaca196ee0ca5569c0
EBUILD math-functions-0.1.6.0.ebuild 868 BLAKE2B bb92ba9d6f6d4025d45084e4cf4aeef748c7ca45b932c4b6ac772ed82db3d53b8fa3e6e2a0450979b0e03b294e19fedd4e549e643c4b43ea9bc3c9c3624fd54c SHA512 2eb9f9a16ab5b7d475b1323bb998715f929cc016187f40ffff5e607c9a7118eaa77f766bd41d43815ac66e608a6d7a350d42e67c5922c8908127b95069f8f379
+EBUILD math-functions-0.3.3.0.ebuild 1031 BLAKE2B f49dc3deb5175b53ec4e15469abe49520e15aab1968983e9c0cc5dcc93a735340b10adacbea4ad0128256f517ee12f2ae3630db2ffbda8d7bb4c236945d5a393 SHA512 158c4d73a06fbb03ab961ea71e5645bbb47502dc67c1d1d935b3a07e85c049e7a716c9eba32c83099f4676aa503c9fcdfc1b2cecdb58b3e138f01ba4be813c9f
MISC metadata.xml 550 BLAKE2B f7003c6609e08895f2d6ad5c193147cd1bb98a101c1d594f98ec859a7295e8e03ba3057f42926d353cfade194709a6bd5a1ac48842493408ad86c764dc8e519f SHA512 355f4626c2c385acf0662d46deed375e41681f310cb79b8d0d84ca3c63cc65d14dde4d902968e00175e9276f43e604e98d0d1fd49b08d27ff09a8ed333dfadfb
diff --git a/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild b/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
new file mode 100644
index 000000000000..29f7cf834f44
--- /dev/null
+++ b/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +system-erf,+system-expm1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Special functions and Chebyshev polynomials"
+HOMEPAGE="https://github.com/bos/math-functions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
+ dev-haskell/primitive:=[profile?]
+ >=dev-haskell/vector-0.7:=[profile?]
+ >=dev-haskell/vector-th-unbox-0.2.1.6:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/erf
+ >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/tasty-1.2
+ >=dev-haskell/tasty-hunit-0.10
+ >=dev-haskell/tasty-quickcheck-0.10 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=system-erf \
+ --flag=system-expm1
+}
diff --git a/dev-haskell/microstache/Manifest b/dev-haskell/microstache/Manifest
new file mode 100644
index 000000000000..60829879551e
--- /dev/null
+++ b/dev-haskell/microstache/Manifest
@@ -0,0 +1,3 @@
+DIST microstache-1.0.1.1.tar.gz 20449 BLAKE2B b4f0a6b13e5597ba2c90377032a8b248570977a35bb07d7f8b360add87eff6ea80ee8cbd40cee8e110ff913833b798234d0189e65e4c4964367b3643c15e6837 SHA512 28e0ad58a9724259df176092c125a4ba51fd2278cb0ab2e29bc24bf1e0f1c57a53e5983ff640569e3416fc7cda31b6ba0ae8ad832840a3040ba55fb85fb7f1a1
+EBUILD microstache-1.0.1.1.ebuild 1260 BLAKE2B 066a759ecf4264d7f209a33faa3534268c0588ceef2a19a670c8e899b60de517cc7f5a48afe185902270a387ac980d663807a554886604b14cf4e539d64b5b24 SHA512 c02091ca8e5afb48164a4f83f5cfdaec206986dcb943f5f819f87fa8fd92a729f7f1271e108458cbb66ae7edbb5406973c37baf32e3e8c6832c02dcf5c92c3a8
+MISC metadata.xml 439 BLAKE2B faa4a19c2e0c6142cd228b6b8e1f916e85d5c081b78fab1b26f08b8cc66e1d470a8bd49457bafbb4f83d72951d9833663a7b09b787d5ff27cff3173f6ade1358 SHA512 850819032338424c2ff28ed60c4051eb2f3572d251a869057755dd83ede531b44a955d19fbab6f8c4db6e276bf8e590a43d37fe8c367d1cec7d825ac3125b44c
diff --git a/dev-haskell/microstache/metadata.xml b/dev-haskell/microstache/metadata.xml
new file mode 100644
index 000000000000..2f8ed16ae4ad
--- /dev/null
+++ b/dev-haskell/microstache/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ Mustache templates for Haskell.
+
+ Based on @stache@ library, which uses @megaparsec@.
+ This library uses @parsec@, thus the name: @microstache@.
+
+
diff --git a/dev-haskell/microstache/microstache-1.0.1.1.ebuild b/dev-haskell/microstache/microstache-1.0.1.1.ebuild
new file mode 100644
index 000000000000..9286cf331bb4
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/phadej/microstache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+ >=dev-haskell/parsec-3.1.11:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/text-1.2:=[profile?] =dev-haskell/unordered-containers-0.2.5:=[profile?] =dev-haskell/vector-0.11:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/hspec-2.0 =0.11 && < 1.3' 'aeson >=0.11' \
+ 'containers >=0.4.2.1 && < 0.6' 'containers >=0.4.2.1'
+}
diff --git a/dev-haskell/mod/Manifest b/dev-haskell/mod/Manifest
new file mode 100644
index 000000000000..eb22969f512d
--- /dev/null
+++ b/dev-haskell/mod/Manifest
@@ -0,0 +1,3 @@
+DIST mod-0.1.1.0.tar.gz 9471 BLAKE2B 5f664e1d35abf143223bc25ab5eec054a5a2403ae43bec41fde0b4c386a68a2ede336c539cae6588c267d2104fa182896212d9ac88493919f4b4e66cecfe91b4 SHA512 08656e15e417f11a6e7980510e091d2a59d4786ae269795aba04d5952b08556cd1ee3b9c38b456bf86e08f505a797e82a68ee36eec27cd155692f14cedc2acb0
+EBUILD mod-0.1.1.0.ebuild 899 BLAKE2B 1af3bf7cda3cc71df7ee04b1af33d21bfe3f373f5e079316270ae89f56a340f52dab4ffa2c1d45db6e370f71dfdb8cde332a421d2cf5c2c6ee1a62c032a6e2c8 SHA512 918d6a0bdd1e7c26c61ae81e1605fc35cc53807ffcf38a1a337c4a6ab5e70bb69f8ac7fa72e64dee60753dceffca731a1e5f605345e2131451f8c10e88d94f21
+MISC metadata.xml 603 BLAKE2B 0ea6a60e9a65a101676038d18ea8e7d5bae689fa041707cef942a2aa3b66d72b66c293af2e551ad1a77e0c4fbb70d143a81ae9f04b819859da58acfa33a06fb8 SHA512 aaa980f5638822366286386e1db7f689d09e2d90fd537aeb79cc562599daf729a47b53e557813dcc30eac4f77f02e777b0e55bccf15955f2ec5e775b6b72ef1b
diff --git a/dev-haskell/mod/metadata.xml b/dev-haskell/mod/metadata.xml
new file mode 100644
index 000000000000..dbb7236e5c3c
--- /dev/null
+++ b/dev-haskell/mod/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
+ <https://en.wikipedia.org/wiki/Modular_arithmetic Modular arithmetic>,
+ promoting moduli to the type level, with an emphasis on performance.
+ Originally part of <https://hackage.haskell.org/package/arithmoi arithmoi> package.
+
+
diff --git a/dev-haskell/mod/mod-0.1.1.0.ebuild b/dev-haskell/mod/mod-0.1.1.0.ebuild
new file mode 100644
index 000000000000..cf308500308e
--- /dev/null
+++ b/dev-haskell/mod/mod-0.1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast type-safe modular arithmetic"
+HOMEPAGE="https://github.com/Bodigrim/mod"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+semirings"
+
+RDEPEND=">=dev-lang/ghc-8.2.1:=
+ semirings? ( >=dev-haskell/semirings-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0.0.2
+ test? ( dev-haskell/quickcheck-classes-base
+ >=dev-haskell/tasty-0.10
+ >=dev-haskell/tasty-quickcheck-0.9 =dev-haskell/quickcheck-classes-0.6.3 ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag semirings semirings)
+}
diff --git a/dev-haskell/numtype-dk/Manifest b/dev-haskell/numtype-dk/Manifest
new file mode 100644
index 000000000000..5b1bab94f96d
--- /dev/null
+++ b/dev-haskell/numtype-dk/Manifest
@@ -0,0 +1,3 @@
+DIST numtype-dk-0.5.0.2.tar.gz 7495 BLAKE2B bef39bff1eaec5cfb38ccc16001c670dead2605070645f0015567179c0267a13ce672938b61768489fd027df0a05fe3adbba26053f18bbb1bc91a6c53175dea3 SHA512 4c157fca67313f2ba5c761322b069d488e84574c837a5c708c9f80f21fff3118eb2f7e45f80a420f6b206026c7252b6afd3e46f59421e5c41675cdf067b6bec3
+EBUILD numtype-dk-0.5.0.2.ebuild 579 BLAKE2B e888b43df41fe9dcb7d3c4386736e4635d30f4159b059c23ebd46e02307c715085a0f7422b410bd53e821c19603ba70843f7cfd453458974d6f46ba182bbd274 SHA512 9168869dbc7cd73da7fd6e81ef2e6fa943c001c73bd14f6f493d714d10cd380c5c02775bd58c73f8fa07ffaebb32715944810e3efae01da492f5db7f02411736
+MISC metadata.xml 698 BLAKE2B 8a660bf0d233d0d03ae8d6bf095b54dc36b1cbb2452dbb9bd008dc900fd648150da91c5a5ebb3159ad6576b5581e0da784cd281b7e6b4cedead753c904839926 SHA512 21fca2e10f21043e071122d5ae5f3dddd026b0aeb10b902decd2563b38190d1d8913a163daf5913aecae7a039fd38f61c30016d6b975b86b9f8d7aca136fd81a
diff --git a/dev-haskell/numtype-dk/metadata.xml b/dev-haskell/numtype-dk/metadata.xml
new file mode 100644
index 000000000000..0375c44d97f8
--- /dev/null
+++ b/dev-haskell/numtype-dk/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ This package provides type level representations of the
+ (positive and negative) integers and basic operations (addition,
+ subtraction, multiplication, division, exponentiation) on these.
+ The numtype-dk package differs from the numtype package in that
+ the NumTypes are implemented using Data Kinds, TypeNats, and
+ Closed Type Families rather than Functional Dependencies.
+ Requires GHC 7.8 or later.
+
+
diff --git a/dev-haskell/tar/tar-0.4.0.1.ebuild b/dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild
similarity index 52%
rename from dev-haskell/tar/tar-0.4.0.1.ebuild
rename to dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild
index 60eaf61342a5..83293c81836c 100644
--- a/dev-haskell/tar/tar-0.4.0.1.ebuild
+++ b/dev-haskell/numtype-dk/numtype-dk-0.5.0.2.ebuild
@@ -1,22 +1,24 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-# ebuild generated by hackport 0.3.9999
+# ebuild generated by hackport 0.5.6.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
-DESCRIPTION="Reading, writing and manipulating '.tar' archive files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
+DESCRIPTION="Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"
+HOMEPAGE="https://github.com/bjornbm/numtype-dk"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8"
+ >=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index 1b612629adf4..dd261c86bca6 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1,11 +1,3 @@
-DIST pandoc-types-1.12.3.tar.gz 18633 BLAKE2B 53776ac60c3e658ae6bf348d065d449045b5b0474b16550270c7087c766f1726fed80135ae92cab087a76dee8994a6ff3f68cc7085145f1e065a7cddf3b2759f SHA512 8da2d37baa962c4a414a60ac274736897499b3ba26bd54e2e6dd10616f204c3e143e4e66c97fa209781d73bde35fab7a466a8eaa06edaa13eaa178aa77c285af
-DIST pandoc-types-1.12.4.5.tar.gz 13341 BLAKE2B e0c9d079a8b5ee1eef07d8da87f621a1b005a984ae9b52b81241530bc5e7ef632fd9efe52aa7ab6f55978b28a15ef049769bdaeb5a94cc3b09b5cba8f34f757d SHA512 7f4c1156b074e61cd6fb5f37f5555700f5c21a24eb4226770fb8c83be3dc6075fef0b7b183c06561cc42c194fea0ac7356572e05097165e87e162b161f9c8993
-DIST pandoc-types-1.12.4.7.tar.gz 13208 BLAKE2B 6d823bc596cb779e67d6ba3af0323de2747ff0280e82fb4c319a8ebb5dbe5211015708c5241146a6a8210f9f1907c1d92aa5aac90397d3de3c249d5cf32968fd SHA512 cabb59d4f6bfec3c00d4cac4f2bda60e11ce96394b61d79650544b3249b5ef81758da0d8d08cb3de68ed252845ae1b6f2c4d663e80b4cdc076916c278ac4fc4b
-DIST pandoc-types-1.17.0.4.tar.gz 21540 BLAKE2B ba11e3a9c8fc98597cfaf0812ca35d6346f2c43aa7f67adf3f098b2410d12aed6b60b28003eec16e4cd82c6a355ec03b78d590bfa672d579ca8adc5ad1c63fb5 SHA512 3b3aaa2d6b62be8b3876ead411a0d48277666ab3dd718e5aad5ecca01cb9d66a4d7973bdc250e4fd2d061917d0836f63e6412534fa854c2c886dc798e34c60fc
DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
-EBUILD pandoc-types-1.12.3.ebuild 690 BLAKE2B d05457b9dd83a4dc3a9cb71bb04848fa7e036a4e2a8f016f6db734e48a20b37faa81f38b7a822b776a1adbf89e751da585c4ea98afa82fa92ec959b4c183bb69 SHA512 637e63136aa0ba1d21f2bf4150bcb2d691eb3feb19f075fd0ec26e3311cc1816276bb24b2e7f02eacf65b17b2d72bf62c94a4b5115813cb661b238aa38671b50
-EBUILD pandoc-types-1.12.4.5.ebuild 778 BLAKE2B ac5b67e1e683a2f412af5ab8fbd42cff4117598c6d8a7b4ef8fbd274a69cd26ffced06a264d4d88451ace94b9072a585d791cba96d6dc8ba31d037db4bacb36e SHA512 e9b5b3b6bb1818b92d381d0d0fd129894e2ce175d10cd047bb49d9f329bbf83822a08856c2a50307846581bad1b8957be56539cd568287760b262df9ec35f3f2
-EBUILD pandoc-types-1.12.4.7.ebuild 778 BLAKE2B 7b6a48628a7ab2ba21cb7c387fb33d94976cb4acb56b1983c0bab7b237f846e8f7e4242622ce3a6f514fd4a255e38dbb0ae3a01d8d17aa7b6019e8974b07728b SHA512 086c8fd8059d3ba22d7bee1675b33a94286eb919a829d1d0289be39ba5ced8d001a2ea5d6a7cc932607811bc70fc02ada33bebd39871cae6f991a0b2bb9bbde5
-EBUILD pandoc-types-1.17.0.4.ebuild 1166 BLAKE2B 8b669040dd8ef5081c1fa02795eedac09d99e4310184ca5ae843a0e6f4327d2b22a8c4c911184a8d80af95dc2bc03471c2f04c3c3d976cb911a219dffff02ef6 SHA512 d63df34f0e2c11c70d88c57d6639e61d0e5f83c4aea44fcb6f2494ffce36ee91df2254f369ce7ed947839e7717c4b022c03f74008089bb959e4bc16447e485de
EBUILD pandoc-types-1.20.ebuild 1212 BLAKE2B 2114df77a615113b867e7ce381b3475611944ff92bc14f883848afba80342fd034328f5ff5a64a14525fca73a1cee0c74d18a5dc233ee45e6de28d2418833b41 SHA512 99ba7d61c11258a1ba09ba6769efc9ffff14c32f0aad3fc5220c2bbcab691909452e876d91325ae7f993cb6a8ab0d2ef2c902ba61e3fb4054fbdc8cb0365c980
MISC metadata.xml 742 BLAKE2B be89ec8208d0891fbe9af9f4cdbd438daaaf96e8fa3478b9b9713c57349e6a516c0b8d5ad1074e4b34d02e0d1f1d52ff27a7dcc2699362ed7ddd5bee18940255 SHA512 438830b6cd891695dbc45cb03b0bcd34f85fb5d7225384617a1d130c086b687e7dfed06d4122b0025ad70eba4ed25e2d3dd2803a0a84012d225b75cdfb6fa9e6
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
deleted file mode 100644
index a042d0f51bb6..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
+++ /dev/null
@@ -1,26 +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.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
deleted file mode 100644
index 0bd0a14f78e8..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
+++ /dev/null
@@ -1,27 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] =dev-haskell/deepseq-generics-0.1:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
deleted file mode 100644
index a13b3e07c2ef..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
+++ /dev/null
@@ -1,27 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] =dev-haskell/deepseq-generics-0.1:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
deleted file mode 100644
index c6839b395ca1..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] =dev-haskell/deepseq-generics-0.1:=[profile?]
- >=dev-haskell/quickcheck-2:2=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.3 =dev-haskell/test-framework-hunit-0.2 =dev-haskell/test-framework-quickcheck2-0.2.9 =dev-haskell/aeson-0.7:=[profile?] =dev-haskell/monad-control-0.2:=[profile?] =dev-haskell/persistent-2.1.3:=[profile?] =dev-haskell/text-0.5:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?] =dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild b/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
deleted file mode 100644
index fa0195fefb94..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
+++ /dev/null
@@ -1,45 +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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
- >=dev-haskell/aeson-compat-0.3.2.0:=[profile?] =dev-haskell/http-api-data-0.2:=[profile?]
- >=dev-haskell/monad-control-0.2:=[profile?] =dev-haskell/persistent-2.5:=[profile?] =dev-haskell/text-0.5:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?] =dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/quickcheck )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'aeson >= 0.7 && < 0.12' 'aeson >= 0.7' \
- 'http-api-data >= 0.2 && < 0.3' 'http-api-data >= 0.2'
-}
diff --git a/dev-haskell/primitive-addr/Manifest b/dev-haskell/primitive-addr/Manifest
new file mode 100644
index 000000000000..4093c034f3be
--- /dev/null
+++ b/dev-haskell/primitive-addr/Manifest
@@ -0,0 +1,3 @@
+DIST primitive-addr-0.1.0.2.tar.gz 2983 BLAKE2B c272cbbdc874f8a297170b363e2b3ea0ab374b6ecc02fddfa1e82eed5a9b75c52e53aa3ca782027cf1d14d91ad826818c71752a778dcd9080994970284ac2c28 SHA512 e025238791271793e91faecba337d04e0cfc1e6b4dd130bd590247e961ef541ac81beca511ef117130eaf5665abb06b73e1985b1ed87705fa4c2704641d60ae4
+EBUILD primitive-addr-0.1.0.2.ebuild 614 BLAKE2B 9512baffb8d63bfb91f4b2b9476f8715092acb44afff6bf5d0d3a726d70f393a00f0818df202455a2d0dcd66596ab100e099a930e32295dcfbc9f3b6c797fc65 SHA512 d1a9e47db8df742860ddba651f702b0a99f7f02c2f6b824a56cad21acfe89998d0b3d7133fc8b8d5b18625e667432290fe53a5fc1b7a7d58f79f037add5ebd89
+MISC metadata.xml 320 BLAKE2B ba9508fea0c049fcfd647cea805376213fd7c4bd07ee06c7b1cd7299ef60d01f4cd07a0b9a1499b638b3e4427fd24fb79ceced0a8af72e3eebdd387d4787843b SHA512 a67d2b094fa0a7b72ceedb21c9ea7b6d038577f558f1d65c816ff68af3d49b80412f73c3a5d934e9d6ddc8dbcf9d7eee3f768355a1bda2ab5fa9487ae0652da6
diff --git a/dev-haskell/primitive-addr/metadata.xml b/dev-haskell/primitive-addr/metadata.xml
new file mode 100644
index 000000000000..30e2dffbfd97
--- /dev/null
+++ b/dev-haskell/primitive-addr/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ Addresses to unmanaged memory
+
+
diff --git a/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild b/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
new file mode 100644
index 000000000000..ce29f2d74df9
--- /dev/null
+++ b/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Addresses to unmanaged memory"
+HOMEPAGE="https://github.com/andrewthad/primitive-addr"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/primitive-0.6.4:=[profile?] =dev-lang/ghc-7.4.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+"
diff --git a/dev-haskell/quickcheck-classes-base/Manifest b/dev-haskell/quickcheck-classes-base/Manifest
new file mode 100644
index 000000000000..6664c2ecf0b6
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/Manifest
@@ -0,0 +1,3 @@
+DIST quickcheck-classes-base-0.6.0.0.tar.gz 25760 BLAKE2B d09794c63da8311836e6422006d262fca21f7d71b473b69f57bd49b3ed2e39f29fcfd18b73fd311db4f6b1cca390cc579f2438481dbd680841c835d7d0d9f557 SHA512 3d0a7c68ab1cdaddbd272df633e0704f5ee3997b3a86fe79cb960f7c84f8546f3360b9d52ada45b9db6344135f0aab1093d5304935ae19f43d235790fba83216
+EBUILD quickcheck-classes-base-0.6.0.0.ebuild 1143 BLAKE2B 9f80f952b5ebe7f421bea47b9fd028ceb8f21aacf6a73dac28e5d7a321b43eef02df93ee78ba347a1e588ae56b5b8562b58b6c84fd1734e62143ea6940874993 SHA512 55d5b608286319e3bedeb2f0601556045420b05520062ecc5ef9e1b41f68b05a05ccdbcd204f38c73079da86ce494c60c8977cd9212cc92b667e7dc2f3327c91
+MISC metadata.xml 1592 BLAKE2B 7020e82f10049c969769746ae0650957824e80aa448ee2a360055d88006e5423cf888f4467fe364c58df852c6611126a60fc91c55f621c02e4787f6f236aa28d SHA512 a9583e85d9b560b12cf7493e64010527bac6cfc2e9e259624919f77459fabd36bf75ec8ef53085812f99623c67da03ffa16b6e85d2d1da4823c898c8cb56a7d3
diff --git a/dev-haskell/quickcheck-classes-base/metadata.xml b/dev-haskell/quickcheck-classes-base/metadata.xml
new file mode 100644
index 000000000000..6b8592b1a5b8
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/metadata.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
+ This libary is a minimal variant of `quickcheck-classes` that
+ only provides laws for typeclasses from `base`. The main purpose
+ of splitting this out is so that `primitive` can depend on
+ `quickcheck-classes-base` in its test suite, avoiding the circular
+ dependency that arises if `quickcheck-classes` is used instead.
+
+ This library provides QuickCheck properties to ensure
+ that typeclass instances adhere to the set of laws that
+ they are supposed to. There are other libraries that do
+ similar things, such as `genvalidity-hspec` and `checkers`.
+ This library differs from other solutions by not introducing
+ any new typeclasses that the user needs to learn.
+
+ /Note:/ on GHC < 8.5, this library uses the higher-kinded typeclasses
+ ('Data.Functor.Classes.Show1', 'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
+ but on GHC >= 8.5, it uses `-XQuantifiedConstraints` to express these
+ constraints more cleanly.
+
+
diff --git a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.0.0.ebuild b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.0.0.ebuild
new file mode 100644
index 000000000000..8b0c61a1e9d7
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses from 'base'"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+binary-laws +unary-laws"
+
+RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
+ dev-haskell/bifunctors:=[profile?]
+ dev-haskell/contravariant:=[profile?]
+ dev-haskell/fail:=[profile?]
+ >=dev-haskell/semigroups-0.17:=[profile?]
+ dev-haskell/tagged:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+ binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+ unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+ !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag binary-laws binary-laws) \
+ $(cabal_flag unary-laws unary-laws)
+}
diff --git a/dev-haskell/quickcheck-classes/Manifest b/dev-haskell/quickcheck-classes/Manifest
new file mode 100644
index 000000000000..4e8808c5d94c
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/Manifest
@@ -0,0 +1,3 @@
+DIST quickcheck-classes-0.6.4.0.tar.gz 19976 BLAKE2B 614ebc6e1be382a942a55a039921021fd4bcaa2f5c977a8d83bd7b1fb76feebb31f94da908c2389d5f9ab5f7e2481f76223375db41d12b3583658d5d7361ed9b SHA512 2d5786d3cd386a795d5e1ca58ef55fb2efb9285724cf8cbb2f28577973ac2b2a9058ba6185904bc29da88f6d080f4a38629df272502796a0c2e31f9a0e8b658c
+EBUILD quickcheck-classes-0.6.4.0.ebuild 1955 BLAKE2B 7ebebce4d4fca87ea9cafa847cac4e5ae4deeb0823f4ae6a835bde154b3ead9516161fdb4a6b29fc14788b33371b26fcfae0c977f0436f8abc786a7ae2d0168d SHA512 8c2d6da15fe86bd8e97ddf28563477fb9d1ca321f60034bd5507ac3c6eab490c46ad5fa214ea8bebb0b04c51f8023622bd885e95f43bcb01d8070a08367b8580
+MISC metadata.xml 1912 BLAKE2B 5fa229a9678e56d25a15e8bd8d7ecc228c56786eca51bea101184b240f1a901d2ce124f531fc3f4a86ef2c64770e0c5fbfd47c38c6abd1cdf00e16d167b6dbf7 SHA512 56cbbdc738e1cdf5ca4d208dec76c99806828756746aa5a812f1523c3917fb90c6a050fce9489db52064b7b4b54d17768e2a9296176876eab78f454dec2b5d0a
diff --git a/dev-haskell/quickcheck-classes/metadata.xml b/dev-haskell/quickcheck-classes/metadata.xml
new file mode 100644
index 000000000000..aaf10d4bc2b5
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/metadata.xml
@@ -0,0 +1,47 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
+ This library provides QuickCheck properties to ensure
+ that typeclass instances adhere to the set of laws that
+ they are supposed to. There are other libraries that do
+ similar things, such as `genvalidity-hspec` and `checkers`.
+ This library differs from other solutions by not introducing
+ any new typeclasses that the user needs to learn.
+
+ /Note:/ on GHC < 8.5, this library uses the higher-kinded typeclasses
+ ('Data.Functor.Classes.Show1', 'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
+ but on GHC >= 8.5, it uses `-XQuantifiedConstraints` to express these
+ constraints more cleanly.
+
+
diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
new file mode 100644
index 000000000000..e4dbaa884075
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector"
+
+RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
+ dev-haskell/bifunctors:=[profile?]
+ dev-haskell/contravariant:=[profile?]
+ dev-haskell/fail:=[profile?]
+ >=dev-haskell/primitive-0.6.4:=[profile?] =dev-haskell/primitive-addr-0.1.0.2:=[profile?] =dev-haskell/quickcheck-classes-base-0.6:=[profile?] =dev-haskell/semigroups-0.17:=[profile?]
+ dev-haskell/tagged:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+ aeson? ( >=dev-haskell/aeson-0.9:=[profile?] )
+ binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+ semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
+ semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] )
+ unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+ !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+ vector? ( >=dev-haskell/vector-0.12:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( >=dev-haskell/base-orphans-0.5
+ dev-haskell/tasty
+ dev-haskell/tasty-quickcheck
+ !vector? ( dev-haskell/vector ) )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag aeson aeson) \
+ $(cabal_flag binary-laws binary-laws) \
+ $(cabal_flag semigroupoids semigroupoids) \
+ $(cabal_flag semirings semirings) \
+ $(cabal_flag unary-laws unary-laws) \
+ $(cabal_flag vector vector)
+}
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 86a406d6fb4f..eb0da1bf1aca 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -1,11 +1,3 @@
-DIST scientific-0.3.3.8.tar.gz 18543 BLAKE2B ae3a16163d830fe20f7e2705b9e99aa9156743287aa45e635a282f5369b9132f2b8de11596353a5c374b0e11e5a2219ab40de842f1a273f956032fd1908ce514 SHA512 ef77aa3490cbbc92ab71c1db7015ead24100a6230444b895c49bc4840a80dad04f4f8ff0c1bff27490f5c35b53a1f0c294177912492d1259e204bd4d874ea477
-DIST scientific-0.3.4.4.tar.gz 21646 BLAKE2B 9ca2e989cea77dc70a1ce26de4571b0ccdd1ec68c7ab84f00bbb32d7a121963feae9cdd4acb7d51e417a698222143fd4a34d838af21e6f86551fb5f9e097e05f SHA512 18c36036ffe15ef4203d391864c91d505a4a55c7da1b71556cbd6ebb7f83e71e0695789f8beaa4741ae4e21ae54bc1f795a26cd4e3208d08625d639519945217
-DIST scientific-0.3.4.6.tar.gz 21932 BLAKE2B 5d78b981d5627b172af677a35a9bde73bd96053f06cf5e7945957400d3b2b6455bdd6d5039dbf21df16a8bf5f68889a54d9ef71eaf977e0908e21e7792575744 SHA512 c4d3f3c166c45395aa420ff598671128faae130cf85f22b651e338dbbdbe9215ef3b75c58f6b495978a4dd36a49fa45de9a68c7b870151296dc09095e3c79e09
-DIST scientific-0.3.4.9.tar.gz 21932 BLAKE2B 5f0f900b5b51d8b4720bf73d4f2ec4911df7156c9bb5013995eec5f9ee0817be61ad8caf4cc41d07f4b022467de1c6e6943eb630e93cb1b1d9760b6b2b0b58ee SHA512 10b317f6d6aa39883891d4fafaad3a8bdcc8390705f981144f3fe040191ffc7364e0505fde07ab7a3fa9d0b03f97adf42be48fcea2d13ef521fb1031590c0db3
DIST scientific-0.3.6.2.tar.gz 23510 BLAKE2B 096cd305cdbc4856f48e81de5387b229c4f23fdbfc641243ffa56a74422ec7b224fb2979f22cbdcf747d56c6073ce74ff6ca773093570a8d0a774e2b33d26697 SHA512 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee
-EBUILD scientific-0.3.3.8.ebuild 1311 BLAKE2B 8dbc0e2bb80b57b5fc64a50f8ab8dc3e974c9ff40237a3b5d1f7faf7ba37626184f800fff701d0aeffe18d363fa8555e8023182487700e3e331e3dc5004d09ef SHA512 0b9218d391828505bb4cafeda2b8cce466942931e1557e11bed8eabac12c529a4aeca7829d53358e31bad197b51958b109f4a5057384ccce6d1ed4e7dd27e523
-EBUILD scientific-0.3.4.4.ebuild 1462 BLAKE2B 87f91572f9a97f0b5abe4928ce5908b5a2c4e16544ee2161e1482071d1b53fcbb94f28d951ca6a247b8b003664390f01ff533bfb146057411b58ebdb4fedc856 SHA512 40b73de4817c99dd59b47f46b1efa938b154b71a5250cb72943f98728898037ad5ae3784d6722747f751e463f64d14b026a3f0da184ca8b7cc852fa08b2db94b
-EBUILD scientific-0.3.4.6.ebuild 1462 BLAKE2B d6b96237f8ee33c081e6e29f8ced684b11af9a45e7aef1a134aaf6a9526d145f857c9e000f655b5450c6a657288e27c6430f4bfe6ba93ec7da396c3d7cc6ad5d SHA512 0ea071927c7cfc4920c23a76dec9c4fa5ca9e779b3f29c56ab55ee6cbfa996aa7071c2450db56e0027282edc49e42b8b24d44765a53c70b551776f6621e392c7
-EBUILD scientific-0.3.4.9.ebuild 1433 BLAKE2B 0094267797c399fc3d40ac034d2f8f9e0fdc81779274b80a6ea214a135af28ca37d69758d34e7e7c804c40cdeba4fbccb1e271c82dd6c10cce3e9bf23deec553 SHA512 529748a4a3ec24061b1f504b7a4bd91bcb354bad1104ccd44cb588ff7a27937168506f47e5428356999ea71610c2e358a66ef8f748545c73e68a113e14e39dd5
EBUILD scientific-0.3.6.2.ebuild 1003 BLAKE2B 74568fe34148084cb21513d016e5bdcd4deda8208109486d67312c43fd78f4bbaf22a96176bb4f1020b61291306514567499db7b2672158f267e6d9da0c1a936 SHA512 f746132e49f8cf3553b3347df977a61ae2706c34c98b76da533692aefa64b1765bb2c1ce0cec06b56ecb7e013a2873f8633efabd8510d9706b2f9ed4a521242d
-MISC metadata.xml 1019 BLAKE2B 199c5a43e898b24760454aa88076485f8615506c4feda7df63dec16a907f1f9a645039ce7c4a5c4bd85f642cc1aca577edfc3b714c8632eae99d0f827fbaf8e5 SHA512 954d114b29202a451e82be2dea78c68db8b23c52d46a2dbc59b7cbef7d500d91edc0e23dce702f36569caa7ed3c85ee52bc3cc314d18e9249218635390252963
+MISC metadata.xml 865 BLAKE2B 52a07c5a35f30ad750004fbbe63818dfa5fdef4964bb3dccf62a55f1c67fed8e860f558f02e2bce6b148f03da31db9650421bfb8d82985376e5c02b3c48799e3 SHA512 2ceead4c34d1554693d2ccb1c65c35e2d06f20fbc04053973ef58466b5cb7fc48f36accd358e7bdd14fca01cb7a958d6a1fb82d4aff4cf57cad4360e23167cfb
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index af4a88b17cb6..bc68c8a356b5 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -19,12 +19,6 @@
scientific notation they can be efficiently
parsed to a @Scientific@ number.
-
basvandijk/scientific
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
deleted file mode 100644
index d7b467896092..000000000000
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ /dev/null
@@ -1,39 +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.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/hashable-1.1.2:=[profile?] =dev-haskell/text-0.8:=[profile?] =dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/quickcheck-2.5 =dev-haskell/smallcheck-1.0 =dev-haskell/tasty-0.5 =dev-haskell/tasty-ant-xml-1.0 =dev-haskell/tasty-hunit-0.8 =dev-haskell/tasty-quickcheck-0.8 =dev-haskell/tasty-smallcheck-0.2 =dev-haskell/binary-0.4.1:=[profile?] =dev-haskell/hashable-1.1.2:=[profile?] =dev-haskell/text-0.8:=[profile?] =dev-haskell/vector-0.5:=[profile?] =dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/quickcheck-2.5 =dev-haskell/smallcheck-1.0 =dev-haskell/tasty-0.5 =dev-haskell/tasty-ant-xml-1.0 =dev-haskell/tasty-hunit-0.8 =dev-haskell/tasty-quickcheck-0.8 =dev-haskell/tasty-smallcheck-0.2 =dev-haskell/binary-0.4.1:=[profile?] =dev-haskell/hashable-1.1.2:=[profile?] =dev-haskell/text-0.8:=[profile?] =dev-haskell/vector-0.5:=[profile?] =dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.16.0
- test? ( >=dev-haskell/quickcheck-2.5 =dev-haskell/smallcheck-1.0 =dev-haskell/tasty-0.5