gentoo resync : 30.05.2020

15 files changed, 12 insertions, 134 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 3eea0d1f94fd..9106dc4cb571 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/anigif/Manifest b/dev-tcltk/anigif/Manifest
deleted file mode 100644
index 246c33786b34..000000000000
--- a/dev-tcltk/anigif/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST anigif-1.3.zip 18270 BLAKE2B 02d154165d3d7b598e2ee6b0a537ca9a80b02c449a26aedb92aa4d7692e8443680fd55526fd4760757ca0686867475760ba2351baaf1be8592aff05215402c31 SHA512 d9611319461cd4a956eaacbbd63104594fc20752731a9dc314934409a1705d822738f266f4dd4419cd966ce4161148a74e9607be4ed734cb6b715ad00b4743ab
-EBUILD anigif-1.3-r1.ebuild 490 BLAKE2B 20a3c6015085dce1aeaa3f09130cedb899897fa7b08253ec7c45e02dfd4a347f048a8a9f20f775d349eb6b0cba84d001d36863fd537be717d16fe64bf342c4ac SHA512 ea21283209cd69e8fa1b0c87e3e8e75a6e7f099cd6117d60ca67cd9e697898de5e9fd80c39a7c612ff19c94772b74e0b6d4ca1d07ec68b974925191ce5b10f09
-MISC metadata.xml 251 BLAKE2B acd83d9f4b3e0aad8b344a89bfa05ecd317bafb67e94b6419126a240e3c1318b28fbcf0354b33a4c53de3dfb13a7dab86db1160210ce830aeaf6247244cc5cee SHA512 41c00844e2a94c1a10e3e18e835452e4eb171b62606f850305a8b24bcae57c201ab093ac7fc330e39c796e08a648cb8de98a0ca95a0dfc063ec5bafaa93f0790
diff --git a/dev-tcltk/anigif/anigif-1.3-r1.ebuild b/dev-tcltk/anigif/anigif-1.3-r1.ebuild
deleted file mode 100644
index 21f658b0bee9..000000000000
--- a/dev-tcltk/anigif/anigif-1.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Image rotation package"
-HOMEPAGE="http://cardtable.sourceforge.net/tcltk/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.zip"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/tcl:0"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/$(get_libdir)/${P}
-	doins *
-}
diff --git a/dev-tcltk/anigif/metadata.xml b/dev-tcltk/anigif/metadata.xml
deleted file mode 100644
index a8cd1c3ffe87..000000000000
--- a/dev-tcltk/anigif/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">cardtable</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-tcltk/combobox/Manifest b/dev-tcltk/combobox/Manifest
deleted file mode 100644
index 66dc9c18048c..000000000000
--- a/dev-tcltk/combobox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST combobox-2.3.tar.gz 37327 BLAKE2B 2d89eb45099d3ab2b4c40d54c9da4ce484df09c3562abb0a50ef1850a43290b7221aa7c9eacdedbeea6b08b9022b0f512ab77aaec8349d34d7fb43d771f2d7db SHA512 6c85ed671ad64d671630bba09cbcbbcecee91d0ed77a63eee60b1b1ae12caf6312ab1da9a1cbb8ac949136ac37889c20f4dbd0097e41c8eeb3b018ebbafcf36e
-EBUILD combobox-2.3-r1.ebuild 533 BLAKE2B a369baef38ebc607ad3c0e970aad3b3fbd716ba57cd6ff297de14dd596253637c1d3f19cf1a04ea8702ca8f1054fc7fb169b511a3e93303d5cd6124562edb8cb SHA512 793158090b58f4ec89cc41c7b8493a96883d71c548d542bc9b0d7d62a9f7c4030afb72ca7e35214412a522ea3fa2dd53d16071e43374e10ef21882b64e6e2893
-MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-tcltk/combobox/combobox-2.3-r1.ebuild b/dev-tcltk/combobox/combobox-2.3-r1.ebuild
deleted file mode 100644
index 18deabbbf549..000000000000
--- a/dev-tcltk/combobox/combobox-2.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="A combobox megawidget"
-HOMEPAGE="http://www1.clearlight.com/~oakley/tcl/combobox/index.html"
-SRC_URI="http://www1.clearlight.com/~oakley/tcl/combobox/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/tcl:0="
-DEPEND=""
-
-src_install() {
-	insinto /usr/$(get_libdir)/${P}
-	doins *tcl *tmml *n
-	dodoc *txt
-	dohtml *html
-}
diff --git a/dev-tcltk/combobox/metadata.xml b/dev-tcltk/combobox/metadata.xml
deleted file mode 100644
index 8425c0d53cb0..000000000000
--- a/dev-tcltk/combobox/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
index b2c4ea9fb8ef..80c8596fd0ed 100644
--- a/dev-tcltk/expect-lite/Manifest
+++ b/dev-tcltk/expect-lite/Manifest
@@ -1,3 +1,3 @@
 DIST expect-lite_4.9.0.tar.gz 149560 BLAKE2B 6db5c7f37d996996bcd94ef5e0b7d2d2d592cfd88f56f751c35f53826d3cea473861d332327caf4e9c6950a983b2d907955a7b68e8ea46655e07a8197fbe1f6b SHA512 1a210f5937cf31768a77c9f8d7147be1d8bd3f4e3c68c8941fef7871d22c209c9946aa1f3b2705a0332523439a7e8c9ef7ae3a46d4b5174b5e759bf15dcad4e5
