Backport fixes from -9999 to release, remove old

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 30 insertions, 258 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/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)" \