Backport fixes from -9999 to release, remove old

Package-Manager: portage-2.2.7/cvs/Linux x86_64

8 files changed, 33 insertions, 269 deletions

diff --git a/dev-lang/tcc/ChangeLog b/dev-lang/tcc/ChangeLog
index 44cbd51ecdf7..006dd86b7bb4 100644
--- a/dev-lang/tcc/ChangeLog
+++ b/dev-lang/tcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/tcc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.39 2013/10/13 01:33:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.40 2013/10/13 06:56:00 patrick Exp $
+
+*tcc-0.9.26-r1 (13 Oct 2013)
+
+  13 Oct 2013; Patrick Lauer <patrick@gentoo.org> +tcc-0.9.26-r1.ebuild,
+  -tcc-0.9.23-r1.ebuild, -tcc-0.9.24.ebuild, -tcc-0.9.25.ebuild,
+  -tcc-0.9.26.ebuild, -tcc-0.9.26_pre1.ebuild, tcc-9999.ebuild:
+  Backport fixes from -9999 to release, remove old
 
   13 Oct 2013; Patrick Lauer <patrick@gentoo.org> tcc-9999.ebuild:
   Remove keywords from live ebuild
diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index e9f37ae51006..d8bdd75b1bcb 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -2,16 +2,8 @@ AUX tcc-0.9.23-anonunion.patch 1971 SHA256 32ecc52923bb10a6ff43e507e097d41c7da87
 AUX tcc-0.9.23-asneeded.patch 1711 SHA256 14d3029d2cb7a27c3dfbdc98562aa309d5a3002218ba115584c605ea4cd8e839 SHA512 e17cfd98dcca877d134a9fedf0995639f5d3d6f19a21c170836c014933eea59b0499016911c2c3ac3acdfa8f0e131057b38eb9f25b6498183a26687ab5db4807 WHIRLPOOL 28a83a0559e96f2c8132fd4e43af106b77398baa8c7688d4dd8154a04e2f4e8d8663e65868f0a0fca727dc773720a8fbd6077139eb6964084ebbb75464c7e3ef
 AUX tcc-0.9.23-nxbit.patch 2160 SHA256 1296c9023fb2787e0c8530b27ff565175725b406d5ec54b1898a9b5550bb848d SHA512 b45260c3c9a24e6ed5948fd81716cc3d9085a3a7f123322353988f0022c75f89940642809c31e6992a1016c8b121dcb83234f7baed8f93f8409e9a42a15e88e2 WHIRLPOOL 704e15c3417dc948ad03b5bba8d79dd15911c385ae6c04cfcc3a8cf8e13ae49fe7547fe517889e7a089ae52b1541b17b24ca00f87f0e508501c47c77ae170ca1
 AUX tcc-0.9.25-flags.patch 2768 SHA256 91011cc843a7563bc91ca71e9bcc8dcd95102d370b276b266f12a64ddd705070 SHA512 7a511fd2bbc9263b92cc5171ba1c1518b98db13d051246a9183e578b53e0b1d5598e34bda0e8ac368adc3fa8378fa27b5c3dae74e847fc49739b12adf1c553c3 WHIRLPOOL 97079b179a686c645a46163c11fe6229dfd4b3d77c07c3b24fcf77c71484a9a881abfebbc78915ba4f71aefd873e3c59ee25750e545c2c01fc552c4d4ba23f58
