gentoo resync : 17.02.2020

6 files changed, 4 insertions, 120 deletions

diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index faba86fee98d..3acae36ff34e 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -1,8 +1,4 @@
-AUX clang.patch 441 BLAKE2B 6b60d1fd80301abdd707a8310e0c93d12e91bb9d680b72db13c48de8bbe31a8923406c008c9c2ad68216ee2688c8651df85056127fefc5fa31f48521442fcc97 SHA512 e19817d5f500bd95060efff3c984218800cbcabe01a88fb048b459cce8d67c435ff1d2130d7eedac55f5726bc0cc13dabe41c2535c2bc3c5fc0a21dc7128a965
-AUX linker.patch 667 BLAKE2B b84f58dd0c460e36c90c6ff3f6cc342034daede23bae157152c7c44ac845c0cd30c6773966227a0d0cb6b08bb70770323c04209c880b2150414687e973717207 SHA512 aadbd3676b5333ae3b8a04c75117633ca8b08c5fa0f695b9f7ff7d3019ff06211c986d0a0986c7dc329621cc1a57e23d50924fd49cf1367490d962fcef4b4efe
-DIST tcc-0.9.26.tar.bz2 525906 BLAKE2B 588e387d563ddede9842ac9012df36520fb1596bd3047fda2684ab44e49f8c1a35c1560c2fee724933cfcad5d618d84df853b72e1fee144b551cb67f7af1558a SHA512 abdbe208498cf4865a2036b5426616f5888b9b0e8d5d2fda6d1dd4afab3386167f12eca87d8a5c4c9b7dc88620d983ddce3e874b7dfa9c21eceea29ffa635d53
 DIST tcc-0.9.27.tar.bz2 634999 BLAKE2B 9a76dac9f54fa0b64a72e874cfec9a4bd9b938d244d064b2e76bd31acfb9e48fdbdb8895132634be1dee4302293405bf75606a6804c8178afa8fd30daa53b73a SHA512 835184292d97c07f0ff7b36ec550e855e649b04e23c7e2a1c706d223409eb60708dc1ae969f28eba45e56c8b96ae56936b93caf9d8a13ac5adf119014d5367a7
-EBUILD tcc-0.9.26-r3.ebuild 1726 BLAKE2B 0c820f31b9c66a7dcb645e7e73169c88d1c1e3677d107381fd61fffd0f9f75cf0136d1cb5d0f6922b0fc6fcea9a6504dfeb701d727e42b7a230164f30297d1d8 SHA512 a596f1bdcad4d526e39841d3d81144492ff6b0d12809e57ea59d7dc162231ca8ef09d26e9efbd7cae297d78b7f4c0c45f9993a6343fd7e1fd8cf52e8417dca5a
-EBUILD tcc-0.9.27.ebuild 1569 BLAKE2B 62c6f6537960ce69a3ea7afc0ebd9a7d5b3d9151f1cfbd4ae4486a65c8a96dad5b7a140ff696d38192e97a6e46cb9072e3b0756fe5a64c84220da9bc77f5dc98 SHA512 f5f96a9edd2ab351c503a61e09c0f2189865bd108ecc721e551ebedab750facfc5d5da3380737ba3b1b10f93987c39495583aabe5507f1f70968e4ed558b6e70
+EBUILD tcc-0.9.27.ebuild 1507 BLAKE2B 463216d8345068c8852fc76571f7db26722813c05efbfaad2372b950d8344ece98c3452ff87899ff4e8616ed51c3df76a6fd6aa0ff53f40f2b363393eec50c67 SHA512 94bd0fe005b456f96e8c8da642d02a1cb6d2005aca0e1e1530e3167f85c50cb017c9849b391dfdc870da1e72da14206cecd6897833cd68cc111543014b06e8ce
 EBUILD tcc-9999.ebuild 1716 BLAKE2B 15babf54f338c50b0d15a46e97d603dfb6635f228d98be56d24e382d6ee95f7832dd63abb92f159cb57b328f93d40985c979212b7ea530f49eddcf5f250d880b SHA512 06ecbcf511e376cf6d243dcca0145b76c43f32a39760a241be1230969f3ddf4bfe95aa6d2b791804e6234b81435ddc9ef5af708243e3393846d3762f2897c090