-EBUILD expect-lite-4.9.0.ebuild 635 BLAKE2B c6c84f54d8f129545223f0e3497643d9d4e6ded023bf35e400d95653a19c63e22aa1a567ba7cf281d1b604c57f9e22bd3526433a9e497aa5e79d9a58ef687206 SHA512 ac97c4a8153746bc5e93464907012309aa5c980f58c4814581efe30b7a3cdab1c21af4ab1bff90d48ad2638fee42a84d00df970901989f78cebf886e072555e7
+EBUILD expect-lite-4.9.0.ebuild 652 BLAKE2B 76f526f491ac64b4833f7d996769b0647a103e7e93e6f71a20cf22c5770256dec846e247b99bd8bb4ca1b1940d6c35f1b7267f7d0fbc9e37479156c253f2fc30 SHA512 bb752ffb9f3e9bd5668c6e256a00ed4472e1a77c9fa10b76d12241b05a4371a439bd1f3b602936718e0d6529092284b7b8959628abf5fed6bf21eb9c97493c4d
 MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
index 7e006fefdd6b..71432aaa93d8 100644
--- a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
+++ b/dev-tcltk/expect-lite/expect-lite-4.9.0.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="6"
@@ -28,6 +28,7 @@ src_install() {
 	dodoc -r Docs/*
 
 	dobin ${PN}
+	gunzip man/*.gz
 	doman man/*
 
 	if use examples ; then
diff --git a/dev-tcltk/tcl-mccp/Manifest b/dev-tcltk/tcl-mccp/Manifest
deleted file mode 100644
index 4bf4d31c9ddf..000000000000
--- a/dev-tcltk/tcl-mccp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tcl-mccp-0.6-flags.patch 542 BLAKE2B 79b55fa8fc3ec3a7a7db8070699b426ca50fb7d76dc6185a141e0490d430cc84ba8ca8eb131f5b6f3745a1c3ddd9125b88e739491aaaae6089a1e1a6e28849b0 SHA512 c89c93b56ad2fc5d30ab79b968e79ac4eb737b1e545108e4f1d76828418f5e5d3f38505ea4a0a2adbbc676f8f7e1e40eda0e6e2c4c79238087096b44cb690886
-DIST tcl-mccp-0.6.tar.gz 167446 BLAKE2B 6ebd6fb6fbaa8cd8c6438dd21e38fd19fca47c1e0c7e96c33fc183e7be2d2c42fbfb2b3225e49243c941a1f018d6efbef3183ef736a52117e2e3cf01d1698aec SHA512 d3f77b49454dc4f838b91d95146c71d6f8d46d293743b46b551e9217a92a9f6b03b26400cc21faf9bb22a0a0f92123b25f9b284453f756654e87b82201c395e6
-EBUILD tcl-mccp-0.6.ebuild 483 BLAKE2B 804495c264e70ffa6a1f276fe4978a3029c40c79270530ae84d9895d7a2e8be19b00ccc2b297c094a2a3c297e9f96b329f8373adf60ed3c0d24cdb991fc13a24 SHA512 45be67f435d5b7125f274182e45b5da86062063acbb3c1dd3fca8e868f4a62f2e7284f8b217fa3da008309e036148e187a5c1e242ef523ffe0562ff0e0d2314b
-MISC metadata.xml 331 BLAKE2B c997cc555632151748b711b082971ca85a7fc9649144465ca0d8b4ab32656f039eedffc742aace78ac6f32cd1fadae2ed9c55f4eb134946d4d539cca7c9e0a6b SHA512 b22d31f4f4502cd2efa5aeee0914277c7b3fe45967ed231b2514f26cad2b86ea03beb19b60e88c2a5fce6c26833bdf50d2b5aafd554af98fc0a7c976942c46d9
diff --git a/dev-tcltk/tcl-mccp/files/tcl-mccp-0.6-flags.patch b/dev-tcltk/tcl-mccp/files/tcl-mccp-0.6-flags.patch
deleted file mode 100644
index b3b563d3d7c1..000000000000
--- a/dev-tcltk/tcl-mccp/files/tcl-mccp-0.6-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 956887d..4af7a06 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -91,8 +91,8 @@ lib_LTLIBRARIES = libtcl-mccp.la
- libtcl_mccp_la_SOURCES = MCCP.c mccpDecompress.c
- lib_DATA = pkgIndex.tcl
- 
--CFLAGS := -Wall -I $(TCL_PREFIX)/include -lz
--LIBS := $(TCL_STUB_LIB_SPEC) 
-+CFLAGS += -Wall -I $(TCL_PREFIX)/include
-+LIBS += $(TCL_STUB_LIB_SPEC) -lz
- 
- # FIXME: is this the right way to mofify libdir?
- libdir = @libdir@/tcl-mccp
diff --git a/dev-tcltk/tcl-mccp/metadata.xml b/dev-tcltk/tcl-mccp/metadata.xml
deleted file mode 100644
index 368a0ae4c4a9..000000000000
--- a/dev-tcltk/tcl-mccp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tcltk@gentoo.org</email>
-		<name>Gentoo Tcltk Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">tcl-mccp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild b/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
deleted file mode 100644
index 136252e6cf21..000000000000
--- a/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="mccp extension to TCL"
-HOMEPAGE="http://tcl-mccp.sf.net/"
-SRC_URI="mirror://sourceforge/tcl-mccp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-lang/tcl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-src_configure() {
-	econf --with-tcl="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
index acb67c942242..61b412140240 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -7,5 +7,5 @@ DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b932
 DIST tclreadline-2.3.8.tar.gz 393167 BLAKE2B e6a8d35904a0ed22fac01d7f6b6ecc9eef99acea149253ec9a0f7a3463a163ef17daa052bd4801fb9e365b056ab58d69fe2ec9884a9279881638c7b99c12f6a7 SHA512 0c5ce53a8f4cc222de013932698e442c63b36e3f07d10b962d127444f75c28b2caf7f06b5958150748f7a1d535c577c825b9a0dd525e077a348c3ff899a74e61
 DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
 EBUILD tclreadline-2.1.0-r5.ebuild 1849 BLAKE2B b7fa4bf1db26f914acd559e6b30cfd8515f379d48dcc67b13f8be2e9a1ca8452fd802c59d5a31c34eb2e533c4996cb804fa75133cc309e87583dc3309e355199 SHA512 e07faa38e34fdab0c78673b3a824ae5f8fc9734e7477ae2a19aba437d0a90e1af0a8057a2d58f8dd7af6538ed6181336830402a0e3551c72046100b3fdbc1db6
-EBUILD tclreadline-2.3.8.ebuild 605 BLAKE2B 0260055ab64880cc0c2c397dfaa2236c4354f4453d373c6cfceae581976a20d64b0867811a3400a86f0b254bf05d872d13d97833d41a40d0fc2a4e219adb01f2 SHA512 a736d3b51912663c68270a855101a2b44e95687ba916c5292e96258c2d1792d49a641141b3ae098817319c85e5f0b068178d3e51ac878e79988a99a2b144a8e0
+EBUILD tclreadline-2.3.8.ebuild 704 BLAKE2B 60d504ecd5a2aa4d6afea1f5e3881518dbdb6152d3a4082eace065ecf7101d2c724ad3b8a466b3cf50f898e6d3f83b4cf7b606f5c55d5cb2887f37a49f4997a4 SHA512 a29a435bc219fe31da6349763bf8b3ec8337abbcf59cf551e4cdce68deaf33cdb820f06f8f840f85b42c40558399a37b2463777bbe5fd4bb6a504ca16ab233f1
 MISC metadata.xml 334 BLAKE2B b04f2a6d45f622095b6c4a34a0752583e773c10a7df53c77f02d642dc8ca715a1ab9dbd2ad64122142fd93122b004cd456350774a082cd3f72d0b920eb54e03c SHA512 23517fbebe1eedf4558ec1c04e10774229762eb7279d0bda99f602fac526afd817968bbff0ba23a1ef433684afda85f830ed7f5643b7c9cca22e7d2f66f71691
diff --git a/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild b/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild
index afd3eb3663d1..9ebdb8473d89 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.3.8.ebuild
@@ -11,16 +11,20 @@ SRC_URI="https://github.com/flightaware/tclreadline/archive/v${PV}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="tk"
 
 DEPEND="dev-lang/tcl:0=
-	sys-libs/readline:0="
+	sys-libs/readline:0=
+	tk? ( dev-lang/tk:0= )"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_configure() {
-	econf \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+	local myConf=--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+	if ! use tk; then
+		myConf="$myConf --without-tk"
+	fi
+	econf $myConf
 }
 
 src_install() {