-DIST tcc-0.9.23.tar.gz 423807 SHA256 074632c574116004c63b32798048c73c184d123d8cf96cce849765296b255991 SHA512 f741a9d6416dd23b97743e4a984b84613a2571744008956c1167abbc503e00d7edb721b64108a7cc2193d4a5605e42846d12d1e77060266d343f9bc477b624b4 WHIRLPOOL 9a57fb1b8ad5dbd08556db426ab0d9311e4e5cba84de586c4156079b1a3c1fa660183548e85895d172edfa6fbf4fb0202e93a7ed30aa4036c6f918d2da72fd52
-DIST tcc-0.9.24.tar.bz2 364601 SHA256 27aed4071ab6ec5a7b5425d0346a214747ab6375353ca3ee8514f87984f94e79 SHA512 f0d2727501d21a25bd92f6d6a0d903d86ce95b2fd9dfe406bc896312393aab4bc1a76d4ccbca0c4cb6494bb935435e6687cfc1daa75fc04ae9a78b0b1b786f3d WHIRLPOOL 8f7568e293c254247f16da42cc6a34008ac9c72772d5ddec29453bced915e8cb4a3c11d0644c0e4b022ccb42501685dd2c25a0a798398d16e5950beefb7b0685
-DIST tcc-0.9.25.tar.bz2 382914 SHA256 1bed6cb0fb2ef4100df1b94435d22863679e84cf419ec48ef96d9c0e9063de35 SHA512 d214ed420b58b2fcb1a7702fba0ed8eb6f5a4a1e94524abacb24604e86ebdd2a0c0f5d72fc1f89df0f291c78c4a8e0f306e1168207b68a9de4a710db3f368997 WHIRLPOOL 6fb4c5b5a2e2b59636257b14fe40a6cad7d869bcac8e9cd22869a7318961a30458c870672ccef770792fa2fd77b7fb38eb65477d68d8b99bf5b11bcc0c0a049e
 DIST tcc-0.9.26.tar.bz2 525906 SHA256 521e701ae436c302545c3f973a9c9b7e2694769c71d9be10f70a2460705b6d71 SHA512 abdbe208498cf4865a2036b5426616f5888b9b0e8d5d2fda6d1dd4afab3386167f12eca87d8a5c4c9b7dc88620d983ddce3e874b7dfa9c21eceea29ffa635d53 WHIRLPOOL 62fc30f8a72f8f78ba4b7e3d8d11f5e5a920615dff0ff799a64fdb9611017a4d1537c10228f94250ac202dedcd05d0aa90a8565dc5956d5639b70a7e4fe1009c