-MISC metadata.xml 296 BLAKE2B 462027e1d9376620315a4740919c364088046fd44ab966260c6c6b165e503da13363cf485cdbcfa97717746b76c10069d1a5bf775643277ef47ce68e99f1c885 SHA512 b098dffc9f50966e80349d0fca166363191bd5e4cca786c3cdefd613f46c59b4abc2208cf22a75bcc5459531905713ac6ada2cc2ad77231c0ecdc1fef1bcf8f1
+MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-lang/tcc/files/clang.patch b/dev-lang/tcc/files/clang.patch
deleted file mode 100644
index 01cc72335fd8..000000000000
--- a/dev-lang/tcc/files/clang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fix compiling tcc with clang. Upstream commit 73ac39c317a20accaf3b25ba833deee0c2e2849f
-# Gentoo bug #502452
-diff --git a/lib/libtcc1.c b/lib/libtcc1.c
-index cf9babf..b46fb5d 100644
---- a/lib/libtcc1.c
-+++ b/lib/libtcc1.c
-@@ -647,6 +647,11 @@ struct __va_list_struct {
-     char *reg_save_area;
- };
- 
-+#undef __va_start
-+#undef __va_arg
-+#undef __va_copy
-+#undef __va_end
-+
- void *__va_start(void *fp)
- {
-     struct __va_list_struct *ap =
diff --git a/dev-lang/tcc/files/linker.patch b/dev-lang/tcc/files/linker.patch
deleted file mode 100644
index 8304470e3682..000000000000
--- a/dev-lang/tcc/files/linker.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fixes the default linker options for portage
-# Upstream commit ba286136bf8e48c71ffd6c2fd9ce97e64a6eeeb1
-
-diff --git a/libtcc.c b/libtcc.c
-index 127806f..dc78643 100644
---- a/libtcc.c
-+++ b/libtcc.c
-@@ -1560,6 +1560,10 @@ static int tcc_set_linker(TCCState *s, const char *option)
-             } else
-                 goto err;
- 
-+        } else if (link_option(option, "as-needed", &p)) {
-+            ignoring = 1;
-+        } else if (link_option(option, "O", &p)) {
-+            ignoring = 1;
-         } else if (link_option(option, "rpath=", &p)) {
-             s->rpath = copy_linker_arg(p);
-         } else if (link_option(option, "section-alignment=", &p)) {
diff --git a/dev-lang/tcc/metadata.xml b/dev-lang/tcc/metadata.xml
index e9e27ec895b5..4f503c94254e 100644
--- a/dev-lang/tcc/metadata.xml
+++ b/dev-lang/tcc/metadata.xml
@@ -5,7 +5,4 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<longdescription>
-	Tiny C compiler
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/tcc/tcc-0.9.26-r3.ebuild b/dev-lang/tcc/tcc-0.9.26-r3.ebuild
deleted file mode 100644
index 9148d63ce5d1..000000000000
--- a/dev-lang/tcc/tcc-0.9.26-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="https://bellard.org/tcc/"
-SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-DEPEND="dev-lang/perl" # doc generation
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	# Don't strip
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile || die
-
-	# Fix examples
-	sed -i -e '1{
-		i#! /usr/bin/tcc -run
-		/^#!/d
-	}' examples/ex*.c || die
-	sed -i -e '1s/$/ -lX11/' examples/ex4.c || die
-
-	# Fix texi2html invocation
-	sed -i -e 's/-number//' Makefile || die
-	sed -i -e 's/--sections//' Makefile || die
-
-	# Fix compiling tcc with clang
-	eapply "${FILESDIR}"/clang.patch
-
-	# Allows using tcc as the system compiler for Gentoo
-	eapply "${FILESDIR}"/linker.patch
-
-	eapply_user
-}
-
-src_configure() {
-	use test && unset CFLAGS LDFLAGS # Tests run with CC=tcc etc, they will fail hard otherwise
-					# better fixes welcome, it feels wrong to hack the env like this
-	# not autotools, so call configure directly
-	./configure --cc="$(tc-getCC)" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc Changelog README TODO VERSION
-	#dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
-
-src_test() {
-	# this is using tcc bits that don't know as-needed etc.
-	TCCFLAGS="" emake test
-}
diff --git a/dev-lang/tcc/tcc-0.9.27.ebuild b/dev-lang/tcc/tcc-0.9.27.ebuild
index 4fee67f37dc2..7090fdeb01d1 100644
--- a/dev-lang/tcc/tcc-0.9.27.ebuild
+++ b/dev-lang/tcc/tcc-0.9.27.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"
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 DEPEND="dev-lang/perl" # doc generation
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
+RDEPEND=""
 IUSE="test"
 RESTRICT="!test? ( test )"