-DIST tcc-0.9.26_pre1.tar.bz2 507151 SHA256 4ca940cae772d9b5e189254898c92c5bd7a86ba6249178250d9f1329a70b954e SHA512 5c2828a7864ec4c2e5025fadb0b5edad3acb5060c25d239c8931ac2da9c2bbbc3ee77fa9534b22bbbe950eb0e99b8558c727feba4404a455c42dac1ddcdcc611 WHIRLPOOL 5f9966c185fe3bca6d6ad595943b58dd6510bffd14e9e341b16922b6c2c73f0759648e52e773bff7c92a3894ca4eac4cc0f6cc3c09093545ce8c47699554de64
-EBUILD tcc-0.9.23-r1.ebuild 1541 SHA256 32cdd2dde46e229571e4e9dee874118371a4b630388914f8ba9f867776763611 SHA512 e2cf87f833b7750bb9522f9ab5a3d0bdf15cb2287d4f634ce24e876de5799249c4546f9f50e6279f6231e1d0da83b4f3e78f8b52881de24dffdda67bcc5e4952 WHIRLPOOL 4f6c00f79ba8610f0451d5e66d9d300e46104c8d1b0188df3f67397724b23d68e4fe4faa2eb2e7941a7c01960f8faf7074fcd42edf20b96b35c875c00c55de3d
-EBUILD tcc-0.9.24.ebuild 1567 SHA256 990874e27f30952a339ae0d33051204f0e602cfe7711c53aa99b45196af86cf2 SHA512 19ea4f60864d649715d4587e3cb0072b1cd49ad64fdc75e62ac8113a1a3fcec706452b6ee8727d5df0a98a3f22cdfdea7bb95795f29bfb26ca0469e40e70a818 WHIRLPOOL 1c2ba151890a318e7b942274cd11bb93c896b8daf618af3d77ffc334df5f59fe9ccb73be60666b5a81fd9ee71ecf947672c5ab20a59c4709584dcfe372033f4e
-EBUILD tcc-0.9.25.ebuild 1473 SHA256 6885eaea0056448a90479bc7b5a5f208eff645ff204a67d37cadc369d0c3bd74 SHA512 ed0350ec6e3c24cda588553fc9d63c3569f30fb163662c1f920f2c64bd19a381c873cdf94f70c208c1fdddd13cccf63ed7735ec8bbf6d7d05ba8bfe0c4af60db WHIRLPOOL 91fb590ce78d68325e7146c5e6ccaaee686bb5fd0d0e3a8d3f950fb2715e2997b8a6817ea756470c07642a2b2740fd6b338c2469670fd68c571232181548916a
-EBUILD tcc-0.9.26.ebuild 1422 SHA256 3edcf13b07ac0c1405b2b97b1023a25076958e30fe95964129fd9bedefd9ce2b SHA512 f3c63158ee743bb72dc94550e1cde7db40d75381e8e71a21248c24ad1480cc49dfef2b4a579a5f7d2e6b304ecb8e3a904b2b55922f9f08517981cc3252ed4faa WHIRLPOOL d703127fcd05876bdbd4a1886fa263e8ea58e2a1de0cf5b61663cea4f643a3a9fcdb9f68a951d216732da14115d81771d6ef74b3400df500bf19792ebf24875c
-EBUILD tcc-0.9.26_pre1.ebuild 1515 SHA256 db7f2c3b5401ea011b1f42c36c4aadc2059dce95c394c907469a06de7e29c573 SHA512 400cbf8c7f3e8ee862bcfe721f470b12fd0bdb4439d9665313c1f8e5745fd94aa8a4861be69700baac7e0724180305366b5cfb6bf1a0186948c7f0abd44bb557 WHIRLPOOL 0937134f0b9d5b6dae863e61c6e5ba090028684f6d277bc23d1c431a5187fa86ebb43d91670b4ee573a4417a2b8b2b63745ea5284ceaf64729835a75e1293da3
-EBUILD tcc-9999.ebuild 1725 SHA256 1932ebcf16e3698756e44bdbe8b308c8510cdcbf7a32f1201d9ae66230229061 SHA512 e279de661caa73bc10eb417f91dd8f134b6a9cc0b4cfea8209e14195de92352b3f091c2a39395d9e9db061a5f02f2680b54eec9800fa5fa4d28efc09e8d8640a WHIRLPOOL ab7c96c40ad5865c71a48c79d3a2bf4bbbad59805c2a7177f8b2f8f45d5023a7ec72be644cf6b87aef9c0eaaa2d1b0b65f3f76ea23a820f855fbee302f498fd8
-MISC ChangeLog 6039 SHA256 fbf0519ded0fbe327ddff49ad5bdb30061dd5933b081c10eb046174fb1a328e8 SHA512 46587aa257cf0bb9ebf0990de953411f9ed532c5e2a41859a0ce03df195cf8584319314935904d0cf52d620e6c3f8a4a8a17de011f500510922bc6c0516d0f46 WHIRLPOOL b455082616203b406d27d91d1e1e24c245526e82916ef62e9a24576b37badc0d0c0975b824ac56615ec9e39b63af9022139ddc5243a580539229e715d304ecfd
+EBUILD tcc-0.9.26-r1.ebuild 1759 SHA256 02b8a1def2aca43bd02ca9caf75c3d7018409445dd9c5e9368cb9a4667203b47 SHA512 dae94be7ca10c9b0b7df4a9a99d674de11b66061d2ab64bbad4664ef7cab2a98469c4a4a745bfacd5ab69ddeafff03cdd097ae6eaffb6eac150ca41ff2227ecb WHIRLPOOL 37ede57c871ce9b3f16618a7284e58b1e6d1e362663bbccddff9c03e8ee37f0ff79f2e88500b23b76a8e3318b7178c2011ad63ce5137bf5943f5d78f065935fb
+EBUILD tcc-9999.ebuild 1725 SHA256 0e285333e0e06dc9229e2cf949940fb96c08c0d2b2338df2a7e98f320ef6de70 SHA512 03a07c9a98ddc36c8db1bdcb6192b347f04bb9dec0f85cc39494c5f65e192a74b8c2a4504e8254e561449362805010ab277597d26e5d76f987ca58e082dfa610 WHIRLPOOL eefb418ababa2bed4fe77044a58a96830ba7c12b24e5ab34db7b67ed8575d7da5a9033ee0673ba8ed9960e9ac5dc808c2ac2b47cc466b29c614fccaa4d6b61cb
+MISC ChangeLog 6323 SHA256 3033ac6e937c1809b86f7a1815d5d9296533ec0e65f08947973fa50159122fbd SHA512 d348bd6068036e15ca404e8ed7e317dd7b92e645b69e840a7b5927b9ce2f01850f8c175afcfccb43077788a898a73f8e3293c75753a87d04b3575fe70e3104bb WHIRLPOOL db41c04a9a76c312b4310d4c015b25251b76703ee0516e559efa9050f5951832ceceb1d0bbc800a7c0ebf6828df99c77ebafdf4b0560cf99fb5f4190d645f5c9
 MISC metadata.xml 162 SHA256 444ece0c3cb4908c78c6588147078383d3636d1b3da9a20111ec03c5640eefdb SHA512 90b297db4586c916661651712b086666171b3cb06a716b1c9b72adff283eb32f0892a344f390d986edf44a7e6a6052d962c2f5926c450485841fad29a3dffd58 WHIRLPOOL 3b050468257155cec1a6d660c08ce4efb2e80d664a08e83057496a602268c493832c73b032aceb880654e5cef88abbc0c7f8f9e054aa383030b36397e111e34a
diff --git a/dev-lang/tcc/tcc-0.9.23-r1.ebuild b/dev-lang/tcc/tcc-0.9.23-r1.ebuild
deleted file mode 100644
index bee701a9ca4e..000000000000
--- a/dev-lang/tcc/tcc-0.9.23-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.23-r1.ebuild,v 1.6 2009/01/04 21:03:25 patrick Exp $
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="A very small C compiler for ix86"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.nongnu.org/releases/tinycc/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* x86"
-
-DEPEND=""
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-
-# Testsuite is broken, relies on gcc to compile
-# invalid C code that it no longer accepts
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-anonunion.patch
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-nxbit.patch
-
-	# Don't strip
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile
-
-	# Fix examples
-	sed -i -e '1{
-		i#! /usr/bin/tcc -run
-		/^#!/d
-	}' examples/ex*.c
-	sed -i -e '1s/$/ -lX11/' examples/ex4.c
-}
-
-src_install() {
-	#autoconf for the package does not create dirs if they are missing for some reason
-	dodir /usr/bin
-	dodir /usr/lib/tcc
-	dodir /usr/share/man/man1
-	dodir /usr/include
-	dodir /usr/share/doc/${PF}
-	make \
-		bindir="${D}"/usr/bin \
-		libdir="${D}"/usr/lib \
-		tccdir="${D}"/usr/lib/tcc \
-		includedir="${D}"/usr/include \
-		docdir="${D}"/usr/share/doc/${PF} \
-		mandir="${D}"/usr/share/man install || die
-	dodoc Changelog README TODO VERSION COPYING
-	dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
diff --git a/dev-lang/tcc/tcc-0.9.24.ebuild b/dev-lang/tcc/tcc-0.9.24.ebuild
deleted file mode 100644
index c382f60fcd20..000000000000
--- a/dev-lang/tcc/tcc-0.9.24.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.24.ebuild,v 1.1 2009/01/04 21:03:25 patrick Exp $
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="A very small C compiler for ix86"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.nongnu.org/releases/tinycc/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~x86"
-
-DEPEND=""
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-
-# Testsuite is broken, relies on gcc to compile
-# invalid C code that it no longer accepts
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch "${FILESDIR}"/${PN}-0.9.23-anonunion.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.23-asneeded.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.23-nxbit.patch
-
-	# Don't strip
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile
-
-	# Fix examples
-	sed -i -e '1{
-		i#! /usr/bin/tcc -run
-		/^#!/d
-	}' examples/ex*.c
-	sed -i -e '1s/$/ -lX11/' examples/ex4.c
-}
-
-src_install() {
-	#autoconf for the package does not create dirs if they are missing for some reason
-	dodir /usr/bin
-	dodir /usr/lib/tcc
-	dodir /usr/share/man/man1
-	dodir /usr/include
-	dodir /usr/share/doc/${PF}
-	make \
-		bindir="${D}"/usr/bin \
-		libdir="${D}"/usr/lib \
-		tccdir="${D}"/usr/lib/tcc \
-		includedir="${D}"/usr/include \
-		docdir="${D}"/usr/share/doc/${PF} \
-		mandir="${D}"/usr/share/man install || die
-	dodoc Changelog README TODO VERSION COPYING
-	dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
diff --git a/dev-lang/tcc/tcc-0.9.25.ebuild b/dev-lang/tcc/tcc-0.9.25.ebuild
deleted file mode 100644
index 64abe0442ddc..000000000000
--- a/dev-lang/tcc/tcc-0.9.25.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.25.ebuild,v 1.3 2010/08/16 20:05:34 truedfx Exp $
-
-inherit eutils toolchain-funcs
-
-IUSE=""
-DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.nongnu.org/releases/tinycc/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-
-# Testsuite is broken, relies on gcc to compile
-# invalid C code that it no longer accepts
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.9.25-flags.patch
-
-	# Don't strip
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile
-
-	# Fix examples
-	sed -i -e '1{
-		i#! /usr/bin/tcc -run
-		/^#!/d
-	}' examples/ex*.c
-	sed -i -e '1s/$/ -lX11/' examples/ex4.c
-}
-
-src_compile() {
-	local myopts
-	use x86 && myopts="--cpu=x86"
-	use amd64 && myopts="--cpu=x86-64"
-	econf ${myopts} --cc="$(tc-getCC)"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake \
-		bindir="${D}"/usr/bin \
-		libdir="${D}"/usr/lib \
-		tccdir="${D}"/usr/lib/tcc \
-		includedir="${D}"/usr/include \
-		docdir="${D}"/usr/share/doc/${PF} \
-		mandir="${D}"/usr/share/man install || die "make install failed"
-	dodoc Changelog README TODO VERSION
-	dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
diff --git a/dev-lang/tcc/tcc-0.9.26.ebuild b/dev-lang/tcc/tcc-0.9.26-r1.ebuild
index 33d050199f35..ff4a590d2c34 100644
--- a/dev-lang/tcc/tcc-0.9.26.ebuild
+++ b/dev-lang/tcc/tcc-0.9.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.26.ebuild,v 1.2 2013/07/18 03:44:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.26-r1.ebuild,v 1.1 2013/10/13 06:56:00 patrick Exp $
 
 EAPI="5"
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="dev-lang/perl" # doc generation
 # Both tendra and tinycc install /usr/bin/tcc
 RDEPEND="!dev-lang/tendra"
+IUSE="test"
 
 src_prepare() {
 	# Don't strip
@@ -31,13 +32,20 @@ src_prepare() {
 
 	# fix texi2html invocation
 	sed -i -e 's/-number//' Makefile || die
+	sed -i -e 's/--sections//' Makefile || die
 }
 
 src_configure() {
-	local myopts
-	use x86 && myopts="--cpu=x86"
-	use amd64 && myopts="--cpu=x86-64"
-	econf ${myopts} --cc="$(tc-getCC)"
+	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)" \
+                --bindir=/usr/bin \
+                --libdir=/usr/$(get_libdir) \
+                --tccdir=tcc \
+                --includedir=/usr/include \
+                --docdir=/usr/share/doc/${PF} \
+                --mandir=/usr/share/man
 }
 
 src_compile() {
@@ -45,17 +53,15 @@ src_compile() {
 }
 
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		bindir="${D}"/usr/bin \
-		libdir="${D}"/usr/lib \
-		tccdir="${D}"/usr/lib/tcc \
-		includedir="${D}"/usr/include \
-		docdir="${D}"/usr/share/doc/${PF} \
-		mandir="${D}"/usr/share/man install
+	emake DESTDIR="${D}" install
 
 	dodoc Changelog README TODO VERSION
-	dohtml tcc-doc.html
+	#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.26_pre1.ebuild b/dev-lang/tcc/tcc-0.9.26_pre1.ebuild
deleted file mode 100644
index 4b8aeaf436d2..000000000000
--- a/dev-lang/tcc/tcc-0.9.26_pre1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.26_pre1.ebuild,v 1.2 2013/04/16 09:35:47 patrick Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-IUSE=""
-DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://dev.gentoo.org/~patrick/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-text/texi2html" # doc generation
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-
-# Testsuite is broken, relies on gcc to compile
-# invalid C code that it no longer accepts
-RESTRICT="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
-}
-
-src_configure() {
-	local myopts
-	use x86 && myopts="--cpu=x86"
-	use amd64 && myopts="--cpu=x86-64"
-	econf ${myopts} --cc="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		bindir="${D}"/usr/bin \
-		libdir="${D}"/usr/lib \
-		tccdir="${D}"/usr/lib/tcc \
-		includedir="${D}"/usr/include \
-		docdir="${D}"/usr/share/doc/${PF} \
-		mandir="${D}"/usr/share/man install || die "make install failed"
-	dodoc Changelog README TODO VERSION
-	dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
diff --git a/dev-lang/tcc/tcc-9999.ebuild b/dev-lang/tcc/tcc-9999.ebuild
index 0ac086efc9f9..5997043d8067 100644
--- a/dev-lang/tcc/tcc-9999.ebuild
+++ b/dev-lang/tcc/tcc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-9999.ebuild,v 1.4 2013/10/13 01:33:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-9999.ebuild,v 1.5 2013/10/13 06:56:00 patrick Exp $
 
 EAPI="5"
 
@@ -36,7 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
-	use test && unset CFLAGS LDFLAGS # Tests run with CC=gcc etc, they will fail hard otherwise
+	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)" \